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

package/dist/esm/hoc/WithConditionalDnDContext.js

@@ -0,0 +1,99 @@
+import * as React from "react";
+import React2, { useCallback, useContext, useMemo } from "react";
+import { DndContext, DragOverlay } from "@dnd-kit/core";
+import { SortableContext } from "@dnd-kit/sortable";
+import { useTreeDndkitConfig } from "@elliemae/ds-drag-and-drop";
+import TreeViewContext from "../TreeViewContext";
+import { TreeItem } from "../parts/TreeItem";
+import { DnDTreeContext } from "./DnDTreeContext";
+const ensure = (argument, message = "This should never happen") => {
+  if (argument === void 0 || argument === null) {
+    throw new TypeError(message);
+  }
+  return argument;
+};
+const withConditionalDnDRowContext = (Component) => (props) => {
+  const [lastActiveId, setLastActiveId] = React2.useState("");
+  const {
+    props: { data, onOrderChange, getIsDropValid },
+    flattenedItems,
+    visibleItems: flattenedVisibleTree,
+    withDragAndDrop
+  } = useContext(TreeViewContext);
+  const flattenedVisibleTreeForDnD = useMemo(() => flattenedVisibleTree.map((item, index) => ({
+    uid: item.id.toString(),
+    depth: (item.treeDepth ?? 1) - 1,
+    realIndex: index,
+    childrenCount: item.children?.length ?? 0,
+    parentId: item.node.parent?.model?.id?.toString() ?? null,
+    original: item
+  })), [flattenedVisibleTree]);
+  const onReorder = useCallback((tree, indexes) => {
+    const nodes = {};
+    tree.forEach((item) => {
+      const originalItem = item.original;
+      originalItem.children = [];
+      nodes[item.uid] = item.original;
+    });
+    const newUserTree = [];
+    tree.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);
+      } else if (item.uid !== "__ds_tree_root")
+        newUserTree.push(item.original);
+    });
+    onOrderChange(newUserTree, data, flattenedItems[indexes.fromIndex]);
+  }, [onOrderChange, data, flattenedItems]);
+  const {
+    dndContextProps,
+    sortableContextProps,
+    activeId,
+    activeIndex,
+    depth,
+    dropIndicatorPosition,
+    visibleItems,
+    isDropValid
+  } = useTreeDndkitConfig({
+    flattenedItems,
+    visibleItems: flattenedVisibleTreeForDnD,
+    isHorizontalDnD: false,
+    isExpandable: true,
+    onReorder,
+    getIsDropValid,
+    maxDragAndDropLevel: Infinity
+  });
+  if (lastActiveId !== activeId && activeId)
+    setLastActiveId(activeId);
+  if (withDragAndDrop)
+    return /* @__PURE__ */ React2.createElement(DndContext, {
+      ...dndContextProps
+    }, /* @__PURE__ */ React2.createElement(SortableContext, {
+      ...sortableContextProps
+    }, /* @__PURE__ */ React2.createElement(DnDTreeContext.Provider, {
+      value: {
+        activeIndex,
+        depth,
+        visibleItems: visibleItems.map((item) => item.original),
+        dropIndicatorPosition,
+        lastActiveId,
+        setLastActiveId,
+        isDropValid
+      }
+    }, /* @__PURE__ */ React2.createElement(Component, {
+      ...props
+    }))), /* @__PURE__ */ React2.createElement(DragOverlay, {
+      style: { width: "auto" }
+    }, activeId ? /* @__PURE__ */ React2.createElement(TreeItem, {
+      itemIndex: activeIndex,
+      item: ensure(flattenedVisibleTree.find((item) => item.id.toString() === activeId)),
+      isDragOverlay: true
+    }) : null));
+  return /* @__PURE__ */ React2.createElement(Component, {
+    ...props
+  });
+};
+export {
+  withConditionalDnDRowContext
+};
+//# sourceMappingURL=WithConditionalDnDContext.js.map

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

