feat: onTreePopulate handler

Author: P0lip

package.json

@@ -23,7 +23,7 @@
     "build": "sl-scripts bundle --sourcemap",
     "build.docs": "build-storybook -c .storybook -o docs-auto",
     "commit": "git-cz",
-    "lint": "tslint -c tslint.json -p tsconfig.json 'src/**/*.ts?'",
+    "lint": "tslint -c tslint.json -p tsconfig.json 'src/**/*.{ts,tsx}'",
     "lint.fix": "yarn lint --fix",
     "release": "sl-scripts release",
     "release.docs": "sl-scripts release:docs",

src/components/JsonSchemaViewer.tsx

@@ -5,7 +5,7 @@ import { action } from 'mobx';
 import * as React from 'react';
 
 import { JSONSchema4 } from 'json-schema';
-import { SchemaTree, SchemaTreeOptions, SchemaTreeRefDereferenceFn } from '../tree/tree';
+import { SchemaTree, SchemaTreeOptions, SchemaTreePopulateHandler, SchemaTreeRefDereferenceFn } from '../tree/tree';
 import { GoToRefHandler, RowRenderer } from '../types';
 import { isSchemaViewerEmpty } from '../utils/isSchemaViewerEmpty';
 import { SchemaTree as SchemaTreeComponent } from './SchemaTree';
@@ -24,6 +24,7 @@ export interface IJsonSchemaViewer {
   mergeAllOf?: boolean;
   FallbackComponent?: typeof FallbackComponent;
   rowRenderer?: RowRenderer;
+  onTreePopulate?: SchemaTreePopulateHandler;
   resolveRef?: SchemaTreeRefDereferenceFn;
   shouldResolveEagerly?: boolean;
 }
@@ -49,6 +50,7 @@ export class JsonSchemaViewerComponent extends React.PureComponent<IJsonSchemaVi
       mergeAllOf: this.mergeAllOf,
       resolveRef: this.props.resolveRef,
       shouldResolveEagerly: !!this.props.shouldResolveEagerly,
+      onPopulate: this.props.onTreePopulate,
     };
   }
 
@@ -86,6 +88,10 @@ export class JsonSchemaViewerComponent extends React.PureComponent<IJsonSchemaVi
       this.tree.treeOptions.resolveRef = this.props.resolveRef;
     }
 
+    if (prevProps.onTreePopulate !== this.props.onTreePopulate) {
+      this.tree.treeOptions.onPopulate = this.props.onTreePopulate;
+    }
+
     if (
       this.treeStore.defaultExpandedDepth !== this.expandedDepth ||
       prevProps.schema !== this.props.schema ||

src/components/__tests__/Property.spec.tsx

@@ -161,6 +161,7 @@ describe('Property component', () => {
         mergeAllOf: false,
         resolveRef: void 0,
         shouldResolveEagerly: false,
+        onPopulate: void 0,
       });
 
       tree.populate();
@@ -186,6 +187,7 @@ describe('Property component', () => {
         mergeAllOf: false,
         resolveRef: void 0,
         shouldResolveEagerly: false,
+        onPopulate: void 0,
       });
 
       tree.populate();
@@ -211,6 +213,7 @@ describe('Property component', () => {
         mergeAllOf: false,
         resolveRef: void 0,
         shouldResolveEagerly: false,
+        onPopulate: void 0,
       });
 
       tree.populate();
@@ -237,6 +240,7 @@ describe('Property component', () => {
         mergeAllOf: false,
         resolveRef: void 0,
         shouldResolveEagerly: false,
+        onPopulate: void 0,
       });
 
       tree.populate();

src/components/__tests__/SchemaRow.spec.tsx

@@ -67,6 +67,7 @@ describe('SchemaRow component', () => {
       mergeAllOf: false,
       resolveRef: void 0,
       shouldResolveEagerly: false,
+      onPopulate: void 0,
     });
 
     tree.populate();
@@ -96,6 +97,7 @@ describe('SchemaRow component', () => {
       mergeAllOf: false,
       resolveRef: void 0,
       shouldResolveEagerly: false,
+      onPopulate: void 0,
     });
 
     tree.populate();
@@ -131,6 +133,7 @@ describe('SchemaRow component', () => {
           mergeAllOf: false,
           resolveRef: void 0,
           shouldResolveEagerly: false,
+          onPopulate: void 0,
         });
 
         tree.populate();
@@ -189,6 +192,7 @@ describe('SchemaRow component', () => {
         mergeAllOf: false,
         resolveRef: void 0,
         shouldResolveEagerly: false,
+        onPopulate: void 0,
       });
 
       tree.populate();

src/components/shared/Property.tsx

@@ -26,11 +26,15 @@ function count(obj: Optional<JSONSchema4 | null>): number | null {
 function shouldShowPropertyName(treeNode: SchemaTreeListNode) {
   if (treeNode.parent === null) return false;
   try {
-    const { schema } = getSchemaNodeMetadata(treeNode.parent);
-    let type = getPrimaryType(schema);
+    const { schemaNode } = getSchemaNodeMetadata(treeNode.parent);
+    if (!('type' in schemaNode)) {
+      return false;
+    }
+
+    let type = schemaNode.type;
 
-    if (type === SchemaKind.Array && schema.items) {
-      type = getPrimaryType(schema.items);
+    if (type === SchemaKind.Array && (schemaNode as IArrayNode).items) {
+      type = getPrimaryType((schemaNode as IArrayNode).items!);
     }
 
     return type === SchemaKind.Object;