maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-26 06:47:17 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't use componentWillReceiveProps related to SearchMap component

Browse source
This commit is contained in:
Jenni Nurmi 2019-08-27 14:48:53 +03:00
parent c13413170f
commit 34c4903bad
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/SearchMap/SearchMapWithGoogleMap.js
View file

@ -365,10 +365,10 @@ class SearchMapWithGoogleMap extends Component {
this.onIdle = this.onIdle.bind(this);
}
componentWillReceiveProps(nextProps) {
if (!isEqual(this.props.location, nextProps.location)) {
componentDidUpdate(prevProps) {
if (!isEqual(prevProps.location, this.props.location)) {
// If no mapSearch url parameter is given, this is original location search
const { mapSearch } = parse(nextProps.location.search, {
const { mapSearch } = parse(this.props.location.search, {
latlng: ['origin'],
latlngBounds: ['bounds'],
});
@ -383,8 +383,8 @@ class SearchMapWithGoogleMap extends Component {
// Do not call fitMapToBounds if bounds are the same.
// Our bounds are viewport bounds, and fitBounds will try to add margins around those bounds
// that would result to zoom-loop (bound change -> fitmap -> bounds change -> ...)
if (!isEqual(nextProps.bounds, currentBounds) && !this.viewportBounds) {
fitMapToBounds(this.map, nextProps.bounds, { padding: 0 });
if (!isEqual(this.props.bounds, currentBounds) && !this.viewportBounds) {
fitMapToBounds(this.map, this.props.bounds, { padding: 0 });
}
}
}

12
src/components/SearchMap/SearchMapWithMapbox.js
View file

@ -249,10 +249,10 @@ class SearchMapWithMapbox extends Component {
this.handleMobilePinchZoom = this.handleMobilePinchZoom.bind(this);
}
componentWillReceiveProps(nextProps) {
if (!isEqual(this.props.location, nextProps.location)) {
componentDidUpdate(prevProps) {
if (!isEqual(prevProps.location, this.props.location)) {
// If no mapSearch url parameter is given, this is original location search
const { mapSearch } = parse(nextProps.location.search, {
const { mapSearch } = parse(this.props.location.search, {
latlng: ['origin'],
latlngBounds: ['bounds'],
});
@ -267,13 +267,11 @@ class SearchMapWithMapbox extends Component {
// Do not call fitMapToBounds if bounds are the same.
// Our bounds are viewport bounds, and fitBounds will try to add margins around those bounds
// that would result to zoom-loop (bound change -> fitmap -> bounds change -> ...)
if (!isEqual(nextProps.bounds, currentBounds) && !this.viewportBounds) {
fitMapToBounds(this.map, nextProps.bounds, { padding: 0, isAutocompleteSearch: true });
if (!isEqual(this.props.bounds, currentBounds) && !this.viewportBounds) {
fitMapToBounds(this.map, this.props.bounds, { padding: 0, isAutocompleteSearch: true });
}
}
}
componentDidUpdate(prevProps) {
if (!this.map && this.state.mapContainer) {
this.initializeMap();