Merge remote-tracking branch 'FredyC/iteratable-support'

src/react/JSONTree/JSONIterableNode.js

@@ -0,0 +1,143 @@
+import React from 'react';
+import reactMixin from 'react-mixin';
+import { ExpandedStateHandlerMixin } from './mixins';
+import JSONArrow from './JSONArrow';
+import grabNode from './grab-node';
+
+const styles = {
+  base: {
+    position: 'relative',
+    paddingTop: 3,
+    paddingBottom: 3,
+    paddingRight: 0,
+    marginLeft: 14
+  },
+  label: {
+    margin: 0,
+    padding: 0,
+    display: 'inline-block'
+  },
+  span: {
+    cursor: 'default'
+  },
+  spanType: {
+    marginLeft: 5,
+    marginRight: 5
+  }
+};
+
+@reactMixin.decorate(ExpandedStateHandlerMixin)
+export default class JSONIterableNode extends React.Component {
+  defaultProps = {
+    data: [],
+    initialExpanded: false
+  };
+
+  // flag to see if we still need to render our child nodes
+  needsChildNodes = true;
+
+  // cache store for our child nodes
+  renderedChildren = [];
+
+  // cache store for the number of items string we display
+  itemString = false;
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      expanded: this.props.initialExpanded,
+      createdChildNodes: false
+    };
+  }
+
+  // Returns the child nodes for each entry in iterable. If we have
+  // generated them previously, we return from cache, otherwise we create
+  // them.
+  getChildNodes() {
+    if (this.state.expanded && this.needsChildNodes) {
+      let childNodes = [];
+      for (const entry of this.props.data) {
+        let key = null;
+        let value = null;
+        if (Array.isArray(entry)) {
+          [key, value] = entry;
+        } else {
+          key = childNodes.length;
+          value = entry;
+        }
+
+        let prevData;
+        if (typeof this.props.previousData !== 'undefined') {
+          prevData = this.props.previousData[key];
+        }
+        const node = grabNode(key, value, prevData, this.props.theme);
+        if (node !== false) {
+          childNodes.push(node);
+        }
+      }
+      this.needsChildNodes = false;
+      this.renderedChildren = childNodes;
+    }
+    return this.renderedChildren;
+  }
+
+  // Returns the "n entries" string for this node, generating and
+  // caching it if it hasn't been created yet.
+  getItemString() {
+    if (!this.itemString) {
+      const { data } = this.props;
+      let count = 0;
+      if (Number.isSafeInteger(data.size)) {
+        count = data.size;
+      } else {
+        for (const entry of data) { // eslint-disable-line no-unused-vars
+          count += 1;
+        }
+      }
+      this.itemString = count + ' entr' + (count !== 1 ? 'ies' : 'y');
+    }
+    return this.itemString;
+  }
+
+  render() {
+    const childNodes = this.getChildNodes();
+    const childListStyle = {
+      padding: 0,
+      margin: 0,
+      listStyle: 'none',
+      display: (this.state.expanded) ? 'block' : 'none'
+    };
+    let containerStyle;
+    let spanStyle = {
+      ...styles.span,
+      color: this.props.theme.base0E
+    };
+    containerStyle = {
+      ...styles.base
+    };
+    if (this.state.expanded) {
+      spanStyle = {
+        ...spanStyle,
+        color: this.props.theme.base03
+      };
+    }
+    return (
+      <li style={containerStyle}>
+        <JSONArrow theme={this.props.theme} open={this.state.expanded} onClick={::this.handleClick}/>
+        <label style={{
+          ...styles.label,
+          color: this.props.theme.base0D
+        }} onClick={::this.handleClick}>
+          {this.props.keyName}:
+        </label>
+        <span style={spanStyle} onClick={::this.handleClick}>
+          <span style={styles.spanType}>()</span>
+          {this.getItemString()}
+        </span>
+        <ol style={childListStyle}>
+          {childNodes}
+        </ol>
+      </li>
+    );
+  }
+}

src/react/JSONTree/grab-node.js

@@ -2,6 +2,7 @@ import React from 'react';
 import objType from './obj-type';
 import JSONObjectNode from './JSONObjectNode';
 import JSONArrayNode from './JSONArrayNode';
+import JSONIterableNode from './JSONIterableNode';
 import JSONStringNode from './JSONStringNode';
 import JSONNumberNode from './JSONNumberNode';
 import JSONBooleanNode from './JSONBooleanNode';
@@ -13,6 +14,8 @@ export default function(key, value, prevValue, theme) {
     return <JSONObjectNode data={value} previousData={prevValue} theme={theme} keyName={key} key={key} />;
   } else if (nodeType === 'Array') {
     return <JSONArrayNode data={value} previousData={prevValue} theme={theme} keyName={key} key={key} />;
+  } else if (nodeType === 'Iterable') {
+    return <JSONIterableNode data={value} previousData={prevValue} theme={theme} keyName={key} key={key} />;
   } else if (nodeType === 'String') {
     return <JSONStringNode keyName={key} previousValue={prevValue} theme={theme} value={value} key={key} />;
   } else if (nodeType === 'Number') {

src/react/JSONTree/obj-type.js

@@ -1,3 +1,8 @@
 export default function(obj) {
+  if (obj !== null && typeof obj === 'object' && !Array.isArray(obj) &&
+    typeof obj[Symbol.iterator] === 'function'
+  ) {
+    return 'Iterable';
+  }
   return Object.prototype.toString.call(obj).slice(8, -1);
 }