feat(tree): hook up expanded option view + minor populate handler tweak

Author: P0lip

src/tree/__tests__/tree.spec.ts

@@ -1123,7 +1123,7 @@ describe('SchemaTree', () => {
       tree.populate();
 
       expect(onPopulate).toBeCalledTimes(1);
-      expect(onPopulate).toBeCalledWith(tree.root);
+      expect(onPopulate).toBeCalledWith(tree, tree.root);
     });
 
     test('given $ref resolution, should be called', () => {
@@ -1144,8 +1144,8 @@ describe('SchemaTree', () => {
       tree.unwrap(tree.itemAt(1) as TreeListParentNode);
 
       expect(onPopulate).toBeCalledTimes(2);
-      expect(onPopulate).nthCalledWith(1, tree.root);
-      expect(onPopulate).nthCalledWith(2, tree.itemAt(1));
+      expect(onPopulate).nthCalledWith(1, tree, tree.root);
+      expect(onPopulate).nthCalledWith(2, tree, tree.itemAt(1));
     });
 
     test('given expanding, should be called', () => {
@@ -1166,8 +1166,8 @@ describe('SchemaTree', () => {
       tree.unwrap(tree.itemAt(0) as TreeListParentNode);
 
       expect(onPopulate).toBeCalledTimes(2);
-      expect(onPopulate).nthCalledWith(1, tree.root);
-      expect(onPopulate).nthCalledWith(2, tree.itemAt(0));
+      expect(onPopulate).nthCalledWith(1, tree, tree.root);
+      expect(onPopulate).nthCalledWith(2, tree, tree.itemAt(0));
     });
   });
 });

src/tree/tree.ts

@@ -21,7 +21,7 @@ export type SchemaTreeRefDereferenceFn = (
   schema: JSONSchema4,
 ) => Optional<JSONSchema4>;
 
-export type SchemaTreePopulateHandler = (node: TreeListParentNode) => void;
+export type SchemaTreePopulateHandler = (tree: SchemaTree, node: TreeListParentNode) => void;
 
 export type SchemaTreeOptions = {
   expandedDepth: number;
@@ -37,7 +37,11 @@ export class SchemaTree extends Tree {
   public treeOptions: SchemaTreeOptions;
 
   constructor(public schema: JSONSchema4, public state: TreeState, opts: SchemaTreeOptions) {
-    super();
+    super({
+      expanded: node =>
+        (!(node.id in state.expanded) && SchemaTree.getLevel(node) <= opts.expandedDepth) ||
+        state.expanded[node.id] === true,
+    });
 
     this.treeOptions = opts;
   }
@@ -66,7 +70,7 @@ export class SchemaTree extends Tree {
     });
     this.state.expanded = expanded;
     this.invalidate();
-    this.treeOptions.onPopulate?.(this.root);
+    this.treeOptions.onPopulate?.(this, this.root);
   }
 
   public populateTreeFragment(parent: TreeListParentNode, schema: JSONSchema4, path: JsonPath, stepIn: boolean) {
@@ -88,7 +92,7 @@ export class SchemaTree extends Tree {
 
     this.insertTreeFragment(stepIn ? this.stepIn(artificialRoot, parent) : artificialRoot.children, parent);
 
-    this.treeOptions.onPopulate?.(parent);
+    this.treeOptions.onPopulate?.(this, parent);
   }
 
   protected insertErrorNode(parent: TreeListParentNode, error: string) {
@@ -121,7 +125,7 @@ export class SchemaTree extends Tree {
       } else if (hasRefItems(schemaNode)) {
         this.populateRefFragment(node, [...path, 'items'], schemaNode.items.$ref);
       } else {
-        throw new Error(`I do know not how not expand node ${path.join('.')}`);
+        throw new Error(`I do know not how to expand this node ${path.join('.')}`);
       }
     } catch (ex) {
       this.insertErrorNode(node, ex.message);