@@ -0,0 +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, useMemo } from 'react';\nimport { DndContext, DragOverlay } from '@dnd-kit/core';\nimport { SortableContext } from '@dnd-kit/sortable';\nimport { useTreeDndkitConfig } from '@elliemae/ds-drag-and-drop';\nimport { DSTreeviewT } from '../react-desc-prop-types';\nimport TreeViewContext from '../TreeViewContext';\nimport { TreeItem } from '../parts/TreeItem';\nimport { DnDTreeContext } from './DnDTreeContext';\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) => (props) => {\n  const [lastActiveId, setLastActiveId] = React.useState('');\n\n  const {\n    props: { data, onOrderChange, getIsDropValid },\n    flattenedItems,\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[], indexes: { 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;\n        originalItem.children = [];\n        nodes[item.uid] = item.original;\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);\n        } else if (item.uid !== '__ds_tree_root') newUserTree.push(item.original);\n      });\n      // Tell the user that the order has change, he can chose to commit it or not\n      onOrderChange(newUserTree, data, flattenedItems[indexes.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  } = useTreeDndkitConfig({\n    flattenedItems,\n    visibleItems: flattenedVisibleTreeForDnD,\n    isHorizontalDnD: false,\n    isExpandable: true,\n    onReorder,\n    getIsDropValid,\n    maxDragAndDropLevel: Infinity,\n  });\n\n  if (lastActiveId !== activeId && activeId) setLastActiveId(activeId);\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) as DSTreeviewT.Item[],\n              dropIndicatorPosition,\n              lastActiveId,\n              setLastActiveId,\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": "AAAA;ACAA;AACA;AACA;AACA;AAEA;AACA;AACA;AAIA,MAAM,SAAS,CAAK,UAAgC,UAAU,+BAAkC;AAC9F,MAAI,aAAa,UAAa,aAAa,MAAM;AAC/C,UAAM,IAAI,UAAU;AAAA;AAGtB,SAAO;AAAA;AAIF,MAAM,+BAA8C,CAAC,cAAc,CAAC,UAAU;AACnF,QAAM,CAAC,cAAc,mBAAmB,OAAM,SAAS;AAEvD,QAAM;AAAA,IACJ,OAAO,EAAE,MAAM,eAAe;AAAA,IAC9B;AAAA,IACA,cAAc;AAAA,IACd;AAAA,MACE,WAAW;AAEf,QAAM,6BAA6B,QACjC,MACE,qBAAqB,IAAI,CAAC,MAAM,UAAW;AAAA,IACzC,KAAK,KAAK,GAAG;AAAA,IACb,OAAQ,MAAK,aAAa,KAAK;AAAA,IAC/B,WAAW;AAAA,IACX,eAAe,KAAK,UAAU,UAAU;AAAA,IACxC,UAAU,KAAK,KAAK,QAAQ,OAAO,IAAI,cAAc;AAAA,IACrD,UAAU;AAAA,OAEd,CAAC;AAGH,QAAM,YAAY,YAChB,CAAC,MAA6B,YAAwD;AAEpF,UAAM,QAAiE;AACvE,SAAK,QAAQ,CAAC,SAAS;AACrB,YAAM,eAAe,KAAK;AAC1B,mBAAa,WAAW;AACxB,YAAM,KAAK,OAAO,KAAK;AAAA;AAGzB,UAAM,cAAwC;AAC9C,SAAK,QAAQ,CAAC,SAAS;AAGrB,UAAI,KAAK,aAAa,QAAQ,KAAK,aAAa,UAAa,KAAK,aAAa,kBAAkB;AAC/F,cAAM,aAAa,MAAM,KAAK;AAC9B,mBAAW,UAAU,KAAK,KAAK;AAAA,iBACtB,KAAK,QAAQ;AAAkB,oBAAY,KAAK,KAAK;AAAA;AAGlE,kBAAc,aAAa,MAAM,eAAe,QAAQ;AAAA,KAE1D,CAAC,eAAe,MAAM;AAGxB,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,MACE,oBAAoB;AAAA,IACtB;AAAA,IACA,cAAc;AAAA,IACd,iBAAiB;AAAA,IACjB,cAAc;AAAA,IACd;AAAA,IACA;AAAA,IACA,qBAAqB;AAAA;AAGvB,MAAI,iBAAiB,YAAY;AAAU,oBAAgB;AAE3D,MAAI;AACF,WACE,qCAAC,YAAD;AAAA,SAAgB;AAAA,OACd,qCAAC,iBAAD;AAAA,SAAqB;AAAA,OACnB,qCAAC,eAAe,UAAhB;AAAA,MACE,OAAO;AAAA,QACL;AAAA,QACA;AAAA,QACA,cAAc,aAAa,IAAI,CAAC,SAAS,KAAK;AAAA,QAC9C;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA;AAAA,OAGF,qCAAC,WAAD;AAAA,SAAe;AAAA,UAGnB,qCAAC,aAAD;AAAA,MAAa,OAAO,EAAE,OAAO;AAAA,OAC1B,WACC,qCAAC,UAAD;AAAA,MACE,WAAW;AAAA,MACX,MAAM,OAAO,qBAAqB,KAAK,CAAC,SAAS,KAAK,GAAG,eAAe;AAAA,MACxE,eAAa;AAAA,SAEb;AAIZ,SAAO,qCAAC,WAAD;AAAA,OAAe;AAAA;AAAA;",
+  "names": []
+}

package/dist/esm/hoc/WithDnDSortableItemContext.js

