Skip to content
This repository was archived by the owner on May 14, 2020. It is now read-only.

Commit 5ff22d7

Browse files
committed
Also fixed a regression where values were not being styled with their own value-specific theme colors
1 parent fb671f1 commit 5ff22d7

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/JSONValueNode.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default class JSONValueNode extends React.Component {
4545
{this.props.labelRenderer(this.props.keyName)}:
4646
</label>
4747
<span style={{
48-
color: this.props.theme.base0B,
48+
color: this.props.valueColor,
4949
...this.props.styles.getValueStyle(this.props.nodeType, true)
5050
}}>{this.props.valueRenderer(this.props.valueGetter(this.props.value))}</span>
5151
</li>

src/grab-node.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@ export default function({
4747
case 'Iterable':
4848
return <JSONIterableNode {...nestedNodeProps} />;
4949
case 'String':
50-
return <JSONValueNode {...simpleNodeProps} valueGetter={raw => `"${raw}"`} />;
50+
return <JSONValueNode {...simpleNodeProps} valueColor={theme.base0B} valueGetter={raw => `"${raw}"`} />;
5151
case 'Number':
52-
return <JSONValueNode {...simpleNodeProps} />;
52+
return <JSONValueNode {...simpleNodeProps} valueColor={theme.base09} />;
5353
case 'Boolean':
54-
return <JSONValueNode {...simpleNodeProps} valueGetter={raw => raw ? 'true' : 'false'} />;
54+
return <JSONValueNode {...simpleNodeProps} valueColor={theme.base09} valueGetter={raw => raw ? 'true' : 'false'} />;
5555
case 'Date':
56-
return <JSONValueNode {...simpleNodeProps} valueGetter={raw => raw.toISOString()} />;
56+
return <JSONValueNode {...simpleNodeProps} valueColor={theme.base0B} valueGetter={raw => raw.toISOString()} />;
5757
case 'Null':
58-
return <JSONValueNode {...simpleNodeProps} valueGetter={() => 'null'} />;
58+
return <JSONValueNode {...simpleNodeProps} valueColor={theme.base08} valueGetter={() => 'null'} />;
5959
case 'Undefined':
60-
return <JSONValueNode {...simpleNodeProps} valueGetter={() => 'undefined'} />;
60+
return <JSONValueNode {...simpleNodeProps} valueColor={theme.base08} valueGetter={() => 'undefined'} />;
6161
case 'Function':
62-
return <JSONValueNode {...simpleNodeProps} valueGetter={raw => raw.toString()} />;
62+
return <JSONValueNode {...simpleNodeProps} valueColor={theme.base08} valueGetter={raw => raw.toString()} />;
6363
default:
6464
return false;
6565
}

0 commit comments

Comments
 (0)