Refactor/rewrite from scratch

package.json

@@ -88,15 +88,14 @@
     "prismjs": "^1.5.1",
     "raf": "^3.3.0",
     "raw-loader": "^0.5.1",
-    "react": "^0.14.0",
-    "react-addons-pure-render-mixin": "^0.14.0",
-    "react-addons-update": "^0.14.0",
-    "react-bootstrap": "^0.28.0",
-    "react-dom": "^0.14.0",
+    "react": "^15.0.0",
+    "react-addons-update": "^15.0.0",
+    "react-bootstrap": "^0.30.3",
+    "react-dom": "^15.0.0",
     "react-github-fork-ribbon": "^0.4.4",
     "react-helmet": "^3.1.0",
     "react-icons": "^2.2.1",
-    "react-prism": "^3.0.0",
+    "react-prism": "^4.0.0",
     "react-router": "^2.8.1",
     "react-router-bootstrap": "^0.23.1",
     "react-scripts": "0.6.1",
@@ -111,12 +110,13 @@
     "invariant": "^2.2.1",
     "lodash": "^4.16.2",
     "marker-clusterer-plus": "^2.1.4",
+    "react-display-name": "^0.2.0",
     "react-prop-types-element-of-type": "^2.2.0",
     "scriptjs": "^2.5.8",
     "warning": "^3.0.0"
   },
   "peerDependencies": {
-    "react": "^0.14.0 || ^15.0.0",
-    "react-dom": "^0.14.0 || ^15.0.0"
+    "react": "^15.0.0",
+    "react-dom": "^15.0.0"
   }
 }

src/lib/Circle.js

@@ -1,85 +1,145 @@
+/* global google */
+import _ from "lodash";
+
 import {
   default as React,
-  Component,
   PropTypes,
 } from "react";
 
 import {
-  default as canUseDOM,
-} from "can-use-dom";
+  MAP,
+  CIRCLE,
+} from "./constants";
 
 import {
-  default as CircleCreator,
-  circleDefaultPropTypes,
-  circleControlledPropTypes,
-  circleEventPropTypes,
-} from "./creators/CircleCreator";
-
-import { default as GoogleMapHolder } from "./creators/GoogleMapHolder";
-
-export default class Circle extends Component {
-  static propTypes = {
-    // Uncontrolled default[props] - used only in componentDidMount
-    ...circleDefaultPropTypes,
-    // Controlled [props] - used in componentDidMount/componentDidUpdate
-    ...circleControlledPropTypes,
-    // Event [onEventName]
-    ...circleEventPropTypes,
-  }
-
-  static contextTypes = {
-    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder),
-  }
+  addDefaultPrefixToPropTypes,
+  collectUncontrolledAndControlledProps,
+  default as enhanceElement,
+} from "./enhanceElement";
 
-  // Public APIs
+const controlledPropTypes = {
+  // NOTICE!!!!!!
   //
-  // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Circle
+  // Only expose those with getters & setters in the table as controlled props.
+  //
+  // [].map.call($0.querySelectorAll("tr>td>code", function(it){ return it.textContent; })
+  //    .filter(function(it){ return it.match(/^set/) && !it.match(/^setMap/); })
   //
+  // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Circle
+  center: PropTypes.any,
+  draggable: PropTypes.bool,
+  editable: PropTypes.bool,
+  options: PropTypes.object,
+  radius: PropTypes.number,
+  visible: PropTypes.bool,
+};
+
+const defaultUncontrolledPropTypes = addDefaultPrefixToPropTypes(controlledPropTypes);
+
+const eventMap = {
+  // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Circle
   // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
-  //    .filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
-  getBounds() { return this.state.circle.getBounds(); }
+  onCenterChanged: `center_changed`,
 
-  getCenter() { return this.state.circle.getCenter(); }
+  onClick: `click`,
 
-  getDraggable() { return this.state.circle.getDraggable(); }
+  onDblClick: `dblclick`,
 
-  getEditable() { return this.state.circle.getEditable(); }
+  onDrag: `drag`,
 
-  getMap() { return this.state.circle.getMap(); }
+  onDragEnd: `dragend`,
 
-  getRadius() { return this.state.circle.getRadius(); }
+  onDragStart: `dragstart`,
 
-  getVisible() { return this.state.circle.getVisible(); }
-  // END - Public APIs
+  onMouseDown: `mousedown`,
+
+  onMouseMove: `mousemove`,
+
+  onMouseOut: `mouseout`,
+
+  onMouseOver: `mouseover`,
+
+  onMouseUp: `mouseup`,
+
+  onRadiusChanged: `radius_changed`,
+
+  onRightClick: `rightclick`,
+};
+
+const publicMethodMap = {
+  // Public APIs
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Circle
+  //
+  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
+  //    .filter(function(it){ return it.match(/^get/) && !it.match(/Map$/); })
+  getBounds(circle) { return circle.getBounds(); },
 
-  state = {
-  }
+  getCenter(circle) { return circle.getCenter(); },
 
-  componentWillMount() {
-    const { mapHolderRef } = this.context;
+  getDraggable(circle) { return circle.getDraggable(); },
 
-    if (!canUseDOM) {
-      return;
-    }
-    const circle = CircleCreator._createCircle({
-      ...this.props,
-      mapHolderRef,
-    });
+  getEditable(circle) { return circle.getEditable(); },
 
-    this.setState({ circle });
-  }
+  getMap(circle) { return circle.getMap(); },
 
-  render() {
-    if (this.state.circle) {
-      return (
-        <CircleCreator circle={this.state.circle} {...this.props}>
-          {this.props.children}
-        </CircleCreator>
-      );
-    } else {
-      return (<noscript />);
-    }
-  }
+  getRadius(circle) { return circle.getRadius(); },
+
+  getVisible(circle) { return circle.getVisible(); },
+  // END - Public APIs
+};
+
+const controlledPropUpdaterMap = {
+  center(circle, center) { circle.setCenter(center); },
+  draggable(circle, draggable) { circle.setDraggable(draggable); },
+  editable(circle, editable) { circle.setEditable(editable); },
+  options(circle, options) { circle.setOptions(options); },
+  radius(circle, radius) { circle.setRadius(radius); },
+  visible(circle, visible) { circle.setVisible(visible); },
+};
+
+function getInstanceFromComponent(component) {
+  return component.state[CIRCLE];
 }
+
+export default _.flowRight(
+  React.createClass,
+  enhanceElement(getInstanceFromComponent, publicMethodMap, eventMap, controlledPropUpdaterMap),
+)({
+  displayName: `Circle`,
+
+  propTypes: {
+    ...controlledPropTypes,
+    ...defaultUncontrolledPropTypes,
+  },
+
+  contextTypes: {
+    [MAP]: PropTypes.object,
+  },
+
+  getInitialState() {
+    // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Circle
+    const circle = new google.maps.Circle({
+      map: this.context[MAP],
+      ...collectUncontrolledAndControlledProps(
+        defaultUncontrolledPropTypes,
+        controlledPropTypes,
+        this.props
+      ),
+    });
+    return {
+      [CIRCLE]: circle,
+    };
+  },
+
+  componentWillUnmount() {
+    const circle = getInstanceFromComponent(this);
+    if (circle) {
+      circle.setMap(null);
+    }
+  },
+
+  render() {
+    return false;
+  },
+});