@@ -0,0 +1,40 @@
+import * as React from "react";
+import React2, { useContext, useMemo } from "react";
+import { useSortable } from "@dnd-kit/sortable";
+import { SortableItemContext } from "./SortableItemContext";
+import TreeViewContext from "../TreeViewContext";
+import { DnDTreeContext } from "./DnDTreeContext";
+const withDnDSortableItemContext = (Component) => (props) => {
+  const { withDragAndDrop } = useContext(TreeViewContext);
+  const { dropIndicatorPosition, lastActiveId, setLastActiveId, isDropValid } = useContext(DnDTreeContext);
+  const id = props.item.id.toString();
+  const draggableOptions = useMemo(() => ({
+    id
+  }), [id]);
+  const useSortableHelpers = useSortable(draggableOptions);
+  const draggableProps = useMemo(() => {
+    if (!withDragAndDrop)
+      return false;
+    const { index, overIndex } = useSortableHelpers;
+    return {
+      ...useSortableHelpers,
+      shouldShowDropIndicatorPosition: overIndex === index,
+      dropIndicatorPosition,
+      lastActiveId,
+      setLastActiveId,
+      isDropValid
+    };
+  }, [withDragAndDrop, useSortableHelpers, dropIndicatorPosition, lastActiveId, setLastActiveId, isDropValid]);
+  const ctx = useMemo(() => ({
+    draggableProps
+  }), [draggableProps]);
+  return /* @__PURE__ */ React2.createElement(SortableItemContext.Provider, {
+    value: ctx
+  }, /* @__PURE__ */ React2.createElement(Component, {
+    ...props
+  }));
+};
+export {
+  withDnDSortableItemContext
+};
+//# sourceMappingURL=WithDnDSortableItemContext.js.map

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

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../scripts/build/transpile/react-shim.js", "../../../src/hoc/WithDnDSortableItemContext.tsx"],
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable @typescript-eslint/no-unsafe-call */\n/* eslint-disable @typescript-eslint/no-unsafe-member-access */\n/* eslint-disable @typescript-eslint/no-unsafe-assignment */\nimport React, { useContext, useMemo } from 'react';\nimport { useSortable } from '@dnd-kit/sortable';\nimport { SortableItemContext, SortableItemContextType } from './SortableItemContext';\nimport TreeViewContext from '../TreeViewContext';\nimport { DnDTreeContext } from './DnDTreeContext';\nimport { DSTreeviewT } from '../react-desc-prop-types';\n\ntype FunctionalHOC = <T = unknown>(Component: React.ComponentType<T>, ...other: unknown[]) => (props: T) => JSX.Element;\n\nexport const withDnDSortableItemContext: FunctionalHOC = (Component) => (props: any) => {\n  const { withDragAndDrop } = useContext(TreeViewContext);\n  const { dropIndicatorPosition, lastActiveId, setLastActiveId, isDropValid } = useContext(DnDTreeContext);\n\n  const id = (props as { item: DSTreeviewT.Item }).item.id.toString();\n\n  // onMount generate unique options, so everyting is only ran once\n  const draggableOptions = useMemo(\n    () => ({\n      id,\n    }),\n    [id],\n  );\n\n  const useSortableHelpers = useSortable(draggableOptions);\n\n  // calculate all the \"useSortable\" values as per required\n  const draggableProps = useMemo(() => {\n    if (!withDragAndDrop) return false;\n\n    const { index, overIndex } = useSortableHelpers;\n\n    return {\n      ...useSortableHelpers,\n      shouldShowDropIndicatorPosition: overIndex === index,\n      dropIndicatorPosition,\n      lastActiveId,\n      setLastActiveId,\n      isDropValid,\n    };\n  }, [withDragAndDrop, useSortableHelpers, dropIndicatorPosition, lastActiveId, setLastActiveId, isDropValid]);\n\n  // we use a context so we can easly access information wherever without bubbling down\n  // this context is all Memoized so as long as component is not re-mounted,\n  // the context won't trigger un-required renders per-se...\n  const ctx: SortableItemContextType = useMemo(\n    () => ({\n      draggableProps,\n    }),\n    [draggableProps],\n  );\n  // we always add the context, if draggableProps===false we don't have the DnD enabled.\n  return (\n    <SortableItemContext.Provider value={ctx}>\n      <Component {...props} />\n    </SortableItemContext.Provider>\n  );\n};\n"],
+  "mappings": "AAAA;ACGA;AACA;AACA;AACA;AACA;AAKO,MAAM,6BAA4C,CAAC,cAAc,CAAC,UAAe;AACtF,QAAM,EAAE,oBAAoB,WAAW;AACvC,QAAM,EAAE,uBAAuB,cAAc,iBAAiB,gBAAgB,WAAW;AAEzF,QAAM,KAAM,MAAqC,KAAK,GAAG;AAGzD,QAAM,mBAAmB,QACvB,MAAO;AAAA,IACL;AAAA,MAEF,CAAC;AAGH,QAAM,qBAAqB,YAAY;AAGvC,QAAM,iBAAiB,QAAQ,MAAM;AACnC,QAAI,CAAC;AAAiB,aAAO;AAE7B,UAAM,EAAE,OAAO,cAAc;AAE7B,WAAO;AAAA,SACF;AAAA,MACH,iCAAiC,cAAc;AAAA,MAC/C;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA,KAED,CAAC,iBAAiB,oBAAoB,uBAAuB,cAAc,iBAAiB;AAK/F,QAAM,MAA+B,QACnC,MAAO;AAAA,IACL;AAAA,MAEF,CAAC;AAGH,SACE,qCAAC,oBAAoB,UAArB;AAAA,IAA8B,OAAO;AAAA,KACnC,qCAAC,WAAD;AAAA,OAAe;AAAA;AAAA;",
+  "names": []
+}

package/dist/esm/parts/DnDHandle.js

@@ -0,0 +1,28 @@
+import * as React from "react";
+import React2, { useContext } from "react";
+import { GripperVertical } from "@elliemae/ds-icons";
+import { SortableItemContext } from "../hoc/SortableItemContext";
+const DnDHandle = ({ id, isDragOverlay }) => {
+  const { draggableProps } = useContext(SortableItemContext);
+  const isDragging = draggableProps && draggableProps.isDragging;
+  return /* @__PURE__ */ React2.createElement(GripperVertical, {
+    role: "button",
+    ...draggableProps && {
+      ...draggableProps.listeners,
+      ...draggableProps.attributes
+    },
+    "data-testid": "drag-handle",
+    "data-isactive": draggableProps && !!draggableProps.active,
+    "data-isdragoverlay": isDragOverlay,
+    id: `${id}-drag-handle`,
+    key: `${id}-drag-handle`,
+    className: `drag-handle ${isDragging ? "" : "focuseable"}`,
+    color: ["brand-primary", "800"],
+    size: "s",
+    tabIndex: 0
+  });
+};
+export {
+  DnDHandle
+};
+//# sourceMappingURL=DnDHandle.js.map

package/dist/esm/parts/DnDHandle.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../scripts/build/transpile/react-shim.js", "../../../src/parts/DnDHandle.tsx"],
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import React, { useContext } from 'react';\nimport { GripperVertical } from '@elliemae/ds-icons';\nimport { SortableItemContext } from '../hoc/SortableItemContext';\nimport { DSTreeviewT } from '../react-desc-prop-types';\n\nexport const DnDHandle = ({ id, isDragOverlay }: { id: DSTreeviewT.StringOrNum; isDragOverlay: boolean }) => {\n  const { draggableProps } = useContext(SortableItemContext);\n\n  const isDragging = draggableProps && draggableProps.isDragging;\n\n  return (\n    <GripperVertical\n      role=\"button\"\n      {...(draggableProps && {\n        ...draggableProps.listeners,\n        ...draggableProps.attributes,\n      })}\n      data-testid=\"drag-handle\"\n      data-isactive={draggableProps && !!draggableProps.active}\n      data-isdragoverlay={isDragOverlay}\n      id={`${id}-drag-handle`}\n      key={`${id}-drag-handle`}\n      className={`drag-handle ${isDragging ? '' : 'focuseable'}`}\n      color={['brand-primary', '800']}\n      size=\"s\"\n      tabIndex={0}\n    />\n  );\n};\n"],
+  "mappings": "AAAA;ACAA;AACA;AACA;AAGO,MAAM,YAAY,CAAC,EAAE,IAAI,oBAA6E;AAC3G,QAAM,EAAE,mBAAmB,WAAW;AAEtC,QAAM,aAAa,kBAAkB,eAAe;AAEpD,SACE,qCAAC,iBAAD;AAAA,IACE,MAAK;AAAA,OACA,kBAAkB;AAAA,SAClB,eAAe;AAAA,SACf,eAAe;AAAA;AAAA,IAEpB,eAAY;AAAA,IACZ,iBAAe,kBAAkB,CAAC,CAAC,eAAe;AAAA,IAClD,sBAAoB;AAAA,IACpB,IAAI,GAAG;AAAA,IACP,KAAK,GAAG;AAAA,IACR,WAAW,eAAe,aAAa,KAAK;AAAA,IAC5C,OAAO,CAAC,iBAAiB;AAAA,IACzB,MAAK;AAAA,IACL,UAAU;AAAA;AAAA;",
+  "names": []
+}

