Skip to content

Commit 9aa89ad

Browse files
authored
Merge branch 'master' into master
2 parents ceb3d00 + 02ea901 commit 9aa89ad

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

dist/components/Marker.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@
136136
icon = _props.icon,
137137
label = _props.label,
138138
draggable = _props.draggable,
139-
title = _props.title;
139+
title = _props.title,
140+
optimized = _props.optimized,
141+
zIndex = _props.zIndex;
140142

141143
if (!google) {
142144
return null;
@@ -153,7 +155,9 @@
153155
icon: icon,
154156
label: label,
155157
title: title,
156-
draggable: draggable
158+
draggable: draggable,
159+
optimized: optimized,
160+
zIndex: zIndex
157161
};
158162
this.marker = new google.maps.Marker(pref);
159163

dist/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
center: center,
232232
zoom: this.props.zoom,
233233
maxZoom: this.props.maxZoom,
234-
minZoom: this.props.maxZoom,
234+
minZoom: this.props.minZoom,
235235
clickableIcons: this.props.clickableIcons,
236236
disableDefaultUI: this.props.disableDefaultUI,
237237
zoomControl: this.props.zoomControl,

0 commit comments

Comments
 (0)