This repository was archived by the owner on May 14, 2020. It is now read-only.
File tree 7 files changed +23
-19
lines changed
7 files changed +23
-19
lines changed Original file line number Diff line number Diff line change @@ -25,7 +25,8 @@ function getChildNodes({
25
25
styles,
26
26
theme,
27
27
valueRenderer,
28
- allExpanded
28
+ allExpanded,
29
+ keyPath
29
30
} ) {
30
31
const childNodes = [ ] ;
31
32
data . forEach ( ( value , key ) => {
@@ -36,7 +37,7 @@ function getChildNodes({
36
37
37
38
const node = grabNode ( {
38
39
getItemString,
39
- key,
40
+ keyPath : [ key , ... keyPath ] ,
40
41
labelRenderer,
41
42
previousData : previousDataValue ,
42
43
renderItemString,
Original file line number Diff line number Diff line change @@ -33,7 +33,8 @@ function getChildNodes({
33
33
styles,
34
34
theme,
35
35
valueRenderer,
36
- allExpanded
36
+ allExpanded,
37
+ keyPath
37
38
} ) {
38
39
const childNodes = [ ] ;
39
40
for ( const entry of data ) {
@@ -53,7 +54,7 @@ function getChildNodes({
53
54
54
55
const node = grabNode ( {
55
56
getItemString,
56
- key,
57
+ keyPath : [ key , ... keyPath ] ,
57
58
labelRenderer,
58
59
previousData : previousDataValue ,
59
60
styles,
Original file line number Diff line number Diff line change @@ -98,7 +98,7 @@ export default class JSONNestedNode extends React.Component {
98
98
color : this . props . theme . base0D ,
99
99
...this . props . styles . getLabelStyle ( this . props . nodeType , this . state . expanded )
100
100
} } onClick = { ::this . handleClick } >
101
- { this . props . labelRenderer ( this . props . keyName ) } :
101
+ { this . props . labelRenderer ( ... this . props . keyPath ) } :
102
102
</ label >
103
103
< span style = { {
104
104
...spanStyle ,
Original file line number Diff line number Diff line change @@ -26,7 +26,8 @@ export function getChildNodes({
26
26
styles,
27
27
theme,
28
28
valueRenderer,
29
- allExpanded
29
+ allExpanded,
30
+ keyPath
30
31
} ) {
31
32
const childNodes = [ ] ;
32
33
for ( let key in data ) {
@@ -38,7 +39,7 @@ export function getChildNodes({
38
39
39
40
const node = grabNode ( {
40
41
getItemString,
41
- key,
42
+ keyPath : [ key , ... keyPath ] ,
42
43
labelRenderer,
43
44
previousData : previousDataValue ,
44
45
renderItemString,
Original file line number Diff line number Diff line change @@ -42,7 +42,7 @@ export default class JSONValueNode extends React.Component {
42
42
color : this . props . theme . base0D ,
43
43
...this . props . styles . getLabelStyle ( this . props . nodeType , true )
44
44
} } >
45
- { this . props . labelRenderer ( this . props . keyName ) } :
45
+ { this . props . labelRenderer ( ... this . props . keyPath ) } :
46
46
</ label >
47
47
< span style = { {
48
48
color : this . props . valueColor ,
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ export default function({
9
9
getItemString,
10
10
initialExpanded = false ,
11
11
allExpanded,
12
- key ,
12
+ keyPath ,
13
13
labelRenderer,
14
14
previousData,
15
15
styles,
@@ -22,8 +22,8 @@ export default function({
22
22
const simpleNodeProps = {
23
23
getItemString,
24
24
initialExpanded,
25
- key,
26
- keyName : key ,
25
+ key : keyPath [ 0 ] ,
26
+ keyPath ,
27
27
labelRenderer,
28
28
nodeType,
29
29
previousData,
@@ -38,7 +38,7 @@ export default function({
38
38
data : value ,
39
39
initialExpanded,
40
40
allExpanded,
41
- keyName : key
41
+ keyPath
42
42
} ;
43
43
44
44
switch ( nodeType ) {
Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ export default class JSONTree extends React.Component {
39
39
expandRoot : true ,
40
40
expandAll : false ,
41
41
hideRoot : false ,
42
- keyName : 'root' ,
42
+ keyPath : [ 'root' ] ,
43
43
theme : solarized ,
44
44
getArrowStyle : getEmptyStyle ,
45
45
getListStyle : getEmptyStyle ,
@@ -71,19 +71,19 @@ export default class JSONTree extends React.Component {
71
71
getItemString,
72
72
labelRenderer,
73
73
valueRenderer,
74
- keyName : key ,
74
+ keyPath ,
75
75
previousData,
76
76
theme
77
77
} = this . props ;
78
78
79
- var nodeToRender ;
79
+ let nodeToRender ;
80
80
81
- if ( ! this . props . hideRoot ) {
81
+ if ( ! this . props . hideRoot ) {
82
82
nodeToRender = grabNode ( {
83
83
getItemString,
84
84
initialExpanded,
85
85
allExpanded,
86
- key ,
86
+ keyPath ,
87
87
previousData,
88
88
styles : getStyles ,
89
89
theme,
@@ -97,10 +97,11 @@ export default class JSONTree extends React.Component {
97
97
getItemString,
98
98
labelRenderer,
99
99
previousData,
100
- styles :getStyles ,
100
+ styles : getStyles ,
101
101
theme,
102
102
valueRenderer,
103
- allExpanded
103
+ allExpanded,
104
+ keyPath : [ ]
104
105
} ) ;
105
106
}
106
107
You can’t perform that action at this time.
0 commit comments