package/dist/esm/parts/DropIndicator.js

@@ -0,0 +1,51 @@
+import * as React from "react";
+import React2 from "react";
+import styled from "styled-components";
+import { DropIndicatorPosition } from "../hoc/SortableItemContext";
+const getPositionStyles = ({ dropIndicatorPosition }) => `
+      top: ${dropIndicatorPosition === DropIndicatorPosition.Before ? "0" : "unset"};
+      bottom: ${dropIndicatorPosition === DropIndicatorPosition.After ? "0" : "unset"};
+      left: -2px;
+    `;
+const getCircleStyles = ({ dropIndicatorPosition }) => ({
+  position: "absolute",
+  zIndex: 20,
+  top: dropIndicatorPosition === DropIndicatorPosition.After ? "unset" : "-2px",
+  bottom: dropIndicatorPosition === DropIndicatorPosition.Before ? "unset" : "-2px",
+  left: "0px",
+  opacity: 1
+});
+const StyledIndicator = styled.div`
+  position: absolute;
+  ${getPositionStyles}
+  box-sizing: border-box;
+  width: ${(props) => props.vertical ? "2px" : "100%"};
+  height: ${(props) => props.vertical ? "100%" : "2px"};
+  background-color: ${({ isDropValid, theme }) => isDropValid ? theme.colors.brand[600] : theme.colors.danger[900]};
+  z-index: 20;
+`;
+const CircleIndicator = (style, isDropValid) => /* @__PURE__ */ React2.createElement("svg", {
+  height: "6",
+  width: "6",
+  style
+}, /* @__PURE__ */ React2.createElement("circle", {
+  cx: "3",
+  cy: "3",
+  r: "3",
+  strokeWidth: "0",
+  fill: isDropValid ? "#1E79C2" : "#C64252"
+}));
+const DropIndicator = ({ dropIndicatorPosition, isLast, isDropValid }) => {
+  if (![DropIndicatorPosition.After, DropIndicatorPosition.Before].includes(dropIndicatorPosition))
+    return null;
+  const safeDropIndicatorPosition = isLast ? DropIndicatorPosition.Before : dropIndicatorPosition;
+  return /* @__PURE__ */ React2.createElement(React2.Fragment, null, CircleIndicator(getCircleStyles({ dropIndicatorPosition: safeDropIndicatorPosition }), isDropValid), /* @__PURE__ */ React2.createElement(StyledIndicator, {
+    dropIndicatorPosition: safeDropIndicatorPosition,
+    isDropValid
+  }));
+};
+var DropIndicator_default = DropIndicator;
+export {
+  DropIndicator_default as default
+};
+//# sourceMappingURL=DropIndicator.js.map

package/dist/esm/parts/DropIndicator.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../scripts/build/transpile/react-shim.js", "../../../src/parts/DropIndicator.tsx"],
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "import React from 'react';\nimport styled from 'styled-components';\nimport { DropIndicatorPosition } from '../hoc/SortableItemContext';\n\ninterface DropIndicatorProps {\n  vertical?: boolean;\n  dropIndicatorPosition: DropIndicatorPosition | false;\n  isLast?: boolean;\n  isDropValid?: boolean;\n}\n\nconst getPositionStyles = ({ dropIndicatorPosition }: DropIndicatorProps) => `\n      top: ${dropIndicatorPosition === DropIndicatorPosition.Before ? '0' : 'unset'};\n      bottom: ${dropIndicatorPosition === DropIndicatorPosition.After ? '0' : 'unset'};\n      left: -2px;\n    `;\n\nconst getCircleStyles = ({ dropIndicatorPosition }: DropIndicatorProps) => ({\n  position: 'absolute',\n  zIndex: 20,\n  top: dropIndicatorPosition === DropIndicatorPosition.After ? 'unset' : '-2px',\n  bottom: dropIndicatorPosition === DropIndicatorPosition.Before ? 'unset' : '-2px',\n  left: '0px',\n  opacity: 1,\n});\n\nconst StyledIndicator = styled.div<DropIndicatorProps>`\n  position: absolute;\n  ${getPositionStyles}\n  box-sizing: border-box;\n  width: ${(props) => (props.vertical ? '2px' : '100%')};\n  height: ${(props) => (props.vertical ? '100%' : '2px')};\n  background-color: ${({ isDropValid, theme }) => (isDropValid ? theme.colors.brand[600] : theme.colors.danger[900])};\n  z-index: 20;\n`;\n\nconst CircleIndicator = (style: Record<string, unknown>, isDropValid: boolean | null | undefined) => (\n  <svg height=\"6\" width=\"6\" style={style}>\n    <circle cx=\"3\" cy=\"3\" r=\"3\" strokeWidth=\"0\" fill={isDropValid ? '#1E79C2' : '#C64252'} />\n  </svg>\n);\n\nconst DropIndicator: React.ComponentType<DropIndicatorProps> = ({ dropIndicatorPosition, isLast, isDropValid }) => {\n  if (\n    ![DropIndicatorPosition.After, DropIndicatorPosition.Before].includes(\n      dropIndicatorPosition as DropIndicatorPosition,\n    )\n  )\n    return null;\n\n  const safeDropIndicatorPosition = isLast ? DropIndicatorPosition.Before : dropIndicatorPosition;\n\n  return (\n    <>\n      {CircleIndicator(getCircleStyles({ dropIndicatorPosition: safeDropIndicatorPosition }), isDropValid)}\n      <StyledIndicator dropIndicatorPosition={safeDropIndicatorPosition} isDropValid={isDropValid} />\n    </>\n  );\n};\n\nexport default DropIndicator;\n"],
+  "mappings": "AAAA;ACAA;AACA;AACA;AASA,MAAM,oBAAoB,CAAC,EAAE,4BAAgD;AAAA,aAChE,0BAA0B,sBAAsB,SAAS,MAAM;AAAA,gBAC5D,0BAA0B,sBAAsB,QAAQ,MAAM;AAAA;AAAA;AAI9E,MAAM,kBAAkB,CAAC,EAAE,4BAAiD;AAAA,EAC1E,UAAU;AAAA,EACV,QAAQ;AAAA,EACR,KAAK,0BAA0B,sBAAsB,QAAQ,UAAU;AAAA,EACvE,QAAQ,0BAA0B,sBAAsB,SAAS,UAAU;AAAA,EAC3E,MAAM;AAAA,EACN,SAAS;AAAA;AAGX,MAAM,kBAAkB,OAAO;AAAA;AAAA,IAE3B;AAAA;AAAA,WAEO,CAAC,UAAW,MAAM,WAAW,QAAQ;AAAA,YACpC,CAAC,UAAW,MAAM,WAAW,SAAS;AAAA,sBAC5B,CAAC,EAAE,aAAa,YAAa,cAAc,MAAM,OAAO,MAAM,OAAO,MAAM,OAAO,OAAO;AAAA;AAAA;AAI/G,MAAM,kBAAkB,CAAC,OAAgC,gBACvD,qCAAC,OAAD;AAAA,EAAK,QAAO;AAAA,EAAI,OAAM;AAAA,EAAI;AAAA,GACxB,qCAAC,UAAD;AAAA,EAAQ,IAAG;AAAA,EAAI,IAAG;AAAA,EAAI,GAAE;AAAA,EAAI,aAAY;AAAA,EAAI,MAAM,cAAc,YAAY;AAAA;AAIhF,MAAM,gBAAyD,CAAC,EAAE,uBAAuB,QAAQ,kBAAkB;AACjH,MACE,CAAC,CAAC,sBAAsB,OAAO,sBAAsB,QAAQ,SAC3D;AAGF,WAAO;AAET,QAAM,4BAA4B,SAAS,sBAAsB,SAAS;AAE1E,SACE,4DACG,gBAAgB,gBAAgB,EAAE,uBAAuB,8BAA8B,cACxF,qCAAC,iBAAD;AAAA,IAAiB,uBAAuB;AAAA,IAA2B;AAAA;AAAA;AAKzE,IAAO,wBAAQ;",
+  "names": []
+}

