refactor(src): change creator arguments to accept single props object

tomchentw · tomchentw · commit 777fd837401a · 2015-10-13T10:34:31.000+08:00
diff --git a/src/Circle.js b/src/Circle.js
@@ -53,8 +53,7 @@ export default class Circle extends Component {
     if (!canUseDOM) {
       return;
     }
-    const {mapHolderRef, ...circleProps} = this.props;
-    const circle = CircleCreator._createCircle(mapHolderRef, circleProps);
+    const circle = CircleCreator._createCircle(this.props);
 
     this.setState({ circle });
   }
diff --git a/src/DirectionsRenderer.js b/src/DirectionsRenderer.js
@@ -49,8 +49,7 @@ export default class DirectionsRenderer extends Component {
     if (!canUseDOM) {
       return;
     }
-    const {mapHolderRef, ...directionsRendererProps} = this.props;
-    const directionsRenderer = DirectionsRendererCreator._createDirectionsRenderer(mapHolderRef, directionsRendererProps);
+    const directionsRenderer = DirectionsRendererCreator._createDirectionsRenderer(this.props);
 
     this.setState({ directionsRenderer });
   }
diff --git a/src/DrawingManager.js b/src/DrawingManager.js
@@ -45,8 +45,7 @@ export default class DrawingManager extends Component {
     if (!canUseDOM) {
       return;
     }
-    const {mapHolderRef, ...drawingManagerProps} = this.props;
-    const drawingManager = DrawingManagerCreator._createDrawingManager(mapHolderRef, drawingManagerProps);
+    const drawingManager = DrawingManagerCreator._createDrawingManager(this.props);
 
     this.setState({ drawingManager });
   }
diff --git a/src/InfoWindow.js b/src/InfoWindow.js
@@ -45,8 +45,7 @@ export default class InfoWindow extends Component {
     if (!canUseDOM) {
       return;
     }
-    const {mapHolderRef, anchorHolderRef, ...infoWindowProps} = this.props;
-    const infoWindow = InfoWindowCreator._createInfoWindow(mapHolderRef, infoWindowProps, anchorHolderRef);
+    const infoWindow = InfoWindowCreator._createInfoWindow(this.props);
 
     this.setState({ infoWindow });
   }
diff --git a/src/Marker.js b/src/Marker.js
@@ -67,8 +67,7 @@ export default class Marker extends Component {
     if (!canUseDOM) {
       return;
     }
-    const {mapHolderRef, ...markerProps} = this.props;
-    const marker = MarkerCreator._createMarker(mapHolderRef, markerProps);
+    const marker = MarkerCreator._createMarker(this.props);
 
     this.setState({ marker });
   }
diff --git a/src/OverlayView.js b/src/OverlayView.js
@@ -55,8 +55,7 @@ export default class OverlayView extends Component {
     if (!canUseDOM) {
       return;
     }
-    const {mapHolderRef, ...overlayViewProps} = this.props;
-    const overlayView = OverlayViewCreator._createOverlayView(mapHolderRef, overlayViewProps);
+    const overlayView = OverlayViewCreator._createOverlayView(this.props);
 
     this.setState({ overlayView });
   }
diff --git a/src/Polygon.js b/src/Polygon.js
@@ -49,8 +49,7 @@ export default class Polygon extends Component {
     if (!canUseDOM) {
       return;
     }
-    const {mapHolderRef, ...polygonProps} = this.props;
-    const polygon = PolygonCreator._createPolygon(mapHolderRef, polygonProps);
+    const polygon = PolygonCreator._createPolygon(this.props);
 
     this.setState({ polygon });
   }
diff --git a/src/Polyline.js b/src/Polyline.js
@@ -47,8 +47,7 @@ export default class Polyline extends Component {
     if (!canUseDOM) {
       return;
     }
-    const {mapHolderRef, ...polylineProps} = this.props;
-    const polyline = PolylineCreator._createPolyline(mapHolderRef, polylineProps);
+    const polyline = PolylineCreator._createPolyline(this.props);
 
     this.setState({ polyline });
   }
diff --git a/src/Rectangle.js b/src/Rectangle.js
@@ -51,8 +51,7 @@ export default class Rectangle extends Component {
     if (!canUseDOM) {
       return;
     }
-    const {mapHolderRef, ...rectangleProps} = this.props;
-    const rectangle = RectangleCreator._createRectangle(mapHolderRef, rectangleProps);
+    const rectangle = RectangleCreator._createRectangle(this.props);
 
     this.setState({ rectangle });
   }
