@elliemae/ds-drag-and-drop 2.4.2-rc.9 → 2.4.2

package/cjs/hierarchy/customCollisionDetection.js

@@ -11,19 +11,15 @@ require('core-js/modules/esnext.async-iterator.for-each.js');
 require('core-js/modules/esnext.iterator.for-each.js');
 
 const customCollisionDetection = (activeId, activeParent, dndItems) => _ref => {
-  var _originalContainer$re;
-
   let {
     droppableContainers,
     collisionRect
   } = _ref;
   const entriesWithSameParent = droppableContainers.filter(_ref2 => {
-    var _dndItems$find;
-
     let {
       id
     } = _ref2;
-    return ((_dndItems$find = dndItems.find(item => item.id === id)) === null || _dndItems$find === void 0 ? void 0 : _dndItems$find.parentId) === activeParent;
+    return dndItems.find(item => item.id === id)?.parentId === activeParent;
   });
   const originalContainer = entriesWithSameParent.find(_ref3 => {
     let {
@@ -31,7 +27,7 @@ const customCollisionDetection = (activeId, activeParent, dndItems) => _ref => {
     } = _ref3;
     return id === activeId;
   });
-  const originalRect = originalContainer === null || originalContainer === void 0 ? void 0 : (_originalContainer$re = originalContainer.rect) === null || _originalContainer$re === void 0 ? void 0 : _originalContainer$re.current;
+  const originalRect = originalContainer?.rect?.current;
   if (!originalRect) return null;
 
   if (originalRect.offsetLeft <= collisionRect.offsetLeft && collisionRect.offsetLeft <= originalRect.offsetLeft + originalRect.width) {

package/cjs/hierarchy/getHierarchyKeyboardCoordinates.js

@@ -23,8 +23,6 @@ const directions = [core.KeyboardCode.Down, core.KeyboardCode.Right, core.Keyboa
 const vertical = [core.KeyboardCode.Up, core.KeyboardCode.Down];
 
 const getHorizontalKeyboardCoordinates = _ref => {
-  var _droppableContainers$, _droppableContainers$2, _droppableContainers$3, _droppableContainers$4;
-
   let {
     items,
     active,
@@ -40,20 +38,18 @@ const getHorizontalKeyboardCoordinates = _ref => {
   const layoutRects = []; // Get the reacheable rects depending on the arrow key pressed
 
   droppableContainers.forEach(container => {
-    var _items$find;
-
-    if (container !== null && container !== void 0 && container.disabled || !overRect) {
+    if (container?.disabled || !overRect) {
       return;
     }
 
-    const node = container === null || container === void 0 ? void 0 : container.node.current;
+    const node = container?.node.current;
 
     if (!node) {
       return;
     }
 
-    const itemParent = (_items$find = items.find(item => item.id === container.id)) === null || _items$find === void 0 ? void 0 : _items$find.parentId;
-    if (itemParent !== (activeItem === null || activeItem === void 0 ? void 0 : activeItem.parentId)) return;
+    const itemParent = items.find(item => item.id === container.id)?.parentId;
+    if (itemParent !== activeItem?.parentId) return;
     const rect = core.getViewRect(node);
 
     if (event.code === core.KeyboardCode.Left && collisionRect.left > rect.right - 10) {
@@ -68,8 +64,8 @@ const getHorizontalKeyboardCoordinates = _ref => {
     active
   });
   if (!closestId) return undefined;
-  const closestDroppableContainer = (_droppableContainers$ = droppableContainers.get(closestId)) === null || _droppableContainers$ === void 0 ? void 0 : (_droppableContainers$2 = _droppableContainers$.node) === null || _droppableContainers$2 === void 0 ? void 0 : _droppableContainers$2.current;
-  const activeDroppableContainer = (_droppableContainers$3 = droppableContainers.get(active === null || active === void 0 ? void 0 : active.id)) === null || _droppableContainers$3 === void 0 ? void 0 : (_droppableContainers$4 = _droppableContainers$3.node) === null || _droppableContainers$4 === void 0 ? void 0 : _droppableContainers$4.current;
+  const closestDroppableContainer = droppableContainers.get(closestId)?.node?.current;
+  const activeDroppableContainer = droppableContainers.get(active?.id)?.node?.current;
   if (!closestDroppableContainer || !activeDroppableContainer) return undefined;
   const closestRect = core.getViewRect(closestDroppableContainer);
   const activeRect = core.getViewRect(activeDroppableContainer);

package/cjs/hierarchy/useHierarchyAnnouncements.js

@@ -5,25 +5,25 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var react = require('react');
 
 const useHierarchyAnnouncements = visibleItemsDictionary => {
-  const onDragStart = react.useCallback(id => "Picked up draggable item from position ".concat(visibleItemsDictionary[id].index + 1, "."), [visibleItemsDictionary]);
+  const onDragStart = react.useCallback(id => `Picked up draggable item from position ${visibleItemsDictionary[id].index + 1}.`, [visibleItemsDictionary]);
   const onDragMove = react.useCallback((id, overId) => {
     if (overId) {
       const overIndex = visibleItemsDictionary[overId].index + 1;
-      return "Draggable item was moved to position ".concat(overIndex, ".");
+      return `Draggable item was moved to position ${overIndex}.`;
     }
 
-    return "Draggable item is no longer over a droppable area.";
+    return `Draggable item is no longer over a droppable area.`;
   }, [visibleItemsDictionary]);
   const onDragOver = onDragMove;
   const onDragEnd = react.useCallback((id, overId) => {
     if (overId) {
       const overIndex = visibleItemsDictionary[overId].index + 1;
-      return "Draggable item was dropped over position ".concat(overIndex, ".");
+      return `Draggable item was dropped over position ${overIndex}.`;
     }
 
-    return "Draggable item was dropped at it's original position.";
+    return `Draggable item was dropped at it's original position.`;
   }, [visibleItemsDictionary]);
-  const onDragCancel = react.useCallback(id => "Dragging was cancelled. Draggable item from position ".concat(visibleItemsDictionary[id].index + 1, " was dropped at it's initial position."), [visibleItemsDictionary]);
+  const onDragCancel = react.useCallback(id => `Dragging was cancelled. Draggable item from position ${visibleItemsDictionary[id].index + 1} was dropped at it's initial position.`, [visibleItemsDictionary]);
   return {
     onDragStart,
     onDragOver,

package/cjs/hierarchy/useHierarchyDndkitConfig.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-require('core-js/modules/web.dom-collections.iterator.js');
 require('core-js/modules/esnext.async-iterator.map.js');
 require('core-js/modules/esnext.iterator.map.js');
 require('core-js/modules/esnext.async-iterator.for-each.js');
@@ -53,8 +52,6 @@ const measuring = {
 const noop = () => null;
 
 const useHierarchyDndkitConfig = _ref2 => {
-  var _itemsDictionary$acti;
-
   let {
     flattenedItems,
     dragOverlayDataTestid,
@@ -98,21 +95,17 @@ const useHierarchyDndkitConfig = _ref2 => {
     onReorder
   }));
   const announcements = useHierarchyAnnouncements.useHierarchyAnnouncements(itemsDictionary);
-  const dndContextProps = react.useMemo(() => {
-    var _itemsDictionary;
-
-    return _objectSpread({
-      announcements,
-      modifiers,
-      sensors,
-      measuring,
-      collisionDetection: customCollisionDetection.customCollisionDetection(activeId, (_itemsDictionary = itemsDictionary[activeId !== null && activeId !== void 0 ? activeId : '']) === null || _itemsDictionary === void 0 ? void 0 : _itemsDictionary.parentId, dndItems)
-    }, dragActionHandlers);
-  }, [announcements, modifiers, sensors, activeId, itemsDictionary, dndItems, dragActionHandlers]);
+  const dndContextProps = react.useMemo(() => _objectSpread({
+    announcements,
+    modifiers,
+    sensors,
+    measuring,
+    collisionDetection: customCollisionDetection.customCollisionDetection(activeId, itemsDictionary[activeId ?? '']?.parentId, dndItems)
+  }, dragActionHandlers), [announcements, modifiers, sensors, activeId, itemsDictionary, dndItems, dragActionHandlers]);
   return {
     dndContextProps,
     activeId,
-    activeIndex: activeId ? (_itemsDictionary$acti = itemsDictionary[activeId]) === null || _itemsDictionary$acti === void 0 ? void 0 : _itemsDictionary$acti.index : -1
+    activeIndex: activeId ? itemsDictionary[activeId]?.index : -1
   };
 };
 

package/cjs/tree/customCollisionDetection.js

@@ -7,7 +7,6 @@ require('core-js/modules/esnext.iterator.constructor.js');
 require('core-js/modules/esnext.iterator.find.js');
 require('core-js/modules/esnext.async-iterator.reduce.js');
 require('core-js/modules/esnext.iterator.reduce.js');
-require('core-js/modules/web.dom-collections.iterator.js');
 var constants = require('./constants.js');
 
 const DUMMY_ID = 'DUMMY_ID_INTERNAL_USE_ONLY';
@@ -35,8 +34,6 @@ const thresholdRatio = 0.2; // Percentage to be inside
 const insideThreshold = 0.7;
 const customCollisionDetection = (activeId, visibleItemsDictionary, setDropIndicatorPosition, maxDragAndDropLevel, lastPosition, setLastPosition) => {
   const func = _ref => {
-    var _originalContainer$re;
-
     let {
       droppableContainers,
       collisionRect
@@ -47,7 +44,7 @@ const customCollisionDetection = (activeId, visibleItemsDictionary, setDropIndic
       } = _ref2;
       return id === activeId;
     });
-    const originalRect = originalContainer === null || originalContainer === void 0 ? void 0 : (_originalContainer$re = originalContainer.rect) === null || _originalContainer$re === void 0 ? void 0 : _originalContainer$re.current; // We first check if the item was moved up or down
+    const originalRect = originalContainer?.rect?.current; // We first check if the item was moved up or down
     // This modifies how to search the matching colliding rect
 
     let isUp = lastPosition === 'up';

package/cjs/tree/getTreeKeyboardCoordinates.js

@@ -24,8 +24,6 @@ const directions = [core.KeyboardCode.Down, core.KeyboardCode.Right, core.Keyboa
 const horizontal = [core.KeyboardCode.Left, core.KeyboardCode.Right];
 
 const getVerticalKeyboardCoordinates = _ref => {
-  var _droppableContainers$, _droppableContainers$2;
-
   let {
     items,
     active,
@@ -42,7 +40,7 @@ const getVerticalKeyboardCoordinates = _ref => {
   const layoutRects = []; // Get the reacheable rects depending on the arrow key pressed
 
   droppableContainers.forEach(container => {
-    if (container !== null && container !== void 0 && container.disabled || !overRect) {
+    if (container?.disabled || !overRect) {
       return;
     }
 
@@ -61,7 +59,7 @@ const getVerticalKeyboardCoordinates = _ref => {
     active
   });
   const closestItem = items.find(item => item.uid === closestId);
-  const closestElement = (_droppableContainers$ = droppableContainers.get(closestId)) === null || _droppableContainers$ === void 0 ? void 0 : (_droppableContainers$2 = _droppableContainers$.node) === null || _droppableContainers$2 === void 0 ? void 0 : _droppableContainers$2.current; // If no rect is closest, do nothing
+  const closestElement = droppableContainers.get(closestId)?.node?.current; // If no rect is closest, do nothing
 
   if (!closestId || !closestItem || !closestElement) return undefined;
   const closestRect = core.getViewRect(closestElement);

package/cjs/tree/useTreeAnnouncements.js

@@ -6,23 +6,23 @@ var react = require('react');
 var constants = require('./constants.js');
 
 const useTreeAnnouncements = (visibleItemsDictionary, dropIndicatorPosition) => {
-  const onDragStart = react.useCallback(id => "Picked up draggable item from position ".concat(visibleItemsDictionary[id].realIndex + 1, "."), [visibleItemsDictionary]);
+  const onDragStart = react.useCallback(id => `Picked up draggable item from position ${visibleItemsDictionary[id].realIndex + 1}.`, [visibleItemsDictionary]);
   const onDragMove = react.useCallback((id, overId) => {
     if (overId) {
       const overIndex = visibleItemsDictionary[overId].realIndex + 1;
 
       if (dropIndicatorPosition === constants.DropIndicatorPosition.Inside) {
-        return "Draggable item was moved inside the item at position ".concat(overIndex, ".");
+        return `Draggable item was moved inside the item at position ${overIndex}.`;
       }
 
       if (dropIndicatorPosition === constants.DropIndicatorPosition.Before) {
-        return "Draggable item was moved to position ".concat(overIndex - 1, ".");
+        return `Draggable item was moved to position ${overIndex - 1}.`;
       }
 
-      return "Draggable item was moved to position ".concat(overIndex, ".");
+      return `Draggable item was moved to position ${overIndex}.`;
     }
 
-    return "Draggable item is no longer over a droppable area.";
+    return `Draggable item is no longer over a droppable area.`;
   }, [visibleItemsDictionary, dropIndicatorPosition]);
   const onDragOver = onDragMove;
   const onDragEnd = react.useCallback((id, overId) => {
@@ -30,19 +30,19 @@ const useTreeAnnouncements = (visibleItemsDictionary, dropIndicatorPosition) =>
       const overIndex = visibleItemsDictionary[overId].realIndex + 1;
 
       if (dropIndicatorPosition === constants.DropIndicatorPosition.Inside) {
-        return "Draggable item was dropped inside the item at position ".concat(overIndex, ".");
+        return `Draggable item was dropped inside the item at position ${overIndex}.`;
       }
 
       if (dropIndicatorPosition === constants.DropIndicatorPosition.Before) {
-        return "Draggable item was dropped over position ".concat(overIndex - 1, ".");
+        return `Draggable item was dropped over position ${overIndex - 1}.`;
       }
 
-      return "Draggable item was dropped over position ".concat(overIndex, ".");
+      return `Draggable item was dropped over position ${overIndex}.`;
     }
 
-    return "Draggable item was dropped at it's original position.";
+    return `Draggable item was dropped at it's original position.`;
   }, [dropIndicatorPosition, visibleItemsDictionary]);
-  const onDragCancel = react.useCallback(id => "Dragging was cancelled. Draggable item from position ".concat(visibleItemsDictionary[id].realIndex + 1, " was dropped at it's initial position."), [visibleItemsDictionary]);
+  const onDragCancel = react.useCallback(id => `Dragging was cancelled. Draggable item from position ${visibleItemsDictionary[id].realIndex + 1} was dropped at it's initial position.`, [visibleItemsDictionary]);
   return {
     onDragStart,
     onDragOver,

package/cjs/tree/useTreeDndkitConfig.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-require('core-js/modules/web.dom-collections.iterator.js');
 require('core-js/modules/esnext.async-iterator.map.js');
 require('core-js/modules/esnext.iterator.map.js');
 require('core-js/modules/esnext.async-iterator.for-each.js');
@@ -56,8 +55,6 @@ const measuring = {
   }
 };
 const useTreeDndkitConfig = _ref2 => {
-  var _visibleItemsDictiona, _visibleItemsDictiona2;
-
   let {
     flattenedItems,
     visibleItems: preVisibleItems,
@@ -141,7 +138,7 @@ const useTreeDndkitConfig = _ref2 => {
     sortableContextProps,
     isDropValid,
     activeId,
-    activeIndex: (_visibleItemsDictiona = (_visibleItemsDictiona2 = visibleItemsDictionary[activeId]) === null || _visibleItemsDictiona2 === void 0 ? void 0 : _visibleItemsDictiona2.realIndex) !== null && _visibleItemsDictiona !== void 0 ? _visibleItemsDictiona : -1,
+    activeIndex: visibleItemsDictionary[activeId]?.realIndex ?? -1,
     overId,
     depth: projected ? projected.depth : 0,
     dropIndicatorPosition,

package/cjs/tree/useTreePreviewHandlers.js

@@ -29,12 +29,10 @@ const useTreePreviewHandlers = _ref => {
   }, [setActiveId, setDropIndicatorPosition, setOverId]);
   const handlePreviewDragMove = react.useCallback(() => null, []);
   const handlePreviewDragOver = react.useCallback(_ref3 => {
-    var _over$id;
-
     let {
       over
     } = _ref3;
-    setOverId((_over$id = over === null || over === void 0 ? void 0 : over.id) !== null && _over$id !== void 0 ? _over$id : '');
+    setOverId(over?.id ?? '');
   }, [setOverId]);
   const handlePreviewDragEnd = react.useCallback(() => {
     resetState();

package/cjs/tree/utilities.js

@@ -33,7 +33,7 @@ const getProjection = (items, visibleItemsDictionary, overId, dropIndicatorPosit
 
   return {
     depth: getMinDepth(nextItem),
-    parentId: nextItem === null || nextItem === void 0 ? void 0 : nextItem.parentId
+    parentId: nextItem?.parentId
   };
 };
 const removeChildrenOf = (items, id) => {

package/esm/hierarchy/customCollisionDetection.js

@@ -7,19 +7,15 @@ import 'core-js/modules/esnext.async-iterator.for-each.js';
 import 'core-js/modules/esnext.iterator.for-each.js';
 
 const customCollisionDetection = (activeId, activeParent, dndItems) => _ref => {
-  var _originalContainer$re;
-
   let {
     droppableContainers,
     collisionRect
   } = _ref;
   const entriesWithSameParent = droppableContainers.filter(_ref2 => {
-    var _dndItems$find;
-
     let {
       id
     } = _ref2;
-    return ((_dndItems$find = dndItems.find(item => item.id === id)) === null || _dndItems$find === void 0 ? void 0 : _dndItems$find.parentId) === activeParent;
+    return dndItems.find(item => item.id === id)?.parentId === activeParent;
   });
   const originalContainer = entriesWithSameParent.find(_ref3 => {
     let {
@@ -27,7 +23,7 @@ const customCollisionDetection = (activeId, activeParent, dndItems) => _ref => {
     } = _ref3;
     return id === activeId;
   });
-  const originalRect = originalContainer === null || originalContainer === void 0 ? void 0 : (_originalContainer$re = originalContainer.rect) === null || _originalContainer$re === void 0 ? void 0 : _originalContainer$re.current;
+  const originalRect = originalContainer?.rect?.current;
   if (!originalRect) return null;
 
   if (originalRect.offsetLeft <= collisionRect.offsetLeft && collisionRect.offsetLeft <= originalRect.offsetLeft + originalRect.width) {

package/esm/hierarchy/getHierarchyKeyboardCoordinates.js

@@ -15,8 +15,6 @@ const directions = [KeyboardCode.Down, KeyboardCode.Right, KeyboardCode.Up, Keyb
 const vertical = [KeyboardCode.Up, KeyboardCode.Down];
 
 const getHorizontalKeyboardCoordinates = _ref => {
-  var _droppableContainers$, _droppableContainers$2, _droppableContainers$3, _droppableContainers$4;
-
   let {
     items,
     active,
@@ -32,20 +30,18 @@ const getHorizontalKeyboardCoordinates = _ref => {
   const layoutRects = []; // Get the reacheable rects depending on the arrow key pressed
 
   droppableContainers.forEach(container => {
-    var _items$find;
-
-    if (container !== null && container !== void 0 && container.disabled || !overRect) {
+    if (container?.disabled || !overRect) {
       return;
     }
 
-    const node = container === null || container === void 0 ? void 0 : container.node.current;
+    const node = container?.node.current;
 
     if (!node) {
       return;
     }
 
-    const itemParent = (_items$find = items.find(item => item.id === container.id)) === null || _items$find === void 0 ? void 0 : _items$find.parentId;
-    if (itemParent !== (activeItem === null || activeItem === void 0 ? void 0 : activeItem.parentId)) return;
+    const itemParent = items.find(item => item.id === container.id)?.parentId;
+    if (itemParent !== activeItem?.parentId) return;
     const rect = getViewRect(node);
 
     if (event.code === KeyboardCode.Left && collisionRect.left > rect.right - 10) {
@@ -60,8 +56,8 @@ const getHorizontalKeyboardCoordinates = _ref => {
     active
   });
   if (!closestId) return undefined;
-  const closestDroppableContainer = (_droppableContainers$ = droppableContainers.get(closestId)) === null || _droppableContainers$ === void 0 ? void 0 : (_droppableContainers$2 = _droppableContainers$.node) === null || _droppableContainers$2 === void 0 ? void 0 : _droppableContainers$2.current;
-  const activeDroppableContainer = (_droppableContainers$3 = droppableContainers.get(active === null || active === void 0 ? void 0 : active.id)) === null || _droppableContainers$3 === void 0 ? void 0 : (_droppableContainers$4 = _droppableContainers$3.node) === null || _droppableContainers$4 === void 0 ? void 0 : _droppableContainers$4.current;
+  const closestDroppableContainer = droppableContainers.get(closestId)?.node?.current;
+  const activeDroppableContainer = droppableContainers.get(active?.id)?.node?.current;
   if (!closestDroppableContainer || !activeDroppableContainer) return undefined;
   const closestRect = getViewRect(closestDroppableContainer);
   const activeRect = getViewRect(activeDroppableContainer);

package/esm/hierarchy/useHierarchyAnnouncements.js

@@ -1,25 +1,25 @@
 import { useCallback } from 'react';
 
 const useHierarchyAnnouncements = visibleItemsDictionary => {
-  const onDragStart = useCallback(id => "Picked up draggable item from position ".concat(visibleItemsDictionary[id].index + 1, "."), [visibleItemsDictionary]);
+  const onDragStart = useCallback(id => `Picked up draggable item from position ${visibleItemsDictionary[id].index + 1}.`, [visibleItemsDictionary]);
   const onDragMove = useCallback((id, overId) => {
     if (overId) {
       const overIndex = visibleItemsDictionary[overId].index + 1;
-      return "Draggable item was moved to position ".concat(overIndex, ".");
+      return `Draggable item was moved to position ${overIndex}.`;
     }
 
-    return "Draggable item is no longer over a droppable area.";
+    return `Draggable item is no longer over a droppable area.`;
   }, [visibleItemsDictionary]);
   const onDragOver = onDragMove;
   const onDragEnd = useCallback((id, overId) => {
     if (overId) {
       const overIndex = visibleItemsDictionary[overId].index + 1;
-      return "Draggable item was dropped over position ".concat(overIndex, ".");
+      return `Draggable item was dropped over position ${overIndex}.`;
     }
 
-    return "Draggable item was dropped at it's original position.";
+    return `Draggable item was dropped at it's original position.`;
   }, [visibleItemsDictionary]);
-  const onDragCancel = useCallback(id => "Dragging was cancelled. Draggable item from position ".concat(visibleItemsDictionary[id].index + 1, " was dropped at it's initial position."), [visibleItemsDictionary]);
+  const onDragCancel = useCallback(id => `Dragging was cancelled. Draggable item from position ${visibleItemsDictionary[id].index + 1} was dropped at it's initial position.`, [visibleItemsDictionary]);
   return {
     onDragStart,
     onDragOver,

package/esm/hierarchy/useHierarchyDndkitConfig.js

@@ -1,7 +1,6 @@
 import 'core-js/modules/esnext.async-iterator.filter.js';
 import 'core-js/modules/esnext.iterator.filter.js';
 import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
-import 'core-js/modules/web.dom-collections.iterator.js';
 import 'core-js/modules/esnext.async-iterator.map.js';
 import 'core-js/modules/esnext.iterator.map.js';
 import 'core-js/modules/esnext.async-iterator.for-each.js';
@@ -45,8 +44,6 @@ const measuring = {
 const noop = () => null;
 
 const useHierarchyDndkitConfig = _ref2 => {
-  var _itemsDictionary$acti;
-
   let {
     flattenedItems,
     dragOverlayDataTestid,
@@ -90,21 +87,17 @@ const useHierarchyDndkitConfig = _ref2 => {
     onReorder
   }));
   const announcements = useHierarchyAnnouncements(itemsDictionary);
-  const dndContextProps = useMemo(() => {
-    var _itemsDictionary;
-
-    return _objectSpread({
-      announcements,
-      modifiers,
-      sensors,
-      measuring,
-      collisionDetection: customCollisionDetection(activeId, (_itemsDictionary = itemsDictionary[activeId !== null && activeId !== void 0 ? activeId : '']) === null || _itemsDictionary === void 0 ? void 0 : _itemsDictionary.parentId, dndItems)
-    }, dragActionHandlers);
-  }, [announcements, modifiers, sensors, activeId, itemsDictionary, dndItems, dragActionHandlers]);
+  const dndContextProps = useMemo(() => _objectSpread({
+    announcements,
+    modifiers,
+    sensors,
+    measuring,
+    collisionDetection: customCollisionDetection(activeId, itemsDictionary[activeId ?? '']?.parentId, dndItems)
+  }, dragActionHandlers), [announcements, modifiers, sensors, activeId, itemsDictionary, dndItems, dragActionHandlers]);
   return {
     dndContextProps,
     activeId,
-    activeIndex: activeId ? (_itemsDictionary$acti = itemsDictionary[activeId]) === null || _itemsDictionary$acti === void 0 ? void 0 : _itemsDictionary$acti.index : -1
+    activeIndex: activeId ? itemsDictionary[activeId]?.index : -1
   };
 };
 

package/esm/tree/customCollisionDetection.js

@@ -3,7 +3,6 @@ import 'core-js/modules/esnext.iterator.constructor.js';
 import 'core-js/modules/esnext.iterator.find.js';
 import 'core-js/modules/esnext.async-iterator.reduce.js';
 import 'core-js/modules/esnext.iterator.reduce.js';
-import 'core-js/modules/web.dom-collections.iterator.js';
 import { DropIndicatorPosition } from './constants.js';
 
 const DUMMY_ID = 'DUMMY_ID_INTERNAL_USE_ONLY';
@@ -31,8 +30,6 @@ const thresholdRatio = 0.2; // Percentage to be inside
 const insideThreshold = 0.7;
 const customCollisionDetection = (activeId, visibleItemsDictionary, setDropIndicatorPosition, maxDragAndDropLevel, lastPosition, setLastPosition) => {
   const func = _ref => {
-    var _originalContainer$re;
-
     let {
       droppableContainers,
       collisionRect
@@ -43,7 +40,7 @@ const customCollisionDetection = (activeId, visibleItemsDictionary, setDropIndic
       } = _ref2;
       return id === activeId;
     });
-    const originalRect = originalContainer === null || originalContainer === void 0 ? void 0 : (_originalContainer$re = originalContainer.rect) === null || _originalContainer$re === void 0 ? void 0 : _originalContainer$re.current; // We first check if the item was moved up or down
+    const originalRect = originalContainer?.rect?.current; // We first check if the item was moved up or down
     // This modifies how to search the matching colliding rect
 
     let isUp = lastPosition === 'up';

package/esm/tree/getTreeKeyboardCoordinates.js

@@ -16,8 +16,6 @@ const directions = [KeyboardCode.Down, KeyboardCode.Right, KeyboardCode.Up, Keyb
 const horizontal = [KeyboardCode.Left, KeyboardCode.Right];
 
 const getVerticalKeyboardCoordinates = _ref => {
-  var _droppableContainers$, _droppableContainers$2;
-
   let {
     items,
     active,
@@ -34,7 +32,7 @@ const getVerticalKeyboardCoordinates = _ref => {
   const layoutRects = []; // Get the reacheable rects depending on the arrow key pressed
 
   droppableContainers.forEach(container => {
-    if (container !== null && container !== void 0 && container.disabled || !overRect) {
+    if (container?.disabled || !overRect) {
       return;
     }
 
@@ -53,7 +51,7 @@ const getVerticalKeyboardCoordinates = _ref => {
     active
   });
   const closestItem = items.find(item => item.uid === closestId);
-  const closestElement = (_droppableContainers$ = droppableContainers.get(closestId)) === null || _droppableContainers$ === void 0 ? void 0 : (_droppableContainers$2 = _droppableContainers$.node) === null || _droppableContainers$2 === void 0 ? void 0 : _droppableContainers$2.current; // If no rect is closest, do nothing
+  const closestElement = droppableContainers.get(closestId)?.node?.current; // If no rect is closest, do nothing
 
   if (!closestId || !closestItem || !closestElement) return undefined;
   const closestRect = getViewRect(closestElement);

package/esm/tree/useTreeAnnouncements.js

@@ -2,23 +2,23 @@ import { useCallback } from 'react';
 import { DropIndicatorPosition } from './constants.js';
 
 const useTreeAnnouncements = (visibleItemsDictionary, dropIndicatorPosition) => {
-  const onDragStart = useCallback(id => "Picked up draggable item from position ".concat(visibleItemsDictionary[id].realIndex + 1, "."), [visibleItemsDictionary]);
+  const onDragStart = useCallback(id => `Picked up draggable item from position ${visibleItemsDictionary[id].realIndex + 1}.`, [visibleItemsDictionary]);
   const onDragMove = useCallback((id, overId) => {
     if (overId) {
       const overIndex = visibleItemsDictionary[overId].realIndex + 1;
 
       if (dropIndicatorPosition === DropIndicatorPosition.Inside) {
-        return "Draggable item was moved inside the item at position ".concat(overIndex, ".");
+        return `Draggable item was moved inside the item at position ${overIndex}.`;
       }
 
       if (dropIndicatorPosition === DropIndicatorPosition.Before) {
-        return "Draggable item was moved to position ".concat(overIndex - 1, ".");
+        return `Draggable item was moved to position ${overIndex - 1}.`;
       }
 
-      return "Draggable item was moved to position ".concat(overIndex, ".");
+      return `Draggable item was moved to position ${overIndex}.`;
     }
 
-    return "Draggable item is no longer over a droppable area.";
+    return `Draggable item is no longer over a droppable area.`;
   }, [visibleItemsDictionary, dropIndicatorPosition]);
   const onDragOver = onDragMove;
   const onDragEnd = useCallback((id, overId) => {
@@ -26,19 +26,19 @@ const useTreeAnnouncements = (visibleItemsDictionary, dropIndicatorPosition) =>
       const overIndex = visibleItemsDictionary[overId].realIndex + 1;
 
       if (dropIndicatorPosition === DropIndicatorPosition.Inside) {
-        return "Draggable item was dropped inside the item at position ".concat(overIndex, ".");
+        return `Draggable item was dropped inside the item at position ${overIndex}.`;
       }
 
       if (dropIndicatorPosition === DropIndicatorPosition.Before) {
-        return "Draggable item was dropped over position ".concat(overIndex - 1, ".");
+        return `Draggable item was dropped over position ${overIndex - 1}.`;
       }
 
-      return "Draggable item was dropped over position ".concat(overIndex, ".");
+      return `Draggable item was dropped over position ${overIndex}.`;
     }
 
-    return "Draggable item was dropped at it's original position.";
+    return `Draggable item was dropped at it's original position.`;
   }, [dropIndicatorPosition, visibleItemsDictionary]);
-  const onDragCancel = useCallback(id => "Dragging was cancelled. Draggable item from position ".concat(visibleItemsDictionary[id].realIndex + 1, " was dropped at it's initial position."), [visibleItemsDictionary]);
+  const onDragCancel = useCallback(id => `Dragging was cancelled. Draggable item from position ${visibleItemsDictionary[id].realIndex + 1} was dropped at it's initial position.`, [visibleItemsDictionary]);
   return {
     onDragStart,
     onDragOver,

package/esm/tree/useTreeDndkitConfig.js

@@ -1,7 +1,6 @@
 import 'core-js/modules/esnext.async-iterator.filter.js';
 import 'core-js/modules/esnext.iterator.filter.js';
 import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
-import 'core-js/modules/web.dom-collections.iterator.js';
 import 'core-js/modules/esnext.async-iterator.map.js';
 import 'core-js/modules/esnext.iterator.map.js';
 import 'core-js/modules/esnext.async-iterator.for-each.js';
@@ -48,8 +47,6 @@ const measuring = {
   }
 };
 const useTreeDndkitConfig = _ref2 => {
-  var _visibleItemsDictiona, _visibleItemsDictiona2;
-
   let {
     flattenedItems,
     visibleItems: preVisibleItems,
@@ -133,7 +130,7 @@ const useTreeDndkitConfig = _ref2 => {
     sortableContextProps,
     isDropValid,
     activeId,
-    activeIndex: (_visibleItemsDictiona = (_visibleItemsDictiona2 = visibleItemsDictionary[activeId]) === null || _visibleItemsDictiona2 === void 0 ? void 0 : _visibleItemsDictiona2.realIndex) !== null && _visibleItemsDictiona !== void 0 ? _visibleItemsDictiona : -1,
+    activeIndex: visibleItemsDictionary[activeId]?.realIndex ?? -1,
     overId,
     depth: projected ? projected.depth : 0,
     dropIndicatorPosition,

package/esm/tree/useTreePreviewHandlers.js

@@ -25,12 +25,10 @@ const useTreePreviewHandlers = _ref => {
   }, [setActiveId, setDropIndicatorPosition, setOverId]);
   const handlePreviewDragMove = useCallback(() => null, []);
   const handlePreviewDragOver = useCallback(_ref3 => {
-    var _over$id;
-
     let {
       over
     } = _ref3;
-    setOverId((_over$id = over === null || over === void 0 ? void 0 : over.id) !== null && _over$id !== void 0 ? _over$id : '');
+    setOverId(over?.id ?? '');
   }, [setOverId]);
   const handlePreviewDragEnd = useCallback(() => {
     resetState();

package/esm/tree/utilities.js

@@ -29,7 +29,7 @@ const getProjection = (items, visibleItemsDictionary, overId, dropIndicatorPosit
 
   return {
     depth: getMinDepth(nextItem),
-    parentId: nextItem === null || nextItem === void 0 ? void 0 : nextItem.parentId
+    parentId: nextItem?.parentId
   };
 };
 const removeChildrenOf = (items, id) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/ds-drag-and-drop",
-  "version": "2.4.2-rc.9",
+  "version": "2.4.2",
   "license": "MIT",
   "description": "ICE MT - Dimsum - Drag And Drop",
   "module": "./esm/index.js",