@elliemae/ds-treeview 2.3.0-alpha.2 → 2.3.0-alpha.3

package/esm/parts/TreeList.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../scripts/build/transpile/react-shim.js", "../../../src/parts/TreeList.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable max-lines */\nimport React, { useContext } from 'react';\nimport { SortableContainer } from '@elliemae/react-sortable-hoc';\nimport { aggregatedClasses } from '@elliemae/ds-classnames';\nimport { DSCircularProgressIndicator } from '@elliemae/ds-circular-progress-indicator';\n\nimport TreeViewContext from '../TreeViewContext';\nimport { DSTreeViewPrefix, treeListBlockName } from '../config/cssClassesConstants';\nimport { TreeItem, DragAndDropTreeItem } from './TreeItem';\n\nimport type { DSTreeviewT } from '../react-desc-prop-types';\n\nexport const treeListNoItemsBn = `${treeListBlockName}-no-items`;\nexport const TreeListNoItems = aggregatedClasses('div', {\n  'data-testid': treeListNoItemsBn,\n})(treeListNoItemsBn) as unknown as React.ComponentType<React.ComponentProps<'div'>>;\n\n// React.ComponentProps<'ul'> uses LegacyRef typings that existed pre-hook era\n// we omit the LegacyRef typings in favor of hook-era typings\ninterface UlProps extends Omit<React.ComponentProps<'ul'>, 'ref'> {\n  ref: React.MutableRefObject<HTMLUListElement | undefined> | undefined;\n}\nexport const TreeListWrapper = aggregatedClasses('ul', {\n  'data-testid': treeListBlockName,\n  role: 'tree',\n})(treeListBlockName, null, ({ rowSize }: { rowSize: 'normal' | 'compact' }) => ({\n  [`rowsize-${rowSize}`]: rowSize,\n})) as unknown as React.ComponentType<UlProps>;\n\nconst compactRowClass = `${DSTreeViewPrefix}-tv-row-size-compact`;\nconst normaRowClass = `${DSTreeViewPrefix}-tv-row-size-normal`;\n\ninterface PropsT {\n  onMouseDragOverItem?: (opts: {\n    event: React.MouseEvent<HTMLLIElement>;\n    item: DSTreeviewT.Item;\n    itemIndex: number;\n    setIsDraggingOverThis: React.Dispatch<React.SetStateAction<boolean>>;\n    openFolderOnHoverTimeout: React.MutableRefObject<NodeJS.Timeout | null>;\n  }) => void;\n}\n\nexport const TreeList = (props: PropsT) => {\n  const { onMouseDragOverItem } = props;\n  const ctx = useContext(TreeViewContext);\n  const {\n    virtualListRef,\n    virtualListHelpers,\n    visibleItems,\n    withDragAndDrop,\n    props: { width, height, rowSize, noItemsPlaceholder, isLoading },\n  } = ctx;\n  const { totalSize, virtualItems } = virtualListHelpers;\n  const className = `${rowSize === 'compact' ? `${compactRowClass}` : `${normaRowClass}`}`;\n\n  return (\n    <TreeListWrapper\n      ref={virtualListRef}\n      className={className}\n      style={{\n        height: `${typeof height === 'number' ? `${height}px` : height}`,\n        width: `${typeof width === 'number' ? `${width}px` : width}`,\n        overflow: 'auto',\n      }}\n    >\n      {isLoading ? (\n        <div\n          style={{\n            width: '100%',\n            height: '100%',\n            display: 'flex',\n            alignItems: 'center',\n            justifyContent: 'center',\n          }}\n        >\n          <DSCircularProgressIndicator size=\"xl\" loading={isLoading} showLabel waiting={false} showTooltip={false} />\n        </div>\n      ) : null}\n      {!isLoading && virtualItems.length === 0 ? <TreeListNoItems>{noItemsPlaceholder}</TreeListNoItems> : null}\n      {!isLoading && virtualItems.length !== 0 ? (\n        <div\n          style={{\n            height: `${totalSize}px`,\n            width: '100%',\n            position: 'relative',\n          }}\n        >\n          {virtualItems.map((virtualItem) => {\n            const { index, measureRef, start } = virtualItem;\n            const item = visibleItems[index];\n            item.virtualIndex = index;\n            const { id } = item;\n\n            const style = {\n              position: 'absolute',\n              top: 0,\n              left: 0,\n              width: '100%',\n              transform: `translateY(${start}px)`,\n            };\n\n            const listItemProps = {\n              key: `DS-TreeView-List-Item-${id}`,\n              virtualItemRef: measureRef,\n              index, // this is consumed by the DnD HOC\n              itemIndex: index,\n              item,\n              itemWrapperStyle: style,\n            };\n\n            if (withDragAndDrop)\n              return <DragAndDropTreeItem {...listItemProps} onMouseDragOverItem={onMouseDragOverItem} />;\n            return <TreeItem {...listItemProps} />;\n          })}\n        </div>\n      ) : null}\n    </TreeListWrapper>\n  );\n};\ntype SortablePropsT = PropsT & {\n  disableAnimation?: boolean;\n  getContainer: (element: React.ReactElement<unknown>) => HTMLElement | Promise<HTMLElement>;\n};\nexport const DragAndDropTreeList = SortableContainer<SortablePropsT>(TreeList);\n"],
-  "mappings": "AAAA;ACCA;AACA;AACA;AACA;AAEA;AACA;AACA;AAIO,MAAM,oBAAoB,GAAG;AAC7B,MAAM,kBAAkB,kBAAkB,OAAO;AAAA,EACtD,eAAe;AAAA,GACd;AAOI,MAAM,kBAAkB,kBAAkB,MAAM;AAAA,EACrD,eAAe;AAAA,EACf,MAAM;AAAA,GACL,mBAAmB,MAAM,CAAC,EAAE,cAAkD;AAAA,GAC9E,WAAW,YAAY;AAAA;AAG1B,MAAM,kBAAkB,GAAG;AAC3B,MAAM,gBAAgB,GAAG;AAYlB,MAAM,WAAW,CAAC,UAAkB;AACzC,QAAM,EAAE,wBAAwB;AAChC,QAAM,MAAM,WAAW;AACvB,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,OAAO,EAAE,OAAO,QAAQ,SAAS,oBAAoB;AAAA,MACnD;AACJ,QAAM,EAAE,WAAW,iBAAiB;AACpC,QAAM,YAAY,GAAG,YAAY,YAAY,GAAG,oBAAoB,GAAG;AAEvE,SACE,qCAAC,iBAAD;AAAA,IACE,KAAK;AAAA,IACL;AAAA,IACA,OAAO;AAAA,MACL,QAAQ,GAAG,OAAO,WAAW,WAAW,GAAG,aAAa;AAAA,MACxD,OAAO,GAAG,OAAO,UAAU,WAAW,GAAG,YAAY;AAAA,MACrD,UAAU;AAAA;AAAA,KAGX,YACC,qCAAC,OAAD;AAAA,IACE,OAAO;AAAA,MACL,OAAO;AAAA,MACP,QAAQ;AAAA,MACR,SAAS;AAAA,MACT,YAAY;AAAA,MACZ,gBAAgB;AAAA;AAAA,KAGlB,qCAAC,6BAAD;AAAA,IAA6B,MAAK;AAAA,IAAK,SAAS;AAAA,IAAW,WAAS;AAAA,IAAC,SAAS;AAAA,IAAO,aAAa;AAAA,QAElG,MACH,CAAC,aAAa,aAAa,WAAW,IAAI,qCAAC,iBAAD,MAAkB,sBAAwC,MACpG,CAAC,aAAa,aAAa,WAAW,IACrC,qCAAC,OAAD;AAAA,IACE,OAAO;AAAA,MACL,QAAQ,GAAG;AAAA,MACX,OAAO;AAAA,MACP,UAAU;AAAA;AAAA,KAGX,aAAa,IAAI,CAAC,gBAAgB;AACjC,UAAM,EAAE,OAAO,YAAY,UAAU;AACrC,UAAM,OAAO,aAAa;AAC1B,SAAK,eAAe;AACpB,UAAM,EAAE,OAAO;AAEf,UAAM,QAAQ;AAAA,MACZ,UAAU;AAAA,MACV,KAAK;AAAA,MACL,MAAM;AAAA,MACN,OAAO;AAAA,MACP,WAAW,cAAc;AAAA;AAG3B,UAAM,gBAAgB;AAAA,MACpB,KAAK,yBAAyB;AAAA,MAC9B,gBAAgB;AAAA,MAChB;AAAA,MACA,WAAW;AAAA,MACX;AAAA,MACA,kBAAkB;AAAA;AAGpB,QAAI;AACF,aAAO,qCAAC,qBAAD;AAAA,WAAyB;AAAA,QAAe;AAAA;AACjD,WAAO,qCAAC,UAAD;AAAA,SAAc;AAAA;AAAA,QAGvB;AAAA;AAQH,MAAM,sBAAsB,kBAAkC;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable max-lines */\nimport React, { useContext } from 'react';\nimport { aggregatedClasses } from '@elliemae/ds-classnames';\nimport { DSCircularProgressIndicator } from '@elliemae/ds-circular-progress-indicator';\n\nimport TreeViewContext from '../TreeViewContext';\nimport { DSTreeViewPrefix, treeListBlockName } from '../config/cssClassesConstants';\nimport TreeItem from './TreeItem';\n\nimport type { DSTreeviewT } from '../react-desc-prop-types';\nimport { withConditionalDnDRowContext } from '../hoc/WithConditionalDnDContext';\nimport { DnDTreeContext } from '../hoc/DnDTreeContext';\n\nexport const treeListNoItemsBn = `${treeListBlockName}-no-items`;\nexport const TreeListNoItems = aggregatedClasses('div', {\n  'data-testid': treeListNoItemsBn,\n})(treeListNoItemsBn) as unknown as React.ComponentType<React.ComponentProps<'div'>>;\n\n// React.ComponentProps<'ul'> uses LegacyRef typings that existed pre-hook era\n// we omit the LegacyRef typings in favor of hook-era typings\ninterface UlProps extends Omit<React.ComponentProps<'ul'>, 'ref'> {\n  ref: React.MutableRefObject<HTMLUListElement | undefined> | undefined;\n}\nexport const TreeListWrapper = aggregatedClasses('ul', {\n  'data-testid': treeListBlockName,\n  role: 'tree',\n})(treeListBlockName, null, ({ rowSize }: { rowSize: 'normal' | 'compact' }) => ({\n  [`rowsize-${rowSize}`]: rowSize,\n})) as unknown as React.ComponentType<UlProps>;\n\nconst compactRowClass = `${DSTreeViewPrefix}-tv-row-size-compact`;\nconst normaRowClass = `${DSTreeViewPrefix}-tv-row-size-normal`;\n\ninterface PropsT {\n  onMouseDragOverItem?: (opts: {\n    event: React.MouseEvent<HTMLLIElement>;\n    item: DSTreeviewT.Item;\n    itemIndex: number;\n    setIsDraggingOverThis: React.Dispatch<React.SetStateAction<boolean>>;\n    openFolderOnHoverTimeout: React.MutableRefObject<NodeJS.Timeout | null>;\n  }) => void;\n}\n\nconst TreeListComp: React.ComponentType<PropsT> = () => {\n  const ctx = useContext(TreeViewContext);\n  const {\n    virtualListRef,\n    virtualListHelpers,\n    visibleItems: flattenedVisibleItems,\n    props: { width, height, rowSize, noItemsPlaceholder, isLoading },\n  } = ctx;\n  const { totalSize, virtualItems } = virtualListHelpers;\n  const className = `${rowSize === 'compact' ? `${compactRowClass}` : `${normaRowClass}`}`;\n\n  const { visibleItems } = useContext(DnDTreeContext);\n\n  return (\n    <TreeListWrapper\n      ref={virtualListRef}\n      className={className}\n      style={{\n        height: `${typeof height === 'number' ? `${height}px` : height}`,\n        width: `${typeof width === 'number' ? `${width}px` : width}`,\n        overflow: 'auto',\n      }}\n    >\n      {isLoading ? (\n        <div\n          style={{\n            width: '100%',\n            height: '100%',\n            display: 'flex',\n            alignItems: 'center',\n            justifyContent: 'center',\n          }}\n        >\n          <DSCircularProgressIndicator size=\"xl\" loading={isLoading} showLabel waiting={false} showTooltip={false} />\n        </div>\n      ) : null}\n      {!isLoading && virtualItems.length === 0 ? <TreeListNoItems>{noItemsPlaceholder}</TreeListNoItems> : null}\n      {!isLoading && virtualItems.length !== 0 ? (\n        <div\n          style={{\n            height: `${totalSize}px`,\n            width: '100%',\n            position: 'relative',\n          }}\n        >\n          {virtualItems.map((virtualItem) => {\n            const { index, measureRef, start } = virtualItem;\n            const item = (visibleItems || flattenedVisibleItems)[index];\n            if (!item) return null;\n            item.virtualIndex = index;\n            const { id } = item;\n\n            const style = {\n              position: 'absolute',\n              top: `${start}px`,\n              left: 0,\n              width: '100%',\n            };\n\n            const listItemProps = {\n              key: `DS-TreeView-List-Item-${id}`,\n              virtualItemRef: measureRef,\n              index, // this is consumed by the DnD HOC\n              itemIndex: index,\n              item,\n              itemWrapperStyle: style,\n            };\n\n            return <TreeItem {...listItemProps} />;\n          })}\n        </div>\n      ) : null}\n    </TreeListWrapper>\n  );\n};\n\nexport const TreeList = withConditionalDnDRowContext(TreeListComp);\n"],
+  "mappings": "AAAA;ACCA;AACA;AACA;AAEA;AACA;AACA;AAGA;AACA;AAEO,MAAM,oBAAoB,GAAG;AAC7B,MAAM,kBAAkB,kBAAkB,OAAO;AAAA,EACtD,eAAe;AAAA,GACd;AAOI,MAAM,kBAAkB,kBAAkB,MAAM;AAAA,EACrD,eAAe;AAAA,EACf,MAAM;AAAA,GACL,mBAAmB,MAAM,CAAC,EAAE,cAAkD;AAAA,GAC9E,WAAW,YAAY;AAAA;AAG1B,MAAM,kBAAkB,GAAG;AAC3B,MAAM,gBAAgB,GAAG;AAYzB,MAAM,eAA4C,MAAM;AACtD,QAAM,MAAM,WAAW;AACvB,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA,cAAc;AAAA,IACd,OAAO,EAAE,OAAO,QAAQ,SAAS,oBAAoB;AAAA,MACnD;AACJ,QAAM,EAAE,WAAW,iBAAiB;AACpC,QAAM,YAAY,GAAG,YAAY,YAAY,GAAG,oBAAoB,GAAG;AAEvE,QAAM,EAAE,iBAAiB,WAAW;AAEpC,SACE,qCAAC,iBAAD;AAAA,IACE,KAAK;AAAA,IACL;AAAA,IACA,OAAO;AAAA,MACL,QAAQ,GAAG,OAAO,WAAW,WAAW,GAAG,aAAa;AAAA,MACxD,OAAO,GAAG,OAAO,UAAU,WAAW,GAAG,YAAY;AAAA,MACrD,UAAU;AAAA;AAAA,KAGX,YACC,qCAAC,OAAD;AAAA,IACE,OAAO;AAAA,MACL,OAAO;AAAA,MACP,QAAQ;AAAA,MACR,SAAS;AAAA,MACT,YAAY;AAAA,MACZ,gBAAgB;AAAA;AAAA,KAGlB,qCAAC,6BAAD;AAAA,IAA6B,MAAK;AAAA,IAAK,SAAS;AAAA,IAAW,WAAS;AAAA,IAAC,SAAS;AAAA,IAAO,aAAa;AAAA,QAElG,MACH,CAAC,aAAa,aAAa,WAAW,IAAI,qCAAC,iBAAD,MAAkB,sBAAwC,MACpG,CAAC,aAAa,aAAa,WAAW,IACrC,qCAAC,OAAD;AAAA,IACE,OAAO;AAAA,MACL,QAAQ,GAAG;AAAA,MACX,OAAO;AAAA,MACP,UAAU;AAAA;AAAA,KAGX,aAAa,IAAI,CAAC,gBAAgB;AACjC,UAAM,EAAE,OAAO,YAAY,UAAU;AACrC,UAAM,OAAQ,iBAAgB,uBAAuB;AACrD,QAAI,CAAC;AAAM,aAAO;AAClB,SAAK,eAAe;AACpB,UAAM,EAAE,OAAO;AAEf,UAAM,QAAQ;AAAA,MACZ,UAAU;AAAA,MACV,KAAK,GAAG;AAAA,MACR,MAAM;AAAA,MACN,OAAO;AAAA;AAGT,UAAM,gBAAgB;AAAA,MACpB,KAAK,yBAAyB;AAAA,MAC9B,gBAAgB;AAAA,MAChB;AAAA,MACA,WAAW;AAAA,MACX;AAAA,MACA,kBAAkB;AAAA;AAGpB,WAAO,qCAAC,UAAD;AAAA,SAAc;AAAA;AAAA,QAGvB;AAAA;AAKH,MAAM,WAAW,6BAA6B;",
   "names": []
 }

