react-native-tree-multi-select 3.0.0-beta.2 → 3.0.0-beta.4

package/src/helpers/expandCollapse.helper.ts

@@ -49,8 +49,8 @@ export function handleToggleExpand<ID>(storeId: string, id: ID) {
 /**
  * Expand all nodes in the tree.
  */
-export function expandAll(storeId: string) {
-    const treeViewStore = getTreeViewStore(storeId);
+export function expandAll<ID>(storeId: string) {
+    const treeViewStore = getTreeViewStore<ID>(storeId);
     const { nodeMap, updateExpanded } = treeViewStore.getState();
     // Create a new Set containing the IDs of all nodes
     const newExpanded = new Set(nodeMap.keys());
@@ -60,11 +60,11 @@ export function expandAll(storeId: string) {
 /**
  * Collapse all nodes in the tree.
  */
-export function collapseAll(storeId: string) {
-    const treeViewStore = getTreeViewStore(storeId);
+export function collapseAll<ID>(storeId: string) {
+    const treeViewStore = getTreeViewStore<ID>(storeId);
     const { updateExpanded } = treeViewStore.getState();
     // Clear the expanded state
-    updateExpanded(new Set<string>());
+    updateExpanded(new Set());
 }
 
 /**

package/src/helpers/moveTreeNode.helper.ts

@@ -18,6 +18,9 @@ export function moveTreeNode<ID>(
 ): TreeNode<ID>[] {
     if (draggedNodeId === targetNodeId) return data;
 
+    // Prevent moving a node into its own descendant (would create a cycle)
+    if (isDescendant(data, draggedNodeId, targetNodeId)) return data;
+
     // Step 1: Deep clone the tree
     const cloned = deepCloneTree(data);
 
@@ -32,6 +35,36 @@ export function moveTreeNode<ID>(
     return cloned;
 }
 
+/**
+ * Check if `candidateDescendantId` is a descendant of `ancestorId` in the tree.
+ */
+function isDescendant<ID>(
+    nodes: TreeNode<ID>[],
+    ancestorId: ID,
+    candidateDescendantId: ID,
+): boolean {
+    for (const node of nodes) {
+        if (node.id === ancestorId) {
+            // Found the ancestor — search its subtree for the candidate
+            return containsNode(node.children ?? [], candidateDescendantId);
+        }
+        if (node.children && isDescendant(node.children, ancestorId, candidateDescendantId)) {
+            return true;
+        }
+    }
+    return false;
+}
+
+/** Check if a node with the given ID exists anywhere in the subtree. */
+function containsNode<ID>(nodes: TreeNode<ID>[], nodeId: ID): boolean {
+    for (const node of nodes) {
+        if (node.id === nodeId) return true;
+        if (node.children && containsNode(node.children, nodeId)) return true;
+    }
+    return false;
+}
+
+/** Deep clone a tree structure so mutations don't affect the original. */
 function deepCloneTree<ID>(nodes: TreeNode<ID>[]): TreeNode<ID>[] {
     return nodes.map(node => ({
         ...node,

package/src/helpers/selectAll.helper.ts

@@ -7,13 +7,13 @@ import { toggleCheckboxes } from "./toggleCheckbox.helper";
  *
  * If there is no search text, then it selects all nodes; otherwise, it selects all visible nodes.
  */
-export function selectAllFiltered(storeId: string) {
-    const treeViewStore = getTreeViewStore(storeId);
+export function selectAllFiltered<ID>(storeId: string) {
+    const treeViewStore = getTreeViewStore<ID>(storeId);
     const { searchText, innerMostChildrenIds } = treeViewStore.getState();
 
     // If there's no search text, select all nodes
     if (!searchText) {
-        selectAll(storeId);
+        selectAll<ID>(storeId);
     } else {
         // If there's search text, only select the visible nodes
         toggleCheckboxes(storeId, innerMostChildrenIds, true);
@@ -25,13 +25,13 @@ export function selectAllFiltered(storeId: string) {
  *
  * If there is no search text, then it unselects all nodes; otherwise, it unselects all visible nodes.
  */
-export function unselectAllFiltered(storeId: string) {
-    const treeViewStore = getTreeViewStore(storeId);
+export function unselectAllFiltered<ID>(storeId: string) {
+    const treeViewStore = getTreeViewStore<ID>(storeId);
     const { searchText, innerMostChildrenIds } = treeViewStore.getState();
 
     // If there's no search text, unselect all nodes
     if (!searchText) {
-        unselectAll(storeId);
+        unselectAll<ID>(storeId);
     } else {
         // If there's search text, only unselect the visible nodes
         toggleCheckboxes(storeId, innerMostChildrenIds, false);
@@ -43,8 +43,8 @@ export function unselectAllFiltered(storeId: string) {
  *
  * This function selects all nodes by adding all node ids to the checked set and clearing the indeterminate set.
  */
-export function selectAll(storeId: string) {
-    const treeViewStore = getTreeViewStore(storeId);
+export function selectAll<ID>(storeId: string) {
+    const treeViewStore = getTreeViewStore<ID>(storeId);
     const {
         nodeMap,
         updateChecked,
@@ -64,8 +64,8 @@ export function selectAll(storeId: string) {
  *
  * This function unselects all nodes by clearing both the checked and indeterminate sets.
  */
-export function unselectAll(storeId: string) {
-    const treeViewStore = getTreeViewStore(storeId);
+export function unselectAll<ID>(storeId: string) {
+    const treeViewStore = getTreeViewStore<ID>(storeId);
     const { updateChecked, updateIndeterminate } = treeViewStore.getState();
     // Update the state to mark all nodes as unchecked
 

package/src/helpers/toggleCheckbox.helper.ts

@@ -1,5 +1,56 @@
+import type { CheckboxValueType, TreeNode } from "../types/treeView.types";
 import { getTreeViewStore } from "../store/treeView.store";
 
+/** Derive the tri-state checkbox value from checked and indeterminate booleans. */
+export function getCheckboxValue(
+    isChecked: boolean,
+    isIndeterminate: boolean
+): CheckboxValueType {
+    if (isIndeterminate) return "indeterminate";
+    return isChecked;
+}
+
+/**
+ * Update a parent node's checked/indeterminate state based on its children.
+ * Mutates tempChecked and tempIndeterminate in-place.
+ */
+function updateParentCheckState<ID>(
+    parentId: ID,
+    children: TreeNode<ID>[],
+    tempChecked: Set<ID>,
+    tempIndeterminate: Set<ID>,
+): void {
+    let allChecked = true;
+    let anyCheckedOrIndeterminate = false;
+
+    for (const child of children) {
+        const isChecked = tempChecked.has(child.id);
+        const isIndeterminate = tempIndeterminate.has(child.id);
+
+        if (isChecked) {
+            anyCheckedOrIndeterminate = true;
+        } else if (isIndeterminate) {
+            anyCheckedOrIndeterminate = true;
+            allChecked = false;
+        } else {
+            allChecked = false;
+        }
+
+        if (!allChecked && anyCheckedOrIndeterminate) break;
+    }
+
+    if (allChecked) {
+        tempChecked.add(parentId);
+        tempIndeterminate.delete(parentId);
+    } else if (anyCheckedOrIndeterminate) {
+        tempChecked.delete(parentId);
+        tempIndeterminate.add(parentId);
+    } else {
+        tempChecked.delete(parentId);
+        tempIndeterminate.delete(parentId);
+    }
+}
+
 /**
  * Function to toggle checkbox state for a tree structure.
  * It sets the checked and indeterminate state for all affected nodes in the tree after an action to check/uncheck is made.
@@ -106,7 +157,7 @@ export function toggleCheckboxes<ID>(
         while (stack.length > 0) {
             const nodeId = stack.pop()!;
             const node = nodeMap.get(nodeId);
-            if (!node) continue; // Node does not exist; skip
+            if (!node) continue;
 
             if (childrenChecked) {
                 tempChecked.add(nodeId);
@@ -157,43 +208,8 @@ export function toggleCheckboxes<ID>(
      */
     function updateNodeState(nodeId: ID) {
         const node = nodeMap.get(nodeId);
-        if (!node || !node.children || node.children.length === 0) {
-            // Leaf nodes are already updated.
-            return;
-        }
-
-        let allChildrenChecked = true;
-        let anyChildCheckedOrIndeterminate = false;
-
-        for (const child of node.children) {
-            const isChecked = tempChecked.has(child.id);
-            const isIndeterminate = tempIndeterminate.has(child.id);
-
-            if (isChecked) {
-                anyChildCheckedOrIndeterminate = true;
-            } else if (isIndeterminate) {
-                anyChildCheckedOrIndeterminate = true;
-                allChildrenChecked = false;
-            } else {
-                allChildrenChecked = false;
-            }
-
-            // If both conditions are met, we can break early.
-            if (!allChildrenChecked && anyChildCheckedOrIndeterminate) {
-                break;
-            }
-        }
-
-        if (allChildrenChecked) {
-            tempChecked.add(nodeId);
-            tempIndeterminate.delete(nodeId);
-        } else if (anyChildCheckedOrIndeterminate) {
-            tempChecked.delete(nodeId);
-            tempIndeterminate.add(nodeId);
-        } else {
-            tempChecked.delete(nodeId);
-            tempIndeterminate.delete(nodeId);
-        }
+        if (!node?.children?.length) return;
+        updateParentCheckState(nodeId, node.children, tempChecked, tempIndeterminate);
     }
 
     // Update the state object with the new checked and indeterminate sets.
@@ -225,7 +241,7 @@ export function recalculateCheckedStates<ID>(storeId: string) {
     const tempIndeterminate = new Set(indeterminate);
 
     // Collect parent nodes and clean up leaf nodes that shouldn't be indeterminate.
-    // A leaf node (no children) can never be indeterminate — this can happen when
+    // A leaf node (no children) can never be indeterminate - this can happen when
     // all children of a formerly-indeterminate parent are dragged away.
     const parentNodes: ID[] = [];
     for (const [id, node] of nodeMap) {
@@ -260,37 +276,9 @@ export function recalculateCheckedStates<ID>(storeId: string) {
     // Update each parent based on its children's current state
     for (const parentId of parentNodes) {
         const node = nodeMap.get(parentId);
+        /* istanbul ignore next -- parentNodes is built from nodeMap entries with children above; same nodeMap, same iteration — unreachable unless nodeMap mutates between loops */
         if (!node?.children?.length) continue;
-
-        let allChecked = true;
-        let anyCheckedOrIndeterminate = false;
-
-        for (const child of node.children) {
-            const isChecked = tempChecked.has(child.id);
-            const isIndeterminate = tempIndeterminate.has(child.id);
-
-            if (isChecked) {
-                anyCheckedOrIndeterminate = true;
-            } else if (isIndeterminate) {
-                anyCheckedOrIndeterminate = true;
-                allChecked = false;
-            } else {
-                allChecked = false;
-            }
-
-            if (!allChecked && anyCheckedOrIndeterminate) break;
-        }
-
-        if (allChecked) {
-            tempChecked.add(parentId);
-            tempIndeterminate.delete(parentId);
-        } else if (anyCheckedOrIndeterminate) {
-            tempChecked.delete(parentId);
-            tempIndeterminate.add(parentId);
-        } else {
-            tempChecked.delete(parentId);
-            tempIndeterminate.delete(parentId);
-        }
+        updateParentCheckState(parentId, node.children, tempChecked, tempIndeterminate);
     }
 
     updateChecked(tempChecked);