Merge branch 'master' of https://github.com/facebook/react-devtools into banana_slug

Conflicts:
	shells/chrome/manifest.json

Author: Hedger Wang

.flowconfig

@@ -15,4 +15,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe
 suppress_comment=\\(.\\|\n\\)*\\$FlowIssue
 
 [version]
-0.18.1
+0.20.1

agent/Agent.js

@@ -160,7 +160,7 @@ class Agent extends EventEmitter {
     // used to "view source in Sources pane"
     bridge.on('putSelectedInstance', id => {
       var node = this.elementData.get(id);
-      if (node.publicInstance) {
+      if (node && node.publicInstance) {
         window.__REACT_DEVTOOLS_GLOBAL_HOOK__.$inst = node.publicInstance;
       } else {
         window.__REACT_DEVTOOLS_GLOBAL_HOOK__.$inst = null;
@@ -210,7 +210,7 @@ class Agent extends EventEmitter {
   highlight(id: ElementID) {
     var data = this.elementData.get(id);
     var node = this.getNodeForID(id);
-    if (node) {
+    if (data && node) {
       this.emit('highlight', {node, name: data.name, props: data.props});
     }
   }
@@ -234,7 +234,7 @@ class Agent extends EventEmitter {
       return null;
     }
     var renderer = this.renderers.get(id);
-    if (this.reactInternals[renderer].getNativeFromReactElement) {
+    if (renderer && this.reactInternals[renderer].getNativeFromReactElement) {
       return this.reactInternals[renderer].getNativeFromReactElement(component);
     }
   }
@@ -275,7 +275,7 @@ class Agent extends EventEmitter {
 
   _setProps({id, path, value}: {id: ElementID, path: Array<string>, value: any}) {
     var data = this.elementData.get(id);
-    if (data.updater && data.updater.setInProps) {
+    if (data && data.updater && data.updater.setInProps) {
       data.updater.setInProps(path, value);
     } else {
       console.warn("trying to set props on a component that doesn't support it");
@@ -284,7 +284,7 @@ class Agent extends EventEmitter {
 
   _setState({id, path, value}: {id: ElementID, path: Array<string>, value: any}) {
     var data = this.elementData.get(id);
-    if (data.updater && data.updater.setInState) {
+    if (data && data.updater && data.updater.setInState) {
       data.updater.setInState(path, value);
     } else {
       console.warn("trying to set state on a component that doesn't support it");
@@ -293,7 +293,7 @@ class Agent extends EventEmitter {
 
   _setContext({id, path, value}: {id: ElementID, path: Array<string>, value: any}) {
     var data = this.elementData.get(id);
-    if (data.updater && data.updater.setInContext) {
+    if (data && data.updater && data.updater.setInContext) {
       data.updater.setInContext(path, value);
     } else {
       console.warn("trying to set state on a component that doesn't support it");
@@ -302,6 +302,9 @@ class Agent extends EventEmitter {
 
   _makeGlobal({id, path}: {id: ElementID, path: Array<string>}) {
     var data = this.elementData.get(id);
+    if (!data) {
+      return;
+    }
     var value;
     if (path === 'instance') {
       value = data.publicInstance;

agent/Bridge.js

@@ -285,8 +285,11 @@ class Bridge {
     }
 
     if (payload.type === 'callback') {
-      this._cbs.get(payload.id)(...payload.args);
-      this._cbs.delete(payload.id);
+      var callback = this._cbs.get(payload.id);
+      if (callback) {
+        callback(...payload.args);
+        this._cbs.delete(payload.id);
+      }
       return;
     }
 
@@ -346,12 +349,14 @@ class Bridge {
   }
 
   _inspectResponse(id: string, path: Array<string>, callback: number) {
-    var val = getIn(this._inspectables.get(id), path);
+    var inspectable = this._inspectables.get(id);
+
     var result = {};
     var cleaned = [];
     var proto = null;
     var protoclean = [];
-    if (val) {
+    if (inspectable) {
+      var val = getIn(inspectable, path);
       var protod = false;
       var isFn = typeof val === 'function';
       Object.getOwnPropertyNames(val).forEach(name => {

frontend/DataView/DataView.js

@@ -190,13 +190,12 @@ class DataItem extends React.Component {
   }
 }
 
-function alphanumericSort(a, b) {
+function alphanumericSort(a: string, b: string): number {
   if ('' + (+a) === a) {
     if ('' + (+b) !== b) {
       return -1;
     }
-    a = +a;
-    b = +b;
+    return (+a < +b) ? -1 : 1;
   }
   return (a < b) ? -1 : 1;
 }

frontend/Highlighter/Highlighter.js

@@ -62,7 +62,6 @@ class Highlighter {
     if (!this._overlay) {
       this._overlay = new Overlay(this._win);
     }
-    // $FlowFixMe this._overlay is clearly not null at this point
     this._overlay.inspect(node, name);
   }
 
@@ -71,7 +70,6 @@ class Highlighter {
     if (!this._multiOverlay) {
       this._multiOverlay = new MultiOverlay(this._win);
     }
-    // $FlowFixMe this._multiOverlay is clearly not null at this point
     this._multiOverlay.highlightMany(nodes);
   }
 

frontend/Store.js

@@ -219,7 +219,6 @@ class Store extends EventEmitter {
           .map(([key, val]) => key)
           .toList();
       }
-      // $FlowFixMe this.searchRoots is not falsey
       this.searchRoots.forEach(id => {
         if (this.hasBottom(id)) {
           this._nodes = this._nodes.setIn([id, 'collapsed'], true);

frontend/decorate.js

@@ -120,7 +120,6 @@ module.exports = function(options: Options, Component: any): any {
   }
 
   Wrapper.contextTypes = {
-    // $FlowFixMe computed property
     [storeKey]: React.PropTypes.object,
   };
 

frontend/provideStore.js

@@ -19,15 +19,13 @@ module.exports = function(name: string): Object {
       store: Object,
     };
     getChildContext() {
-      // $FlowFixMe computed property
       return {[name]: this.props.store};
     }
     render() {
       return this.props.children();
     }
   }
   Wrapper.childContextTypes = {
-    // $FlowFixMe computed property
     [name]: React.PropTypes.object,
   };
   Wrapper.displayName = 'StoreProvider(' + name + ')';