package/esm/plugins/dnd/TreeDndPlugin.js

@@ -1,30 +1,6 @@
 import * as React from "react";
-import React2, { useContext } from "react";
-import { DragAndDropTreeList } from "../../parts/TreeList";
-import { useDnDHelpers } from "../../utils/useDnDHelpers";
-import { keyCodes } from "../../utils/dnd-helpers";
-import TreeViewContext from "../../TreeViewContext";
-const TreeDnD = () => {
-  const { updateBeforeSortStart, onSortStart, onMouseDragOverItem, onSortEnd } = useDnDHelpers();
-  const ctx = useContext(TreeViewContext);
-  const { virtualListRef } = ctx;
-  return /* @__PURE__ */ React2.createElement(DragAndDropTreeList, {
-    useDragHandle: true,
-    transitionDuration: 0,
-    keyboardSortingTransitionDuration: 0,
-    hideSortableGhost: false,
-    disableAnimation: true,
-    updateBeforeSortStart,
-    onSortStart,
-    onMouseDragOverItem,
-    onSortEnd,
-    getContainer: () => virtualListRef?.current,
-    keyCodes
-  });
-};
 const TreeDndPlugin = "tree-dnd";
 export {
-  TreeDnD,
   TreeDndPlugin
 };
 //# sourceMappingURL=TreeDndPlugin.js.map

package/esm/plugins/dnd/TreeDndPlugin.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../scripts/build/transpile/react-shim.js", "../../../../src/plugins/dnd/TreeDndPlugin.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import React, { useContext } from 'react';\n\nimport { DragAndDropTreeList } from '../../parts/TreeList';\n\nimport { useDnDHelpers } from '../../utils/useDnDHelpers';\nimport { keyCodes } from '../../utils/dnd-helpers';\n\nimport TreeViewContext from '../../TreeViewContext';\nexport const TreeDnD = () => {\n  const { updateBeforeSortStart, onSortStart, onMouseDragOverItem, onSortEnd } = useDnDHelpers();\n  const ctx = useContext(TreeViewContext);\n  const { virtualListRef } = ctx;\n  return (\n    <DragAndDropTreeList\n      useDragHandle\n      transitionDuration={0}\n      keyboardSortingTransitionDuration={0}\n      hideSortableGhost={false}\n      disableAnimation\n      updateBeforeSortStart={updateBeforeSortStart}\n      onSortStart={onSortStart}\n      onMouseDragOverItem={onMouseDragOverItem}\n      onSortEnd={onSortEnd}\n      getContainer={() => virtualListRef?.current as HTMLUListElement}\n      keyCodes={keyCodes}\n    />\n  );\n};\n\nexport const TreeDndPlugin = 'tree-dnd';\n"],
-  "mappings": "AAAA;ACAA;AAEA;AAEA;AACA;AAEA;AACO,MAAM,UAAU,MAAM;AAC3B,QAAM,EAAE,uBAAuB,aAAa,qBAAqB,cAAc;AAC/E,QAAM,MAAM,WAAW;AACvB,QAAM,EAAE,mBAAmB;AAC3B,SACE,qCAAC,qBAAD;AAAA,IACE,eAAa;AAAA,IACb,oBAAoB;AAAA,IACpB,mCAAmC;AAAA,IACnC,mBAAmB;AAAA,IACnB,kBAAgB;AAAA,IAChB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,cAAc,MAAM,gBAAgB;AAAA,IACpC;AAAA;AAAA;AAKC,MAAM,gBAAgB;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "export const TreeDndPlugin = 'tree-dnd';\n"],
+  "mappings": "AAAA;ACAO,MAAM,gBAAgB;",
   "names": []
 }

package/esm/react-desc-prop-types.js

@@ -28,6 +28,7 @@ const TreeViewPropTypes = {
   isMultiSelect: PropTypes.bool.description("whether the tree view is multi select or not").defaultValue(false),
   isSingleSelect: PropTypes.bool.description("wheter the tree view is single select or not").defaultValue(false),
   isLoading: PropTypes.bool.description("wheter the tree should show the loading state or not").defaultValue(false),
+  getIsDropValid: PropTypes.func.description("Function that returns true if the drop is valid and false if it's not").defaultValue("() => true"),
   restrictDragAndDrop: PropTypes.bool.description("whether to restrict DnD functionality or not").defaultValue(false),
   showChildrenAmount: PropTypes.bool.description("whether to show the amount of children or not").defaultValue(false),
   sortable: PropTypes.bool.description("whether the sortable functionality is active or not").defaultValue(false),

package/esm/react-desc-prop-types.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../scripts/build/transpile/react-shim.js", "../../src/react-desc-prop-types.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable max-lines */\nimport { PropTypes } from 'react-desc';\nimport TreeModel from 'tree-model';\nimport { useVirtual } from 'react-virtual';\nexport declare namespace DSTreeviewT {\n  export type StringOrNum = string | number;\n  export type SelectionState = boolean | 'mixed';\n  export type SelectionItems = Record<StringOrNum, SelectionState>;\n  export type ScrollToFunc = ReturnType<typeof useVirtual>['scrollToIndex'];\n  export type ScrollToItemOptions = Parameters<ReturnType<typeof useVirtual>['scrollToIndex']>[1];\n  export type ScrollToItemFunc = (options: ScrollToItemOptions) => void;\n  export type ExpandedItems = Record<StringOrNum, true>; // { [id]:true } -> e.g. {1:true; 2:true} // false are not listed\n  export interface SimpleItem {\n    [key: string]: unknown;\n    name: string;\n    children: SimpleItem[];\n    id: StringOrNum;\n  }\n  export interface Item extends SimpleItem {\n    children: Item[];\n    treeDepth?: number;\n    virtualIndex?: number;\n    isChecked?: boolean | 'mixed';\n    isGroup?: boolean;\n    isExpanded?: boolean;\n    childrenMatchesSearchQuery?: boolean;\n    matchesSearchQuery?: boolean;\n    nodeItemRef?: React.RefObject<HTMLLIElement>;\n    model: TreeModel.Node<Item>['model'];\n    node: TreeModel.Node<Item>;\n    nodePath: TreeModel.Node<Item>[];\n  }\n\n  export interface Actions {\n    toggleExpandAll: (isExpand: boolean) => Promise<DSTreeviewT.Item[]>;\n    scrollTo: DSTreeviewT.ScrollToFunc;\n    setSelectedItemByVirtualIndex: (index: number) => void;\n    setFocusedItemByVirtualIndex: (\n      index: number,\n      scrollOpts: DSTreeviewT.ScrollToItemOptions & { withScroll?: boolean },\n    ) => void;\n  }\n  export interface InstanceRef {\n    actions: Actions;\n  }\n\n  export interface DefaultProps {\n    plugins: string[];\n    selection: SelectionItems;\n    instanceRef: React.MutableRefObject<InstanceRef>;\n    isItemDisabled: (item: Item) => boolean;\n    disableIcons: boolean;\n    fluid: boolean;\n    isMultiSelect: boolean;\n    isSingleSelect: boolean;\n    restrictDragAndDrop: boolean;\n    showChildrenAmount: boolean;\n    sortable: boolean;\n    isLoading: boolean;\n    highlightOnlyQuery: boolean;\n    onItemClick: (item: Item, e: React.MouseEvent<HTMLLIElement>) => void;\n    onItemFocus: (meta: { scrollToItem: ScrollToItemFunc; itemIndex: number; item: Item }) => void;\n    onVisibleItemsChange: (newVisibleItems: Item[]) => void;\n    onOrderChange: (newData: Item[], oldData: Item[], draggedItem: Item) => void;\n    onSelectionChange: (\n      selection: SelectionItems,\n      item: Item,\n      meta: { scrollToItem: ScrollToItemFunc; itemIndex: number },\n    ) => void;\n    onExpandChange: (expandedHashmap: ExpandedItems, itemToggled: Item | null | undefined) => void;\n    onInstanceRefInitialized: (instanceRef: React.MutableRefObject<InstanceRef>) => void;\n    rowSize: 'normal' | 'compact';\n    labelOverflow: 'wrap' | 'wrap-all' | 'truncate';\n    noItemsPlaceholder: string;\n    nameKey: string;\n    width: StringOrNum;\n    height: StringOrNum;\n    groupIcon: JSX.Element | null;\n    itemIcon: JSX.Element | null;\n    searchQuery: string;\n  }\n  export interface PropsOptional {\n    expanded: ExpandedItems;\n    rightAddons: ((item: Item) => React.ReactNode | React.ReactNode[]) | JSX.Element;\n  }\n  export interface PropsRequired {\n    data: Item[];\n  }\n  export interface Props extends DefaultProps, PropsOptional, PropsRequired {}\n}\n\nexport const TreeViewPropTypes = {\n  data: PropTypes.arrayOf(\n    PropTypes.shape({\n      children: PropTypes.arrayOf(PropTypes.object),\n      id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),\n      isGroup: PropTypes.oneOfType([PropTypes.oneOf([undefined, null]), PropTypes.bool]),\n      name: PropTypes.string,\n      node: PropTypes.object,\n    }),\n  ).description('data to populate tree view').isRequired,\n  plugins: PropTypes.arrayOf(PropTypes.string).description('list of enabled plugins').defaultValue([]),\n  selection: PropTypes.object.description('pre selected items').defaultValue({}),\n  expanded: PropTypes.object.description('control what items are expanded').defaultValue(undefined),\n  instanceRef: PropTypes.shape({\n    current: PropTypes.oneOfType([\n      PropTypes.oneOf([null, undefined]),\n      PropTypes.shape({\n        actions: PropTypes.shape({\n          toggleExpandAll: PropTypes.func,\n          scrollTo: PropTypes.func,\n        }).description('').isRequired,\n      }),\n    ]),\n  }).description('instance ref'),\n  isItemDisabled: PropTypes.func\n    .description('Function that receives an item, and returns whether that item should be disabled')\n    .defaultValue('() => false'),\n  disableIcons: PropTypes.bool.description('disable icons').defaultValue(false),\n  fluid: PropTypes.bool.description('whether is fluid or not').defaultValue(false),\n  isMultiSelect: PropTypes.bool.description('whether the tree view is multi select or not').defaultValue(false),\n  isSingleSelect: PropTypes.bool.description('wheter the tree view is single select or not').defaultValue(false),\n  isLoading: PropTypes.bool.description('wheter the tree should show the loading state or not').defaultValue(false),\n  restrictDragAndDrop: PropTypes.bool.description('whether to restrict DnD functionality or not').defaultValue(false),\n  showChildrenAmount: PropTypes.bool.description('whether to show the amount of children or not').defaultValue(false),\n  sortable: PropTypes.bool.description('whether the sortable functionality is active or not').defaultValue(false),\n  onItemClick: PropTypes.func.description('function executed when clicking on an item').defaultValue('() => {}'),\n  onItemFocus: PropTypes.func.description('function executed when focusing on an item').defaultValue('() => {}'),\n  onVisibleItemsChange: PropTypes.func\n    .description('function executed when the visible items change')\n    .defaultValue('() => {}'),\n  onOrderChange: PropTypes.func.description('function executed when the items order changes').defaultValue('() => {}'),\n  onSelectionChange: PropTypes.func\n    .description('function executed when the selection changes')\n    .defaultValue('() => {}'),\n  onExpandChange: PropTypes.func.description('function executed when expanding an item').defaultValue('() => {}'),\n  onInstanceRefInitialized: PropTypes.func\n    .description('function executed when instanceRef has terminated instanciation')\n    .defaultValue('() => {}'),\n  rowSize: PropTypes.oneOf(['normal', 'compact']).description('size of the row').defaultValue('normal'),\n  labelOverflow: PropTypes.oneOf(['wrap', 'wrap-all', 'truncate'])\n    .description('label truncation preference')\n    .defaultValue('wrap'),\n  width: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).description('components width').defaultValue('100%'),\n  height: PropTypes.oneOfType([PropTypes.number, PropTypes.string])\n    .description('components height')\n    .defaultValue('100%'),\n  groupIcon: PropTypes.node.description('icon for groups'),\n  itemIcon: PropTypes.node.description('icon for items'),\n  searchQuery: PropTypes.string.description('search query value'),\n  noItemsPlaceholder: PropTypes.string\n    .description('message to be shown when there are no items in the treeview to be displayed')\n    .defaultValue('No items found'),\n  name: PropTypes.string.description('property key to identifier for items labels').defaultValue('name'),\n  highlightOnlyQuery: PropTypes.bool.description('whether to highlight results or not').defaultValue(false),\n};\n"],
-  "mappings": "AAAA;ACCA;AA0FO,MAAM,oBAAoB;AAAA,EAC/B,MAAM,UAAU,QACd,UAAU,MAAM;AAAA,IACd,UAAU,UAAU,QAAQ,UAAU;AAAA,IACtC,IAAI,UAAU,UAAU,CAAC,UAAU,QAAQ,UAAU;AAAA,IACrD,SAAS,UAAU,UAAU,CAAC,UAAU,MAAM,CAAC,QAAW,QAAQ,UAAU;AAAA,IAC5E,MAAM,UAAU;AAAA,IAChB,MAAM,UAAU;AAAA,MAElB,YAAY,8BAA8B;AAAA,EAC5C,SAAS,UAAU,QAAQ,UAAU,QAAQ,YAAY,2BAA2B,aAAa;AAAA,EACjG,WAAW,UAAU,OAAO,YAAY,sBAAsB,aAAa;AAAA,EAC3E,UAAU,UAAU,OAAO,YAAY,mCAAmC,aAAa;AAAA,EACvF,aAAa,UAAU,MAAM;AAAA,IAC3B,SAAS,UAAU,UAAU;AAAA,MAC3B,UAAU,MAAM,CAAC,MAAM;AAAA,MACvB,UAAU,MAAM;AAAA,QACd,SAAS,UAAU,MAAM;AAAA,UACvB,iBAAiB,UAAU;AAAA,UAC3B,UAAU,UAAU;AAAA,WACnB,YAAY,IAAI;AAAA;AAAA;AAAA,KAGtB,YAAY;AAAA,EACf,gBAAgB,UAAU,KACvB,YAAY,oFACZ,aAAa;AAAA,EAChB,cAAc,UAAU,KAAK,YAAY,iBAAiB,aAAa;AAAA,EACvE,OAAO,UAAU,KAAK,YAAY,2BAA2B,aAAa;AAAA,EAC1E,eAAe,UAAU,KAAK,YAAY,gDAAgD,aAAa;AAAA,EACvG,gBAAgB,UAAU,KAAK,YAAY,gDAAgD,aAAa;AAAA,EACxG,WAAW,UAAU,KAAK,YAAY,wDAAwD,aAAa;AAAA,EAC3G,qBAAqB,UAAU,KAAK,YAAY,gDAAgD,aAAa;AAAA,EAC7G,oBAAoB,UAAU,KAAK,YAAY,iDAAiD,aAAa;AAAA,EAC7G,UAAU,UAAU,KAAK,YAAY,uDAAuD,aAAa;AAAA,EACzG,aAAa,UAAU,KAAK,YAAY,8CAA8C,aAAa;AAAA,EACnG,aAAa,UAAU,KAAK,YAAY,8CAA8C,aAAa;AAAA,EACnG,sBAAsB,UAAU,KAC7B,YAAY,mDACZ,aAAa;AAAA,EAChB,eAAe,UAAU,KAAK,YAAY,kDAAkD,aAAa;AAAA,EACzG,mBAAmB,UAAU,KAC1B,YAAY,gDACZ,aAAa;AAAA,EAChB,gBAAgB,UAAU,KAAK,YAAY,4CAA4C,aAAa;AAAA,EACpG,0BAA0B,UAAU,KACjC,YAAY,mEACZ,aAAa;AAAA,EAChB,SAAS,UAAU,MAAM,CAAC,UAAU,YAAY,YAAY,mBAAmB,aAAa;AAAA,EAC5F,eAAe,UAAU,MAAM,CAAC,QAAQ,YAAY,aACjD,YAAY,+BACZ,aAAa;AAAA,EAChB,OAAO,UAAU,UAAU,CAAC,UAAU,QAAQ,UAAU,SAAS,YAAY,oBAAoB,aAAa;AAAA,EAC9G,QAAQ,UAAU,UAAU,CAAC,UAAU,QAAQ,UAAU,SACtD,YAAY,qBACZ,aAAa;AAAA,EAChB,WAAW,UAAU,KAAK,YAAY;AAAA,EACtC,UAAU,UAAU,KAAK,YAAY;AAAA,EACrC,aAAa,UAAU,OAAO,YAAY;AAAA,EAC1C,oBAAoB,UAAU,OAC3B,YAAY,+EACZ,aAAa;AAAA,EAChB,MAAM,UAAU,OAAO,YAAY,+CAA+C,aAAa;AAAA,EAC/F,oBAAoB,UAAU,KAAK,YAAY,uCAAuC,aAAa;AAAA;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable max-lines */\nimport { PropTypes } from 'react-desc';\nimport TreeModel from 'tree-model';\nimport { useVirtual } from 'react-virtual';\nexport declare namespace DSTreeviewT {\n  export type StringOrNum = string | number;\n  export type SelectionState = boolean | 'mixed';\n  export type SelectionItems = Record<StringOrNum, SelectionState>;\n  export type ScrollToFunc = ReturnType<typeof useVirtual>['scrollToIndex'];\n  export type ScrollToItemOptions = Parameters<ReturnType<typeof useVirtual>['scrollToIndex']>[1];\n  export type ScrollToItemFunc = (options: ScrollToItemOptions) => void;\n  export type ExpandedItems = Record<StringOrNum, true>; // { [id]:true } -> e.g. {1:true; 2:true} // false are not listed\n  export interface SimpleItem {\n    [key: string]: unknown;\n    name: string;\n    children?: SimpleItem[];\n    id: StringOrNum;\n  }\n\n  export interface Item extends SimpleItem {\n    children: Item[];\n    treeDepth?: number;\n    virtualIndex?: number;\n    isChecked?: boolean | 'mixed';\n    isGroup?: boolean;\n    isExpanded?: boolean;\n    childrenMatchesSearchQuery?: boolean;\n    matchesSearchQuery?: boolean;\n    nodeItemRef?: React.RefObject<HTMLLIElement>;\n    model: TreeModel.Node<Item>['model'];\n    node: TreeModel.Node<Item> & { parent?: TreeModel.Node<Item> };\n    nodePath: TreeModel.Node<Item>[];\n  }\n\n  export interface DndItem {\n    uid: string;\n    depth: number;\n    realIndex: number;\n    childrenCount: number;\n    parentId: string | null;\n    original: SimpleItem;\n  }\n\n  export interface Actions {\n    toggleExpandAll: (isExpand: boolean) => Promise<DSTreeviewT.Item[]>;\n    scrollTo: DSTreeviewT.ScrollToFunc;\n    setSelectedItemByVirtualIndex: (index: number) => void;\n    setFocusedItemByVirtualIndex: (\n      index: number,\n      scrollOpts: DSTreeviewT.ScrollToItemOptions & { withScroll?: boolean },\n    ) => void;\n  }\n  export interface InstanceRef {\n    actions: Actions;\n  }\n\n  export interface DefaultProps {\n    plugins: string[];\n    selection: SelectionItems;\n    instanceRef: React.MutableRefObject<InstanceRef>;\n    isItemDisabled: (item: Item) => boolean;\n    disableIcons: boolean;\n    fluid: boolean;\n    isMultiSelect: boolean;\n    isSingleSelect: boolean;\n    getIsDropValid: (\n      active: DndItem,\n      over: DndItem,\n      dropIndicatorPosition: 'none' | 'before' | 'after' | 'inside',\n    ) => boolean;\n    restrictDragAndDrop: boolean;\n    showChildrenAmount: boolean;\n    sortable: boolean;\n    isLoading: boolean;\n    highlightOnlyQuery: boolean;\n    onItemClick: (item: Item, e: React.MouseEvent<HTMLLIElement>) => void;\n    onItemFocus: (meta: { scrollToItem: ScrollToItemFunc; itemIndex: number; item: Item }) => void;\n    onVisibleItemsChange: (newVisibleItems: Item[]) => void;\n    onOrderChange: (newData: SimpleItem[], oldData: SimpleItem[], draggedItem: DndItem) => void;\n    onSelectionChange: (\n      selection: SelectionItems,\n      item: Item,\n      meta: { scrollToItem: ScrollToItemFunc; itemIndex: number },\n    ) => void;\n    onExpandChange: (expandedHashmap: ExpandedItems, itemToggled: Item | null | undefined) => void;\n    onInstanceRefInitialized: (instanceRef: React.MutableRefObject<InstanceRef>) => void;\n    rowSize: 'normal' | 'compact';\n    labelOverflow: 'wrap' | 'wrap-all' | 'truncate';\n    noItemsPlaceholder: string;\n    nameKey: string;\n    width: StringOrNum;\n    height: StringOrNum;\n    groupIcon: JSX.Element | null;\n    itemIcon: JSX.Element | null;\n    searchQuery: string;\n  }\n  export interface PropsOptional {\n    expanded: ExpandedItems;\n    rightAddons: ((item: Item) => React.ReactNode | React.ReactNode[]) | JSX.Element;\n  }\n  export interface PropsRequired {\n    data: Item[];\n  }\n  export interface Props extends DefaultProps, PropsOptional, PropsRequired {}\n}\n\nexport const TreeViewPropTypes = {\n  data: PropTypes.arrayOf(\n    PropTypes.shape({\n      children: PropTypes.arrayOf(PropTypes.object),\n      id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),\n      isGroup: PropTypes.oneOfType([PropTypes.oneOf([undefined, null]), PropTypes.bool]),\n      name: PropTypes.string,\n      node: PropTypes.object,\n    }),\n  ).description('data to populate tree view').isRequired,\n  plugins: PropTypes.arrayOf(PropTypes.string).description('list of enabled plugins').defaultValue([]),\n  selection: PropTypes.object.description('pre selected items').defaultValue({}),\n  expanded: PropTypes.object.description('control what items are expanded').defaultValue(undefined),\n  instanceRef: PropTypes.shape({\n    current: PropTypes.oneOfType([\n      PropTypes.oneOf([null, undefined]),\n      PropTypes.shape({\n        actions: PropTypes.shape({\n          toggleExpandAll: PropTypes.func,\n          scrollTo: PropTypes.func,\n        }).description('').isRequired,\n      }),\n    ]),\n  }).description('instance ref'),\n  isItemDisabled: PropTypes.func\n    .description('Function that receives an item, and returns whether that item should be disabled')\n    .defaultValue('() => false'),\n  disableIcons: PropTypes.bool.description('disable icons').defaultValue(false),\n  fluid: PropTypes.bool.description('whether is fluid or not').defaultValue(false),\n  isMultiSelect: PropTypes.bool.description('whether the tree view is multi select or not').defaultValue(false),\n  isSingleSelect: PropTypes.bool.description('wheter the tree view is single select or not').defaultValue(false),\n  isLoading: PropTypes.bool.description('wheter the tree should show the loading state or not').defaultValue(false),\n  getIsDropValid: PropTypes.func\n    .description(\"Function that returns true if the drop is valid and false if it's not\")\n    .defaultValue('() => true'),\n  restrictDragAndDrop: PropTypes.bool.description('whether to restrict DnD functionality or not').defaultValue(false),\n  showChildrenAmount: PropTypes.bool.description('whether to show the amount of children or not').defaultValue(false),\n  sortable: PropTypes.bool.description('whether the sortable functionality is active or not').defaultValue(false),\n  onItemClick: PropTypes.func.description('function executed when clicking on an item').defaultValue('() => {}'),\n  onItemFocus: PropTypes.func.description('function executed when focusing on an item').defaultValue('() => {}'),\n  onVisibleItemsChange: PropTypes.func\n    .description('function executed when the visible items change')\n    .defaultValue('() => {}'),\n  onOrderChange: PropTypes.func.description('function executed when the items order changes').defaultValue('() => {}'),\n  onSelectionChange: PropTypes.func\n    .description('function executed when the selection changes')\n    .defaultValue('() => {}'),\n  onExpandChange: PropTypes.func.description('function executed when expanding an item').defaultValue('() => {}'),\n  onInstanceRefInitialized: PropTypes.func\n    .description('function executed when instanceRef has terminated instanciation')\n    .defaultValue('() => {}'),\n  rowSize: PropTypes.oneOf(['normal', 'compact']).description('size of the row').defaultValue('normal'),\n  labelOverflow: PropTypes.oneOf(['wrap', 'wrap-all', 'truncate'])\n    .description('label truncation preference')\n    .defaultValue('wrap'),\n  width: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).description('components width').defaultValue('100%'),\n  height: PropTypes.oneOfType([PropTypes.number, PropTypes.string])\n    .description('components height')\n    .defaultValue('100%'),\n  groupIcon: PropTypes.node.description('icon for groups'),\n  itemIcon: PropTypes.node.description('icon for items'),\n  searchQuery: PropTypes.string.description('search query value'),\n  noItemsPlaceholder: PropTypes.string\n    .description('message to be shown when there are no items in the treeview to be displayed')\n    .defaultValue('No items found'),\n  name: PropTypes.string.description('property key to identifier for items labels').defaultValue('name'),\n  highlightOnlyQuery: PropTypes.bool.description('whether to highlight results or not').defaultValue(false),\n};\n"],
+  "mappings": "AAAA;ACCA;AAyGO,MAAM,oBAAoB;AAAA,EAC/B,MAAM,UAAU,QACd,UAAU,MAAM;AAAA,IACd,UAAU,UAAU,QAAQ,UAAU;AAAA,IACtC,IAAI,UAAU,UAAU,CAAC,UAAU,QAAQ,UAAU;AAAA,IACrD,SAAS,UAAU,UAAU,CAAC,UAAU,MAAM,CAAC,QAAW,QAAQ,UAAU;AAAA,IAC5E,MAAM,UAAU;AAAA,IAChB,MAAM,UAAU;AAAA,MAElB,YAAY,8BAA8B;AAAA,EAC5C,SAAS,UAAU,QAAQ,UAAU,QAAQ,YAAY,2BAA2B,aAAa;AAAA,EACjG,WAAW,UAAU,OAAO,YAAY,sBAAsB,aAAa;AAAA,EAC3E,UAAU,UAAU,OAAO,YAAY,mCAAmC,aAAa;AAAA,EACvF,aAAa,UAAU,MAAM;AAAA,IAC3B,SAAS,UAAU,UAAU;AAAA,MAC3B,UAAU,MAAM,CAAC,MAAM;AAAA,MACvB,UAAU,MAAM;AAAA,QACd,SAAS,UAAU,MAAM;AAAA,UACvB,iBAAiB,UAAU;AAAA,UAC3B,UAAU,UAAU;AAAA,WACnB,YAAY,IAAI;AAAA;AAAA;AAAA,KAGtB,YAAY;AAAA,EACf,gBAAgB,UAAU,KACvB,YAAY,oFACZ,aAAa;AAAA,EAChB,cAAc,UAAU,KAAK,YAAY,iBAAiB,aAAa;AAAA,EACvE,OAAO,UAAU,KAAK,YAAY,2BAA2B,aAAa;AAAA,EAC1E,eAAe,UAAU,KAAK,YAAY,gDAAgD,aAAa;AAAA,EACvG,gBAAgB,UAAU,KAAK,YAAY,gDAAgD,aAAa;AAAA,EACxG,WAAW,UAAU,KAAK,YAAY,wDAAwD,aAAa;AAAA,EAC3G,gBAAgB,UAAU,KACvB,YAAY,yEACZ,aAAa;AAAA,EAChB,qBAAqB,UAAU,KAAK,YAAY,gDAAgD,aAAa;AAAA,EAC7G,oBAAoB,UAAU,KAAK,YAAY,iDAAiD,aAAa;AAAA,EAC7G,UAAU,UAAU,KAAK,YAAY,uDAAuD,aAAa;AAAA,EACzG,aAAa,UAAU,KAAK,YAAY,8CAA8C,aAAa;AAAA,EACnG,aAAa,UAAU,KAAK,YAAY,8CAA8C,aAAa;AAAA,EACnG,sBAAsB,UAAU,KAC7B,YAAY,mDACZ,aAAa;AAAA,EAChB,eAAe,UAAU,KAAK,YAAY,kDAAkD,aAAa;AAAA,EACzG,mBAAmB,UAAU,KAC1B,YAAY,gDACZ,aAAa;AAAA,EAChB,gBAAgB,UAAU,KAAK,YAAY,4CAA4C,aAAa;AAAA,EACpG,0BAA0B,UAAU,KACjC,YAAY,mEACZ,aAAa;AAAA,EAChB,SAAS,UAAU,MAAM,CAAC,UAAU,YAAY,YAAY,mBAAmB,aAAa;AAAA,EAC5F,eAAe,UAAU,MAAM,CAAC,QAAQ,YAAY,aACjD,YAAY,+BACZ,aAAa;AAAA,EAChB,OAAO,UAAU,UAAU,CAAC,UAAU,QAAQ,UAAU,SAAS,YAAY,oBAAoB,aAAa;AAAA,EAC9G,QAAQ,UAAU,UAAU,CAAC,UAAU,QAAQ,UAAU,SACtD,YAAY,qBACZ,aAAa;AAAA,EAChB,WAAW,UAAU,KAAK,YAAY;AAAA,EACtC,UAAU,UAAU,KAAK,YAAY;AAAA,EACrC,aAAa,UAAU,OAAO,YAAY;AAAA,EAC1C,oBAAoB,UAAU,OAC3B,YAAY,+EACZ,aAAa;AAAA,EAChB,MAAM,UAAU,OAAO,YAAY,+CAA+C,aAAa;AAAA,EAC/F,oBAAoB,UAAU,KAAK,YAAY,uCAAuC,aAAa;AAAA;",
   "names": []
 }

package/esm/utils/keyboard-helpers.js

@@ -3,12 +3,11 @@ import { useCallback, useContext, useEffect } from "react";
 import TreeViewContext from "../TreeViewContext";
 import { focusItem } from "./tree-helpers";
 import { toggleExpandAllHelper, toggleItemExpand } from "./group-expands-helpers";
-const useOnItemKeyDown = (item) => {
+const useOnItemKeyDown = (item, draggableProps) => {
   const ctx = useContext(TreeViewContext);
   const {
     props: { onItemFocus },
     triggerTreeRerender,
-    isDragging,
     visibleItems,
     setFocusedItem,
     setSelectedItem,
@@ -24,11 +23,12 @@ const useOnItemKeyDown = (item) => {
   }), [onItemFocus, scrollToIndex]);
   const onItemKeyDown = useCallback((e) => {
     const { keyCode } = e;
-    if (!isDragging) {
+    if (!(draggableProps && draggableProps.active)) {
       if (keyCode !== 9)
         e.preventDefault();
-      if (keyCode === 13 || keyCode === 32)
+      if ((keyCode === 13 || keyCode === 32) && e.target.tagName === "LI") {
         setSelectedItem(item);
+      }
       if (keyCode === 37) {
         if (isGroup && isExpanded) {
           toggleItemExpand(item, triggerTreeRerender, updateUserExpandedState, scrollToIndex);
@@ -103,18 +103,18 @@ const useOnItemKeyDown = (item) => {
       }
     }
   }, [
-    isDragging,
+    draggableProps,
     setSelectedItem,
     item,
     isGroup,
     isExpanded,
     triggerTreeRerender,
+    updateUserExpandedState,
     scrollToIndex,
     setLatestToggledItem,
     visibleItems,
     setFocusedItem,
-    onItemFocusCurry,
-    updateUserExpandedState
+    onItemFocusCurry
   ]);
   return onItemKeyDown;
 };

package/esm/utils/keyboard-helpers.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../scripts/build/transpile/react-shim.js", "../../../src/utils/keyboard-helpers.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable max-params */\n/* eslint-disable max-lines */\n/* eslint-disable max-statements */\n/* eslint-disable complexity */\nimport { useCallback, useContext, useEffect } from 'react';\nimport TreeViewContext from '../TreeViewContext';\nimport { focusItem } from './tree-helpers';\nimport { toggleExpandAllHelper, toggleItemExpand } from './group-expands-helpers';\nimport type { DSTreeviewT } from '../react-desc-prop-types';\nimport type { DSTreeviewInternalsT } from '../sharedTypes';\n\n// 9 tab\n// 13 enter\n// 32 space\n// 37 left arrow\n// 38 up arrow\n// 39 right arrow\n// 40 down arrow\n// 35 end\n// 36 home\n\n// 56 number 8\n// 106 (NumPad) *\n\nexport const useOnItemKeyDown = (item: DSTreeviewT.Item) => {\n  const ctx = useContext(TreeViewContext);\n  const {\n    props: { onItemFocus },\n    triggerTreeRerender,\n    isDragging,\n    visibleItems,\n    setFocusedItem,\n    setSelectedItem,\n    setLatestToggledItem,\n    updateUserExpandedState,\n    virtualListHelpers: { scrollToIndex },\n  } = ctx;\n  const { isGroup, isExpanded } = item;\n  const onItemFocusCurry = useCallback(\n    (newFocusItem: DSTreeviewT.Item) =>\n      onItemFocus({\n        itemIndex: newFocusItem.virtualIndex as number,\n        scrollToItem: (opts = { align: 'start' }) => scrollToIndex(newFocusItem.virtualIndex as number, opts),\n        item: newFocusItem,\n      }),\n    [onItemFocus, scrollToIndex],\n  );\n\n  const onItemKeyDown = useCallback(\n    (e: React.KeyboardEvent<HTMLLIElement>) => {\n      const { keyCode } = e;\n      if (!isDragging) {\n        if (keyCode !== 9) e.preventDefault(); // allow tab/shift+tab\n        if (keyCode === 13 || keyCode === 32) setSelectedItem(item);\n\n        if (keyCode === 37) {\n          if (isGroup && isExpanded) {\n            toggleItemExpand(item, triggerTreeRerender, updateUserExpandedState, scrollToIndex);\n            setLatestToggledItem(item);\n          }\n        }\n        if (keyCode === 39) {\n          if (isGroup && !isExpanded) {\n            toggleItemExpand(item, triggerTreeRerender, updateUserExpandedState, scrollToIndex);\n            setLatestToggledItem(item);\n          }\n        }\n\n        const { virtualIndex } = item;\n        if (typeof virtualIndex === 'number') {\n          const lastItemIndex = visibleItems.length - 1;\n          if (keyCode === 38) {\n            const isLoopedFocus = virtualIndex === 0;\n            const newFocusIndex = isLoopedFocus ? lastItemIndex : virtualIndex - 1;\n            const newFocusItem = visibleItems[newFocusIndex];\n            scrollToIndex(newFocusIndex);\n            if (isLoopedFocus) {\n              // when looping the list from start to end we need to wait a bit before focusing\n              setTimeout(() => {\n                setFocusedItem(newFocusItem);\n                focusItem(newFocusItem);\n                onItemFocusCurry(newFocusItem);\n              }, 300);\n            } else {\n              setFocusedItem(newFocusItem);\n              onItemFocusCurry(newFocusItem);\n              focusItem(newFocusItem);\n            }\n          }\n          if (keyCode === 40) {\n            const isLoopedFocus = virtualIndex === lastItemIndex;\n            const newFocusIndex = isLoopedFocus ? 0 : virtualIndex + 1;\n            const newFocusItem = visibleItems[newFocusIndex];\n            scrollToIndex(newFocusIndex);\n            if (isLoopedFocus) {\n              // when looping the list from start to end we need to wait a bit before focusing\n              setTimeout(() => {\n                setFocusedItem(newFocusItem);\n                onItemFocusCurry(newFocusItem);\n                focusItem(newFocusItem);\n              }, 300);\n            } else {\n              setFocusedItem(newFocusItem);\n              onItemFocusCurry(newFocusItem);\n              focusItem(newFocusItem);\n            }\n          }\n          if (keyCode === 35) {\n            if (virtualIndex !== lastItemIndex) {\n              const newFocusItem = visibleItems[lastItemIndex];\n              scrollToIndex(lastItemIndex);\n              setTimeout(() => {\n                setFocusedItem(newFocusItem);\n                onItemFocusCurry(newFocusItem);\n                focusItem(newFocusItem);\n              }, 300);\n            }\n          }\n          if (keyCode === 36) {\n            if (virtualIndex !== 0) {\n              const newFocusItem = visibleItems[0];\n              scrollToIndex(0);\n              setTimeout(() => {\n                setFocusedItem(newFocusItem);\n                onItemFocusCurry(newFocusItem);\n                focusItem(newFocusItem);\n              }, 300);\n            }\n          }\n        }\n      }\n    },\n    [\n      isDragging,\n      setSelectedItem,\n      item,\n      isGroup,\n      isExpanded,\n      triggerTreeRerender,\n      scrollToIndex,\n      setLatestToggledItem,\n      visibleItems,\n      setFocusedItem,\n      onItemFocusCurry,\n      updateUserExpandedState,\n    ],\n  );\n\n  return onItemKeyDown;\n};\n\nexport const useGlobalKeyboardListener = (func: (e: KeyboardEvent) => void) => {\n  useEffect(() => {\n    document.addEventListener('keydown', func);\n    return () => document.removeEventListener('keydown', func);\n  }, [func]);\n};\n\nexport const useGlobalToggleAllExpandShortcut = (\n  treeRoot: DSTreeviewT.Item['node'],\n  triggerTreeRerender: () => void,\n  setLatestToggledItem: DSTreeviewInternalsT.CTX['setLatestToggledItem'],\n  updateUserExpandedState: DSTreeviewInternalsT.CTX['updateUserExpandedState'],\n) => {\n  const memoizedToggleAllKeyboardShortcut = useCallback(\n    (e: KeyboardEvent) => {\n      const { shiftKey, keyCode } = e;\n      if (shiftKey && keyCode === 56) {\n        toggleExpandAllHelper('toggle', treeRoot, triggerTreeRerender, setLatestToggledItem, updateUserExpandedState);\n      }\n    },\n    [setLatestToggledItem, treeRoot, triggerTreeRerender, updateUserExpandedState],\n  );\n\n  return useGlobalKeyboardListener(memoizedToggleAllKeyboardShortcut);\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable max-params */\n/* eslint-disable max-lines */\n/* eslint-disable max-statements */\n/* eslint-disable complexity */\nimport { useCallback, useContext, useEffect } from 'react';\nimport TreeViewContext from '../TreeViewContext';\nimport { focusItem } from './tree-helpers';\nimport { toggleExpandAllHelper, toggleItemExpand } from './group-expands-helpers';\nimport type { DSTreeviewT } from '../react-desc-prop-types';\nimport type { DSTreeviewInternalsT } from '../sharedTypes';\nimport { SortableItemContextType } from '../hoc/SortableItemContext';\n\n// 9 tab\n// 13 enter\n// 32 space\n// 37 left arrow\n// 38 up arrow\n// 39 right arrow\n// 40 down arrow\n// 35 end\n// 36 home\n\n// 56 number 8\n// 106 (NumPad) *\n\nexport const useOnItemKeyDown = (item: DSTreeviewT.Item, draggableProps: SortableItemContextType['draggableProps']) => {\n  const ctx = useContext(TreeViewContext);\n  const {\n    props: { onItemFocus },\n    triggerTreeRerender,\n    visibleItems,\n    setFocusedItem,\n    setSelectedItem,\n    setLatestToggledItem,\n    updateUserExpandedState,\n    virtualListHelpers: { scrollToIndex },\n  } = ctx;\n  const { isGroup, isExpanded } = item;\n  const onItemFocusCurry = useCallback(\n    (newFocusItem: DSTreeviewT.Item) =>\n      onItemFocus({\n        itemIndex: newFocusItem.virtualIndex as number,\n        scrollToItem: (opts = { align: 'start' }) => scrollToIndex(newFocusItem.virtualIndex as number, opts),\n        item: newFocusItem,\n      }),\n    [onItemFocus, scrollToIndex],\n  );\n\n  const onItemKeyDown = useCallback(\n    (e: React.KeyboardEvent<HTMLLIElement>) => {\n      const { keyCode } = e;\n      if (!(draggableProps && draggableProps.active)) {\n        if (keyCode !== 9) e.preventDefault(); // allow tab/shift+tab\n        if ((keyCode === 13 || keyCode === 32) && (e.target as HTMLElement).tagName === 'LI') {\n          setSelectedItem(item);\n        }\n\n        if (keyCode === 37) {\n          if (isGroup && isExpanded) {\n            toggleItemExpand(item, triggerTreeRerender, updateUserExpandedState, scrollToIndex);\n            setLatestToggledItem(item);\n          }\n        }\n        if (keyCode === 39) {\n          if (isGroup && !isExpanded) {\n            toggleItemExpand(item, triggerTreeRerender, updateUserExpandedState, scrollToIndex);\n            setLatestToggledItem(item);\n          }\n        }\n\n        const { virtualIndex } = item;\n        if (typeof virtualIndex === 'number') {\n          const lastItemIndex = visibleItems.length - 1;\n          if (keyCode === 38) {\n            const isLoopedFocus = virtualIndex === 0;\n            const newFocusIndex = isLoopedFocus ? lastItemIndex : virtualIndex - 1;\n            const newFocusItem = visibleItems[newFocusIndex];\n            scrollToIndex(newFocusIndex);\n            if (isLoopedFocus) {\n              // when looping the list from start to end we need to wait a bit before focusing\n              setTimeout(() => {\n                setFocusedItem(newFocusItem);\n                focusItem(newFocusItem);\n                onItemFocusCurry(newFocusItem);\n              }, 300);\n            } else {\n              setFocusedItem(newFocusItem);\n              onItemFocusCurry(newFocusItem);\n              focusItem(newFocusItem);\n            }\n          }\n          if (keyCode === 40) {\n            const isLoopedFocus = virtualIndex === lastItemIndex;\n            const newFocusIndex = isLoopedFocus ? 0 : virtualIndex + 1;\n            const newFocusItem = visibleItems[newFocusIndex];\n            scrollToIndex(newFocusIndex);\n            if (isLoopedFocus) {\n              // when looping the list from start to end we need to wait a bit before focusing\n              setTimeout(() => {\n                setFocusedItem(newFocusItem);\n                onItemFocusCurry(newFocusItem);\n                focusItem(newFocusItem);\n              }, 300);\n            } else {\n              setFocusedItem(newFocusItem);\n              onItemFocusCurry(newFocusItem);\n              focusItem(newFocusItem);\n            }\n          }\n          if (keyCode === 35) {\n            if (virtualIndex !== lastItemIndex) {\n              const newFocusItem = visibleItems[lastItemIndex];\n              scrollToIndex(lastItemIndex);\n              setTimeout(() => {\n                setFocusedItem(newFocusItem);\n                onItemFocusCurry(newFocusItem);\n                focusItem(newFocusItem);\n              }, 300);\n            }\n          }\n          if (keyCode === 36) {\n            if (virtualIndex !== 0) {\n              const newFocusItem = visibleItems[0];\n              scrollToIndex(0);\n              setTimeout(() => {\n                setFocusedItem(newFocusItem);\n                onItemFocusCurry(newFocusItem);\n                focusItem(newFocusItem);\n              }, 300);\n            }\n          }\n        }\n      }\n    },\n    [\n      draggableProps,\n      setSelectedItem,\n      item,\n      isGroup,\n      isExpanded,\n      triggerTreeRerender,\n      updateUserExpandedState,\n      scrollToIndex,\n      setLatestToggledItem,\n      visibleItems,\n      setFocusedItem,\n      onItemFocusCurry,\n    ],\n  );\n\n  return onItemKeyDown;\n};\n\nexport const useGlobalKeyboardListener = (func: (e: KeyboardEvent) => void) => {\n  useEffect(() => {\n    document.addEventListener('keydown', func);\n    return () => document.removeEventListener('keydown', func);\n  }, [func]);\n};\n\nexport const useGlobalToggleAllExpandShortcut = (\n  treeRoot: DSTreeviewT.Item['node'],\n  triggerTreeRerender: () => void,\n  setLatestToggledItem: DSTreeviewInternalsT.CTX['setLatestToggledItem'],\n  updateUserExpandedState: DSTreeviewInternalsT.CTX['updateUserExpandedState'],\n) => {\n  const memoizedToggleAllKeyboardShortcut = useCallback(\n    (e: KeyboardEvent) => {\n      const { shiftKey, keyCode } = e;\n      if (shiftKey && keyCode === 56) {\n        toggleExpandAllHelper('toggle', treeRoot, triggerTreeRerender, setLatestToggledItem, updateUserExpandedState);\n      }\n    },\n    [setLatestToggledItem, treeRoot, triggerTreeRerender, updateUserExpandedState],\n  );\n\n  return useGlobalKeyboardListener(memoizedToggleAllKeyboardShortcut);\n};\n"],
+  "mappings": "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",
   "names": []
 }

package/esm/utils/refs-helpers.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../scripts/build/transpile/react-shim.js", "../../../src/utils/refs-helpers.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "// allow multiple refs to be set to point to the same DOM element\ntype GenericMergeableRef = null | undefined | React.MutableRefObject<unknown> | ((ref: HTMLElement) => void);\nexport const setMultipleRefs = (...refs: GenericMergeableRef[]): ((ref: HTMLElement) => void) => {\n  const filteredRefs = refs.filter(Boolean);\n  if (!filteredRefs.length) return () => {};\n  if (filteredRefs.length === 0) return () => {};\n\n  return (newRef) => {\n    filteredRefs.forEach((refToBeUpdated) => {\n      if (typeof refToBeUpdated === 'function') {\n        refToBeUpdated(newRef);\n      } else if (refToBeUpdated) {\n        refToBeUpdated.current = newRef;\n      }\n    });\n  };\n};\n"],
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "// allow multiple refs to be set to point to the same DOM element\ntype GenericMergeableRef = null | undefined | React.MutableRefObject<unknown> | ((ref: HTMLElement) => void) | false;\nexport const setMultipleRefs = (...refs: GenericMergeableRef[]): ((ref: HTMLElement) => void) => {\n  const filteredRefs = refs.filter(Boolean);\n  if (!filteredRefs.length) return () => {};\n  if (filteredRefs.length === 0) return () => {};\n\n  return (newRef) => {\n    filteredRefs.forEach((refToBeUpdated) => {\n      if (typeof refToBeUpdated === 'function') {\n        refToBeUpdated(newRef);\n      } else if (refToBeUpdated) {\n        refToBeUpdated.current = newRef;\n      }\n    });\n  };\n};\n"],
   "mappings": "AAAA;ACEO,MAAM,kBAAkB,IAAI,SAA8D;AAC/F,QAAM,eAAe,KAAK,OAAO;AACjC,MAAI,CAAC,aAAa;AAAQ,WAAO,MAAM;AAAA;AACvC,MAAI,aAAa,WAAW;AAAG,WAAO,MAAM;AAAA;AAE5C,SAAO,CAAC,WAAW;AACjB,iBAAa,QAAQ,CAAC,mBAAmB;AACvC,UAAI,OAAO,mBAAmB,YAAY;AACxC,uBAAe;AAAA,iBACN,gBAAgB;AACzB,uBAAe,UAAU;AAAA;AAAA;AAAA;AAAA;",
   "names": []
 }

package/esm/utils/tree-helpers.js

@@ -91,7 +91,7 @@ const enrichNodeModelInPlace = (node, searchQuery = "", selection = null, expand
   if (!node.model.nodeItemRef) {
     node.model.nodeItemRef = createRef();
   }
-  if (typeof node.model.isGroup !== "boolean" && node.model?.children?.length > 0) {
+  if (typeof node.model.isGroup !== "boolean" && (node.model?.children?.length ?? 0) > 0) {
     node.model.isGroup = true;
   }
   if (node.model.isGroup && node.model.id !== "__ds_tree_root") {
@@ -119,9 +119,29 @@ const enrichNodeModelInPlace = (node, searchQuery = "", selection = null, expand
 const focusItem = (item) => {
   item?.nodeItemRef?.current?.focus();
 };
+const flattenTreeForDnD = (data, shouldDescend = () => true) => {
+  const flattenedTree = [];
+  let index = 0;
+  const doit = (node, depth = 0, parentId = null) => {
+    flattenedTree.push({
+      uid: node.id.toString(),
+      depth,
+      realIndex: index,
+      childrenCount: node.children?.length ?? 0,
+      parentId: parentId !== null ? parentId.toString() : null,
+      original: node
+    });
+    index += 1;
+    if (shouldDescend(node))
+      node.children?.forEach((child) => doit(child, depth + 1, node.id.toString()));
+  };
+  data.forEach((datum) => doit(datum));
+  return flattenedTree;
+};
 export {
   cloneNode,
   enrichNodeModelInPlace,
+  flattenTreeForDnD,
   focusItem,
   getChildrenMatchesSearchQuery,
   getItemsParentNode,

package/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) {\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"],
-  "mappings": "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",
+  "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: DSTreeviewT.SimpleItem[],\n  shouldDescend: (datum: DSTreeviewT.SimpleItem) => boolean = () => true,\n) => {\n  const flattenedTree: DSTreeviewT.DndItem[] = [];\n  let index = 0;\n  const doit = (node: DSTreeviewT.SimpleItem, depth = 0, parentId: DSTreeviewT.StringOrNum | null = null) => {\n    flattenedTree.push({\n      uid: node.id.toString(),\n      depth,\n      realIndex: index,\n      childrenCount: node.children?.length ?? 0,\n      parentId: parentId !== null ? parentId.toString() : null,\n      original: node,\n    });\n    index += 1;\n    if (shouldDescend(node)) node.children?.forEach((child) => doit(child, depth + 1, node.id.toString()));\n  };\n\n  data.forEach((datum) => doit(datum));\n  return flattenedTree;\n};\n"],
+  "mappings": "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",
   "names": []
 }

package/esm/utils/useTree.js

@@ -2,7 +2,7 @@ import * as React from "react";
 import { useState, useCallback, useMemo, useEffect } from "react";
 import TreeModel from "tree-model";
 import { cloneDeep } from "lodash";
-import { walkVisibles, enrichNodeModelInPlace } from "./tree-helpers";
+import { walkVisibles, enrichNodeModelInPlace, flattenTreeForDnD } from "./tree-helpers";
 import { updateExpandedState } from "./group-expands-helpers";
 const useTree = (data, props, states) => {
   const { setExpandedGroups } = states;
@@ -38,8 +38,8 @@ const useTree = (data, props, states) => {
   useEffect(() => {
     const parsedVisibleItems = [];
     const newExpandedHashMap = {};
+    const shouldContinueWalking = true;
     treeRoot.walk((node) => {
-      const shouldContinueWalking = true;
       enrichNodeModelInPlace(node, searchQuery, selection, expanded);
       if (node.model.id && node.model.isGroup && node.model.isExpanded)
         newExpandedHashMap[node.model.id] = true;
@@ -60,8 +60,10 @@ const useTree = (data, props, states) => {
     expanded,
     setExpandedGroups
   ]);
+  const flattenedItems = useMemo(() => flattenTreeForDnD(data), [data]);
   return {
     visibleItems,
+    flattenedItems,
     tree,
     treeRoot,
     rerenderItems,

package/esm/utils/useTree.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../scripts/build/transpile/react-shim.js", "../../../src/utils/useTree.tsx"],
-  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import { useState, useCallback, useMemo, useEffect } from 'react';\nimport TreeModel from 'tree-model';\nimport { cloneDeep } from 'lodash';\n\nimport { walkVisibles, enrichNodeModelInPlace } from './tree-helpers';\nimport type { DSTreeviewT } from '../react-desc-prop-types';\nimport type { DSTreeviewInternalsT } from '../sharedTypes';\nimport { updateExpandedState } from './group-expands-helpers';\n\nexport const useTree = (\n  data: DSTreeviewT.SimpleItem[],\n  props: DSTreeviewT.Props,\n  states: {\n    setExpandedGroups: DSTreeviewInternalsT.StateSetter<DSTreeviewT.ExpandedItems>;\n  },\n) => {\n  const { setExpandedGroups } = states;\n  const unfrozenData = useMemo(() => cloneDeep(data), [data]);\n\n  // convert data into a TreeModel with extra isExpanded prop\n  // root element type is an exception, children model is based on what the dev passed on\n  // since root is an excepcion we must typecast\n  const tree = useMemo(() => new TreeModel(), []);\n  const [treeData, setTreeData] = useState({\n    id: '__ds_tree_root',\n    name: '__root',\n    isExpanded: true,\n    children: unfrozenData,\n  } as unknown as DSTreeviewT.Item);\n\n  useEffect(() => {\n    setTreeData({\n      id: '__ds_tree_root',\n      name: '__root',\n      isExpanded: true,\n      children: unfrozenData,\n    } as unknown as DSTreeviewT.Item);\n  }, [unfrozenData]);\n\n  // expose a way to rerender the tree\n  //   used for expand functionality\n  const [rerenderItems, setRerenderItems] = useState({});\n  const triggerTreeRerender = useCallback(() => {\n    setRerenderItems({});\n  }, []);\n\n  // when re-rendering we re-parse the list\n  const [treeRoot, setTreeRoot] = useState(tree.parse(treeData));\n  useEffect(() => {\n    setTreeRoot(tree.parse(treeData));\n  }, [treeData, rerenderItems, tree]);\n\n  const [visibleItems, setVisibleItems] = useState<DSTreeviewT.Item[]>([]);\n\n  const { searchQuery, highlightOnlyQuery, onVisibleItemsChange, selection, expanded, onExpandChange } = props;\n\n  const updateUserExpandedState = useCallback(() => {\n    updateExpandedState(treeRoot, onExpandChange);\n  }, [treeRoot, onExpandChange]);\n  // we add missing properties to the received Items\n  //   not the best of the patterns, but it works\n  //   this is where we convert \"SimpleItems\" to \"Items\"\n  //   this was done to avoid breaking changes back in v1\n  useEffect(() => {\n    const parsedVisibleItems: DSTreeviewT.Item[] = [];\n    const newExpandedHashMap: DSTreeviewT.ExpandedItems = {};\n    treeRoot.walk((node) => {\n      const shouldContinueWalking = true; // tree-model ask we return true if we want to continue walking\n      enrichNodeModelInPlace(node, searchQuery, selection, expanded);\n      if (node.model.id && node.model.isGroup && node.model.isExpanded) newExpandedHashMap[node.model.id] = true;\n      return shouldContinueWalking;\n    });\n\n    walkVisibles(\n      treeRoot,\n      (node) => {\n        parsedVisibleItems.push({ ...node.model, node });\n      },\n      true,\n      highlightOnlyQuery,\n    );\n    setVisibleItems(parsedVisibleItems);\n    onVisibleItemsChange(parsedVisibleItems);\n\n    setExpandedGroups(newExpandedHashMap);\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [\n    treeRoot,\n    rerenderItems,\n    searchQuery,\n    highlightOnlyQuery,\n    selection,\n    expanded,\n    setExpandedGroups,\n    // onVisibleItemsChange // evaluate potential performance hit?\n  ]);\n\n  return {\n    visibleItems,\n    tree,\n    treeRoot,\n    rerenderItems,\n    triggerTreeRerender,\n    updateUserExpandedState,\n  };\n};\n"],
-  "mappings": "AAAA;ACAA;AACA;AACA;AAEA;AAGA;AAEO,MAAM,UAAU,CACrB,MACA,OACA,WAGG;AACH,QAAM,EAAE,sBAAsB;AAC9B,QAAM,eAAe,QAAQ,MAAM,UAAU,OAAO,CAAC;AAKrD,QAAM,OAAO,QAAQ,MAAM,IAAI,aAAa;AAC5C,QAAM,CAAC,UAAU,eAAe,SAAS;AAAA,IACvC,IAAI;AAAA,IACJ,MAAM;AAAA,IACN,YAAY;AAAA,IACZ,UAAU;AAAA;AAGZ,YAAU,MAAM;AACd,gBAAY;AAAA,MACV,IAAI;AAAA,MACJ,MAAM;AAAA,MACN,YAAY;AAAA,MACZ,UAAU;AAAA;AAAA,KAEX,CAAC;AAIJ,QAAM,CAAC,eAAe,oBAAoB,SAAS;AACnD,QAAM,sBAAsB,YAAY,MAAM;AAC5C,qBAAiB;AAAA,KAChB;AAGH,QAAM,CAAC,UAAU,eAAe,SAAS,KAAK,MAAM;AACpD,YAAU,MAAM;AACd,gBAAY,KAAK,MAAM;AAAA,KACtB,CAAC,UAAU,eAAe;AAE7B,QAAM,CAAC,cAAc,mBAAmB,SAA6B;AAErE,QAAM,EAAE,aAAa,oBAAoB,sBAAsB,WAAW,UAAU,mBAAmB;AAEvG,QAAM,0BAA0B,YAAY,MAAM;AAChD,wBAAoB,UAAU;AAAA,KAC7B,CAAC,UAAU;AAKd,YAAU,MAAM;AACd,UAAM,qBAAyC;AAC/C,UAAM,qBAAgD;AACtD,aAAS,KAAK,CAAC,SAAS;AACtB,YAAM,wBAAwB;AAC9B,6BAAuB,MAAM,aAAa,WAAW;AACrD,UAAI,KAAK,MAAM,MAAM,KAAK,MAAM,WAAW,KAAK,MAAM;AAAY,2BAAmB,KAAK,MAAM,MAAM;AACtG,aAAO;AAAA;AAGT,iBACE,UACA,CAAC,SAAS;AACR,yBAAmB,KAAK,KAAK,KAAK,OAAO;AAAA,OAE3C,MACA;AAEF,oBAAgB;AAChB,yBAAqB;AAErB,sBAAkB;AAAA,KAEjB;AAAA,IACD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA;AAIF,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA;AAAA;",
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import { useState, useCallback, useMemo, useEffect } from 'react';\nimport TreeModel from 'tree-model';\nimport { cloneDeep } from 'lodash';\n\nimport { walkVisibles, enrichNodeModelInPlace, flattenTreeForDnD } from './tree-helpers';\nimport type { DSTreeviewT } from '../react-desc-prop-types';\nimport type { DSTreeviewInternalsT } from '../sharedTypes';\nimport { updateExpandedState } from './group-expands-helpers';\n\nexport const useTree = (\n  data: DSTreeviewT.SimpleItem[],\n  props: DSTreeviewT.Props,\n  states: {\n    setExpandedGroups: DSTreeviewInternalsT.StateSetter<DSTreeviewT.ExpandedItems>;\n  },\n) => {\n  const { setExpandedGroups } = states;\n  const unfrozenData = useMemo(() => cloneDeep(data), [data]);\n\n  // convert data into a TreeModel with extra isExpanded prop\n  // root element type is an exception, children model is based on what the dev passed on\n  // since root is an excepcion we must typecast\n  const tree = useMemo(() => new TreeModel(), []);\n  const [treeData, setTreeData] = useState({\n    id: '__ds_tree_root',\n    name: '__root',\n    isExpanded: true,\n    children: unfrozenData,\n  } as unknown as DSTreeviewT.Item);\n\n  useEffect(() => {\n    setTreeData({\n      id: '__ds_tree_root',\n      name: '__root',\n      isExpanded: true,\n      children: unfrozenData,\n    } as unknown as DSTreeviewT.Item);\n  }, [unfrozenData]);\n\n  // expose a way to rerender the tree\n  //   used for expand functionality\n  const [rerenderItems, setRerenderItems] = useState({});\n  const triggerTreeRerender = useCallback(() => {\n    setRerenderItems({});\n  }, []);\n\n  // when re-rendering we re-parse the list\n  const [treeRoot, setTreeRoot] = useState(tree.parse(treeData));\n  useEffect(() => {\n    setTreeRoot(tree.parse(treeData));\n  }, [treeData, rerenderItems, tree]);\n\n  const [visibleItems, setVisibleItems] = useState<DSTreeviewT.Item[]>([]);\n\n  const { searchQuery, highlightOnlyQuery, onVisibleItemsChange, selection, expanded, onExpandChange } = props;\n\n  const updateUserExpandedState = useCallback(() => {\n    updateExpandedState(treeRoot, onExpandChange);\n  }, [treeRoot, onExpandChange]);\n  // we add missing properties to the received Items\n  //   not the best of the patterns, but it works\n  //   this is where we convert \"SimpleItems\" to \"Items\"\n  //   this was done to avoid breaking changes back in v1\n  useEffect(() => {\n    const parsedVisibleItems: DSTreeviewT.Item[] = [];\n    const newExpandedHashMap: DSTreeviewT.ExpandedItems = {};\n    const shouldContinueWalking = true; // tree-model ask we return true if we want to continue walking\n    treeRoot.walk((node) => {\n      enrichNodeModelInPlace(node, searchQuery, selection, expanded);\n      if (node.model.id && node.model.isGroup && node.model.isExpanded) newExpandedHashMap[node.model.id] = true;\n      return shouldContinueWalking;\n    });\n\n    walkVisibles(\n      treeRoot,\n      (node) => {\n        parsedVisibleItems.push({ ...node.model, node });\n      },\n      true,\n      highlightOnlyQuery,\n    );\n    setVisibleItems(parsedVisibleItems);\n    onVisibleItemsChange(parsedVisibleItems);\n\n    setExpandedGroups(newExpandedHashMap);\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [\n    treeRoot,\n    rerenderItems,\n    searchQuery,\n    highlightOnlyQuery,\n    selection,\n    expanded,\n    setExpandedGroups,\n    // onVisibleItemsChange // evaluate potential performance hit?\n  ]);\n\n  const flattenedItems = useMemo(() => flattenTreeForDnD(data), [data]);\n\n  return {\n    visibleItems,\n    flattenedItems,\n    tree,\n    treeRoot,\n    rerenderItems,\n    triggerTreeRerender,\n    updateUserExpandedState,\n  };\n};\n"],
+  "mappings": "AAAA;ACAA;AACA;AACA;AAEA;AAGA;AAEO,MAAM,UAAU,CACrB,MACA,OACA,WAGG;AACH,QAAM,EAAE,sBAAsB;AAC9B,QAAM,eAAe,QAAQ,MAAM,UAAU,OAAO,CAAC;AAKrD,QAAM,OAAO,QAAQ,MAAM,IAAI,aAAa;AAC5C,QAAM,CAAC,UAAU,eAAe,SAAS;AAAA,IACvC,IAAI;AAAA,IACJ,MAAM;AAAA,IACN,YAAY;AAAA,IACZ,UAAU;AAAA;AAGZ,YAAU,MAAM;AACd,gBAAY;AAAA,MACV,IAAI;AAAA,MACJ,MAAM;AAAA,MACN,YAAY;AAAA,MACZ,UAAU;AAAA;AAAA,KAEX,CAAC;AAIJ,QAAM,CAAC,eAAe,oBAAoB,SAAS;AACnD,QAAM,sBAAsB,YAAY,MAAM;AAC5C,qBAAiB;AAAA,KAChB;AAGH,QAAM,CAAC,UAAU,eAAe,SAAS,KAAK,MAAM;AACpD,YAAU,MAAM;AACd,gBAAY,KAAK,MAAM;AAAA,KACtB,CAAC,UAAU,eAAe;AAE7B,QAAM,CAAC,cAAc,mBAAmB,SAA6B;AAErE,QAAM,EAAE,aAAa,oBAAoB,sBAAsB,WAAW,UAAU,mBAAmB;AAEvG,QAAM,0BAA0B,YAAY,MAAM;AAChD,wBAAoB,UAAU;AAAA,KAC7B,CAAC,UAAU;AAKd,YAAU,MAAM;AACd,UAAM,qBAAyC;AAC/C,UAAM,qBAAgD;AACtD,UAAM,wBAAwB;AAC9B,aAAS,KAAK,CAAC,SAAS;AACtB,6BAAuB,MAAM,aAAa,WAAW;AACrD,UAAI,KAAK,MAAM,MAAM,KAAK,MAAM,WAAW,KAAK,MAAM;AAAY,2BAAmB,KAAK,MAAM,MAAM;AACtG,aAAO;AAAA;AAGT,iBACE,UACA,CAAC,SAAS;AACR,yBAAmB,KAAK,KAAK,KAAK,OAAO;AAAA,OAE3C,MACA;AAEF,oBAAgB;AAChB,yBAAqB;AAErB,sBAAkB;AAAA,KAEjB;AAAA,IACD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA;AAIF,QAAM,iBAAiB,QAAQ,MAAM,kBAAkB,OAAO,CAAC;AAE/D,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA;AAAA;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/ds-treeview",
-  "version": "2.3.0-alpha.2",
+  "version": "2.3.0-alpha.3",
   "license": "MIT",
   "description": "ICE MT - Dimsum - Tree View",
   "module": "./esm/index.js",
@@ -19,10 +19,6 @@
       "import": "./esm/utils/useInstanceRefActions.js",
       "require": "./cjs/utils/useInstanceRefActions.js"
     },
-    "./utils/useDnDHelpers": {
-      "import": "./esm/utils/useDnDHelpers.js",
-      "require": "./cjs/utils/useDnDHelpers.js"
-    },
     "./utils/tree-helpers": {
       "import": "./esm/utils/tree-helpers.js",
       "require": "./cjs/utils/tree-helpers.js"
@@ -51,10 +47,6 @@
       "import": "./esm/utils/group-expands-helpers.js",
       "require": "./cjs/utils/group-expands-helpers.js"
     },
-    "./utils/dnd-helpers": {
-      "import": "./esm/utils/dnd-helpers.js",
-      "require": "./cjs/utils/dnd-helpers.js"
-    },
     "./utils/array-helpers": {
       "import": "./esm/utils/array-helpers.js",
       "require": "./cjs/utils/array-helpers.js"
@@ -167,6 +159,14 @@
       "import": "./esm/parts/ExpandCaret.js",
       "require": "./cjs/parts/ExpandCaret.js"
     },
+    "./parts/DropIndicator": {
+      "import": "./esm/parts/DropIndicator.js",
+      "require": "./cjs/parts/DropIndicator.js"
+    },
+    "./parts/DnDHandle": {
+      "import": "./esm/parts/DnDHandle.js",
+      "require": "./cjs/parts/DnDHandle.js"
+    },
     "./parts/ChildrenCountDisplayer": {
       "import": "./esm/parts/ChildrenCountDisplayer.js",
       "require": "./cjs/parts/ChildrenCountDisplayer.js"
@@ -175,6 +175,22 @@
       "import": "./esm/parts/CheckboxSelectable.js",
       "require": "./cjs/parts/CheckboxSelectable.js"
     },
+    "./hoc/WithDnDSortableItemContext": {
+      "import": "./esm/hoc/WithDnDSortableItemContext.js",
+      "require": "./cjs/hoc/WithDnDSortableItemContext.js"
+    },
+    "./hoc/WithConditionalDnDContext": {
+      "import": "./esm/hoc/WithConditionalDnDContext.js",
+      "require": "./cjs/hoc/WithConditionalDnDContext.js"
+    },
+    "./hoc/SortableItemContext": {
+      "import": "./esm/hoc/SortableItemContext.js",
+      "require": "./cjs/hoc/SortableItemContext.js"
+    },
+    "./hoc/DnDTreeContext": {
+      "import": "./esm/hoc/DnDTreeContext.js",
+      "require": "./cjs/hoc/DnDTreeContext.js"
+    },
     "./config/useTreeview": {
       "import": "./esm/config/useTreeview.js",
       "require": "./cjs/config/useTreeview.js"
@@ -211,15 +227,15 @@
     "generateSubmodules": true
   },
   "dependencies": {
-    "@elliemae/ds-button": "2.3.0-alpha.2",
-    "@elliemae/ds-circular-progress-indicator": "2.3.0-alpha.2",
-    "@elliemae/ds-classnames": "2.3.0-alpha.2",
-    "@elliemae/ds-form": "2.3.0-alpha.2",
-    "@elliemae/ds-icons": "2.3.0-alpha.2",
-    "@elliemae/ds-props-helpers": "2.3.0-alpha.2",
-    "@elliemae/ds-shared": "2.3.0-alpha.2",
-    "@elliemae/ds-truncated-tooltip-text": "2.3.0-alpha.2",
-    "@elliemae/ds-utilities": "2.3.0-alpha.2",
+    "@elliemae/ds-button": "2.3.0-alpha.3",
+    "@elliemae/ds-circular-progress-indicator": "2.3.0-alpha.3",
+    "@elliemae/ds-classnames": "2.3.0-alpha.3",
+    "@elliemae/ds-form": "2.3.0-alpha.3",
+    "@elliemae/ds-icons": "2.3.0-alpha.3",
+    "@elliemae/ds-props-helpers": "2.3.0-alpha.3",
+    "@elliemae/ds-shared": "2.3.0-alpha.3",
+    "@elliemae/ds-truncated-tooltip-text": "2.3.0-alpha.3",
+    "@elliemae/ds-utilities": "2.3.0-alpha.3",
     "@elliemae/react-sortable-hoc": "^1.0.0",
     "react-desc": "~4.1.3",
     "react-highlight-words": "~0.17.0",

package/types/hoc/DnDTreeContext.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="react" />
+import { DSTreeviewT } from '../react-desc-prop-types';
+import { DropIndicatorPosition } from './SortableItemContext';
+declare type DnDTreeContextType = {
+    depth: number | undefined;
+    activeIndex: number | undefined;
+    visibleItems: DSTreeviewT.Item[] | undefined;
+    dropIndicatorPosition: DropIndicatorPosition;
+    lastActiveId: string | undefined;
+    setLastActiveId: React.Dispatch<React.SetStateAction<string>> | undefined;
+    isDropValid: boolean;
+};
+export declare const DnDTreeContext: import("react").Context<DnDTreeContextType>;
+export {};

package/types/hoc/SortableItemContext.d.ts

@@ -0,0 +1,19 @@
+/// <reference types="react" />
+import { useSortable } from '@dnd-kit/sortable';
+export declare enum DropIndicatorPosition {
+    None = 0,
+    Before = 1,
+    After = 2,
+    Inside = 3
+}
+export declare type SortableItemContextType = {
+    draggableProps: false | (ReturnType<typeof useSortable> & {
+        dropIndicatorPosition: DropIndicatorPosition;
+        shouldShowDropIndicatorPosition: boolean;
+        lastActiveId?: string;
+        setLastActiveId?: React.Dispatch<React.SetStateAction<string>>;
+        isDropValid: boolean;
+    });
+};
+/** Context for cross component communication */
+export declare const SortableItemContext: import("react").Context<SortableItemContextType>;

package/types/hoc/WithConditionalDnDContext.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+declare type FunctionalHOC = <T = unknown>(Component: React.ComponentType<T>, ...other: unknown[]) => (props: T) => JSX.Element;
+export declare const withConditionalDnDRowContext: FunctionalHOC;
+export {};

package/types/hoc/WithDnDSortableItemContext.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+declare type FunctionalHOC = <T = unknown>(Component: React.ComponentType<T>, ...other: unknown[]) => (props: T) => JSX.Element;
+export declare const withDnDSortableItemContext: FunctionalHOC;
+export {};

package/types/parts/DnDHandle.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+import { DSTreeviewT } from '../react-desc-prop-types';
+export declare const DnDHandle: ({ id, isDragOverlay }: {
+    id: DSTreeviewT.StringOrNum;
+    isDragOverlay: boolean;
+}) => JSX.Element;

package/types/parts/DropIndicator.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+import { DropIndicatorPosition } from '../hoc/SortableItemContext';
+interface DropIndicatorProps {
+    vertical?: boolean;
+    dropIndicatorPosition: DropIndicatorPosition | false;
+    isLast?: boolean;
+    isDropValid?: boolean;
+}
+declare const DropIndicator: React.ComponentType<DropIndicatorProps>;
+export default DropIndicator;