package/{esm → dist/esm}/parts/TreeItem.js

@@ -1,8 +1,6 @@
 import * as React from "react";
-import React2, { useContext, useState, useMemo, useRef, useCallback } from "react";
-import { SortableElement, SortableHandle } from "@elliemae/react-sortable-hoc";
+import React2, { useContext, useMemo, useCallback } from "react";
 import { aggregatedClasses } from "@elliemae/ds-classnames";
-import { GripperVertical } from "@elliemae/ds-icons";
 import RadioSelectable from "./RadioSelectable";
 import CheckboxSelectable from "./CheckboxSelectable";
 import TreeViewContext from "../TreeViewContext";
@@ -13,23 +11,15 @@ import { Icon } from "./Icon";
 import { ExpandCaret } from "./ExpandCaret";
 import { TreeItemText } from "./TreeItemText";
 import { DSTreeViewPrefix, treeItemBlockName } from "../config/cssClassesConstants";
+import { DnDHandle } from "./DnDHandle";
+import { withDnDSortableItemContext } from "../hoc/WithDnDSortableItemContext";
+import { DropIndicatorPosition, SortableItemContext } from "../hoc/SortableItemContext";
+import DropIndicator from "./DropIndicator";
 const TreeListItem = aggregatedClasses("li", {
   "data-testid": treeItemBlockName,
   role: "treeitem"
 })(treeItemBlockName);
 const TreeListItemAddonsWrapper = aggregatedClasses("div")(treeItemBlockName, "addons");
