From fb671f13b5509b581bbdef53e6b78983d7aa1c9c Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Tue, 12 Jan 2016 08:12:35 -0800
Subject: [PATCH 1/2] Resolves #19: Fixed regression in displayed values that
 caused all values to be displayed as strings. Also fixed secondary regression
 that caused null or undefined values to be displayed as empty strings

---
 src/JSONValueNode.js | 4 ++--
 src/grab-node.js     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/JSONValueNode.js b/src/JSONValueNode.js
index 7a8d616..1f9ed60 100644
--- 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
index 9bc530b..d75e14b 100644
--- a/src/grab-node.js
+++ b/src/grab-node.js
@@ -47,7 +47,7 @@ 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':
@@ -55,9 +55,9 @@ export default function({
     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:

From 5ff22d717edc9ca1a21ef1d7b5766507f35d1f5d Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Tue, 12 Jan 2016 08:37:31 -0800
Subject: [PATCH 2/2] Also fixed a regression where values were not being
 styled with their own value-specific theme colors

---
 src/JSONValueNode.js |  2 +-
 src/grab-node.js     | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/JSONValueNode.js b/src/JSONValueNode.js
index 1f9ed60..3a01859 100644
--- 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
index d75e14b..7cb9916 100644
--- 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;
   }