Also fixed a regression where values were not being styled with their…

… own value-specific theme colors
alexkuz · Jan 12, 2016 · 5ff22d7 · 5ff22d7
1 parent fb671f1
commit 5ff22d7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/JSONValueNode.js b/src/JSONValueNode.js
@@ -45,7 +45,7 @@ export default class JSONValueNode extends React.Component {
           {this.props.labelRenderer(this.props.keyName)}:
         </label>
         <span style={{
-          color: this.props.theme.base0B,
+          color: this.props.valueColor,
           ...this.props.styles.getValueStyle(this.props.nodeType, true)
         }}>{this.props.valueRenderer(this.props.valueGetter(this.props.value))}</span>
       </li>

diff --git a/src/grab-node.js b/src/grab-node.js
@@ -47,19 +47,19 @@ export default function({
     case 'Iterable':
       return <JSONIterableNode {...nestedNodeProps} />;
     case 'String':
-      return <JSONValueNode {...simpleNodeProps} valueGetter={raw => `"${raw}"`} />;
+      return <JSONValueNode {...simpleNodeProps} valueColor={theme.base0B} valueGetter={raw => `"${raw}"`} />;
     case 'Number':
-      return <JSONValueNode {...simpleNodeProps} />;
+      return <JSONValueNode {...simpleNodeProps} valueColor={theme.base09} />;
     case 'Boolean':
-      return <JSONValueNode {...simpleNodeProps} valueGetter={raw => raw ? 'true' : 'false'} />;
+      return <JSONValueNode {...simpleNodeProps} valueColor={theme.base09} valueGetter={raw => raw ? 'true' : 'false'} />;
     case 'Date':
-      return <JSONValueNode {...simpleNodeProps} valueGetter={raw => raw.toISOString()} />;
+      return <JSONValueNode {...simpleNodeProps} valueColor={theme.base0B} valueGetter={raw => raw.toISOString()} />;
     case 'Null':
-      return <JSONValueNode {...simpleNodeProps} valueGetter={() => 'null'} />;
+      return <JSONValueNode {...simpleNodeProps} valueColor={theme.base08} valueGetter={() => 'null'} />;
     case 'Undefined':
-      return <JSONValueNode {...simpleNodeProps} valueGetter={() => 'undefined'} />;
+      return <JSONValueNode {...simpleNodeProps} valueColor={theme.base08} valueGetter={() => 'undefined'} />;
     case 'Function':
-      return <JSONValueNode {...simpleNodeProps} valueGetter={raw => raw.toString()} />;
+      return <JSONValueNode {...simpleNodeProps} valueColor={theme.base08} valueGetter={raw => raw.toString()} />;
     default:
       return false;
   }