-const DnDHandle = SortableHandle(({ id }) => /* @__PURE__ */ React2.createElement(GripperVertical, {
-  "data-testid": "drag-handle",
-  key: `${id}-drag-handle`,
-  className: "drag-handle",
-  size: "s",
-  onMouseDown: (e) => {
-    if (e) {
-      e.preventDefault();
-    }
-  },
-  tabIndex: "0"
-}));
 const TreeItem = (props) => {
   const {
     item,
@@ -37,47 +27,43 @@ const TreeItem = (props) => {
     itemWrapperStyle = {},
     virtualItemRef,
     spaceForNestingLevel = 1.5,
-    onMouseDragOverItem
+    isDragOverlay = false
   } = props;
   const { id, node } = item;
   const { nodeItemRef } = node.model;
-  const openFolderOnHoverTimeout = useRef(null);
-  const [isDraggingOverThis, setIsDraggingOverThis] = useState(false);
-  const onItemKeyDown = useOnItemKeyDown(item);
+  const { draggableProps } = useContext(SortableItemContext);
+  const onItemKeyDown = useOnItemKeyDown(item, draggableProps);
   const ctx = useContext(TreeViewContext);
   const {
     props: { disableIcons, rightAddons, onItemClick, onItemFocus, rowSize, labelOverflow },
-    relativeMouseCord,
     withRadioChecks,
     withCheckboxChecks,
     withDragAndDrop,
     selectedItem,
     selectedCheckboxes,
     hoverItem,
-    isDragging,
     virtualListHelpers: { scrollToIndex },
     setHoverItem,
     setSelectedItem,
     setFocusedItem
   } = ctx;
   const setItemRefs = (ref) => {
-    setMultipleRefs(virtualItemRef, nodeItemRef)(ref);
+    setMultipleRefs(virtualItemRef, !isDragOverlay && nodeItemRef, !isDragOverlay && draggableProps && draggableProps.setNodeRef)(ref);
   };
+  const dropIndicatorPosition = draggableProps && draggableProps.shouldShowDropIndicatorPosition && draggableProps.dropIndicatorPosition;
+  const isDropIndicatorPositionInside = dropIndicatorPosition === DropIndicatorPosition.Inside;
+  const isDragging = draggableProps && draggableProps.isDragging;
+  const isDropValid = draggableProps && draggableProps.isDropValid;
   const dropPreviewClassName = useMemo(() => {
-    if (!withDragAndDrop || !relativeMouseCord || !isDraggingOverThis)
-      return "";
-    const { isBefore, isAfter, isValid } = relativeMouseCord;
-    let className = `${DSTreeViewPrefix}-${treeItemBlockName}${isValid ? "--valid" : "--invalid"}`;
-    if (isBefore)
-      className += "-drop-before";
-    else if (isAfter)
-      className += "-drop-after";
-    else
-      className += "-drop-in";
-    return className;
-  }, [withDragAndDrop, relativeMouseCord, isDraggingOverThis]);
-  const selectedClassName = useMemo(() => selectedItem?.id === item.id ? "selected" : "", [item.id, selectedItem?.id]);
-  const hoverClassName = useMemo(() => hoverItem?.id !== item.id || withDragAndDrop && isDragging ? "" : "hover", [hoverItem?.id, item.id, withDragAndDrop, isDragging]);
+    if (isDropIndicatorPositionInside) {
+      const className = `${DSTreeViewPrefix}-${treeItemBlockName}${isDropValid ? "--valid" : "--invalid"}-drop-in`;
+      return className;
+    }
+    return "";
+  }, [isDropIndicatorPositionInside, isDropValid]);
+  const dragOverlayClassName = useMemo(() => isDragOverlay ? "drag-overlay" : "", [isDragOverlay]);
+  const selectedClassName = useMemo(() => selectedItem?.id === item.id && !isDragOverlay ? "selected" : "", [isDragOverlay, item.id, selectedItem?.id]);
+  const hoverClassName = useMemo(() => !isDragOverlay && (hoverItem?.id === item.id || isDragging) ? "hover" : "", [isDragOverlay, hoverItem?.id, item.id, isDragging]);
   const fixedHeightClassname = useMemo(() => {
     if (labelOverflow === "truncate") {
       if (rowSize === "compact")
@@ -86,7 +72,7 @@ const TreeItem = (props) => {
     }
     return "";
   }, [labelOverflow, rowSize]);
-  const finalClassName = useMemo(() => `${dropPreviewClassName} ${fixedHeightClassname} ${selectedClassName} ${hoverClassName}`, [dropPreviewClassName, selectedClassName, hoverClassName, fixedHeightClassname]);
+  const finalClassName = useMemo(() => `${dropPreviewClassName} ${fixedHeightClassname} ${selectedClassName} ${hoverClassName} ${dragOverlayClassName}`, [dropPreviewClassName, selectedClassName, hoverClassName, fixedHeightClassname, dragOverlayClassName]);
   const handleItemClick = useCallback((e) => {
     onItemClick(item, e);
     setFocusedItem(item);
@@ -100,23 +86,7 @@ const TreeItem = (props) => {
   }, [item, scrollToIndex, onItemClick, onItemFocus, setSelectedItem, setFocusedItem]);
   return /* @__PURE__ */ React2.createElement(TreeListItem, {
     tabIndex: 0,
-    onMouseMove: (event) => {
-      if (withDragAndDrop && onMouseDragOverItem) {
-        onMouseDragOverItem({
-          event,
-          item,
-          itemIndex,
-          setIsDraggingOverThis,
-          openFolderOnHoverTimeout
-        });
-      }
-    },
     onMouseLeave: () => {
-      if (withDragAndDrop) {
-        setIsDraggingOverThis(false);
-        if (openFolderOnHoverTimeout?.current)
-          clearTimeout(openFolderOnHoverTimeout.current);
-      }
       if (hoverItem?.id === item.id) {
         setHoverItem(null);
       }
@@ -125,6 +95,7 @@ const TreeItem = (props) => {
       setHoverItem(item);
     },
     onClick: handleItemClick,
+    onBlur: () => setFocusedItem(null),
     ref: setItemRefs,
     style: { ...itemWrapperStyle },
     className: finalClassName,
@@ -134,29 +105,33 @@ const TreeItem = (props) => {
     "data-index": item.virtualIndex,
     onKeyDown: onItemKeyDown
   }, /* @__PURE__ */ React2.createElement(TreeListItemAddonsWrapper, null, withDragAndDrop ? /* @__PURE__ */ React2.createElement(DnDHandle, {
-    id
-  }) : null, withRadioChecks ? /* @__PURE__ */ React2.createElement(RadioSelectable, {
+    id,
+    isDragOverlay
+  }) : null, withRadioChecks && !isDragOverlay ? /* @__PURE__ */ React2.createElement(RadioSelectable, {
     item,
     itemIndex
-  }) : null, withCheckboxChecks ? /* @__PURE__ */ React2.createElement(CheckboxSelectable, {
+  }) : null, withCheckboxChecks && !isDragOverlay ? /* @__PURE__ */ React2.createElement(CheckboxSelectable, {
     item,
     itemIndex
-  }) : null, /* @__PURE__ */ React2.createElement(NestingSpace, {
+  }) : null, !isDragOverlay && /* @__PURE__ */ React2.createElement(NestingSpace, {
     item,
     spaceForNestingLevel
-  }), /* @__PURE__ */ React2.createElement(ExpandCaret, {
+  }), !isDragOverlay && /* @__PURE__ */ React2.createElement(ExpandCaret, {
     item
   }), !disableIcons ? /* @__PURE__ */ React2.createElement(Icon, {
     item
   }) : null), /* @__PURE__ */ React2.createElement(TreeItemText, {
     item
-  }), rightAddons && /* @__PURE__ */ React2.createElement(TreeListItemAddonsWrapper, null, typeof rightAddons === "function" ? rightAddons(item) : rightAddons));
+  }), rightAddons && /* @__PURE__ */ React2.createElement(TreeListItemAddonsWrapper, null, typeof rightAddons === "function" ? rightAddons(item) : rightAddons), /* @__PURE__ */ React2.createElement(DropIndicator, {
+    dropIndicatorPosition,
+    isDropValid
+  }));
 };
