Skip to content

Commit c3ce2fa

Browse files
committed
Add a whole bunch more missing props
1 parent 5aefd08 commit c3ce2fa

File tree

2 files changed

+84
-37
lines changed

2 files changed

+84
-37
lines changed

dist/index.js

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@
244244
var mapConfig = Object.assign({}, {
245245
mapTypeId: mapTypeIds[mapTypeFromProps],
246246
center: center,
247+
tilt: this.props.tilt,
247248
zoom: this.props.zoom,
248249
maxZoom: this.props.maxZoom,
249250
minZoom: this.props.minZoom,
@@ -254,11 +255,16 @@
254255
mapTypeControl: this.props.mapTypeControl,
255256
mapTypeControlOptions: this.props.mapTypeControlOptions,
256257
scaleControl: this.props.scaleControl,
258+
scaleControlOptions: this.props.scaleControlOptions,
259+
streetView: this.props.streetView,
257260
streetViewControl: this.props.streetViewControl,
258261
streetViewControlOptions: this.props.streetViewControlOptions,
259262
panControl: this.props.panControl,
263+
panControlOptions: this.props.panControlOptions
260264
rotateControl: this.props.rotateControl,
265+
rotateControlOptions: this.props.rotateControlOptions
261266
fullscreenControl: this.props.fullscreenControl,
267+
fullscreenControlOptions: this.props.fullscreenControlOptions,
262268
scrollwheel: this.props.scrollwheel,
263269
draggable: this.props.draggable,
264270
draggableCursor: this.props.draggableCursor,
@@ -268,7 +274,11 @@
268274
styles: this.props.styles,
269275
gestureHandling: this.props.gestureHandling,
270276
backgroundColor: this.props.backgroundColor,
271-
draggingCursor: this.props.draggingCursor
277+
draggingCursor: this.props.draggingCursor,
278+
heading: this.props.heading,
279+
overviewMapControl: this.props.overviewMapControl,
280+
overviewMapControlOptions: this.props.overviewMapControlOptions,
281+
signInControl: this.props.signInControl
272282
});
273283

