Resolves #19: Fixed regression in displayed values that caused all va…

…lues to be displayed as strings. Also fixed secondary regression that caused null or undefined values to be displayed as empty strings
alexkuz · Jan 12, 2016 · fb671f1 · fb671f1
1 parent 0dccc37
commit fb671f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/JSONValueNode.js b/src/JSONValueNode.js
@@ -46,8 +46,8 @@ export default class JSONValueNode extends React.Component {
         </label>
         <span style={{
           color: this.props.theme.base0B,
-          ...this.props.styles.getValueStyle('String', true)
-        }}>"{this.props.valueRenderer(this.props.valueGetter(this.props.value))}"</span>
+          ...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,17 +47,17 @@ export default function({
     case 'Iterable':
       return <JSONIterableNode {...nestedNodeProps} />;
     case 'String':
-      return <JSONValueNode {...simpleNodeProps} />;
+      return <JSONValueNode {...simpleNodeProps} valueGetter={raw => `"${raw}"`} />;
     case 'Number':
       return <JSONValueNode {...simpleNodeProps} />;
     case 'Boolean':
       return <JSONValueNode {...simpleNodeProps} valueGetter={raw => raw ? 'true' : 'false'} />;
     case 'Date':
       return <JSONValueNode {...simpleNodeProps} valueGetter={raw => raw.toISOString()} />;
     case 'Null':
-      return <JSONValueNode {...simpleNodeProps} valueGetter={() => null} />;
+      return <JSONValueNode {...simpleNodeProps} valueGetter={() => 'null'} />;
     case 'Undefined':
-      return <JSONValueNode {...simpleNodeProps} valueGetter={() => undefined} />;
+      return <JSONValueNode {...simpleNodeProps} valueGetter={() => 'undefined'} />;
     case 'Function':
       return <JSONValueNode {...simpleNodeProps} valueGetter={raw => raw.toString()} />;
     default: