@elliemae/ds-treeview 3.14.0-next.12 → 3.14.0-next.14

package/dist/cjs/hoc/DnDTreeContext.js

@@ -31,8 +31,6 @@ var React = __toESM(require("react"));
 var import_react = require("react");
 var import_SortableItemContext = require("./SortableItemContext");
 const DnDTreeContext = (0, import_react.createContext)({
-  depth: void 0,
-  activeIndex: void 0,
   visibleItems: void 0,
   dropIndicatorPosition: import_SortableItemContext.DropIndicatorPosition.None,
   isDropValid: false

package/dist/cjs/hoc/DnDTreeContext.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/hoc/DnDTreeContext.tsx", "../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import { createContext } from 'react';\nimport type { DSTreeviewT } from '../react-desc-prop-types';\nimport { DropIndicatorPosition } from './SortableItemContext';\n\ntype DnDTreeContextType = {\n  depth: number | undefined;\n  activeIndex: number | undefined;\n  visibleItems: DSTreeviewT.Item[] | undefined;\n  dropIndicatorPosition: DropIndicatorPosition;\n  isDropValid: boolean;\n};\n\nexport const DnDTreeContext = createContext<DnDTreeContextType>({\n  depth: undefined,\n  activeIndex: undefined,\n  visibleItems: undefined,\n  dropIndicatorPosition: DropIndicatorPosition.None,\n  isDropValid: false,\n});\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAA8B;AAE9B,iCAAsC;AAU/B,MAAM,qBAAiB,4BAAkC;AAAA,EAC9D,OAAO;AAAA,EACP,aAAa;AAAA,EACb,cAAc;AAAA,EACd,uBAAuB,iDAAsB;AAAA,EAC7C,aAAa;AACf,CAAC;",
+  "sourcesContent": ["import { createContext } from 'react';\nimport type { DSTreeviewT } from '../react-desc-prop-types';\nimport { DropIndicatorPosition } from './SortableItemContext';\n\ntype DnDTreeContextType = {\n  visibleItems: DSTreeviewT.Item[] | undefined;\n  dropIndicatorPosition: DropIndicatorPosition;\n  isDropValid: boolean;\n};\n\nexport const DnDTreeContext = createContext<DnDTreeContextType>({\n  visibleItems: undefined,\n  dropIndicatorPosition: DropIndicatorPosition.None,\n  isDropValid: false,\n});\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA,YAAuB;ADAvB,mBAA8B;AAE9B,iCAAsC;AAQ/B,MAAM,qBAAiB,4BAAkC;AAAA,EAC9D,cAAc;AAAA,EACd,uBAAuB,iDAAsB;AAAA,EAC7C,aAAa;AACf,CAAC;",
   "names": []
 }

package/dist/cjs/hoc/WithConditionalDnDContext.js

@@ -63,15 +63,15 @@ const withConditionalDnDRowContext = (Component) => function(props) {
     [flattenedVisibleTree]
   );
   const onReorder = (0, import_react.useCallback)(
-    (tree, metadata) => {
+    (_active, _targetIndex, { movedData, fromIndex }) => {
       const nodes = {};
-      tree.forEach((item) => {
+      movedData.forEach((item) => {
         const originalItem = item.original.model;
         originalItem.children = [];
         nodes[item.uid] = originalItem;
       });
       const newUserTree = [];
-      tree.forEach((item) => {
+      movedData.forEach((item) => {
         if (item.parentId !== null && item.parentId !== void 0 && item.parentId !== "__ds_tree_root") {
           const parentNode = nodes[item.parentId];
           parentNode.children?.push(item.original.model);
@@ -79,36 +79,30 @@ const withConditionalDnDRowContext = (Component) => function(props) {
           newUserTree.push(item.original.model);
         }
       });
-      onOrderChange(newUserTree, data, flattenedItems[metadata.fromIndex]);
+      onOrderChange(newUserTree, data, flattenedItems[fromIndex]);
     },
     [onOrderChange, data, flattenedItems]
   );
-  const {
-    dndContextProps,
-    sortableContextProps,
-    activeId,
-    activeIndex,
-    depth,
-    dropIndicatorPosition,
-    visibleItems,
-    isDropValid,
-    overId
-  } = (0, import_ds_drag_and_drop.useTreeDndkitConfig)({
+  const { dndContextProps, sortableContextProps, active, dropIndicatorPosition, isDropValid, over } = (0, import_ds_drag_and_drop.useTreeDndkitConfig)({
     flattenedItems,
-    visibleItems: flattenedVisibleTreeForDnD,
     isHorizontalDnD: false,
     isExpandable: true,
     onReorder,
     getIsDropValid,
     maxDragAndDropLevel: Infinity
   });
+  const visibleItems = (0, import_react.useMemo)(() => {
+    if (!active)
+      return flattenedVisibleTreeForDnD;
+    return (0, import_ds_drag_and_drop.removeChildrenOf)(flattenedVisibleTreeForDnD, active.id);
+  }, [active, flattenedVisibleTreeForDnD]);
   const timeoutRef = (0, import_react.useRef)();
   (0, import_react.useEffect)(() => {
     if (timeoutRef.current)
       clearTimeout(timeoutRef.current);
-    if (dropIndicatorPosition === import_SortableItemContext.DropIndicatorPosition.Inside && overId) {
+    if (dropIndicatorPosition === import_SortableItemContext.DropIndicatorPosition.Inside && over) {
       timeoutRef.current = setTimeout(() => {
-        const overItem = visibleItems.find((item) => item.uid === overId);
+        const overItem = visibleItems.find((item) => item.uid === over.id);
         if (overItem) {
           const realOverItem = overItem.original;
           if (realOverItem.isGroup && !realOverItem.isExpanded) {
@@ -117,15 +111,13 @@ const withConditionalDnDRowContext = (Component) => function(props) {
         }
       }, 1e3);
     }
-  }, [overId, dropIndicatorPosition, triggerTreeRerender, visibleItems, updateUserExpandedState]);
+  }, [over, dropIndicatorPosition, triggerTreeRerender, visibleItems, updateUserExpandedState]);
   if (withDragAndDrop)
     return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ds_drag_and_drop.DndContext, { ...dndContextProps, children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ds_drag_and_drop.SortableContext, { ...sortableContextProps, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
         import_DnDTreeContext.DnDTreeContext.Provider,
         {
           value: {
-            activeIndex,
-            depth,
             visibleItems: visibleItems.map((item) => item.original),
             dropIndicatorPosition,
             isDropValid
@@ -133,11 +125,11 @@ const withConditionalDnDRowContext = (Component) => function(props) {
           children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, { ...props })
         }
       ) }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ds_drag_and_drop.DragOverlay, { style: { width: "auto" }, children: activeId ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ds_drag_and_drop.DragOverlay, { style: { width: "auto" }, children: active ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
         import_TreeItem.TreeItem,
         {
-          itemIndex: activeIndex,
-          item: ensure(flattenedVisibleTree.find((item) => item.id.toString() === activeId)),
+          itemIndex: -1,
+          item: ensure(flattenedVisibleTree.find((item) => item.id.toString() === active.id.toString())),
           isDragOverlay: true
         }
       ) : null })

package/dist/cjs/hoc/WithConditionalDnDContext.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/hoc/WithConditionalDnDContext.tsx", "../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["import React, { useCallback, useContext, useEffect, useMemo, useRef } from 'react';\nimport { DndContext, DragOverlay, SortableContext, useTreeDndkitConfig } from '@elliemae/ds-drag-and-drop';\nimport type { DSTreeviewT } from '../react-desc-prop-types';\nimport TreeViewContext from '../TreeViewContext';\nimport { TreeItem } from '../parts/TreeItem';\nimport { DnDTreeContext } from './DnDTreeContext';\nimport { DropIndicatorPosition } from './SortableItemContext';\nimport { toggleItemExpand } from '../utils/group-expands-helpers';\n\ntype FunctionalHOC = <T = unknown>(Component: React.ComponentType<T>, ...other: unknown[]) => (props: T) => JSX.Element;\n\nconst ensure = <T,>(argument: T | undefined | null, message = 'This should never happen'): T => {\n  if (argument === undefined || argument === null) {\n    throw new TypeError(message);\n  }\n\n  return argument;\n};\n\n// only wraps in \"DnDContext\" and \"DnDTreeContext\" if any Drag and Drop functionality is requested\nexport const withConditionalDnDRowContext: FunctionalHOC = (Component) =>\n  function (props) {\n    const {\n      props: { data, onOrderChange, getIsDropValid },\n      flattenedItems,\n      updateUserExpandedState,\n      triggerTreeRerender,\n      visibleItems: flattenedVisibleTree,\n      withDragAndDrop,\n    } = useContext(TreeViewContext);\n\n    const flattenedVisibleTreeForDnD = useMemo(\n      () =>\n        flattenedVisibleTree.map((item, index) => ({\n          uid: item.id.toString(),\n          depth: (item.treeDepth ?? 1) - 1,\n          realIndex: index,\n          childrenCount: item.children?.length ?? 0,\n          parentId: item.node.parent?.model?.id?.toString() ?? null,\n          original: item,\n        })),\n      [flattenedVisibleTree],\n    );\n\n    const onReorder = useCallback(\n      (tree: DSTreeviewT.DndItem[], metadata: { targetIndex: number; fromIndex: number }) => {\n        // Pull the row's original data into an object\n        const nodes: Record<DSTreeviewT.StringOrNum, DSTreeviewT.SimpleItem> = {};\n        tree.forEach((item) => {\n          const originalItem = item.original.model;\n          originalItem.children = [];\n          nodes[item.uid] = originalItem;\n        });\n\n        const newUserTree: DSTreeviewT.SimpleItem[] = [];\n        tree.forEach((item) => {\n          // If row has parent, insert it to it's subrows\n          // otherwise append it to the new user data\n          if (item.parentId !== null && item.parentId !== undefined && item.parentId !== '__ds_tree_root') {\n            const parentNode = nodes[item.parentId];\n            parentNode.children?.push(item.original.model);\n          } else if (item.uid !== '__ds_tree_root') {\n            newUserTree.push(item.original.model);\n          }\n        });\n        // Tell the user that the order has change, he can chose to commit it or not\n        onOrderChange(newUserTree, data, flattenedItems[metadata.fromIndex]);\n      },\n      [onOrderChange, data, flattenedItems],\n    );\n\n    const {\n      dndContextProps,\n      sortableContextProps,\n      activeId,\n      activeIndex,\n      depth,\n      dropIndicatorPosition,\n      visibleItems,\n      isDropValid,\n      overId,\n    } = useTreeDndkitConfig({\n      flattenedItems,\n      visibleItems: flattenedVisibleTreeForDnD,\n      isHorizontalDnD: false,\n      isExpandable: true,\n      onReorder,\n      getIsDropValid,\n      maxDragAndDropLevel: Infinity,\n    });\n\n    const timeoutRef = useRef<NodeJS.Timeout>();\n\n    useEffect(() => {\n      if (timeoutRef.current) clearTimeout(timeoutRef.current);\n      if (dropIndicatorPosition === DropIndicatorPosition.Inside && overId) {\n        timeoutRef.current = setTimeout(() => {\n          const overItem = visibleItems.find((item) => item.uid === overId);\n          if (overItem) {\n            const realOverItem = overItem.original;\n            if (realOverItem.isGroup && !realOverItem.isExpanded) {\n              toggleItemExpand(realOverItem, triggerTreeRerender, updateUserExpandedState);\n            }\n          }\n        }, 1000);\n      }\n    }, [overId, dropIndicatorPosition, triggerTreeRerender, visibleItems, updateUserExpandedState]);\n\n    if (withDragAndDrop)\n      return (\n        <DndContext {...dndContextProps}>\n          <SortableContext {...sortableContextProps}>\n            <DnDTreeContext.Provider\n              value={{\n                activeIndex,\n                depth,\n                visibleItems: visibleItems.map((item) => item.original),\n                dropIndicatorPosition,\n                isDropValid,\n              }}\n            >\n              <Component {...props} />\n            </DnDTreeContext.Provider>\n          </SortableContext>\n          <DragOverlay style={{ width: 'auto' }}>\n            {activeId ? (\n              <TreeItem\n                itemIndex={activeIndex}\n                item={ensure(flattenedVisibleTree.find((item) => item.id.toString() === activeId))}\n                isDragOverlay\n              />\n            ) : null}\n          </DragOverlay>\n        </DndContext>\n      );\n    return <Component {...props} />;\n  };\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": "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",
+  "sourcesContent": ["import React, { useCallback, useContext, useEffect, useMemo, useRef } from 'react';\nimport {\n  DndContext,\n  DragOverlay,\n  SortableContext,\n  useTreeDndkitConfig,\n  removeChildrenOf,\n} from '@elliemae/ds-drag-and-drop';\nimport type { DSTreeviewT } from '../react-desc-prop-types';\nimport TreeViewContext from '../TreeViewContext';\nimport { TreeItem } from '../parts/TreeItem';\nimport { DnDTreeContext } from './DnDTreeContext';\nimport { DropIndicatorPosition } from './SortableItemContext';\nimport { toggleItemExpand } from '../utils/group-expands-helpers';\n\ntype FunctionalHOC = <T = unknown>(Component: React.ComponentType<T>, ...other: unknown[]) => (props: T) => JSX.Element;\n\nconst ensure = <T,>(argument: T | undefined | null, message = 'This should never happen'): T => {\n  if (argument === undefined || argument === null) {\n    throw new TypeError(message);\n  }\n\n  return argument;\n};\n\n// only wraps in \"DnDContext\" and \"DnDTreeContext\" if any Drag and Drop functionality is requested\nexport const withConditionalDnDRowContext: FunctionalHOC = (Component) =>\n  function (props) {\n    const {\n      props: { data, onOrderChange, getIsDropValid },\n      flattenedItems,\n      updateUserExpandedState,\n      triggerTreeRerender,\n      visibleItems: flattenedVisibleTree,\n      withDragAndDrop,\n    } = useContext(TreeViewContext);\n\n    const flattenedVisibleTreeForDnD = useMemo(\n      () =>\n        flattenedVisibleTree.map((item, index) => ({\n          uid: item.id.toString(),\n          depth: (item.treeDepth ?? 1) - 1,\n          realIndex: index,\n          childrenCount: item.children?.length ?? 0,\n          parentId: item.node.parent?.model?.id?.toString() ?? null,\n          original: item,\n        })),\n      [flattenedVisibleTree],\n    );\n\n    const onReorder = useCallback(\n      (\n        _active: DSTreeviewT.DndItem,\n        _targetIndex: number,\n        { movedData, fromIndex }: { movedData: DSTreeviewT.DndItem[]; fromIndex: number },\n      ) => {\n        // Pull the row's original data into an object\n        const nodes: Record<DSTreeviewT.StringOrNum, DSTreeviewT.SimpleItem> = {};\n        movedData.forEach((item) => {\n          const originalItem = item.original.model;\n          originalItem.children = [];\n          nodes[item.uid] = originalItem;\n        });\n\n        const newUserTree: DSTreeviewT.SimpleItem[] = [];\n        movedData.forEach((item) => {\n          // If row has parent, insert it to it's subrows\n          // otherwise append it to the new user data\n          if (item.parentId !== null && item.parentId !== undefined && item.parentId !== '__ds_tree_root') {\n            const parentNode = nodes[item.parentId];\n            parentNode.children?.push(item.original.model);\n          } else if (item.uid !== '__ds_tree_root') {\n            newUserTree.push(item.original.model);\n          }\n        });\n        // Tell the user that the order has change, he can chose to commit it or not\n        onOrderChange(newUserTree, data, flattenedItems[fromIndex]);\n      },\n      [onOrderChange, data, flattenedItems],\n    );\n\n    const { dndContextProps, sortableContextProps, active, dropIndicatorPosition, isDropValid, over } =\n      useTreeDndkitConfig({\n        flattenedItems,\n        isHorizontalDnD: false,\n        isExpandable: true,\n        onReorder,\n        getIsDropValid,\n        maxDragAndDropLevel: Infinity,\n      });\n\n    const visibleItems = useMemo(() => {\n      if (!active) return flattenedVisibleTreeForDnD;\n      return removeChildrenOf(flattenedVisibleTreeForDnD, active.id);\n    }, [active, flattenedVisibleTreeForDnD]);\n\n    const timeoutRef = useRef<NodeJS.Timeout>();\n\n    useEffect(() => {\n      if (timeoutRef.current) clearTimeout(timeoutRef.current);\n      if (dropIndicatorPosition === DropIndicatorPosition.Inside && over) {\n        timeoutRef.current = setTimeout(() => {\n          const overItem = visibleItems.find((item) => item.uid === over.id);\n          if (overItem) {\n            const realOverItem = overItem.original;\n            if (realOverItem.isGroup && !realOverItem.isExpanded) {\n              toggleItemExpand(realOverItem, triggerTreeRerender, updateUserExpandedState);\n            }\n          }\n        }, 1000);\n      }\n    }, [over, dropIndicatorPosition, triggerTreeRerender, visibleItems, updateUserExpandedState]);\n\n    if (withDragAndDrop)\n      return (\n        <DndContext {...dndContextProps}>\n          <SortableContext {...sortableContextProps}>\n            <DnDTreeContext.Provider\n              value={{\n                visibleItems: visibleItems.map((item) => item.original),\n                dropIndicatorPosition,\n                isDropValid,\n              }}\n            >\n              <Component {...props} />\n            </DnDTreeContext.Provider>\n          </SortableContext>\n          <DragOverlay style={{ width: 'auto' }}>\n            {active ? (\n              <TreeItem\n                itemIndex={-1}\n                item={ensure(flattenedVisibleTree.find((item) => item.id.toString() === active.id.toString()))}\n                isDragOverlay\n              />\n            ) : null}\n          </DragOverlay>\n        </DndContext>\n      );\n    return <Component {...props} />;\n  };\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": "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",
   "names": ["TreeViewContext"]
 }

package/dist/cjs/utils/tree-helpers.js

@@ -172,7 +172,7 @@ const flattenTreeForDnD = (data, shouldDescend = () => true) => {
       realIndex: index,
       childrenCount: node.children?.length ?? 0,
       parentId: parentId !== null ? parentId.toString() : null,
-      original: { ...node, ...node.model }
+      original: { ...node, ...node.model, node }
     });
     index += 1;
     if (shouldDescend(node))

package/dist/cjs/utils/tree-helpers.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/utils/tree-helpers.tsx", "../../../../../scripts/build/transpile/react-shim.js"],
-  "sourcesContent": ["/* eslint-disable max-statements */\n/* eslint-disable max-params */\n/* eslint-disable complexity */\n/* eslint-disable max-lines */\nimport { createRef } from 'react';\nimport type TreeModel from 'tree-model';\nimport { standardizeSearchQueryString } from './string-helpers';\nimport type { DSTreeviewT } from '../react-desc-prop-types';\n\nexport const walkVisibles = (\n  node: DSTreeviewT.Item['node'],\n  callback: (node: DSTreeviewT.Item['node']) => void,\n  skipRoot = true,\n  highlightOnlyQuery = false,\n) => {\n  const { children, model } = node;\n  const { name, isExpanded, childrenMatchesSearchQuery, matchesSearchQuery } = model;\n\n  const shouldSkipBecauseIsRoot = skipRoot && name === '__root';\n  const queryRestrictionsPassed = !!(highlightOnlyQuery || childrenMatchesSearchQuery || matchesSearchQuery);\n\n  if (!shouldSkipBecauseIsRoot && queryRestrictionsPassed) callback(node);\n\n  const shouldWalkChildren = !!(children.length > 0 && isExpanded && queryRestrictionsPassed);\n  if (shouldWalkChildren) {\n    children.forEach((childNode) => {\n      walkVisibles(childNode, callback, skipRoot, highlightOnlyQuery);\n    });\n  }\n};\n\nexport const walkParents = (\n  nodePath: DSTreeviewT.Item['nodePath'],\n  callback: (currParent: DSTreeviewT.Item['node']) => void,\n  skipRoot = true,\n) => {\n  const parents = [...nodePath].reverse();\n  parents.shift(); // remove current node from the parents array\n  if (skipRoot) parents.pop(); // remove the root from the parents if skipping root\n  parents.forEach(callback);\n};\n\ntype RecursiveCallbackT = (childNode: DSTreeviewT.Item['node'], cb?: RecursiveCallbackT, isFirst?: boolean) => void;\nexport const walkAllNodeChildren = (node: DSTreeviewT.Item['node'], callback: RecursiveCallbackT, isFirst = true) => {\n  const { children = [] } = node;\n  const shouldWalkChildren = children.length;\n\n  if (!isFirst) callback(node);\n\n  if (shouldWalkChildren) {\n    children.forEach((childNode) => {\n      walkAllNodeChildren(childNode, callback, false);\n    });\n  }\n};\n\nexport const getNodeById = (treeRoot: DSTreeviewT.Item['node'], id: DSTreeviewT.StringOrNum) => {\n  const nodes = treeRoot.all((node) => (node as unknown as DSTreeviewT.Item).model.id === id);\n  return nodes[0];\n};\n\nexport const cloneNode = (tree: TreeModel, node: DSTreeviewT.Item) => tree.parse(node.model);\n\nexport const itemsShareSameParent = (items: DSTreeviewT.Item[] = []) => {\n  if (items.length === 0) throw new Error('Received empty items for comparison');\n  if (items.length === 1) return true;\n\n  // when moving in first position we receive [undefined,...{items}]\n  // when moving in last position we receive [...{items}, undefined]\n  const firstExistingItem = items.find((item) => !!item);\n  if (!firstExistingItem) throw new Error(\"Received no items, can't retrieve parent\");\n\n  const firstExistingItemPath = firstExistingItem.node.getPath();\n  // path is like [rootParent, ...[parentsNodes], currentNode]\n  // length -1 is the current-node\n  // length -2 is the parent-node\n  // root node is not printed and is always present so minimum path length is 2 (root + currentNode)\n  const directParentNode = firstExistingItemPath[firstExistingItemPath.length - 2];\n\n  return items.every((item) => {\n    // undefined nodes count as having the same parent\n    if (!item) return true;\n    const itemPath = item.node.getPath();\n    const itemDirectParent = itemPath[itemPath.length - 2];\n    return directParentNode === itemDirectParent;\n  });\n};\n\nexport const getItemsParentNode = (items: DSTreeviewT.Item[] = [], skipSameParentCheck = false) => {\n  if (items.length === 0) throw new Error(\"Received empty items, can't retrieve parent\");\n\n  // in case we already know the items compared shares the same parent\n  if (!skipSameParentCheck)\n    if (!itemsShareSameParent(items))\n      // if we don't know (default, we don't) check if they share the parent\n      throw new Error(\"Received items don't share the same parent, can't retrieve parent\");\n\n  // when moving in first position we receive [undefined,...{items}]\n  // when moving in last position we receive [...{items}, undefined]\n  const firstExistingItem = items.find((item) => !!item);\n  if (!firstExistingItem) throw new Error(\"Received no items, can't retrieve parent\");\n\n  const firstExistingItemPath = firstExistingItem.node.getPath();\n  // path is like [rootParent, ...[parentsNodes], currentNode]\n  // length -1 is the current-node\n  // length -2 is the parent-node\n  // root node is not printed and is always present so minimum path length is 2 (root + currentNode)\n  const directParentNode = firstExistingItemPath[firstExistingItemPath.length - 2];\n  return directParentNode as unknown as DSTreeviewT.Item['node'];\n};\n\nexport const getNodeMatchesSearchQuery = (node: DSTreeviewT.Item['node'], searchQuery = '') => {\n  const standardizedName = standardizeSearchQueryString(node.model.name);\n  const standardizedSearchQuery = standardizeSearchQueryString(searchQuery);\n  return standardizedName.includes(standardizedSearchQuery);\n};\n\nexport const getChildrenMatchesSearchQuery = (parentNode: DSTreeviewT.Item['node'], searchQuery = '') => {\n  let anyChildMatch = false;\n  walkAllNodeChildren(parentNode, (node) => {\n    if (getNodeMatchesSearchQuery(node, searchQuery)) anyChildMatch = true;\n  });\n  return anyChildMatch;\n};\n\n/**\n * Mutate in place a node from tree-model normalizing object properties like \"isGroup\" even if user didn't specify it explicitly,\n * after execution the node will have \"nodePath\" \"treeDepth\" \"nodeItemRef\" \"isGroup\" \"isExpanded\"\n * (optionally, based on the provided arguments) \"matchesSearchQuery\" \"childrenMatchesSearchQuery\" \"isChecked\"\n *\n * @param {object} node - node (based on 'tree-model' lib) that you wish to mutate with extra props\n * @param {string} [searchQuery=''] - optional string used to parse \"matchesSearchQuery\"/\"childrenMatchesSearchQuery\" properties\n * @param {object} [selection=null] - optional selection hashmap used to parse \"isChecked\" properties\n * @param {object} [expanded=null] - optional expanded hashmap used to parse \"isExpanded\" properties\n */\nexport const enrichNodeModelInPlace = (\n  node: TreeModel.Node<DSTreeviewT.SimpleItem>,\n  searchQuery = '',\n  selection: DSTreeviewT.SelectionItems | null = null,\n  expanded: DSTreeviewT.ExpandedItems | null = null,\n) => {\n  const path = node.getPath();\n  const depth = path.length - 1;\n  node.model.nodePath = path;\n  node.model.treeDepth = depth;\n\n  if (!node.model.nodeItemRef) {\n    node.model.nodeItemRef = createRef();\n  }\n\n  // if a node has children but was not marked as isGroup, force-mark as group\n  // this is useful to avoid having to always check both the flag and the children.length...\n  if (typeof node.model.isGroup !== 'boolean' && (node.model?.children?.length ?? 0) > 0) {\n    node.model.isGroup = true;\n  }\n\n  if (node.model.isGroup && node.model.id !== '__ds_tree_root') {\n    if (expanded) node.model.isExpanded = !!expanded[node.model.id];\n    else if (typeof node.model.isExpanded !== 'boolean') {\n      node.model.isExpanded = false;\n    }\n  }\n\n  node.model.matchesSearchQuery = true;\n  node.model.childrenMatchesSearchQuery = false;\n  const partiallyEnrichedNode = node as unknown as TreeModel.Node<DSTreeviewT.Item>;\n  if (searchQuery) {\n    partiallyEnrichedNode.model.matchesSearchQuery = getNodeMatchesSearchQuery(partiallyEnrichedNode, searchQuery);\n\n    if (partiallyEnrichedNode.model.isGroup === true) {\n      partiallyEnrichedNode.model.childrenMatchesSearchQuery = getChildrenMatchesSearchQuery(\n        partiallyEnrichedNode,\n        searchQuery,\n      );\n      if (partiallyEnrichedNode.model.childrenMatchesSearchQuery) partiallyEnrichedNode.model.isExpanded = true;\n    }\n  }\n  if (selection && selection[partiallyEnrichedNode.model.id]) {\n    partiallyEnrichedNode.model.isChecked = selection[partiallyEnrichedNode.model.id];\n  }\n};\n\nexport const focusItem = (item: DSTreeviewT.Item | null) => {\n  item?.nodeItemRef?.current?.focus();\n};\n\nexport const flattenTreeForDnD = (\n  data: TreeModel.Node<DSTreeviewT.Item>,\n  shouldDescend: (datum: TreeModel.Node<DSTreeviewT.Item>) => boolean = () => true,\n) => {\n  const flattenedTree: DSTreeviewT.DndItem[] = [];\n  let index = 0;\n  const doit = (node: TreeModel.Node<DSTreeviewT.Item>, depth = 0, parentId: DSTreeviewT.StringOrNum | null = null) => {\n    flattenedTree.push({\n      uid: node.model.id.toString(),\n      depth,\n      realIndex: index,\n      childrenCount: node.children?.length ?? 0,\n      parentId: parentId !== null ? parentId.toString() : null,\n      original: { ...node, ...node.model },\n    });\n    index += 1;\n    if (shouldDescend(node)) node.children?.forEach((child) => doit(child, depth + 1, node.model.id.toString()));\n  };\n\n  data.children.forEach((node) => doit(node));\n  return flattenedTree;\n};\n", "import * as React from 'react';\nexport { React };\n"],
-  "mappings": "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",
+  "sourcesContent": ["/* eslint-disable max-statements */\n/* eslint-disable max-params */\n/* eslint-disable complexity */\n/* eslint-disable max-lines */\nimport { createRef } from 'react';\nimport type TreeModel from 'tree-model';\nimport { standardizeSearchQueryString } from './string-helpers';\nimport type { DSTreeviewT } from '../react-desc-prop-types';\n\nexport const walkVisibles = (\n  node: DSTreeviewT.Item['node'],\n  callback: (node: DSTreeviewT.Item['node']) => void,\n  skipRoot = true,\n  highlightOnlyQuery = false,\n) => {\n  const { children, model } = node;\n  const { name, isExpanded, childrenMatchesSearchQuery, matchesSearchQuery } = model;\n\n  const shouldSkipBecauseIsRoot = skipRoot && name === '__root';\n  const queryRestrictionsPassed = !!(highlightOnlyQuery || childrenMatchesSearchQuery || matchesSearchQuery);\n\n  if (!shouldSkipBecauseIsRoot && queryRestrictionsPassed) callback(node);\n\n  const shouldWalkChildren = !!(children.length > 0 && isExpanded && queryRestrictionsPassed);\n  if (shouldWalkChildren) {\n    children.forEach((childNode) => {\n      walkVisibles(childNode, callback, skipRoot, highlightOnlyQuery);\n    });\n  }\n};\n\nexport const walkParents = (\n  nodePath: DSTreeviewT.Item['nodePath'],\n  callback: (currParent: DSTreeviewT.Item['node']) => void,\n  skipRoot = true,\n) => {\n  const parents = [...nodePath].reverse();\n  parents.shift(); // remove current node from the parents array\n  if (skipRoot) parents.pop(); // remove the root from the parents if skipping root\n  parents.forEach(callback);\n};\n\ntype RecursiveCallbackT = (childNode: DSTreeviewT.Item['node'], cb?: RecursiveCallbackT, isFirst?: boolean) => void;\nexport const walkAllNodeChildren = (node: DSTreeviewT.Item['node'], callback: RecursiveCallbackT, isFirst = true) => {\n  const { children = [] } = node;\n  const shouldWalkChildren = children.length;\n\n  if (!isFirst) callback(node);\n\n  if (shouldWalkChildren) {\n    children.forEach((childNode) => {\n      walkAllNodeChildren(childNode, callback, false);\n    });\n  }\n};\n\nexport const getNodeById = (treeRoot: DSTreeviewT.Item['node'], id: DSTreeviewT.StringOrNum) => {\n  const nodes = treeRoot.all((node) => (node as unknown as DSTreeviewT.Item).model.id === id);\n  return nodes[0];\n};\n\nexport const cloneNode = (tree: TreeModel, node: DSTreeviewT.Item) => tree.parse(node.model);\n\nexport const itemsShareSameParent = (items: DSTreeviewT.Item[] = []) => {\n  if (items.length === 0) throw new Error('Received empty items for comparison');\n  if (items.length === 1) return true;\n\n  // when moving in first position we receive [undefined,...{items}]\n  // when moving in last position we receive [...{items}, undefined]\n  const firstExistingItem = items.find((item) => !!item);\n  if (!firstExistingItem) throw new Error(\"Received no items, can't retrieve parent\");\n\n  const firstExistingItemPath = firstExistingItem.node.getPath();\n  // path is like [rootParent, ...[parentsNodes], currentNode]\n  // length -1 is the current-node\n  // length -2 is the parent-node\n  // root node is not printed and is always present so minimum path length is 2 (root + currentNode)\n  const directParentNode = firstExistingItemPath[firstExistingItemPath.length - 2];\n\n  return items.every((item) => {\n    // undefined nodes count as having the same parent\n    if (!item) return true;\n    const itemPath = item.node.getPath();\n    const itemDirectParent = itemPath[itemPath.length - 2];\n    return directParentNode === itemDirectParent;\n  });\n};\n\nexport const getItemsParentNode = (items: DSTreeviewT.Item[] = [], skipSameParentCheck = false) => {\n  if (items.length === 0) throw new Error(\"Received empty items, can't retrieve parent\");\n\n  // in case we already know the items compared shares the same parent\n  if (!skipSameParentCheck)\n    if (!itemsShareSameParent(items))\n      // if we don't know (default, we don't) check if they share the parent\n      throw new Error(\"Received items don't share the same parent, can't retrieve parent\");\n\n  // when moving in first position we receive [undefined,...{items}]\n  // when moving in last position we receive [...{items}, undefined]\n  const firstExistingItem = items.find((item) => !!item);\n  if (!firstExistingItem) throw new Error(\"Received no items, can't retrieve parent\");\n\n  const firstExistingItemPath = firstExistingItem.node.getPath();\n  // path is like [rootParent, ...[parentsNodes], currentNode]\n  // length -1 is the current-node\n  // length -2 is the parent-node\n  // root node is not printed and is always present so minimum path length is 2 (root + currentNode)\n  const directParentNode = firstExistingItemPath[firstExistingItemPath.length - 2];\n  return directParentNode as unknown as DSTreeviewT.Item['node'];\n};\n\nexport const getNodeMatchesSearchQuery = (node: DSTreeviewT.Item['node'], searchQuery = '') => {\n  const standardizedName = standardizeSearchQueryString(node.model.name);\n  const standardizedSearchQuery = standardizeSearchQueryString(searchQuery);\n  return standardizedName.includes(standardizedSearchQuery);\n};\n\nexport const getChildrenMatchesSearchQuery = (parentNode: DSTreeviewT.Item['node'], searchQuery = '') => {\n  let anyChildMatch = false;\n  walkAllNodeChildren(parentNode, (node) => {\n    if (getNodeMatchesSearchQuery(node, searchQuery)) anyChildMatch = true;\n  });\n  return anyChildMatch;\n};\n\n/**\n * Mutate in place a node from tree-model normalizing object properties like \"isGroup\" even if user didn't specify it explicitly,\n * after execution the node will have \"nodePath\" \"treeDepth\" \"nodeItemRef\" \"isGroup\" \"isExpanded\"\n * (optionally, based on the provided arguments) \"matchesSearchQuery\" \"childrenMatchesSearchQuery\" \"isChecked\"\n *\n * @param {object} node - node (based on 'tree-model' lib) that you wish to mutate with extra props\n * @param {string} [searchQuery=''] - optional string used to parse \"matchesSearchQuery\"/\"childrenMatchesSearchQuery\" properties\n * @param {object} [selection=null] - optional selection hashmap used to parse \"isChecked\" properties\n * @param {object} [expanded=null] - optional expanded hashmap used to parse \"isExpanded\" properties\n */\nexport const enrichNodeModelInPlace = (\n  node: TreeModel.Node<DSTreeviewT.SimpleItem>,\n  searchQuery = '',\n  selection: DSTreeviewT.SelectionItems | null = null,\n  expanded: DSTreeviewT.ExpandedItems | null = null,\n) => {\n  const path = node.getPath();\n  const depth = path.length - 1;\n  node.model.nodePath = path;\n  node.model.treeDepth = depth;\n\n  if (!node.model.nodeItemRef) {\n    node.model.nodeItemRef = createRef();\n  }\n\n  // if a node has children but was not marked as isGroup, force-mark as group\n  // this is useful to avoid having to always check both the flag and the children.length...\n  if (typeof node.model.isGroup !== 'boolean' && (node.model?.children?.length ?? 0) > 0) {\n    node.model.isGroup = true;\n  }\n\n  if (node.model.isGroup && node.model.id !== '__ds_tree_root') {\n    if (expanded) node.model.isExpanded = !!expanded[node.model.id];\n    else if (typeof node.model.isExpanded !== 'boolean') {\n      node.model.isExpanded = false;\n    }\n  }\n\n  node.model.matchesSearchQuery = true;\n  node.model.childrenMatchesSearchQuery = false;\n  const partiallyEnrichedNode = node as unknown as TreeModel.Node<DSTreeviewT.Item>;\n  if (searchQuery) {\n    partiallyEnrichedNode.model.matchesSearchQuery = getNodeMatchesSearchQuery(partiallyEnrichedNode, searchQuery);\n\n    if (partiallyEnrichedNode.model.isGroup === true) {\n      partiallyEnrichedNode.model.childrenMatchesSearchQuery = getChildrenMatchesSearchQuery(\n        partiallyEnrichedNode,\n        searchQuery,\n      );\n      if (partiallyEnrichedNode.model.childrenMatchesSearchQuery) partiallyEnrichedNode.model.isExpanded = true;\n    }\n  }\n  if (selection && selection[partiallyEnrichedNode.model.id]) {\n    partiallyEnrichedNode.model.isChecked = selection[partiallyEnrichedNode.model.id];\n  }\n};\n\nexport const focusItem = (item: DSTreeviewT.Item | null) => {\n  item?.nodeItemRef?.current?.focus();\n};\n\nexport const flattenTreeForDnD = (\n  data: TreeModel.Node<DSTreeviewT.Item>,\n  shouldDescend: (datum: TreeModel.Node<DSTreeviewT.Item>) => boolean = () => true,\n) => {\n  const flattenedTree: DSTreeviewT.DndItem[] = [];\n  let index = 0;\n  const doit = (node: TreeModel.Node<DSTreeviewT.Item>, depth = 0, parentId: DSTreeviewT.StringOrNum | null = null) => {\n    flattenedTree.push({\n      uid: node.model.id.toString(),\n      depth,\n      realIndex: index,\n      childrenCount: node.children?.length ?? 0,\n      parentId: parentId !== null ? parentId.toString() : null,\n      original: { ...node, ...node.model, node },\n    });\n    index += 1;\n    if (shouldDescend(node)) node.children?.forEach((child) => doit(child, depth + 1, node.model.id.toString()));\n  };\n\n  data.children.forEach((node) => doit(node));\n  return flattenedTree;\n};\n", "import * as React from 'react';\nexport { React };\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/esm/hoc/DnDTreeContext.js

@@ -2,8 +2,6 @@ import * as React from "react";
 import { createContext } from "react";
 import { DropIndicatorPosition } from "./SortableItemContext";
 const DnDTreeContext = createContext({
-  depth: void 0,
-  activeIndex: void 0,
   visibleItems: void 0,
   dropIndicatorPosition: DropIndicatorPosition.None,
   isDropValid: false

package/dist/esm/hoc/DnDTreeContext.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../scripts/build/transpile/react-shim.js", "../../../src/hoc/DnDTreeContext.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import { createContext } from 'react';\nimport type { DSTreeviewT } from '../react-desc-prop-types';\nimport { DropIndicatorPosition } from './SortableItemContext';\n\ntype DnDTreeContextType = {\n  depth: number | undefined;\n  activeIndex: number | undefined;\n  visibleItems: DSTreeviewT.Item[] | undefined;\n  dropIndicatorPosition: DropIndicatorPosition;\n  isDropValid: boolean;\n};\n\nexport const DnDTreeContext = createContext<DnDTreeContextType>({\n  depth: undefined,\n  activeIndex: undefined,\n  visibleItems: undefined,\n  dropIndicatorPosition: DropIndicatorPosition.None,\n  isDropValid: false,\n});\n"],
-  "mappings": "AAAA,YAAY,WAAW;ACAvB,SAAS,qBAAqB;AAE9B,SAAS,6BAA6B;AAU/B,MAAM,iBAAiB,cAAkC;AAAA,EAC9D,OAAO;AAAA,EACP,aAAa;AAAA,EACb,cAAc;AAAA,EACd,uBAAuB,sBAAsB;AAAA,EAC7C,aAAa;AACf,CAAC;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import { createContext } from 'react';\nimport type { DSTreeviewT } from '../react-desc-prop-types';\nimport { DropIndicatorPosition } from './SortableItemContext';\n\ntype DnDTreeContextType = {\n  visibleItems: DSTreeviewT.Item[] | undefined;\n  dropIndicatorPosition: DropIndicatorPosition;\n  isDropValid: boolean;\n};\n\nexport const DnDTreeContext = createContext<DnDTreeContextType>({\n  visibleItems: undefined,\n  dropIndicatorPosition: DropIndicatorPosition.None,\n  isDropValid: false,\n});\n"],
+  "mappings": "AAAA,YAAY,WAAW;ACAvB,SAAS,qBAAqB;AAE9B,SAAS,6BAA6B;AAQ/B,MAAM,iBAAiB,cAAkC;AAAA,EAC9D,cAAc;AAAA,EACd,uBAAuB,sBAAsB;AAAA,EAC7C,aAAa;AACf,CAAC;",
   "names": []
 }

package/dist/esm/hoc/WithConditionalDnDContext.js

@@ -1,7 +1,13 @@
 import * as React from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useCallback, useContext, useEffect, useMemo, useRef } from "react";
-import { DndContext, DragOverlay, SortableContext, useTreeDndkitConfig } from "@elliemae/ds-drag-and-drop";
+import {
+  DndContext,
+  DragOverlay,
+  SortableContext,
+  useTreeDndkitConfig,
+  removeChildrenOf
+} from "@elliemae/ds-drag-and-drop";
 import TreeViewContext from "../TreeViewContext";
 import { TreeItem } from "../parts/TreeItem";
 import { DnDTreeContext } from "./DnDTreeContext";
@@ -34,15 +40,15 @@ const withConditionalDnDRowContext = (Component) => function(props) {
     [flattenedVisibleTree]
   );
   const onReorder = useCallback(
-    (tree, metadata) => {
+    (_active, _targetIndex, { movedData, fromIndex }) => {
       const nodes = {};
-      tree.forEach((item) => {
+      movedData.forEach((item) => {
         const originalItem = item.original.model;
         originalItem.children = [];
         nodes[item.uid] = originalItem;
       });
       const newUserTree = [];
-      tree.forEach((item) => {
+      movedData.forEach((item) => {
         if (item.parentId !== null && item.parentId !== void 0 && item.parentId !== "__ds_tree_root") {
           const parentNode = nodes[item.parentId];
           parentNode.children?.push(item.original.model);
@@ -50,36 +56,30 @@ const withConditionalDnDRowContext = (Component) => function(props) {
           newUserTree.push(item.original.model);
         }
       });
-      onOrderChange(newUserTree, data, flattenedItems[metadata.fromIndex]);
+      onOrderChange(newUserTree, data, flattenedItems[fromIndex]);
     },
     [onOrderChange, data, flattenedItems]
   );
-  const {
-    dndContextProps,
-    sortableContextProps,
-    activeId,
-    activeIndex,
-    depth,
-    dropIndicatorPosition,
-    visibleItems,
-    isDropValid,
-    overId
-  } = useTreeDndkitConfig({
+  const { dndContextProps, sortableContextProps, active, dropIndicatorPosition, isDropValid, over } = useTreeDndkitConfig({
     flattenedItems,
-    visibleItems: flattenedVisibleTreeForDnD,
     isHorizontalDnD: false,
     isExpandable: true,
     onReorder,
     getIsDropValid,
     maxDragAndDropLevel: Infinity
   });
+  const visibleItems = useMemo(() => {
+    if (!active)
+      return flattenedVisibleTreeForDnD;
+    return removeChildrenOf(flattenedVisibleTreeForDnD, active.id);
+  }, [active, flattenedVisibleTreeForDnD]);
   const timeoutRef = useRef();
   useEffect(() => {
     if (timeoutRef.current)
       clearTimeout(timeoutRef.current);
-    if (dropIndicatorPosition === DropIndicatorPosition.Inside && overId) {
+    if (dropIndicatorPosition === DropIndicatorPosition.Inside && over) {
       timeoutRef.current = setTimeout(() => {
-        const overItem = visibleItems.find((item) => item.uid === overId);
+        const overItem = visibleItems.find((item) => item.uid === over.id);
         if (overItem) {
           const realOverItem = overItem.original;
           if (realOverItem.isGroup && !realOverItem.isExpanded) {
@@ -88,15 +88,13 @@ const withConditionalDnDRowContext = (Component) => function(props) {
         }
       }, 1e3);
     }
-  }, [overId, dropIndicatorPosition, triggerTreeRerender, visibleItems, updateUserExpandedState]);
+  }, [over, dropIndicatorPosition, triggerTreeRerender, visibleItems, updateUserExpandedState]);
   if (withDragAndDrop)
     return /* @__PURE__ */ jsxs(DndContext, { ...dndContextProps, children: [
       /* @__PURE__ */ jsx(SortableContext, { ...sortableContextProps, children: /* @__PURE__ */ jsx(
         DnDTreeContext.Provider,
         {
           value: {
-            activeIndex,
-            depth,
             visibleItems: visibleItems.map((item) => item.original),
             dropIndicatorPosition,
             isDropValid
@@ -104,11 +102,11 @@ const withConditionalDnDRowContext = (Component) => function(props) {
           children: /* @__PURE__ */ jsx(Component, { ...props })
         }
       ) }),
-      /* @__PURE__ */ jsx(DragOverlay, { style: { width: "auto" }, children: activeId ? /* @__PURE__ */ jsx(
+      /* @__PURE__ */ jsx(DragOverlay, { style: { width: "auto" }, children: active ? /* @__PURE__ */ jsx(
         TreeItem,
         {
-          itemIndex: activeIndex,
-          item: ensure(flattenedVisibleTree.find((item) => item.id.toString() === activeId)),
+          itemIndex: -1,
+          item: ensure(flattenedVisibleTree.find((item) => item.id.toString() === active.id.toString())),
           isDragOverlay: true
         }
       ) : null })

package/dist/esm/hoc/WithConditionalDnDContext.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../scripts/build/transpile/react-shim.js", "../../../src/hoc/WithConditionalDnDContext.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import React, { useCallback, useContext, useEffect, useMemo, useRef } from 'react';\nimport { DndContext, DragOverlay, SortableContext, useTreeDndkitConfig } from '@elliemae/ds-drag-and-drop';\nimport type { DSTreeviewT } from '../react-desc-prop-types';\nimport TreeViewContext from '../TreeViewContext';\nimport { TreeItem } from '../parts/TreeItem';\nimport { DnDTreeContext } from './DnDTreeContext';\nimport { DropIndicatorPosition } from './SortableItemContext';\nimport { toggleItemExpand } from '../utils/group-expands-helpers';\n\ntype FunctionalHOC = <T = unknown>(Component: React.ComponentType<T>, ...other: unknown[]) => (props: T) => JSX.Element;\n\nconst ensure = <T,>(argument: T | undefined | null, message = 'This should never happen'): T => {\n  if (argument === undefined || argument === null) {\n    throw new TypeError(message);\n  }\n\n  return argument;\n};\n\n// only wraps in \"DnDContext\" and \"DnDTreeContext\" if any Drag and Drop functionality is requested\nexport const withConditionalDnDRowContext: FunctionalHOC = (Component) =>\n  function (props) {\n    const {\n      props: { data, onOrderChange, getIsDropValid },\n      flattenedItems,\n      updateUserExpandedState,\n      triggerTreeRerender,\n      visibleItems: flattenedVisibleTree,\n      withDragAndDrop,\n    } = useContext(TreeViewContext);\n\n    const flattenedVisibleTreeForDnD = useMemo(\n      () =>\n        flattenedVisibleTree.map((item, index) => ({\n          uid: item.id.toString(),\n          depth: (item.treeDepth ?? 1) - 1,\n          realIndex: index,\n          childrenCount: item.children?.length ?? 0,\n          parentId: item.node.parent?.model?.id?.toString() ?? null,\n          original: item,\n        })),\n      [flattenedVisibleTree],\n    );\n\n    const onReorder = useCallback(\n      (tree: DSTreeviewT.DndItem[], metadata: { targetIndex: number; fromIndex: number }) => {\n        // Pull the row's original data into an object\n        const nodes: Record<DSTreeviewT.StringOrNum, DSTreeviewT.SimpleItem> = {};\n        tree.forEach((item) => {\n          const originalItem = item.original.model;\n          originalItem.children = [];\n          nodes[item.uid] = originalItem;\n        });\n\n        const newUserTree: DSTreeviewT.SimpleItem[] = [];\n        tree.forEach((item) => {\n          // If row has parent, insert it to it's subrows\n          // otherwise append it to the new user data\n          if (item.parentId !== null && item.parentId !== undefined && item.parentId !== '__ds_tree_root') {\n            const parentNode = nodes[item.parentId];\n            parentNode.children?.push(item.original.model);\n          } else if (item.uid !== '__ds_tree_root') {\n            newUserTree.push(item.original.model);\n          }\n        });\n        // Tell the user that the order has change, he can chose to commit it or not\n        onOrderChange(newUserTree, data, flattenedItems[metadata.fromIndex]);\n      },\n      [onOrderChange, data, flattenedItems],\n    );\n\n    const {\n      dndContextProps,\n      sortableContextProps,\n      activeId,\n      activeIndex,\n      depth,\n      dropIndicatorPosition,\n      visibleItems,\n      isDropValid,\n      overId,\n    } = useTreeDndkitConfig({\n      flattenedItems,\n      visibleItems: flattenedVisibleTreeForDnD,\n      isHorizontalDnD: false,\n      isExpandable: true,\n      onReorder,\n      getIsDropValid,\n      maxDragAndDropLevel: Infinity,\n    });\n\n    const timeoutRef = useRef<NodeJS.Timeout>();\n\n    useEffect(() => {\n      if (timeoutRef.current) clearTimeout(timeoutRef.current);\n      if (dropIndicatorPosition === DropIndicatorPosition.Inside && overId) {\n        timeoutRef.current = setTimeout(() => {\n          const overItem = visibleItems.find((item) => item.uid === overId);\n          if (overItem) {\n            const realOverItem = overItem.original;\n            if (realOverItem.isGroup && !realOverItem.isExpanded) {\n              toggleItemExpand(realOverItem, triggerTreeRerender, updateUserExpandedState);\n            }\n          }\n        }, 1000);\n      }\n    }, [overId, dropIndicatorPosition, triggerTreeRerender, visibleItems, updateUserExpandedState]);\n\n    if (withDragAndDrop)\n      return (\n        <DndContext {...dndContextProps}>\n          <SortableContext {...sortableContextProps}>\n            <DnDTreeContext.Provider\n              value={{\n                activeIndex,\n                depth,\n                visibleItems: visibleItems.map((item) => item.original),\n                dropIndicatorPosition,\n                isDropValid,\n              }}\n            >\n              <Component {...props} />\n            </DnDTreeContext.Provider>\n          </SortableContext>\n          <DragOverlay style={{ width: 'auto' }}>\n            {activeId ? (\n              <TreeItem\n                itemIndex={activeIndex}\n                item={ensure(flattenedVisibleTree.find((item) => item.id.toString() === activeId))}\n                isDragOverlay\n              />\n            ) : null}\n          </DragOverlay>\n        </DndContext>\n      );\n    return <Component {...props} />;\n  };\n"],
-  "mappings": "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",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import React, { useCallback, useContext, useEffect, useMemo, useRef } from 'react';\nimport {\n  DndContext,\n  DragOverlay,\n  SortableContext,\n  useTreeDndkitConfig,\n  removeChildrenOf,\n} from '@elliemae/ds-drag-and-drop';\nimport type { DSTreeviewT } from '../react-desc-prop-types';\nimport TreeViewContext from '../TreeViewContext';\nimport { TreeItem } from '../parts/TreeItem';\nimport { DnDTreeContext } from './DnDTreeContext';\nimport { DropIndicatorPosition } from './SortableItemContext';\nimport { toggleItemExpand } from '../utils/group-expands-helpers';\n\ntype FunctionalHOC = <T = unknown>(Component: React.ComponentType<T>, ...other: unknown[]) => (props: T) => JSX.Element;\n\nconst ensure = <T,>(argument: T | undefined | null, message = 'This should never happen'): T => {\n  if (argument === undefined || argument === null) {\n    throw new TypeError(message);\n  }\n\n  return argument;\n};\n\n// only wraps in \"DnDContext\" and \"DnDTreeContext\" if any Drag and Drop functionality is requested\nexport const withConditionalDnDRowContext: FunctionalHOC = (Component) =>\n  function (props) {\n    const {\n      props: { data, onOrderChange, getIsDropValid },\n      flattenedItems,\n      updateUserExpandedState,\n      triggerTreeRerender,\n      visibleItems: flattenedVisibleTree,\n      withDragAndDrop,\n    } = useContext(TreeViewContext);\n\n    const flattenedVisibleTreeForDnD = useMemo(\n      () =>\n        flattenedVisibleTree.map((item, index) => ({\n          uid: item.id.toString(),\n          depth: (item.treeDepth ?? 1) - 1,\n          realIndex: index,\n          childrenCount: item.children?.length ?? 0,\n          parentId: item.node.parent?.model?.id?.toString() ?? null,\n          original: item,\n        })),\n      [flattenedVisibleTree],\n    );\n\n    const onReorder = useCallback(\n      (\n        _active: DSTreeviewT.DndItem,\n        _targetIndex: number,\n        { movedData, fromIndex }: { movedData: DSTreeviewT.DndItem[]; fromIndex: number },\n      ) => {\n        // Pull the row's original data into an object\n        const nodes: Record<DSTreeviewT.StringOrNum, DSTreeviewT.SimpleItem> = {};\n        movedData.forEach((item) => {\n          const originalItem = item.original.model;\n          originalItem.children = [];\n          nodes[item.uid] = originalItem;\n        });\n\n        const newUserTree: DSTreeviewT.SimpleItem[] = [];\n        movedData.forEach((item) => {\n          // If row has parent, insert it to it's subrows\n          // otherwise append it to the new user data\n          if (item.parentId !== null && item.parentId !== undefined && item.parentId !== '__ds_tree_root') {\n            const parentNode = nodes[item.parentId];\n            parentNode.children?.push(item.original.model);\n          } else if (item.uid !== '__ds_tree_root') {\n            newUserTree.push(item.original.model);\n          }\n        });\n        // Tell the user that the order has change, he can chose to commit it or not\n        onOrderChange(newUserTree, data, flattenedItems[fromIndex]);\n      },\n      [onOrderChange, data, flattenedItems],\n    );\n\n    const { dndContextProps, sortableContextProps, active, dropIndicatorPosition, isDropValid, over } =\n      useTreeDndkitConfig({\n        flattenedItems,\n        isHorizontalDnD: false,\n        isExpandable: true,\n        onReorder,\n        getIsDropValid,\n        maxDragAndDropLevel: Infinity,\n      });\n\n    const visibleItems = useMemo(() => {\n      if (!active) return flattenedVisibleTreeForDnD;\n      return removeChildrenOf(flattenedVisibleTreeForDnD, active.id);\n    }, [active, flattenedVisibleTreeForDnD]);\n\n    const timeoutRef = useRef<NodeJS.Timeout>();\n\n    useEffect(() => {\n      if (timeoutRef.current) clearTimeout(timeoutRef.current);\n      if (dropIndicatorPosition === DropIndicatorPosition.Inside && over) {\n        timeoutRef.current = setTimeout(() => {\n          const overItem = visibleItems.find((item) => item.uid === over.id);\n          if (overItem) {\n            const realOverItem = overItem.original;\n            if (realOverItem.isGroup && !realOverItem.isExpanded) {\n              toggleItemExpand(realOverItem, triggerTreeRerender, updateUserExpandedState);\n            }\n          }\n        }, 1000);\n      }\n    }, [over, dropIndicatorPosition, triggerTreeRerender, visibleItems, updateUserExpandedState]);\n\n    if (withDragAndDrop)\n      return (\n        <DndContext {...dndContextProps}>\n          <SortableContext {...sortableContextProps}>\n            <DnDTreeContext.Provider\n              value={{\n                visibleItems: visibleItems.map((item) => item.original),\n                dropIndicatorPosition,\n                isDropValid,\n              }}\n            >\n              <Component {...props} />\n            </DnDTreeContext.Provider>\n          </SortableContext>\n          <DragOverlay style={{ width: 'auto' }}>\n            {active ? (\n              <TreeItem\n                itemIndex={-1}\n                item={ensure(flattenedVisibleTree.find((item) => item.id.toString() === active.id.toString()))}\n                isDragOverlay\n              />\n            ) : null}\n          </DragOverlay>\n        </DndContext>\n      );\n    return <Component {...props} />;\n  };\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/esm/utils/tree-helpers.js

@@ -132,7 +132,7 @@ const flattenTreeForDnD = (data, shouldDescend = () => true) => {
       realIndex: index,
       childrenCount: node.children?.length ?? 0,
       parentId: parentId !== null ? parentId.toString() : null,
-      original: { ...node, ...node.model }
+      original: { ...node, ...node.model, node }
     });
     index += 1;
     if (shouldDescend(node))

package/dist/esm/utils/tree-helpers.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../scripts/build/transpile/react-shim.js", "../../../src/utils/tree-helpers.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable max-statements */\n/* eslint-disable max-params */\n/* eslint-disable complexity */\n/* eslint-disable max-lines */\nimport { createRef } from 'react';\nimport type TreeModel from 'tree-model';\nimport { standardizeSearchQueryString } from './string-helpers';\nimport type { DSTreeviewT } from '../react-desc-prop-types';\n\nexport const walkVisibles = (\n  node: DSTreeviewT.Item['node'],\n  callback: (node: DSTreeviewT.Item['node']) => void,\n  skipRoot = true,\n  highlightOnlyQuery = false,\n) => {\n  const { children, model } = node;\n  const { name, isExpanded, childrenMatchesSearchQuery, matchesSearchQuery } = model;\n\n  const shouldSkipBecauseIsRoot = skipRoot && name === '__root';\n  const queryRestrictionsPassed = !!(highlightOnlyQuery || childrenMatchesSearchQuery || matchesSearchQuery);\n\n  if (!shouldSkipBecauseIsRoot && queryRestrictionsPassed) callback(node);\n\n  const shouldWalkChildren = !!(children.length > 0 && isExpanded && queryRestrictionsPassed);\n  if (shouldWalkChildren) {\n    children.forEach((childNode) => {\n      walkVisibles(childNode, callback, skipRoot, highlightOnlyQuery);\n    });\n  }\n};\n\nexport const walkParents = (\n  nodePath: DSTreeviewT.Item['nodePath'],\n  callback: (currParent: DSTreeviewT.Item['node']) => void,\n  skipRoot = true,\n) => {\n  const parents = [...nodePath].reverse();\n  parents.shift(); // remove current node from the parents array\n  if (skipRoot) parents.pop(); // remove the root from the parents if skipping root\n  parents.forEach(callback);\n};\n\ntype RecursiveCallbackT = (childNode: DSTreeviewT.Item['node'], cb?: RecursiveCallbackT, isFirst?: boolean) => void;\nexport const walkAllNodeChildren = (node: DSTreeviewT.Item['node'], callback: RecursiveCallbackT, isFirst = true) => {\n  const { children = [] } = node;\n  const shouldWalkChildren = children.length;\n\n  if (!isFirst) callback(node);\n\n  if (shouldWalkChildren) {\n    children.forEach((childNode) => {\n      walkAllNodeChildren(childNode, callback, false);\n    });\n  }\n};\n\nexport const getNodeById = (treeRoot: DSTreeviewT.Item['node'], id: DSTreeviewT.StringOrNum) => {\n  const nodes = treeRoot.all((node) => (node as unknown as DSTreeviewT.Item).model.id === id);\n  return nodes[0];\n};\n\nexport const cloneNode = (tree: TreeModel, node: DSTreeviewT.Item) => tree.parse(node.model);\n\nexport const itemsShareSameParent = (items: DSTreeviewT.Item[] = []) => {\n  if (items.length === 0) throw new Error('Received empty items for comparison');\n  if (items.length === 1) return true;\n\n  // when moving in first position we receive [undefined,...{items}]\n  // when moving in last position we receive [...{items}, undefined]\n  const firstExistingItem = items.find((item) => !!item);\n  if (!firstExistingItem) throw new Error(\"Received no items, can't retrieve parent\");\n\n  const firstExistingItemPath = firstExistingItem.node.getPath();\n  // path is like [rootParent, ...[parentsNodes], currentNode]\n  // length -1 is the current-node\n  // length -2 is the parent-node\n  // root node is not printed and is always present so minimum path length is 2 (root + currentNode)\n  const directParentNode = firstExistingItemPath[firstExistingItemPath.length - 2];\n\n  return items.every((item) => {\n    // undefined nodes count as having the same parent\n    if (!item) return true;\n    const itemPath = item.node.getPath();\n    const itemDirectParent = itemPath[itemPath.length - 2];\n    return directParentNode === itemDirectParent;\n  });\n};\n\nexport const getItemsParentNode = (items: DSTreeviewT.Item[] = [], skipSameParentCheck = false) => {\n  if (items.length === 0) throw new Error(\"Received empty items, can't retrieve parent\");\n\n  // in case we already know the items compared shares the same parent\n  if (!skipSameParentCheck)\n    if (!itemsShareSameParent(items))\n      // if we don't know (default, we don't) check if they share the parent\n      throw new Error(\"Received items don't share the same parent, can't retrieve parent\");\n\n  // when moving in first position we receive [undefined,...{items}]\n  // when moving in last position we receive [...{items}, undefined]\n  const firstExistingItem = items.find((item) => !!item);\n  if (!firstExistingItem) throw new Error(\"Received no items, can't retrieve parent\");\n\n  const firstExistingItemPath = firstExistingItem.node.getPath();\n  // path is like [rootParent, ...[parentsNodes], currentNode]\n  // length -1 is the current-node\n  // length -2 is the parent-node\n  // root node is not printed and is always present so minimum path length is 2 (root + currentNode)\n  const directParentNode = firstExistingItemPath[firstExistingItemPath.length - 2];\n  return directParentNode as unknown as DSTreeviewT.Item['node'];\n};\n\nexport const getNodeMatchesSearchQuery = (node: DSTreeviewT.Item['node'], searchQuery = '') => {\n  const standardizedName = standardizeSearchQueryString(node.model.name);\n  const standardizedSearchQuery = standardizeSearchQueryString(searchQuery);\n  return standardizedName.includes(standardizedSearchQuery);\n};\n\nexport const getChildrenMatchesSearchQuery = (parentNode: DSTreeviewT.Item['node'], searchQuery = '') => {\n  let anyChildMatch = false;\n  walkAllNodeChildren(parentNode, (node) => {\n    if (getNodeMatchesSearchQuery(node, searchQuery)) anyChildMatch = true;\n  });\n  return anyChildMatch;\n};\n\n/**\n * Mutate in place a node from tree-model normalizing object properties like \"isGroup\" even if user didn't specify it explicitly,\n * after execution the node will have \"nodePath\" \"treeDepth\" \"nodeItemRef\" \"isGroup\" \"isExpanded\"\n * (optionally, based on the provided arguments) \"matchesSearchQuery\" \"childrenMatchesSearchQuery\" \"isChecked\"\n *\n * @param {object} node - node (based on 'tree-model' lib) that you wish to mutate with extra props\n * @param {string} [searchQuery=''] - optional string used to parse \"matchesSearchQuery\"/\"childrenMatchesSearchQuery\" properties\n * @param {object} [selection=null] - optional selection hashmap used to parse \"isChecked\" properties\n * @param {object} [expanded=null] - optional expanded hashmap used to parse \"isExpanded\" properties\n */\nexport const enrichNodeModelInPlace = (\n  node: TreeModel.Node<DSTreeviewT.SimpleItem>,\n  searchQuery = '',\n  selection: DSTreeviewT.SelectionItems | null = null,\n  expanded: DSTreeviewT.ExpandedItems | null = null,\n) => {\n  const path = node.getPath();\n  const depth = path.length - 1;\n  node.model.nodePath = path;\n  node.model.treeDepth = depth;\n\n  if (!node.model.nodeItemRef) {\n    node.model.nodeItemRef = createRef();\n  }\n\n  // if a node has children but was not marked as isGroup, force-mark as group\n  // this is useful to avoid having to always check both the flag and the children.length...\n  if (typeof node.model.isGroup !== 'boolean' && (node.model?.children?.length ?? 0) > 0) {\n    node.model.isGroup = true;\n  }\n\n  if (node.model.isGroup && node.model.id !== '__ds_tree_root') {\n    if (expanded) node.model.isExpanded = !!expanded[node.model.id];\n    else if (typeof node.model.isExpanded !== 'boolean') {\n      node.model.isExpanded = false;\n    }\n  }\n\n  node.model.matchesSearchQuery = true;\n  node.model.childrenMatchesSearchQuery = false;\n  const partiallyEnrichedNode = node as unknown as TreeModel.Node<DSTreeviewT.Item>;\n  if (searchQuery) {\n    partiallyEnrichedNode.model.matchesSearchQuery = getNodeMatchesSearchQuery(partiallyEnrichedNode, searchQuery);\n\n    if (partiallyEnrichedNode.model.isGroup === true) {\n      partiallyEnrichedNode.model.childrenMatchesSearchQuery = getChildrenMatchesSearchQuery(\n        partiallyEnrichedNode,\n        searchQuery,\n      );\n      if (partiallyEnrichedNode.model.childrenMatchesSearchQuery) partiallyEnrichedNode.model.isExpanded = true;\n    }\n  }\n  if (selection && selection[partiallyEnrichedNode.model.id]) {\n    partiallyEnrichedNode.model.isChecked = selection[partiallyEnrichedNode.model.id];\n  }\n};\n\nexport const focusItem = (item: DSTreeviewT.Item | null) => {\n  item?.nodeItemRef?.current?.focus();\n};\n\nexport const flattenTreeForDnD = (\n  data: TreeModel.Node<DSTreeviewT.Item>,\n  shouldDescend: (datum: TreeModel.Node<DSTreeviewT.Item>) => boolean = () => true,\n) => {\n  const flattenedTree: DSTreeviewT.DndItem[] = [];\n  let index = 0;\n  const doit = (node: TreeModel.Node<DSTreeviewT.Item>, depth = 0, parentId: DSTreeviewT.StringOrNum | null = null) => {\n    flattenedTree.push({\n      uid: node.model.id.toString(),\n      depth,\n      realIndex: index,\n      childrenCount: node.children?.length ?? 0,\n      parentId: parentId !== null ? parentId.toString() : null,\n      original: { ...node, ...node.model },\n    });\n    index += 1;\n    if (shouldDescend(node)) node.children?.forEach((child) => doit(child, depth + 1, node.model.id.toString()));\n  };\n\n  data.children.forEach((node) => doit(node));\n  return flattenedTree;\n};\n"],
-  "mappings": "AAAA,YAAY,WAAW;ACIvB,SAAS,iBAAiB;AAE1B,SAAS,oCAAoC;AAGtC,MAAM,eAAe,CAC1B,MACA,UACA,WAAW,MACX,qBAAqB,UAClB;AACH,QAAM,EAAE,UAAU,MAAM,IAAI;AAC5B,QAAM,EAAE,MAAM,YAAY,4BAA4B,mBAAmB,IAAI;AAE7E,QAAM,0BAA0B,YAAY,SAAS;AACrD,QAAM,0BAA0B,CAAC,EAAE,sBAAsB,8BAA8B;AAEvF,MAAI,CAAC,2BAA2B;AAAyB,aAAS,IAAI;AAEtE,QAAM,qBAAqB,CAAC,EAAE,SAAS,SAAS,KAAK,cAAc;AACnE,MAAI,oBAAoB;AACtB,aAAS,QAAQ,CAAC,cAAc;AAC9B,mBAAa,WAAW,UAAU,UAAU,kBAAkB;AAAA,IAChE,CAAC;AAAA,EACH;AACF;AAEO,MAAM,cAAc,CACzB,UACA,UACA,WAAW,SACR;AACH,QAAM,UAAU,CAAC,GAAG,QAAQ,EAAE,QAAQ;AACtC,UAAQ,MAAM;AACd,MAAI;AAAU,YAAQ,IAAI;AAC1B,UAAQ,QAAQ,QAAQ;AAC1B;AAGO,MAAM,sBAAsB,CAAC,MAAgC,UAA8B,UAAU,SAAS;AACnH,QAAM,EAAE,WAAW,CAAC,EAAE,IAAI;AAC1B,QAAM,qBAAqB,SAAS;AAEpC,MAAI,CAAC;AAAS,aAAS,IAAI;AAE3B,MAAI,oBAAoB;AACtB,aAAS,QAAQ,CAAC,cAAc;AAC9B,0BAAoB,WAAW,UAAU,KAAK;AAAA,IAChD,CAAC;AAAA,EACH;AACF;AAEO,MAAM,cAAc,CAAC,UAAoC,OAAgC;AAC9F,QAAM,QAAQ,SAAS,IAAI,CAAC,SAAU,KAAqC,MAAM,OAAO,EAAE;AAC1F,SAAO,MAAM;AACf;AAEO,MAAM,YAAY,CAAC,MAAiB,SAA2B,KAAK,MAAM,KAAK,KAAK;AAEpF,MAAM,uBAAuB,CAAC,QAA4B,CAAC,MAAM;AACtE,MAAI,MAAM,WAAW;AAAG,UAAM,IAAI,MAAM,qCAAqC;AAC7E,MAAI,MAAM,WAAW;AAAG,WAAO;AAI/B,QAAM,oBAAoB,MAAM,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI;AACrD,MAAI,CAAC;AAAmB,UAAM,IAAI,MAAM,0CAA0C;AAElF,QAAM,wBAAwB,kBAAkB,KAAK,QAAQ;AAK7D,QAAM,mBAAmB,sBAAsB,sBAAsB,SAAS;AAE9E,SAAO,MAAM,MAAM,CAAC,SAAS;AAE3B,QAAI,CAAC;AAAM,aAAO;AAClB,UAAM,WAAW,KAAK,KAAK,QAAQ;AACnC,UAAM,mBAAmB,SAAS,SAAS,SAAS;AACpD,WAAO,qBAAqB;AAAA,EAC9B,CAAC;AACH;AAEO,MAAM,qBAAqB,CAAC,QAA4B,CAAC,GAAG,sBAAsB,UAAU;AACjG,MAAI,MAAM,WAAW;AAAG,UAAM,IAAI,MAAM,6CAA6C;AAGrF,MAAI,CAAC;AACH,QAAI,CAAC,qBAAqB,KAAK;AAE7B,YAAM,IAAI,MAAM,mEAAmE;AAAA;AAIvF,QAAM,oBAAoB,MAAM,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI;AACrD,MAAI,CAAC;AAAmB,UAAM,IAAI,MAAM,0CAA0C;AAElF,QAAM,wBAAwB,kBAAkB,KAAK,QAAQ;AAK7D,QAAM,mBAAmB,sBAAsB,sBAAsB,SAAS;AAC9E,SAAO;AACT;AAEO,MAAM,4BAA4B,CAAC,MAAgC,cAAc,OAAO;AAC7F,QAAM,mBAAmB,6BAA6B,KAAK,MAAM,IAAI;AACrE,QAAM,0BAA0B,6BAA6B,WAAW;AACxE,SAAO,iBAAiB,SAAS,uBAAuB;AAC1D;AAEO,MAAM,gCAAgC,CAAC,YAAsC,cAAc,OAAO;AACvG,MAAI,gBAAgB;AACpB,sBAAoB,YAAY,CAAC,SAAS;AACxC,QAAI,0BAA0B,MAAM,WAAW;AAAG,sBAAgB;AAAA,EACpE,CAAC;AACD,SAAO;AACT;AAYO,MAAM,yBAAyB,CACpC,MACA,cAAc,IACd,YAA+C,MAC/C,WAA6C,SAC1C;AACH,QAAM,OAAO,KAAK,QAAQ;AAC1B,QAAM,QAAQ,KAAK,SAAS;AAC5B,OAAK,MAAM,WAAW;AACtB,OAAK,MAAM,YAAY;AAEvB,MAAI,CAAC,KAAK,MAAM,aAAa;AAC3B,SAAK,MAAM,cAAc,UAAU;AAAA,EACrC;AAIA,MAAI,OAAO,KAAK,MAAM,YAAY,cAAc,KAAK,OAAO,UAAU,UAAU,KAAK,GAAG;AACtF,SAAK,MAAM,UAAU;AAAA,EACvB;AAEA,MAAI,KAAK,MAAM,WAAW,KAAK,MAAM,OAAO,kBAAkB;AAC5D,QAAI;AAAU,WAAK,MAAM,aAAa,CAAC,CAAC,SAAS,KAAK,MAAM;AAAA,aACnD,OAAO,KAAK,MAAM,eAAe,WAAW;AACnD,WAAK,MAAM,aAAa;AAAA,IAC1B;AAAA,EACF;AAEA,OAAK,MAAM,qBAAqB;AAChC,OAAK,MAAM,6BAA6B;AACxC,QAAM,wBAAwB;AAC9B,MAAI,aAAa;AACf,0BAAsB,MAAM,qBAAqB,0BAA0B,uBAAuB,WAAW;AAE7G,QAAI,sBAAsB,MAAM,YAAY,MAAM;AAChD,4BAAsB,MAAM,6BAA6B;AAAA,QACvD;AAAA,QACA;AAAA,MACF;AACA,UAAI,sBAAsB,MAAM;AAA4B,8BAAsB,MAAM,aAAa;AAAA,IACvG;AAAA,EACF;AACA,MAAI,aAAa,UAAU,sBAAsB,MAAM,KAAK;AAC1D,0BAAsB,MAAM,YAAY,UAAU,sBAAsB,MAAM;AAAA,EAChF;AACF;AAEO,MAAM,YAAY,CAAC,SAAkC;AAC1D,QAAM,aAAa,SAAS,MAAM;AACpC;AAEO,MAAM,oBAAoB,CAC/B,MACA,gBAAsE,MAAM,SACzE;AACH,QAAM,gBAAuC,CAAC;AAC9C,MAAI,QAAQ;AACZ,QAAM,OAAO,CAAC,MAAwC,QAAQ,GAAG,WAA2C,SAAS;AACnH,kBAAc,KAAK;AAAA,MACjB,KAAK,KAAK,MAAM,GAAG,SAAS;AAAA,MAC5B;AAAA,MACA,WAAW;AAAA,MACX,eAAe,KAAK,UAAU,UAAU;AAAA,MACxC,UAAU,aAAa,OAAO,SAAS,SAAS,IAAI;AAAA,MACpD,UAAU,EAAE,GAAG,MAAM,GAAG,KAAK,MAAM;AAAA,IACrC,CAAC;AACD,aAAS;AACT,QAAI,cAAc,IAAI;AAAG,WAAK,UAAU,QAAQ,CAAC,UAAU,KAAK,OAAO,QAAQ,GAAG,KAAK,MAAM,GAAG,SAAS,CAAC,CAAC;AAAA,EAC7G;AAEA,OAAK,SAAS,QAAQ,CAAC,SAAS,KAAK,IAAI,CAAC;AAC1C,SAAO;AACT;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable max-statements */\n/* eslint-disable max-params */\n/* eslint-disable complexity */\n/* eslint-disable max-lines */\nimport { createRef } from 'react';\nimport type TreeModel from 'tree-model';\nimport { standardizeSearchQueryString } from './string-helpers';\nimport type { DSTreeviewT } from '../react-desc-prop-types';\n\nexport const walkVisibles = (\n  node: DSTreeviewT.Item['node'],\n  callback: (node: DSTreeviewT.Item['node']) => void,\n  skipRoot = true,\n  highlightOnlyQuery = false,\n) => {\n  const { children, model } = node;\n  const { name, isExpanded, childrenMatchesSearchQuery, matchesSearchQuery } = model;\n\n  const shouldSkipBecauseIsRoot = skipRoot && name === '__root';\n  const queryRestrictionsPassed = !!(highlightOnlyQuery || childrenMatchesSearchQuery || matchesSearchQuery);\n\n  if (!shouldSkipBecauseIsRoot && queryRestrictionsPassed) callback(node);\n\n  const shouldWalkChildren = !!(children.length > 0 && isExpanded && queryRestrictionsPassed);\n  if (shouldWalkChildren) {\n    children.forEach((childNode) => {\n      walkVisibles(childNode, callback, skipRoot, highlightOnlyQuery);\n    });\n  }\n};\n\nexport const walkParents = (\n  nodePath: DSTreeviewT.Item['nodePath'],\n  callback: (currParent: DSTreeviewT.Item['node']) => void,\n  skipRoot = true,\n) => {\n  const parents = [...nodePath].reverse();\n  parents.shift(); // remove current node from the parents array\n  if (skipRoot) parents.pop(); // remove the root from the parents if skipping root\n  parents.forEach(callback);\n};\n\ntype RecursiveCallbackT = (childNode: DSTreeviewT.Item['node'], cb?: RecursiveCallbackT, isFirst?: boolean) => void;\nexport const walkAllNodeChildren = (node: DSTreeviewT.Item['node'], callback: RecursiveCallbackT, isFirst = true) => {\n  const { children = [] } = node;\n  const shouldWalkChildren = children.length;\n\n  if (!isFirst) callback(node);\n\n  if (shouldWalkChildren) {\n    children.forEach((childNode) => {\n      walkAllNodeChildren(childNode, callback, false);\n    });\n  }\n};\n\nexport const getNodeById = (treeRoot: DSTreeviewT.Item['node'], id: DSTreeviewT.StringOrNum) => {\n  const nodes = treeRoot.all((node) => (node as unknown as DSTreeviewT.Item).model.id === id);\n  return nodes[0];\n};\n\nexport const cloneNode = (tree: TreeModel, node: DSTreeviewT.Item) => tree.parse(node.model);\n\nexport const itemsShareSameParent = (items: DSTreeviewT.Item[] = []) => {\n  if (items.length === 0) throw new Error('Received empty items for comparison');\n  if (items.length === 1) return true;\n\n  // when moving in first position we receive [undefined,...{items}]\n  // when moving in last position we receive [...{items}, undefined]\n  const firstExistingItem = items.find((item) => !!item);\n  if (!firstExistingItem) throw new Error(\"Received no items, can't retrieve parent\");\n\n  const firstExistingItemPath = firstExistingItem.node.getPath();\n  // path is like [rootParent, ...[parentsNodes], currentNode]\n  // length -1 is the current-node\n  // length -2 is the parent-node\n  // root node is not printed and is always present so minimum path length is 2 (root + currentNode)\n  const directParentNode = firstExistingItemPath[firstExistingItemPath.length - 2];\n\n  return items.every((item) => {\n    // undefined nodes count as having the same parent\n    if (!item) return true;\n    const itemPath = item.node.getPath();\n    const itemDirectParent = itemPath[itemPath.length - 2];\n    return directParentNode === itemDirectParent;\n  });\n};\n\nexport const getItemsParentNode = (items: DSTreeviewT.Item[] = [], skipSameParentCheck = false) => {\n  if (items.length === 0) throw new Error(\"Received empty items, can't retrieve parent\");\n\n  // in case we already know the items compared shares the same parent\n  if (!skipSameParentCheck)\n    if (!itemsShareSameParent(items))\n      // if we don't know (default, we don't) check if they share the parent\n      throw new Error(\"Received items don't share the same parent, can't retrieve parent\");\n\n  // when moving in first position we receive [undefined,...{items}]\n  // when moving in last position we receive [...{items}, undefined]\n  const firstExistingItem = items.find((item) => !!item);\n  if (!firstExistingItem) throw new Error(\"Received no items, can't retrieve parent\");\n\n  const firstExistingItemPath = firstExistingItem.node.getPath();\n  // path is like [rootParent, ...[parentsNodes], currentNode]\n  // length -1 is the current-node\n  // length -2 is the parent-node\n  // root node is not printed and is always present so minimum path length is 2 (root + currentNode)\n  const directParentNode = firstExistingItemPath[firstExistingItemPath.length - 2];\n  return directParentNode as unknown as DSTreeviewT.Item['node'];\n};\n\nexport const getNodeMatchesSearchQuery = (node: DSTreeviewT.Item['node'], searchQuery = '') => {\n  const standardizedName = standardizeSearchQueryString(node.model.name);\n  const standardizedSearchQuery = standardizeSearchQueryString(searchQuery);\n  return standardizedName.includes(standardizedSearchQuery);\n};\n\nexport const getChildrenMatchesSearchQuery = (parentNode: DSTreeviewT.Item['node'], searchQuery = '') => {\n  let anyChildMatch = false;\n  walkAllNodeChildren(parentNode, (node) => {\n    if (getNodeMatchesSearchQuery(node, searchQuery)) anyChildMatch = true;\n  });\n  return anyChildMatch;\n};\n\n/**\n * Mutate in place a node from tree-model normalizing object properties like \"isGroup\" even if user didn't specify it explicitly,\n * after execution the node will have \"nodePath\" \"treeDepth\" \"nodeItemRef\" \"isGroup\" \"isExpanded\"\n * (optionally, based on the provided arguments) \"matchesSearchQuery\" \"childrenMatchesSearchQuery\" \"isChecked\"\n *\n * @param {object} node - node (based on 'tree-model' lib) that you wish to mutate with extra props\n * @param {string} [searchQuery=''] - optional string used to parse \"matchesSearchQuery\"/\"childrenMatchesSearchQuery\" properties\n * @param {object} [selection=null] - optional selection hashmap used to parse \"isChecked\" properties\n * @param {object} [expanded=null] - optional expanded hashmap used to parse \"isExpanded\" properties\n */\nexport const enrichNodeModelInPlace = (\n  node: TreeModel.Node<DSTreeviewT.SimpleItem>,\n  searchQuery = '',\n  selection: DSTreeviewT.SelectionItems | null = null,\n  expanded: DSTreeviewT.ExpandedItems | null = null,\n) => {\n  const path = node.getPath();\n  const depth = path.length - 1;\n  node.model.nodePath = path;\n  node.model.treeDepth = depth;\n\n  if (!node.model.nodeItemRef) {\n    node.model.nodeItemRef = createRef();\n  }\n\n  // if a node has children but was not marked as isGroup, force-mark as group\n  // this is useful to avoid having to always check both the flag and the children.length...\n  if (typeof node.model.isGroup !== 'boolean' && (node.model?.children?.length ?? 0) > 0) {\n    node.model.isGroup = true;\n  }\n\n  if (node.model.isGroup && node.model.id !== '__ds_tree_root') {\n    if (expanded) node.model.isExpanded = !!expanded[node.model.id];\n    else if (typeof node.model.isExpanded !== 'boolean') {\n      node.model.isExpanded = false;\n    }\n  }\n\n  node.model.matchesSearchQuery = true;\n  node.model.childrenMatchesSearchQuery = false;\n  const partiallyEnrichedNode = node as unknown as TreeModel.Node<DSTreeviewT.Item>;\n  if (searchQuery) {\n    partiallyEnrichedNode.model.matchesSearchQuery = getNodeMatchesSearchQuery(partiallyEnrichedNode, searchQuery);\n\n    if (partiallyEnrichedNode.model.isGroup === true) {\n      partiallyEnrichedNode.model.childrenMatchesSearchQuery = getChildrenMatchesSearchQuery(\n        partiallyEnrichedNode,\n        searchQuery,\n      );\n      if (partiallyEnrichedNode.model.childrenMatchesSearchQuery) partiallyEnrichedNode.model.isExpanded = true;\n    }\n  }\n  if (selection && selection[partiallyEnrichedNode.model.id]) {\n    partiallyEnrichedNode.model.isChecked = selection[partiallyEnrichedNode.model.id];\n  }\n};\n\nexport const focusItem = (item: DSTreeviewT.Item | null) => {\n  item?.nodeItemRef?.current?.focus();\n};\n\nexport const flattenTreeForDnD = (\n  data: TreeModel.Node<DSTreeviewT.Item>,\n  shouldDescend: (datum: TreeModel.Node<DSTreeviewT.Item>) => boolean = () => true,\n) => {\n  const flattenedTree: DSTreeviewT.DndItem[] = [];\n  let index = 0;\n  const doit = (node: TreeModel.Node<DSTreeviewT.Item>, depth = 0, parentId: DSTreeviewT.StringOrNum | null = null) => {\n    flattenedTree.push({\n      uid: node.model.id.toString(),\n      depth,\n      realIndex: index,\n      childrenCount: node.children?.length ?? 0,\n      parentId: parentId !== null ? parentId.toString() : null,\n      original: { ...node, ...node.model, node },\n    });\n    index += 1;\n    if (shouldDescend(node)) node.children?.forEach((child) => doit(child, depth + 1, node.model.id.toString()));\n  };\n\n  data.children.forEach((node) => doit(node));\n  return flattenedTree;\n};\n"],
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/ds-treeview",
-  "version": "3.14.0-next.12",
+  "version": "3.14.0-next.14",
   "license": "MIT",
   "description": "ICE MT - Dimsum - Tree View",
   "files": [
@@ -231,15 +231,15 @@
     "react-virtual": "~2.10.4",
     "tree-model": "~1.0.7",
     "uid": "~2.0.1",
-    "@elliemae/ds-button": "3.14.0-next.12",
-    "@elliemae/ds-circular-progress-indicator": "3.14.0-next.12",
-    "@elliemae/ds-classnames": "3.14.0-next.12",
-    "@elliemae/ds-form": "3.14.0-next.12",
-    "@elliemae/ds-truncated-tooltip-text": "3.14.0-next.12",
-    "@elliemae/ds-icons": "3.14.0-next.12",
-    "@elliemae/ds-system": "3.14.0-next.12",
-    "@elliemae/ds-utilities": "3.14.0-next.12",
-    "@elliemae/ds-drag-and-drop": "3.14.0-next.12"
+    "@elliemae/ds-button": "3.14.0-next.14",
+    "@elliemae/ds-circular-progress-indicator": "3.14.0-next.14",
+    "@elliemae/ds-classnames": "3.14.0-next.14",
+    "@elliemae/ds-drag-and-drop": "3.14.0-next.14",
+    "@elliemae/ds-form": "3.14.0-next.14",
+    "@elliemae/ds-icons": "3.14.0-next.14",
+    "@elliemae/ds-truncated-tooltip-text": "3.14.0-next.14",
+    "@elliemae/ds-system": "3.14.0-next.14",
+    "@elliemae/ds-utilities": "3.14.0-next.14"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "~5.16.4",