-const DragAndDropTreeItem = SortableElement(TreeItem);
+var TreeItem_default = withDnDSortableItemContext(TreeItem);
 export {
-  DragAndDropTreeItem,
   TreeItem,
   TreeListItem,
-  TreeListItemAddonsWrapper
+  TreeListItemAddonsWrapper,
+  TreeItem_default as default
 };
 //# sourceMappingURL=TreeItem.js.map

package/dist/esm/parts/TreeItem.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../scripts/build/transpile/react-shim.js", "../../../src/parts/TreeItem.tsx"],
+  "sourcesContent": ["import * as React from 'react';\nexport { React };\n", "/* eslint-disable complexity */\n/* eslint-disable max-lines */\nimport React, { useContext, useMemo, useCallback } from 'react';\n\nimport { aggregatedClasses } from '@elliemae/ds-classnames';\n\nimport RadioSelectable from './RadioSelectable';\nimport CheckboxSelectable from './CheckboxSelectable';\nimport TreeViewContext from '../TreeViewContext';\nimport { setMultipleRefs } from '../utils/refs-helpers';\nimport { useOnItemKeyDown } from '../utils/keyboard-helpers';\nimport { NestingSpace } from './NestingSpace';\nimport { Icon } from './Icon';\nimport { ExpandCaret } from './ExpandCaret';\nimport { TreeItemText } from './TreeItemText';\nimport { DSTreeViewPrefix, treeItemBlockName } from '../config/cssClassesConstants';\nimport type { DSTreeviewT } from '../react-desc-prop-types';\nimport { DnDHandle } from './DnDHandle';\nimport { withDnDSortableItemContext } from '../hoc/WithDnDSortableItemContext';\nimport { DropIndicatorPosition, SortableItemContext } from '../hoc/SortableItemContext';\nimport DropIndicator from './DropIndicator';\n\nexport const TreeListItem = aggregatedClasses('li', {\n  'data-testid': treeItemBlockName,\n  role: 'treeitem',\n  // temp fix untill we move to styled components\n})(treeItemBlockName) as unknown as React.ComponentType<React.ComponentProps<'li'>>;\n\nexport const TreeListItemAddonsWrapper = aggregatedClasses('div')(\n  treeItemBlockName,\n  'addons',\n  // temp fix untill we move to styled components\n) as unknown as React.ComponentType;\n\ninterface PropsT {\n  item: DSTreeviewT.Item;\n  itemIndex: number;\n  isDragOverlay?: boolean;\n  virtualItemRef?: React.RefObject<HTMLLIElement>;\n  itemWrapperStyle?: { [key: string]: unknown };\n  spaceForNestingLevel?: number;\n}\nexport const TreeItem = (props: PropsT): JSX.Element => {\n  const {\n    item,\n    itemIndex,\n    itemWrapperStyle = {},\n    virtualItemRef,\n    spaceForNestingLevel = 1.5,\n    isDragOverlay = false,\n  } = props;\n  const { id, node } = item;\n  const { nodeItemRef } = node.model;\n\n  const { draggableProps } = useContext(SortableItemContext);\n\n  const onItemKeyDown = useOnItemKeyDown(item, draggableProps);\n\n  const ctx = useContext(TreeViewContext);\n  const {\n    props: { disableIcons, rightAddons, onItemClick, onItemFocus, rowSize, labelOverflow },\n    withRadioChecks,\n    withCheckboxChecks,\n    withDragAndDrop,\n    selectedItem,\n    selectedCheckboxes,\n    hoverItem,\n    virtualListHelpers: { scrollToIndex },\n    setHoverItem,\n    setSelectedItem,\n    setFocusedItem,\n  } = ctx;\n\n  // Sortable Items needs to update\n  //   - the virtual list ref (for react-virtual requirement)\n  //   - nodeItemRef which is a prop avaiable in the TreeModel nodes\n  //   - the drag and drop node reference\n  const setItemRefs: React.LegacyRef<HTMLLIElement> | undefined = (ref: HTMLLIElement) => {\n    setMultipleRefs(\n      virtualItemRef,\n      !isDragOverlay && nodeItemRef,\n      !isDragOverlay && draggableProps && draggableProps.setNodeRef,\n    )(ref);\n  };\n\n  const dropIndicatorPosition =\n    draggableProps && draggableProps.shouldShowDropIndicatorPosition && draggableProps.dropIndicatorPosition;\n\n  const isDropIndicatorPositionInside = dropIndicatorPosition === DropIndicatorPosition.Inside;\n\n  const isDragging = draggableProps && draggableProps.isDragging;\n\n  const isDropValid = draggableProps && draggableProps.isDropValid;\n\n  const dropPreviewClassName = useMemo(() => {\n    if (isDropIndicatorPositionInside) {\n      const className = `${DSTreeViewPrefix}-${treeItemBlockName}${isDropValid ? '--valid' : '--invalid'}-drop-in`;\n      return className;\n    }\n    return '';\n  }, [isDropIndicatorPositionInside, isDropValid]);\n\n  const dragOverlayClassName = useMemo(() => (isDragOverlay ? 'drag-overlay' : ''), [isDragOverlay]);\n\n  const selectedClassName = useMemo(\n    () => (selectedItem?.id === item.id && !isDragOverlay ? 'selected' : ''),\n    [isDragOverlay, item.id, selectedItem?.id],\n  );\n  const hoverClassName = useMemo(\n    () => (!isDragOverlay && (hoverItem?.id === item.id || isDragging) ? 'hover' : ''),\n    [isDragOverlay, hoverItem?.id, item.id, isDragging],\n  );\n  const fixedHeightClassname = useMemo(() => {\n    if (labelOverflow === 'truncate') {\n      if (rowSize === 'compact') return `${DSTreeViewPrefix}-${treeItemBlockName}--fixed-height-compact`;\n      return `${DSTreeViewPrefix}-${treeItemBlockName}--fixed-height`;\n    }\n    return '';\n  }, [labelOverflow, rowSize]);\n\n  const finalClassName = useMemo(\n    () =>\n      `${dropPreviewClassName} ${fixedHeightClassname} ${selectedClassName} ${hoverClassName} ${dragOverlayClassName}`,\n    [dropPreviewClassName, selectedClassName, hoverClassName, fixedHeightClassname, dragOverlayClassName],\n  );\n\n  const handleItemClick = useCallback(\n    (e: React.MouseEvent<HTMLLIElement>) => {\n      onItemClick(item, e);\n      setFocusedItem(item);\n      setSelectedItem(item);\n      const itemVirtualIndex = typeof item.virtualIndex === 'number' ? item.virtualIndex : -1;\n      onItemFocus({\n        itemIndex: itemVirtualIndex,\n        scrollToItem: (opts = { align: 'start' }) => scrollToIndex(itemVirtualIndex, opts),\n        item,\n      });\n    },\n    [item, scrollToIndex, onItemClick, onItemFocus, setSelectedItem, setFocusedItem],\n  );\n\n  return (\n    <TreeListItem\n      tabIndex={0}\n      onMouseLeave={() => {\n        if (hoverItem?.id === item.id) {\n          setHoverItem(null);\n        }\n      }}\n      onMouseEnter={() => {\n        setHoverItem(item);\n      }}\n      onClick={handleItemClick}\n      onBlur={() => setFocusedItem(null)}\n      ref={setItemRefs}\n      style={{ ...itemWrapperStyle }}\n      className={finalClassName}\n      aria-expanded={!!item.isExpanded}\n      aria-selected={!!selectedCheckboxes[item.id]}\n      data-id={item.id}\n      data-index={item.virtualIndex}\n      onKeyDown={onItemKeyDown}\n    >\n      <TreeListItemAddonsWrapper>\n        {withDragAndDrop ? <DnDHandle id={id} isDragOverlay={isDragOverlay} /> : null}\n        {withRadioChecks && !isDragOverlay ? <RadioSelectable item={item} itemIndex={itemIndex} /> : null}\n        {withCheckboxChecks && !isDragOverlay ? <CheckboxSelectable item={item} itemIndex={itemIndex} /> : null}\n        {!isDragOverlay && <NestingSpace item={item} spaceForNestingLevel={spaceForNestingLevel} />}\n        {!isDragOverlay && <ExpandCaret item={item} />}\n        {!disableIcons ? <Icon item={item} /> : null}\n      </TreeListItemAddonsWrapper>\n      <TreeItemText item={item} />\n      {rightAddons && (\n        <TreeListItemAddonsWrapper>\n          {typeof rightAddons === 'function' ? rightAddons(item) : rightAddons}\n        </TreeListItemAddonsWrapper>\n      )}\n      <DropIndicator dropIndicatorPosition={dropIndicatorPosition} isDropValid={isDropValid} />\n    </TreeListItem>\n  );\n};\n\nexport default withDnDSortableItemContext(TreeItem);\n"],
+  "mappings": "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",
+  "names": []
+}

