Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gtk-grafana/react-json-tree",
"version": "0.0.7",
"version": "0.0.8",
"description": "React JSON Viewer Component, Extracted from redux-devtools",
"keywords": [
"react",
Expand Down
2 changes: 1 addition & 1 deletion src/JSONValueNode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default function JSONValueNode({
}: Props) {
return (
<li
className={`${styles.valueNode} valueNode--${nodeType} valueNode--${keyPath}`}
className={`${styles.valueNode} valueNode--${nodeType} valueNode--${keyPath[0]}`}
>
<span data-testid={"value-node-label"} className={styles.valueNodeLabel}>
{labelRenderer(keyPath, nodeType, false, false)}
Expand Down
13 changes: 11 additions & 2 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,17 @@ const defaultItemString: GetItemString = (
{itemType} {itemString}
</span>
);
const defaultLabelRenderer: LabelRenderer = ([label]) => (
<span className={styles.defaultLabelWrap}>{label}:</span>
const defaultLabelRenderer: LabelRenderer = (
[label],
nodeType,
expanded,
expandable,
) => (
<span
className={`${styles.defaultLabelWrap} ${expandable ? styles.defaultLabelWrapExpandable : ""}`}
>
{label}:
</span>
);
const noCustomNode: IsCustomNode = () => false;

Expand Down
7 changes: 6 additions & 1 deletion src/styles/JSONNestedNode.module.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
.nestedNode {
display: var(--json-tree-inline-flex);
position: relative;
cursor: default;

&--expandable {
align-items: var(--json-tree-align-items);
display: var(--json-tree-block);
cursor: pointer;
}

&--expanded {
Expand All @@ -23,7 +25,6 @@
.nestedNodeLabelWrap {
display: var(--json-tree-block);
align-items: var(--json-tree-align-items);
cursor: pointer;
}

.nestedNodeItemString {
Expand All @@ -41,10 +42,12 @@
display: var(--json-tree-inline-flex);
align-items: var(--json-tree-align-items);
margin-right: var(--json-tree-nested-node-label-margin);
cursor: default;

&--expandable {
display: var(--json-tree-inline-flex);
align-items: var(--json-tree-align-items);
cursor: pointer;
}

&--expanded {
Expand All @@ -54,12 +57,14 @@

.rootNode {
display: var(--json-tree-inline-flex);
cursor: default;
}

.rootNodeExpanded {
}

.rootNodeExpandable {
cursor: pointer;
}

.rootNodeChildren {
Expand Down
1 change: 1 addition & 0 deletions src/styles/JSONValueNode.module.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.valueNode {
display: var(--json-tree-block);
align-items: var(--json-tree-value-node-align-items);
cursor: default;
}

.valueNodeValue {
Expand Down
5 changes: 5 additions & 0 deletions src/styles/tree.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,9 @@
display: var(--json-tree-inline-flex);
margin-right: var(--json-tree-default-label-wrap-margin-right);
color: var(--json-tree-label-color);
cursor: default;

&--expandable {
cursor: pointer;
}
}