274284
Object.keys(mapConfig).forEach(function (key) {
@@ -383,6 +393,7 @@
383393

384394
Map.propTypes = {
385395
google: _propTypes2.default.object,
396+
tilt: _propTypes2.default.number,
386397
zoom: _propTypes2.default.number,
387398
centerAroundCurrentLocation: _propTypes2.default.bool,
388399
center: _propTypes2.default.object,
@@ -401,21 +412,33 @@
401412
mapTypeControl: _propTypes2.default.bool,
402413
mapTypeControlOptions: _propTypes2.default.object,
403414
scaleControl: _propTypes2.default.bool,
415+
scaleControlOptions: _propTypes2.default.object,
416+
streetView: _propTypes2.default.object,
404417
streetViewControl: _propTypes2.default.bool,
405418
streetViewControlOptions: _propTypes2.default.object,
406419
panControl: _propTypes2.default.bool,
420+
panControlOptions: _propTypes2.default.object,
407421
rotateControl: _propTypes2.default.bool,
422+
rotateControlOptions: _propTypes2.default.object,
408423
fullscreenControl: _propTypes2.default.bool,
424+
fullscreenControlOptions: _propTypes2.default.object,
409425
scrollwheel: _propTypes2.default.bool,
410426
draggable: _propTypes2.default.bool,
411427
draggableCursor: _propTypes2.default.string,
428+
draggingCursor: _propTypes2.default.string,
412429
keyboardShortcuts: _propTypes2.default.bool,
413430
disableDoubleClickZoom: _propTypes2.default.bool,
414431
noClear: _propTypes2.default.bool,
415432
styles: _propTypes2.default.array,
416433
gestureHandling: _propTypes2.default.string,
417434
bounds: _propTypes2.default.object,
418-
draggingCursor: _propTypes2.default.string
435+
draggingCursor: _propTypes2.default.string,
436+
backgroundColor: _propTypes2.default.string,
437+
heading: _propTypes2.default.number,
438+
mapTypeId: _propTypes2.default.string,
439+
overviewMapControl: _propTypes2.default.bool,
440+
overviewMapControlOptions: _propTypes2.default.object,
441+
signInControl: _propTypes2.default.bool
419442
};
420443

421444
evtNames.forEach(function (e) {

src/index.js

Lines changed: 59 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -141,32 +141,43 @@ export class Map extends React.Component {
141141
const mapConfig = Object.assign(
142142
{},
143143
{
144-
mapTypeId: mapTypeIds[mapTypeFromProps],
144+
mapTypeId: this.props.mapTypeId || mapTypeIds[mapTypeFromProps],
145145
center: center,
146-
zoom: this.props.zoom,
147-
maxZoom: this.props.maxZoom,
148-
minZoom: this.props.minZoom,
146+
backgroundColor: this.props.backgroundColor,
149147
clickableIcons: !!this.props.clickableIcons,
150148
disableDefaultUI: this.props.disableDefaultUI,
151-
zoomControl: this.props.zoomControl,
152-
zoomControlOptions: this.props.zoomControlOptions,
149+
disableDoubleClickZoom: this.props.disableDoubleClickZoom,
150+
draggable: this.props.draggable,
151+
draggableCursor: this.props.draggableCursor,
152+
draggingCursor: this.props.draggingCursor,
153+
fullscreenControl: this.props.fullscreenControl,
154+
fullscreenControlOptions: this.props.fullscreenControlOptions,
155+
gestureHandling: this.props.gestureHandling,
156+
heading: this.props.heading,
157+
keyboardShortcuts: this.props.keyboardShortcuts,
153158
mapTypeControl: this.props.mapTypeControl,
154159
mapTypeControlOptions: this.props.mapTypeControlOptions,
155-
scaleControl: this.props.scaleControl,
156-
streetViewControl: this.props.streetViewControl,
157-
streetViewControlOptions: this.props.streetViewControlOptions,
160+
maxZoom: this.props.maxZoom,
161+
minZoom: this.props.minZoom,
162+
noClear: this.props.noClear,
163+
overviewMapControl: this.props.overviewMapControl,
164+
overviewMapControlOptions: this.props.overviewMapControlOptions,
158165
panControl: this.props.panControl,
166+
panControlOptions: this.props.panControlOptions,
159167
rotateControl: this.props.rotateControl,
160-
fullscreenControl: this.props.fullscreenControl,
168+
rotateControlOptions: this.props.rotateControlOptions,
169+
scaleControl: this.props.scaleControl,
170+
scaleControlOptions: this.props.scaleControlOptions,
161171
scrollwheel: this.props.scrollwheel,
162-
draggable: this.props.draggable,
163-
draggableCursor: this.props.draggableCursor,
164-
keyboardShortcuts: this.props.keyboardShortcuts,
165-
disableDoubleClickZoom: this.props.disableDoubleClickZoom,
166-
noClear: this.props.noClear,
172+
signInControl: this.props.signInControl,
173+
streetView: this.props.streetView,
174+
streetViewControl: this.props.streetViewControl,
175+
streetViewControlOptions: this.props.streetViewControlOptions,
167176
styles: this.props.styles,
168-
gestureHandling: this.props.gestureHandling,
169-
backgroundColor: this.props.backgroundColor
177+
tilt: this.props.tilt,
178+
zoom: this.props.zoom,
179+
zoomControl: this.props.zoomControl,
180+
zoomControlOptions: this.props.zoomControlOptions
170181
}
171182
);
172183

@@ -269,38 +280,51 @@ export class Map extends React.Component {
269280

270281
Map.propTypes = {
271282
google: PropTypes.object,
272-
zoom: PropTypes.number,
273283
centerAroundCurrentLocation: PropTypes.bool,
274-
center: PropTypes.object,
275284
initialCenter: PropTypes.object,
276285
className: PropTypes.string,
277286
style: PropTypes.object,
278287
containerStyle: PropTypes.object,
279288
visible: PropTypes.bool,
280289
mapType: PropTypes.string,
281-
maxZoom: PropTypes.number,
282-
minZoom: PropTypes.number,
290+
bounds: PropTypes.object,
291+
backgroundColor: PropTypes.string,
292+
center: PropTypes.object,
283293
clickableIcons: PropTypes.bool,
284294
disableDefaultUI: PropTypes.bool,
285-
zoomControl: PropTypes.bool,
286-
zoomControlOptions: PropTypes.object,
287-
mapTypeControl: PropTypes.bool,
288-
mapTypeControlOptions: PropTypes.bool,
289-
scaleControl: PropTypes.bool,
290-
streetViewControl: PropTypes.bool,
291-
streetViewControlOptions: PropTypes.object,
292-
panControl: PropTypes.bool,
293-
rotateControl: PropTypes.bool,
294-
fullscreenControl: PropTypes.bool,
295-
scrollwheel: PropTypes.bool,
295+
disableDoubleClickZoom: PropTypes.bool,
296296
draggable: PropTypes.bool,
297297
draggableCursor: PropTypes.string,
298+
draggingCursor: PropTypes.string,
299+
fullscreenControl: PropTypes.bool,
300+
fullscreenControlOptions: PropTypes.object,
301+
gestureHandling: PropTypes.string,
302+
heading: PropTypes.number,
298303
keyboardShortcuts: PropTypes.bool,
299-
disableDoubleClickZoom: PropTypes.bool,
304+
mapTypeControl: PropTypes.bool,
305+
mapTypeControlOptions: PropTypes.object,
306+
mapTypeId: PropTypes.string,
307+
maxZoom: PropTypes.number,
308+
minZoom: PropTypes.number,
300309
noClear: PropTypes.bool,
310+
overviewMapControl: PropTypes.bool,
311+
overviewMapControlOptions: PropTypes.object,
312+
panControl: PropTypes.bool,
313+
panControlOptions: PropTypes.object,
314+
rotateControl: PropTypes.bool,
315+
rotateControlOptions: PropTypes.object,
316+
scaleControl: PropTypes.bool,
317+
scaleControlOptions: PropTypes.object,
318+
scrollwheel: PropTypes.bool,
319+
signInControl: PropTypes.bool,
320+
streetView: PropTypes.object,
321+
streetViewControl: PropTypes.bool,
322+
streetViewControlOptions: PropTypes.object,
301323
styles: PropTypes.array,
302-
gestureHandling: PropTypes.string,
303-
bounds: PropTypes.object
324+
tilt: PropTypes.number,
325+
zoom: PropTypes.number,
326+
zoomControl: PropTypes.bool,
327+
zoomControlOptions: PropTypes.object
304328
};
305329

306330
evtNames.forEach(e => (Map.propTypes[camelize(e)] = PropTypes.func));

0 commit comments

Comments
 (0)