package/{esm → dist/esm}/parts/TreeList.js

@@ -1,11 +1,12 @@
 import * as React from "react";
 import React2, { useContext } from "react";
-import { SortableContainer } from "@elliemae/react-sortable-hoc";
 import { aggregatedClasses } from "@elliemae/ds-classnames";
 import { DSCircularProgressIndicator } from "@elliemae/ds-circular-progress-indicator";
 import TreeViewContext from "../TreeViewContext";
 import { DSTreeViewPrefix, treeListBlockName } from "../config/cssClassesConstants";
-import { TreeItem, DragAndDropTreeItem } from "./TreeItem";
+import TreeItem from "./TreeItem";
+import { withConditionalDnDRowContext } from "../hoc/WithConditionalDnDContext";
+import { DnDTreeContext } from "../hoc/DnDTreeContext";
 const treeListNoItemsBn = `${treeListBlockName}-no-items`;
 const TreeListNoItems = aggregatedClasses("div", {
   "data-testid": treeListNoItemsBn
@@ -18,18 +19,17 @@ const TreeListWrapper = aggregatedClasses("ul", {
 }));
 const compactRowClass = `${DSTreeViewPrefix}-tv-row-size-compact`;
 const normaRowClass = `${DSTreeViewPrefix}-tv-row-size-normal`;
-const TreeList = (props) => {
-  const { onMouseDragOverItem } = props;
+const TreeListComp = () => {
   const ctx = useContext(TreeViewContext);
   const {
     virtualListRef,
     virtualListHelpers,
-    visibleItems,
-    withDragAndDrop,
+    visibleItems: flattenedVisibleItems,
     props: { width, height, rowSize, noItemsPlaceholder, isLoading }
   } = ctx;
   const { totalSize, virtualItems } = virtualListHelpers;
   const className = `${rowSize === "compact" ? `${compactRowClass}` : `${normaRowClass}`}`;
+  const { visibleItems } = useContext(DnDTreeContext);
   return /* @__PURE__ */ React2.createElement(TreeListWrapper, {
     ref: virtualListRef,
     className,
@@ -60,15 +60,16 @@ const TreeList = (props) => {
     }
   }, virtualItems.map((virtualItem) => {
     const { index, measureRef, start } = virtualItem;
-    const item = visibleItems[index];
+    const item = (visibleItems || flattenedVisibleItems)[index];
+    if (!item)
+      return null;
     item.virtualIndex = index;
     const { id } = item;
     const style = {
       position: "absolute",
-      top: 0,
+      top: `${start}px`,
       left: 0,
-      width: "100%",
-      transform: `translateY(${start}px)`
+      width: "100%"
     };
     const listItemProps = {
       key: `DS-TreeView-List-Item-${id}`,
@@ -78,19 +79,13 @@ const TreeList = (props) => {
       item,
       itemWrapperStyle: style
     };
-    if (withDragAndDrop)
-      return /* @__PURE__ */ React2.createElement(DragAndDropTreeItem, {
-        ...listItemProps,
-        onMouseDragOverItem
-      });
     return /* @__PURE__ */ React2.createElement(TreeItem, {
       ...listItemProps
     });
   })) : null);
 };
-const DragAndDropTreeList = SortableContainer(TreeList);
+const TreeList = withConditionalDnDRowContext(TreeListComp);
 export {
-  DragAndDropTreeList,
   TreeList,
   TreeListNoItems,
   TreeListWrapper,

package/dist/esm/parts/TreeList.js.map

@@ -0,0 +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 { 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": []
+}