diff --git a/src/_Skeleton.js b/src/_Skeleton.js
@@ -41,8 +41,7 @@ export default class Skeleton extends Component {
     if (!canUseDOM) {
       return;
     }
-    const {mapHolderRef, ...skeletonProps} = this.props;
-    const skeleton = SkeletonCreator._createSkeleton(mapHolderRef, skeletonProps);
+    const skeleton = SkeletonCreator._createSkeleton(this.props);
 
     this.setState({ skeleton });
   }
diff --git a/src/addons/InfoBox.js b/src/addons/InfoBox.js
@@ -49,8 +49,7 @@ export default class InfoBox extends Component {
     if (!canUseDOM) {
       return;
     }
-    const {mapHolderRef, ...infoBoxProps} = this.props;
-    const infoBox = InfoBoxCreator._createInfoBox(mapHolderRef, infoBoxProps);
+    const infoBox = InfoBoxCreator._createInfoBox(this.props);
 
     this.setState({ infoBox });
   }
diff --git a/src/addons/addonsCreators/InfoBoxCreator.js b/src/addons/addonsCreators/InfoBoxCreator.js
@@ -49,7 +49,8 @@ export default class InfoBoxCreator extends Component {
     infoBox: PropTypes.object.isRequired,
   }
 
-  static _createInfoBox (mapHolderRef, infoBoxProps, anchorHolderRef) {
+  static _createInfoBox (infoBoxProps) {
+    const {mapHolderRef, anchorHolderRef} = infoBoxProps;
     // "google-maps-infobox" uses "google" as a global variable. Since we don't
     // have "google" on the server, we can not use it in server-side rendering.
     // As a result, we import "google-maps-infobox" here to prevent an error on
diff --git a/src/creators/CircleCreator.js b/src/creators/CircleCreator.js
@@ -50,7 +50,8 @@ export default class CircleCreator extends Component {
     circle: PropTypes.object.isRequired,
   }
 
-  static _createCircle (mapHolderRef, circleProps) {
+  static _createCircle (circleProps) {
+    const {mapHolderRef} = circleProps;
     // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Circle
     const circle = new google.maps.Circle(composeOptions(circleProps, [
       // https://developers.google.com/maps/documentation/javascript/3.exp/reference#CircleOptions
diff --git a/src/creators/DirectionsRendererCreator.js b/src/creators/DirectionsRendererCreator.js
@@ -47,7 +47,8 @@ export default class DirectionsRendererCreator extends Component {
     directionsRenderer: PropTypes.object.isRequired,
   }
 
-  static _createDirectionsRenderer (mapHolderRef, directionsRendererProps) {
+  static _createDirectionsRenderer (directionsRendererProps) {
+    const {mapHolderRef} = directionsRendererProps;
     // https://developers.google.com/maps/documentation/javascript/3.exp/reference#DirectionsRenderer
     const directionsRenderer = new google.maps.DirectionsRenderer(composeOptions(directionsRendererProps, [
       // https://developers.google.com/maps/documentation/javascript/3.exp/reference#DirectionsRendererOptions
diff --git a/src/creators/DrawingManagerCreator.js b/src/creators/DrawingManagerCreator.js
@@ -42,7 +42,8 @@ export default class DrawingManagerCreator extends Component {
     drawingManager: PropTypes.object.isRequired,
   }
 
-  static _createDrawingManager (mapHolderRef, drawingManagerProps) {
+  static _createDrawingManager (drawingManagerProps) {
+    const {mapHolderRef} = drawingManagerProps;
     // https://developers.google.com/maps/documentation/javascript/3.exp/reference#DrawingManager
     const drawingManager = new google.maps.drawing.DrawingManager(composeOptions(drawingManagerProps, [
       // https://developers.google.com/maps/documentation/javascript/3.exp/reference#DrawingManagerOptions
diff --git a/src/creators/InfoWindowCreator.js b/src/creators/InfoWindowCreator.js
@@ -49,7 +49,8 @@ export default class InfoWindowCreator extends Component {
     anchorHolderRef: PropTypes.object,
   }
 
-  static _createInfoWindow (mapHolderRef, infoWindowProps, anchorHolderRef) {
+  static _createInfoWindow (infoWindowProps) {
+    const {mapHolderRef, anchorHolderRef} = infoWindowProps;
     // https://developers.google.com/maps/documentation/javascript/3.exp/reference#InfoWindow
     const infoWindow = new google.maps.InfoWindow(composeOptions(infoWindowProps, [
       // https://developers.google.com/maps/documentation/javascript/3.exp/reference#InfoWindowOptions
diff --git a/src/creators/MarkerCreator.js b/src/creators/MarkerCreator.js
@@ -69,7 +69,8 @@ export default class MarkerCreator extends Component {
     marker: PropTypes.object.isRequired,
   }
 
-  static _createMarker (mapHolderRef, markerProps) {
+  static _createMarker (markerProps) {
+    const {mapHolderRef} = markerProps;
     // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Marker
     const marker = new google.maps.Marker(composeOptions(markerProps, [
       // https://developers.google.com/maps/documentation/javascript/3.exp/reference#MarkerOptions
diff --git a/src/creators/OverlayViewCreator.js b/src/creators/OverlayViewCreator.js
@@ -29,7 +29,8 @@ export default class OverlayViewCreator extends Component {
     overlayView: PropTypes.object.isRequired,
   }
 
-  static _createOverlayView (mapHolderRef, overlayViewProps) {
+  static _createOverlayView (overlayViewProps) {
+    const {mapHolderRef} = overlayViewProps;
     // https://developers.google.com/maps/documentation/javascript/3.exp/reference#OverlayView
     const overlayView = new google.maps.OverlayView();
     overlayView.setValues(composeOptions(overlayViewProps, [
diff --git a/src/creators/PolygonCreator.js b/src/creators/PolygonCreator.js
@@ -50,7 +50,8 @@ export default class PolygonCreator extends Component {
     polygon: PropTypes.object.isRequired,
   }
 
-  static _createPolygon (mapHolderRef, polygonProps) {
+  static _createPolygon (polygonProps) {
+    const {mapHolderRef} = polygonProps;
     // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Polygon
     const polygon = new google.maps.Polygon(composeOptions(polygonProps, [
       // https://developers.google.com/maps/documentation/javascript/3.exp/reference#PolygonOptions
diff --git a/src/creators/PolylineCreator.js b/src/creators/PolylineCreator.js
@@ -48,7 +48,8 @@ export default class PolylineCreator extends Component {
     polyline: PropTypes.object.isRequired,
   }
 
-  static _createPolyline (mapHolderRef, polylineProps) {
+  static _createPolyline (polylineProps) {
+    const {mapHolderRef} = polylineProps;
     // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Polyline
     const polyline = new google.maps.Polyline(composeOptions(polylineProps, [
       // https://developers.google.com/maps/documentation/javascript/3.exp/reference#PolylineOptions
diff --git a/src/creators/RectangleCreator.js b/src/creators/RectangleCreator.js
@@ -49,7 +49,8 @@ export default class RectangleCreator extends Component {
     rectangle: PropTypes.object.isRequired,
   }
 
-  static _createRectangle (mapHolderRef, rectangleProps) {
+  static _createRectangle (rectangleProps) {
+    const {mapHolderRef} = rectangleProps;
     // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Rectangle
     const rectangle = new google.maps.Rectangle(composeOptions(rectangleProps, [
       // https://developers.google.com/maps/documentation/javascript/3.exp/reference#RectangleOptions
diff --git a/src/creators/_SkeletonCreator.js b/src/creators/_SkeletonCreator.js
@@ -41,7 +41,8 @@ export default class SkeletonCreator extends Component {
     skeleton: PropTypes.object.isRequired,
   }
 
-  static _createSkeleton (mapHolderRef, skeletonProps) {
+  static _createSkeleton (skeletonProps) {
+    const {mapHolderRef} = skeletonProps;
     // https://developers.google.com/maps/documentation/javascript/3.exp/reference
     const skeleton = new google.maps.Skeleton(composeOptions(skeletonProps, [
       // https://developers.google.com/maps/documentation/javascript/3.exp/reference
diff --git a/src/utils/composeOptions.js b/src/utils/composeOptions.js
@@ -3,6 +3,8 @@ import {default as controlledOrDefault} from "./controlledOrDefault";
 export default function composeOptions (props, optionNameList) {
   const getter = controlledOrDefault(props);
 
+  // props from arguments may contain unknow props.
+  // We only interested those in optionNameList
   return optionNameList.reduce((acc, optionName) => {
     const value = getter(optionName);
     if ("undefined" !== typeof value) {

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,7 @@ export default class Circle extends Component {`
`53`	`53`	`if (!canUseDOM) {`
`54`	`54`	`return;`
`55`	`55`	`}`
`56`		`- const {mapHolderRef, ...circleProps} = this.props;`
`57`		`- const circle = CircleCreator._createCircle(mapHolderRef, circleProps);`
	`56`	`+ const circle = CircleCreator._createCircle(this.props);`
`58`	`57`
`59`	`58`	`this.setState({ circle });`
`60`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,7 @@ export default class DirectionsRenderer extends Component {`
`49`	`49`	`if (!canUseDOM) {`
`50`	`50`	`return;`
`51`	`51`	`}`
`52`		`- const {mapHolderRef, ...directionsRendererProps} = this.props;`
`53`		`- const directionsRenderer = DirectionsRendererCreator._createDirectionsRenderer(mapHolderRef, directionsRendererProps);`
	`52`	`+ const directionsRenderer = DirectionsRendererCreator._createDirectionsRenderer(this.props);`
`54`	`53`
`55`	`54`	`this.setState({ directionsRenderer });`
`56`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,7 @@ export default class DrawingManager extends Component {`
`45`	`45`	`if (!canUseDOM) {`
`46`	`46`	`return;`
`47`	`47`	`}`
`48`		`- const {mapHolderRef, ...drawingManagerProps} = this.props;`
`49`		`- const drawingManager = DrawingManagerCreator._createDrawingManager(mapHolderRef, drawingManagerProps);`
	`48`	`+ const drawingManager = DrawingManagerCreator._createDrawingManager(this.props);`
`50`	`49`
`51`	`50`	`this.setState({ drawingManager });`
`52`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,7 @@ export default class Marker extends Component {`
`67`	`67`	`if (!canUseDOM) {`
`68`	`68`	`return;`
`69`	`69`	`}`
`70`		`- const {mapHolderRef, ...markerProps} = this.props;`
`71`		`- const marker = MarkerCreator._createMarker(mapHolderRef, markerProps);`
	`70`	`+ const marker = MarkerCreator._createMarker(this.props);`
`72`	`71`
`73`	`72`	`this.setState({ marker });`
`74`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,7 @@ export default class OverlayView extends Component {`
`55`	`55`	`if (!canUseDOM) {`
`56`	`56`	`return;`
`57`	`57`	`}`
`58`		`- const {mapHolderRef, ...overlayViewProps} = this.props;`
`59`		`- const overlayView = OverlayViewCreator._createOverlayView(mapHolderRef, overlayViewProps);`
	`58`	`+ const overlayView = OverlayViewCreator._createOverlayView(this.props);`
`60`	`59`
`61`	`60`	`this.setState({ overlayView });`
`62`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,7 @@ export default class Polyline extends Component {`
`47`	`47`	`if (!canUseDOM) {`
`48`	`48`	`return;`
`49`	`49`	`}`
`50`		`- const {mapHolderRef, ...polylineProps} = this.props;`
`51`		`- const polyline = PolylineCreator._createPolyline(mapHolderRef, polylineProps);`
	`50`	`+ const polyline = PolylineCreator._createPolyline(this.props);`
`52`	`51`
`53`	`52`	`this.setState({ polyline });`
`54`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,7 @@ export default class Rectangle extends Component {`
`51`	`51`	`if (!canUseDOM) {`
`52`	`52`	`return;`
`53`	`53`	`}`
`54`		`- const {mapHolderRef, ...rectangleProps} = this.props;`
`55`		`- const rectangle = RectangleCreator._createRectangle(mapHolderRef, rectangleProps);`
	`54`	`+ const rectangle = RectangleCreator._createRectangle(this.props);`
`56`	`55`
`57`	`56`	`this.setState({ rectangle });`
`58`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,7 @@ export default class Skeleton extends Component {`
`41`	`41`	`if (!canUseDOM) {`
`42`	`42`	`return;`
`43`	`43`	`}`
`44`		`- const {mapHolderRef, ...skeletonProps} = this.props;`
`45`		`- const skeleton = SkeletonCreator._createSkeleton(mapHolderRef, skeletonProps);`
	`44`	`+ const skeleton = SkeletonCreator._createSkeleton(this.props);`
`46`	`45`
`47`	`46`	`this.setState({ skeleton });`
`48`	`47`	`}`