From 491b319078112bcfb67673bc63b9f3a1ae0b6595 Mon Sep 17 00:00:00 2001
From: Bram <bramhavers@gmail.com>
Date: Sun, 1 Dec 2024 21:27:12 +0100
Subject: [PATCH] Moved function to treeview.js

---
 .../framed/TreeView/TreeViewFlatArray.svelte  |  4 +-
 src/TreeView/TreeView.svelte                  | 50 -------------------
 src/TreeView/index.d.ts                       |  2 +
 src/TreeView/index.js                         |  1 +
 src/TreeView/treeview.d.ts                    |  9 ++++
 src/TreeView/treeview.js                      | 42 ++++++++++++++++
 6 files changed, 56 insertions(+), 52 deletions(-)
 create mode 100644 src/TreeView/index.d.ts
 create mode 100644 src/TreeView/treeview.d.ts
 create mode 100644 src/TreeView/treeview.js

diff --git a/docs/src/pages/framed/TreeView/TreeViewFlatArray.svelte b/docs/src/pages/framed/TreeView/TreeViewFlatArray.svelte
index a508b092..0f14cc36 100644
--- a/docs/src/pages/framed/TreeView/TreeViewFlatArray.svelte
+++ b/docs/src/pages/framed/TreeView/TreeViewFlatArray.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { TreeView } from "carbon-components-svelte";
+  import { TreeView, toHierarchy } from "carbon-components-svelte";
   import WatsonMachineLearning from "carbon-icons-svelte/lib/WatsonMachineLearning.svelte";
   import Analytics from "carbon-icons-svelte/lib/Analytics.svelte";
   import Blockchain from "carbon-icons-svelte/lib/Blockchain.svelte";
@@ -51,7 +51,7 @@
 
 <TreeView
   labelText="Cloud Products"
-  {nodesFlat}
+  nodes={toHierarchy(nodesFlat)}
   bind:activeId
   bind:selectedIds
   on:select={({ detail }) => console.log("select", detail)}
diff --git a/src/TreeView/TreeView.svelte b/src/TreeView/TreeView.svelte
index 80c769ed..b07d428d 100644
--- a/src/TreeView/TreeView.svelte
+++ b/src/TreeView/TreeView.svelte
@@ -42,12 +42,6 @@
    */
   export let nodes = [];
 
-  /**
-   * Provide a flat array of nodes to render
-   * @type {Array<TreeNode & {pid?: any}>}
-   */
-  export let nodesFlat = [];
-
   /**
    * Set the current active node id
    * Only one node can be active
@@ -201,47 +195,6 @@
     }
   }
 
-  /**
-   * Create a nested array from a flat array
-   * @type {(flatArray: TreeNode[] & { pid?: any }[]) => TreeNode[]}
-   */
-  function createNestedArray(flatArray) {
-    /** @type TreeNode[] */
-    const tree = [];
-    /** @type TreeNode[] */
-    const childrenOf = [];
-
-    flatArray.forEach((dstItem) => {
-      const { id, pid } = dstItem;
-      childrenOf[id] = childrenOf[id] || [];
-      dstItem["nodes"] = childrenOf[id];
-
-      if (pid) {
-        // objects without pid are root level objects.
-        childrenOf[pid] = childrenOf[pid] || [];
-        delete dstItem.pid; // TreeNode type doesn't have pid.
-        childrenOf[pid].push(dstItem);
-      } else {
-        delete dstItem.pid;
-        tree.push(dstItem);
-      }
-    });
-
-    // Remove the empty nodes props that make TreeView render a twistie.
-    // Maybe this should actually be taken care of in TreeView itself? It makes
-    // no sense i think that an empty nodes property render a twistie.
-    function removeEmptyNodes(element) {
-      element.forEach((elmt) => {
-        if (elmt.nodes?.length === 0) delete elmt.nodes;
-        else {
-          removeEmptyNodes(elmt.nodes);
-        }
-      });
-    }
-    removeEmptyNodes(tree);
-    return tree;
-  }
-
   onMount(() => {
     const firstFocusableNode = ref.querySelector(
       "li.bx--tree-node:not(.bx--tree-node--disabled)",
@@ -267,9 +220,6 @@
     }, []);
   }
 
-  $: if (nodesFlat.length > 0) {
-    nodes = createNestedArray(nodesFlat);
-  }
   $: flattenedNodes = traverse(nodes);
   $: nodeIds = flattenedNodes.map((node) => node.id);
   $: activeNodeId.set(activeId);
diff --git a/src/TreeView/index.d.ts b/src/TreeView/index.d.ts
new file mode 100644
index 00000000..52e3204e
--- /dev/null
+++ b/src/TreeView/index.d.ts
@@ -0,0 +1,2 @@
+export { default as TreeView } from "./TreeView.svelte";
+export { toHierarchy } from "./treeview";
diff --git a/src/TreeView/index.js b/src/TreeView/index.js
index 59f96be0..52e3204e 100644
--- a/src/TreeView/index.js
+++ b/src/TreeView/index.js
@@ -1 +1,2 @@
 export { default as TreeView } from "./TreeView.svelte";
+export { toHierarchy } from "./treeview";
diff --git a/src/TreeView/treeview.d.ts b/src/TreeView/treeview.d.ts
new file mode 100644
index 00000000..4d913ef6
--- /dev/null
+++ b/src/TreeView/treeview.d.ts
@@ -0,0 +1,9 @@
+import { type TreeNode } from "carbon-components-svelte/TreeView/TreeView.svelte";
+/**
+ * Create a nested array from a flat array
+ */
+export function toHierarchy(
+  flatArray: TreeNode[] & { pid?: any }[],
+): TreeNode[];
+
+export default toHierarchy;
diff --git a/src/TreeView/treeview.js b/src/TreeView/treeview.js
new file mode 100644
index 00000000..e1ec6366
--- /dev/null
+++ b/src/TreeView/treeview.js
@@ -0,0 +1,42 @@
+/**
+ * Create a nested array from a flat array
+ * @type {(flatArray: TreeNode[] & { pid?: any }[]) => TreeNode[]}
+ */
+export function toHierarchy(flatArray) {
+  /** @type TreeNode[] */
+  const tree = [];
+  /** @type TreeNode[] */
+  const childrenOf = [];
+
+  flatArray.forEach((dstItem) => {
+    const { id, pid } = dstItem;
+    childrenOf[id] = childrenOf[id] || [];
+    dstItem["nodes"] = childrenOf[id];
+
+    if (pid) {
+      // objects without pid are root level objects.
+      childrenOf[pid] = childrenOf[pid] || [];
+      delete dstItem.pid; // TreeNode type doesn't have pid.
+      childrenOf[pid].push(dstItem);
+    } else {
+      delete dstItem.pid;
+      tree.push(dstItem);
+    }
+  });
+
+  // Remove the empty nodes props that make TreeView render a twistie.
+  // Maybe this should actually be taken care of in TreeView itself? It makes
+  // no sense i think that an empty nodes property render a twistie.
+  function removeEmptyNodes(element) {
+    element.forEach((elmt) => {
+      if (elmt.nodes?.length === 0) delete elmt.nodes;
+      else {
+        removeEmptyNodes(elmt.nodes);
+      }
+    });
+  }
+  removeEmptyNodes(tree);
+  return tree;
+}
+
+export default toHierarchy;