feat(ChildMixin): add invalid_context to check before operations

tomchentw · Oct 24, 2014 · 5d33c30 · 5d33c30
1 parent 9a90337
commit 5d33c30
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/Map.js b/src/Map.js
@@ -14,10 +14,12 @@ module.exports = React.createClass({
   },
 
   componentDidMount () {
+    if (this.invalid_context(true)) return;
     this._init_map(this.context);
   },
 
   componentDidUpdate () {
+    if (this.invalid_context(true)) return;
     this._init_map(this.context);
   },
 
@@ -26,9 +28,6 @@ module.exports = React.createClass({
   },
 
   _init_map (context) {
-    if (context.hasMap() || !context.getApi()) {
-      return;
-    }
     var {Map} = context.getApi();
     context._set_map(
       new Map(

diff --git a/src/Marker.js b/src/Marker.js
@@ -4,7 +4,6 @@ var React = require("react/addons");
 
 var ChildMixin = require("./mixins/ChildMixin");
 
-
 module.exports = React.createClass({
   displayName: "Marker",
 
@@ -23,10 +22,12 @@ module.exports = React.createClass({
   },
 
   componentDidMount () {
+    if (this.invalid_context(this.state.marker)) return;
     this._init_marker(this.context);
   },
 
   componentDidUpdate () {
+    if (this.invalid_context(this.state.marker)) return;
     this._init_marker(this.context);
   },
 
@@ -35,9 +36,6 @@ module.exports = React.createClass({
   },
 
   _init_marker (context) {
-    if (this.state.marker || !context.hasMap() || !context.getApi()) {
-      return;
-    }
     var {Marker} = context.getApi();
     var marker = new Marker(this.props);
     marker.setMap(context.getMap());

diff --git a/src/mixins/ChildMixin.js b/src/mixins/ChildMixin.js
@@ -5,12 +5,18 @@ var React = require("react/addons");
 module.exports = {
 
   shouldComponentUpdate(nextProps, nextState) {
-    return false;
+    return JSON.stringify(nextProps) !== JSON.stringify(this.props);
   },
 
   contextTypes: {
     getMap: React.PropTypes.func,
     getApi: React.PropTypes.func,
     hasMap: React.PropTypes.func,
+  },
+
+  invalid_context (instance) {
+    var {context} = this;
+    var invalidMap = (true === instance ? context.hasMap() : (instance || !context.hasMap()));
+    return invalidMap || !context.getApi();
   }
 };