Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/components/Marker.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
}, {
key: 'componentDidUpdate',
value: function componentDidUpdate(prevProps) {
if (this.props.map !== prevProps.map || this.props.position !== prevProps.position || this.props.icon !== prevProps.icon) {
if (this.props.map !== prevProps.map || (this.props.position && prevProps.position ? this.props.position.lat !== prevProps.position.lat || this.props.position.lng !== prevProps.position.lng : this.props.position !== prevProps.position) || this.props.icon !== prevProps.icon) {
if (this.marker) {
this.marker.setMap(null);
}
Expand Down
7 changes: 4 additions & 3 deletions src/components/Marker.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react'
import PropTypes from 'prop-types'

import { camelize } from '../lib/String'
import { verifyMarkerPosition } from '../lib/verifyMarkerPosition'

const evtNames = [
'click',
Expand Down Expand Up @@ -35,9 +36,9 @@ export class Marker extends React.Component {
}

componentDidUpdate(prevProps) {
if ((this.props.map !== prevProps.map) ||
(this.props.position !== prevProps.position) ||
(this.props.icon !== prevProps.icon)) {
if (this.props.map !== prevProps.map ||
this.props.icon !== prevProps.icon ||
verifyMarkerPosition(this.props.position, prevProps.position)) {
if (this.marker) {
this.marker.setMap(null);
}
Expand Down
6 changes: 6 additions & 0 deletions src/lib/verifyMarkerPosition.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export function verifyMarkerPosition(currentPosition, prevPosition) {
if(currentPosition && prevPosition) {
return currentPosition.lat !== prevPosition.lat || currentPosition.lng !== prevPosition.lng;
}
return false;
}