Skip to content

Commit f1e1200

Browse files
committed
Re-order config and proptypes to minimize diff
1 parent 1fd14e5 commit f1e1200

File tree

2 files changed

+106
-106
lines changed

2 files changed

+106
-106
lines changed

Diff for: dist/index.js

+53-53
Original file line numberDiff line numberDiff line change
@@ -244,41 +244,41 @@
244244
var mapConfig = Object.assign({}, {
245245
mapTypeId: this.props.mapTypeId || mapTypeIds[mapTypeFromProps],
246246
center: center,
247-
backgroundColor: this.props.backgroundColor,
247+
zoom: this.props.zoom,
248+
maxZoom: this.props.maxZoom,
249+
minZoom: this.props.minZoom,
248250
clickableIcons: !!this.props.clickableIcons,
249251
disableDefaultUI: this.props.disableDefaultUI,
250-
disableDoubleClickZoom: this.props.disableDoubleClickZoom,
251-
draggable: this.props.draggable,
252-
draggableCursor: this.props.draggableCursor,
253-
draggingCursor: this.props.draggingCursor,
254-
fullscreenControl: this.props.fullscreenControl,
255-
fullscreenControlOptions: this.props.fullscreenControlOptions,
256-
gestureHandling: this.props.gestureHandling,
257-
heading: this.props.heading,
258-
keyboardShortcuts: this.props.keyboardShortcuts,
252+
zoomControl: this.props.zoomControl,
253+
zoomControlOptions: this.props.zoomControlOptions,
259254
mapTypeControl: this.props.mapTypeControl,
260255
mapTypeControlOptions: this.props.mapTypeControlOptions,
261-
maxZoom: this.props.maxZoom,
262-
minZoom: this.props.minZoom,
263-
noClear: this.props.noClear,
264-
overviewMapControl: this.props.overviewMapControl,
265-
overviewMapControlOptions: this.props.overviewMapControlOptions,
266-
panControl: this.props.panControl,
267-
panControlOptions: this.props.panControlOptions,
268-
rotateControl: this.props.rotateControl,
269-
rotateControlOptions: this.props.rotateControlOptions,
270256
scaleControl: this.props.scaleControl,
271257
scaleControlOptions: this.props.scaleControlOptions,
272-
scrollwheel: this.props.scrollwheel,
273-
signInControl: this.props.signInControl,
274258
streetView: this.props.streetView,
275259
streetViewControl: this.props.streetViewControl,
276260
streetViewControlOptions: this.props.streetViewControlOptions,
261+
panControl: this.props.panControl,
262+
panControlOptions: this.props.panControlOptions,
263+
rotateControl: this.props.rotateControl,
264+
rotateControlOptions: this.props.rotateControlOptions,
265+
fullscreenControl: this.props.fullscreenControl,
266+
fullscreenControlOptions: this.props.fullscreenControlOptions,
267+
scrollwheel: this.props.scrollwheel,
268+
draggable: this.props.draggable,
269+
draggableCursor: this.props.draggableCursor,
270+
draggingCursor: this.props.draggingCursor,
271+
keyboardShortcuts: this.props.keyboardShortcuts,
272+
disableDoubleClickZoom: this.props.disableDoubleClickZoom,
273+
noClear: this.props.noClear,
277274
styles: this.props.styles,
278-
tilt: this.props.tilt,
279-
zoom: this.props.zoom,
280-
zoomControl: this.props.zoomControl,
281-
zoomControlOptions: this.props.zoomControlOptions
275+
gestureHandling: this.props.gestureHandling,
276+
backgroundColor: this.props.backgroundColor,
277+
heading: this.props.heading,
278+
overviewMapControl: this.props.overviewMapControl,
279+
overviewMapControlOptions: this.props.overviewMapControlOptions,
280+
signInControl: this.props.signInControl,
281+
tilt: this.props.tilt
282282
});
283283

