Merge pull request #7261 from meeseeksmachine/auto-backport-of-pr-722…

…7-on-1.x Backport PR #7227 on branch 1.x (Only display node structure in JSONTree for arrays and empty objects)
jupyterlab · Sep 25, 2019 · ba4d87a · ba4d87a
2 parents 4909bb1 + c9cca7b
commit ba4d87a
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/packages/json-extension/src/component.tsx b/packages/json-extension/src/component.tsx
@@ -71,6 +71,17 @@ export class Component extends React.Component<IProps, IState> {
           }}
           invertTheme={false}
           keyPath={[root]}
+          getItemString={(type, data, itemType, itemString) =>
+            Array.isArray(data) ? (
+              // Always display array type and the number of items i.e. "[] 2 items".
+              <span>
+                {itemType} {itemString}
+              </span>
+            ) : Object.keys(data).length === 0 ? (
+              // Only display object type when it's empty i.e. "{}".
+              <span>{itemType}</span>
+            ) : null
+          }
           labelRenderer={([label, type]) => {
             // let className = 'cm-variable';
             // if (type === 'root') {