archive-gh-me/google-map-react
1
0
Fork 0
mirror of https://github.com/google-map-react/google-map-react.git synced 2025-12-08 18:26:32 +00:00
Code Issues Projects Releases Wiki Activity

Add shouldUnregisterMapOnUnmount prop to persist map object on unmount (#722)

Browse Source
This commit is contained in:
Kevin Ramsunder 2019-03-18 13:29:52 -04:00 committed by Michael Diego
parent c8a7f56261
commit 40fe3ead1d
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/google_map.js
View File

@ -137,6 +137,7 @@ export default class GoogleMap extends Component {
style: PropTypes.any,
resetBoundsOnResize: PropTypes.bool,
layerTypes: PropTypes.arrayOf(PropTypes.string), // ['TransitLayer', 'TrafficLayer']
shouldUnregisterMapOnUnmount: PropTypes.bool,
};
static defaultProps = {
@ -161,6 +162,7 @@ export default class GoogleMap extends Component {
layerTypes: [],
heatmap: {},
heatmapLibrary: false,
shouldUnregisterMapOnUnmount: true,
};
static googleMapLoader = googleMapLoader; // eslint-disable-line
@ -424,20 +426,24 @@ export default class GoogleMap extends Component {
this.overlay_.setMap(null);
}
if (this.maps_ && this.map_) {
if (this.maps_ && this.map_ && this.props.shouldUnregisterMapOnUnmount) {
// fix google, as otherwise listeners works even without map
this.map_.setOptions({ scrollwheel: false });
this.maps_.event.clearInstanceListeners(this.map_);
}
this.map_ = null;
this.maps_ = null;
if (this.props.shouldUnregisterMapOnUnmount) {
this.map_ = null;
this.maps_ = null;
}
this.markersDispatcher_.dispose();
this.resetSizeOnIdle_ = false;
delete this.map_;
delete this.markersDispatcher_;
if (this.props.shouldUnregisterMapOnUnmount) {
delete this.map_;
delete this.markersDispatcher_;
}
}
// calc minZoom if map size available
// it's better to not set minZoom less than this calculation gives
@ -662,7 +668,7 @@ export default class GoogleMap extends Component {
this_._onBoundsChanged(map, maps, !this_.props.debounced);
if (!this_.googleApiLoadedCalled_) {
this_._onGoogleApiLoaded({ map, maps });
this_._onGoogleApiLoaded({ map, maps, ref: this_.googleMapDom_ });
this_.googleApiLoadedCalled_ = true;
}
@ -794,7 +800,11 @@ export default class GoogleMap extends Component {
})
.catch(e => {
// notify callback of load failure
this._onGoogleApiLoaded({ map: null, maps: null });
this._onGoogleApiLoaded({
map: null,
maps: null,
ref: this.googleMapDom_,
});
console.error(e); // eslint-disable-line no-console
throw e;
});