284284
Object.keys(mapConfig).forEach(function (key) {
@@ -393,51 +393,51 @@
393393

394394
Map.propTypes = {
395395
google: _propTypes2.default.object,
396+
zoom: _propTypes2.default.number,
396397
centerAroundCurrentLocation: _propTypes2.default.bool,
398+
center: _propTypes2.default.object,
397399
initialCenter: _propTypes2.default.object,
398400
className: _propTypes2.default.string,
399401
style: _propTypes2.default.object,
400402
containerStyle: _propTypes2.default.object,
401403
visible: _propTypes2.default.bool,
402404
mapType: _propTypes2.default.string,
403-
bounds: _propTypes2.default.object,
404-
backgroundColor: _propTypes2.default.string,
405-
center: _propTypes2.default.object,
405+
mapTypeId: _propTypes2.default.string,
406+
maxZoom: _propTypes2.default.number,
407+
minZoom: _propTypes2.default.number,
406408
clickableIcons: _propTypes2.default.bool,
407409
disableDefaultUI: _propTypes2.default.bool,
408-
disableDoubleClickZoom: _propTypes2.default.bool,
409-
draggable: _propTypes2.default.bool,
410-
draggableCursor: _propTypes2.default.string,
411-
draggingCursor: _propTypes2.default.string,
412-
fullscreenControl: _propTypes2.default.bool,
413-
fullscreenControlOptions: _propTypes2.default.object,
414-
gestureHandling: _propTypes2.default.string,
415-
heading: _propTypes2.default.number,
416-
keyboardShortcuts: _propTypes2.default.bool,
410+
zoomControl: _propTypes2.default.bool,
411+
zoomControlOptions: _propTypes2.default.object,
417412
mapTypeControl: _propTypes2.default.bool,
418413
mapTypeControlOptions: _propTypes2.default.object,
419-
mapTypeId: _propTypes2.default.string,
420-
maxZoom: _propTypes2.default.number,
421-
minZoom: _propTypes2.default.number,
422-
noClear: _propTypes2.default.bool,
423-
overviewMapControl: _propTypes2.default.bool,
424-
overviewMapControlOptions: _propTypes2.default.object,
425-
panControl: _propTypes2.default.bool,
426-
panControlOptions: _propTypes2.default.object,
427-
rotateControl: _propTypes2.default.bool,
428-
rotateControlOptions: _propTypes2.default.object,
429414
scaleControl: _propTypes2.default.bool,
430415
scaleControlOptions: _propTypes2.default.object,
431-
scrollwheel: _propTypes2.default.bool,
432-
signInControl: _propTypes2.default.bool,
433416
streetView: _propTypes2.default.object,
434417
streetViewControl: _propTypes2.default.bool,
435418
streetViewControlOptions: _propTypes2.default.object,
419+
panControl: _propTypes2.default.bool,
420+
panControlOptions: _propTypes2.default.object,
421+
rotateControl: _propTypes2.default.bool,
422+
rotateControlOptions: _propTypes2.default.object,
423+
fullscreenControl: _propTypes2.default.bool,
424+
fullscreenControlOptions: _propTypes2.default.object,
425+
scrollwheel: _propTypes2.default.bool,
426+
draggable: _propTypes2.default.bool,
427+
draggableCursor: _propTypes2.default.string,
428+
draggingCursor: _propTypes2.default.string,
429+
keyboardShortcuts: _propTypes2.default.bool,
430+
disableDoubleClickZoom: _propTypes2.default.bool,
431+
noClear: _propTypes2.default.bool,
436432
styles: _propTypes2.default.array,
437-
tilt: _propTypes2.default.number,
438-
zoom: _propTypes2.default.number,
439-
zoomControl: _propTypes2.default.bool,
440-
zoomControlOptions: _propTypes2.default.object
433+
gestureHandling: _propTypes2.default.string,
434+
bounds: _propTypes2.default.object,
435+
backgroundColor: _propTypes2.default.string,
436+
heading: _propTypes2.default.number,
437+
overviewMapControl: _propTypes2.default.bool,
438+
overviewMapControlOptions: _propTypes2.default.object,
439+
signInControl: _propTypes2.default.bool,
440+
tilt: _propTypes2.default.number
441441
};
442442

443443
evtNames.forEach(function (e) {

Diff for: src/index.js

+53-53
Original file line numberDiff line numberDiff line change
@@ -143,41 +143,41 @@ export class Map extends React.Component {
143143
{
144144
mapTypeId: this.props.mapTypeId || mapTypeIds[mapTypeFromProps],
145145
center: center,
146-
backgroundColor: this.props.backgroundColor,
146+
zoom: this.props.zoom,
147+
maxZoom: this.props.maxZoom,
148+
minZoom: this.props.minZoom,
147149
clickableIcons: !!this.props.clickableIcons,
148150
disableDefaultUI: this.props.disableDefaultUI,
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,
151+
zoomControl: this.props.zoomControl,
152+
zoomControlOptions: this.props.zoomControlOptions,
158153
mapTypeControl: this.props.mapTypeControl,
159154
mapTypeControlOptions: this.props.mapTypeControlOptions,
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,
165-
panControl: this.props.panControl,
166-
panControlOptions: this.props.panControlOptions,
167-
rotateControl: this.props.rotateControl,
168-
rotateControlOptions: this.props.rotateControlOptions,
169155
scaleControl: this.props.scaleControl,
170156
scaleControlOptions: this.props.scaleControlOptions,
171-
scrollwheel: this.props.scrollwheel,
172-
signInControl: this.props.signInControl,
173157
streetView: this.props.streetView,
174158
streetViewControl: this.props.streetViewControl,
175159
streetViewControlOptions: this.props.streetViewControlOptions,
160+
panControl: this.props.panControl,
161+
panControlOptions: this.props.panControlOptions,
162+
rotateControl: this.props.rotateControl,
163+
rotateControlOptions: this.props.rotateControlOptions,
164+
fullscreenControl: this.props.fullscreenControl,
165+
fullscreenControlOptions: this.props.fullscreenControlOptions,
166+
scrollwheel: this.props.scrollwheel,
167+
draggable: this.props.draggable,
168+
draggableCursor: this.props.draggableCursor,
169+
draggingCursor: this.props.draggingCursor,
170+
keyboardShortcuts: this.props.keyboardShortcuts,
171+
disableDoubleClickZoom: this.props.disableDoubleClickZoom,
172+
noClear: this.props.noClear,
176173
styles: this.props.styles,
177-
tilt: this.props.tilt,
178-
zoom: this.props.zoom,
179-
zoomControl: this.props.zoomControl,
180-
zoomControlOptions: this.props.zoomControlOptions
174+
gestureHandling: this.props.gestureHandling,
175+
backgroundColor: this.props.backgroundColor,
176+
heading: this.props.heading,
177+
overviewMapControl: this.props.overviewMapControl,
178+
overviewMapControlOptions: this.props.overviewMapControlOptions,
179+
signInControl: this.props.signInControl,
180+
tilt: this.props.tilt
181181
}
182182
);
183183

@@ -280,51 +280,51 @@ export class Map extends React.Component {
280280

281281
Map.propTypes = {
282282
google: PropTypes.object,
283+
zoom: PropTypes.number,
283284
centerAroundCurrentLocation: PropTypes.bool,
285+
center: PropTypes.object,
284286
initialCenter: PropTypes.object,
285287
className: PropTypes.string,
286288
style: PropTypes.object,
287289
containerStyle: PropTypes.object,
288290
visible: PropTypes.bool,
289291
mapType: PropTypes.string,
290-
bounds: PropTypes.object,
291-
backgroundColor: PropTypes.string,
292-
center: PropTypes.object,
292+
mapTypeId: PropTypes.string,
293+
maxZoom: PropTypes.number,
294+
minZoom: PropTypes.number,
293295
clickableIcons: PropTypes.bool,
294296
disableDefaultUI: PropTypes.bool,
295-
disableDoubleClickZoom: PropTypes.bool,
296-
draggable: PropTypes.bool,
297-
draggableCursor: PropTypes.string,
298-
draggingCursor: PropTypes.string,
299-
fullscreenControl: PropTypes.bool,
300-
fullscreenControlOptions: PropTypes.object,
301-
gestureHandling: PropTypes.string,
302-
heading: PropTypes.number,
303-
keyboardShortcuts: PropTypes.bool,
297+
zoomControl: PropTypes.bool,
298+
zoomControlOptions: PropTypes.object,
304299
mapTypeControl: PropTypes.bool,
305300
mapTypeControlOptions: PropTypes.object,
306-
mapTypeId: PropTypes.string,
307-
maxZoom: PropTypes.number,
308-
minZoom: PropTypes.number,
309-
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,
316301
scaleControl: PropTypes.bool,
317302
scaleControlOptions: PropTypes.object,
318-
scrollwheel: PropTypes.bool,
319-
signInControl: PropTypes.bool,
320303
streetView: PropTypes.object,
321304
streetViewControl: PropTypes.bool,
322305
streetViewControlOptions: PropTypes.object,
306+
panControl: PropTypes.bool,
307+
panControlOptions: PropTypes.object,
308+
rotateControl: PropTypes.bool,
309+
rotateControlOptions: PropTypes.object,
310+
fullscreenControl: PropTypes.bool,
311+
fullscreenControlOptions: PropTypes.object,
312+
scrollwheel: PropTypes.bool,
313+
draggable: PropTypes.bool,
314+
draggableCursor: PropTypes.string,
315+
draggingCursor: PropTypes.string,
316+
keyboardShortcuts: PropTypes.bool,
317+
disableDoubleClickZoom: PropTypes.bool,
318+
noClear: PropTypes.bool,
323319
styles: PropTypes.array,
324-
tilt: PropTypes.number,
325-
zoom: PropTypes.number,
326-
zoomControl: PropTypes.bool,
327-
zoomControlOptions: PropTypes.object
320+
gestureHandling: PropTypes.string,
321+
bounds: PropTypes.object,
322+
backgroundColor: PropTypes.string,
323+
heading: PropTypes.number,
324+
overviewMapControl: PropTypes.bool,
325+
overviewMapControlOptions: PropTypes.object,
326+
signInControl: PropTypes.bool,
327+
tilt: PropTypes.number
328328
};
329329

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

0 commit comments

Comments
 (0)