@headless-tree/core 1.3.0 → 1.5.0

package/dist/index.js

@@ -485,6 +485,7 @@ var createTree = (initialConfig) => {
   );
   let treeElement;
   const treeDataRef = { current: {} };
+  let rebuildScheduled = false;
   const itemInstancesMap = {};
   let itemInstances = [];
   const itemElementsMap = {};
@@ -528,6 +529,7 @@ var createTree = (initialConfig) => {
         itemInstances.push(itemInstancesMap[item.itemId]);
       }
     }
+    rebuildScheduled = false;
   };
   const eachFeature = (fn) => {
     for (const feature of additionalFeatures) {
@@ -542,16 +544,48 @@ var createTree = (initialConfig) => {
         var _a2;
         (_a2 = config.setState) == null ? void 0 : _a2.call(config, state);
       },
+      setMounted: ({}, isMounted) => {
+        var _a2;
+        const ref = treeDataRef.current;
+        ref.isMounted = isMounted;
+        if (isMounted) {
+          (_a2 = ref.waitingForMount) == null ? void 0 : _a2.forEach((cb) => cb());
+          ref.waitingForMount = [];
+        }
+      },
       applySubStateUpdate: ({}, stateName, updater) => {
-        state[stateName] = typeof updater === "function" ? updater(state[stateName]) : updater;
-        const externalStateSetter = config[stateHandlerNames[stateName]];
-        externalStateSetter == null ? void 0 : externalStateSetter(state[stateName]);
+        var _a2;
+        const apply = () => {
+          state[stateName] = typeof updater === "function" ? updater(state[stateName]) : updater;
+          const externalStateSetter = config[stateHandlerNames[stateName]];
+          externalStateSetter == null ? void 0 : externalStateSetter(state[stateName]);
+        };
+        const ref = treeDataRef.current;
+        if (ref.isMounted) {
+          apply();
+        } else {
+          (_a2 = ref.waitingForMount) != null ? _a2 : ref.waitingForMount = [];
+          ref.waitingForMount.push(apply);
+        }
       },
       // TODO rebuildSubTree: (itemId: string) => void;
       rebuildTree: () => {
-        var _a2;
-        rebuildItemMeta();
-        (_a2 = config.setState) == null ? void 0 : _a2.call(config, state);
+        var _a2, _b2;
+        const ref = treeDataRef.current;
+        if (ref.isMounted) {
+          rebuildItemMeta();
+          (_a2 = config.setState) == null ? void 0 : _a2.call(config, state);
+        } else {
+          (_b2 = ref.waitingForMount) != null ? _b2 : ref.waitingForMount = [];
+          ref.waitingForMount.push(() => {
+            var _a3;
+            rebuildItemMeta();
+            (_a3 = config.setState) == null ? void 0 : _a3.call(config, state);
+          });
+        }
+      },
+      scheduleRebuildTree: () => {
+        rebuildScheduled = true;
       },
       getConfig: () => config,
       setConfig: (_, updater) => {
@@ -584,7 +618,10 @@ var createTree = (initialConfig) => {
         }
         return existingInstance;
       },
-      getItems: () => itemInstances,
+      getItems: () => {
+        if (rebuildScheduled) rebuildItemMeta();
+        return itemInstances;
+      },
       registerElement: ({}, element) => {
         if (treeElement === element) {
           return;
@@ -817,33 +854,60 @@ var getAllLoadedDescendants = (tree, itemId, includeFolders = false) => {
   if (!tree.getConfig().isItemFolder(tree.getItemInstance(itemId))) {
     return [itemId];
   }
-  const descendants = tree.retrieveChildrenIds(itemId).map((child) => getAllLoadedDescendants(tree, child, includeFolders)).flat();
+  const descendants = tree.retrieveChildrenIds(itemId, true).map((child) => getAllLoadedDescendants(tree, child, includeFolders)).flat();
   return includeFolders ? [itemId, ...descendants] : descendants;
 };
+var getAllDescendants = (tree, itemId, includeFolders = false) => __async(null, null, function* () {
+  yield tree.loadItemData(itemId);
+  if (!tree.getConfig().isItemFolder(tree.getItemInstance(itemId))) {
+    return [itemId];
+  }
+  const childrenIds = yield tree.loadChildrenIds(itemId);
+  const descendants = (yield Promise.all(
+    childrenIds.map(
+      (child) => getAllDescendants(tree, child, includeFolders)
+    )
+  )).flat();
+  return includeFolders ? [itemId, ...descendants] : descendants;
+});
+var withLoadingState = (tree, itemId, callback) => __async(null, null, function* () {
+  tree.applySubStateUpdate("loadingCheckPropagationItems", (items) => [
+    ...items,
+    itemId
+  ]);
+  try {
+    yield callback();
+  } finally {
+    tree.applySubStateUpdate(
+      "loadingCheckPropagationItems",
+      (items) => items.filter((id) => id !== itemId)
+    );
+  }
+});
 var checkboxesFeature = {
   key: "checkboxes",
   overwrites: ["selection"],
   getInitialState: (initialState) => __spreadValues({
-    checkedItems: []
+    checkedItems: [],
+    loadingCheckPropagationItems: []
   }, initialState),
   getDefaultConfig: (defaultConfig, tree) => {
-    var _a, _b, _c;
-    const hasAsyncLoader = (_a = defaultConfig.features) == null ? void 0 : _a.some(
-      (f) => f.key === "async-data-loader"
-    );
-    if (hasAsyncLoader && defaultConfig.propagateCheckedState) {
-      throwError(`propagateCheckedState not supported with async trees`);
-    }
-    const propagateCheckedState = (_b = defaultConfig.propagateCheckedState) != null ? _b : !hasAsyncLoader;
-    const canCheckFolders = (_c = defaultConfig.canCheckFolders) != null ? _c : !propagateCheckedState;
+    var _a, _b;
+    const propagateCheckedState = (_a = defaultConfig.propagateCheckedState) != null ? _a : true;
+    const canCheckFolders = (_b = defaultConfig.canCheckFolders) != null ? _b : !propagateCheckedState;
     return __spreadValues({
       setCheckedItems: makeStateUpdater("checkedItems", tree),
+      setLoadingCheckPropagationItems: makeStateUpdater(
+        "loadingCheckPropagationItems",
+        tree
+      ),
       propagateCheckedState,
       canCheckFolders
     }, defaultConfig);
   },
   stateHandlerNames: {
-    checkedItems: "setCheckedItems"
+    checkedItems: "setCheckedItems",
+    loadingCheckPropagationItems: "setLoadingCheckPropagationItems"
   },
   treeInstance: {
     setCheckedItems: ({ tree }, checkedItems) => {
@@ -863,13 +927,13 @@ var checkboxesFeature = {
         }
       };
     },
-    toggleCheckedState: ({ item }) => {
+    toggleCheckedState: (_0) => __async(null, [_0], function* ({ item }) {
       if (item.getCheckedState() === "checked" /* Checked */) {
-        item.setUnchecked();
+        yield item.setUnchecked();
       } else {
-        item.setChecked();
+        yield item.setChecked();
       }
-    },
+    }),
     getCheckedState: ({ item, tree }) => {
       const { checkedItems } = tree.getState();
       const { propagateCheckedState } = tree.getConfig();
@@ -879,6 +943,7 @@ var checkboxesFeature = {
       }
       if (item.isFolder() && propagateCheckedState) {
         const descendants = getAllLoadedDescendants(tree, itemId);
+        if (descendants.length === 0) return "unchecked" /* Unchecked */;
         if (descendants.every((d) => checkedItems.includes(d))) {
           return "checked" /* Checked */;
         }
@@ -888,36 +953,48 @@ var checkboxesFeature = {
       }
       return "unchecked" /* Unchecked */;
     },
-    setChecked: ({ item, tree, itemId }) => {
-      const { propagateCheckedState, canCheckFolders } = tree.getConfig();
-      if (item.isFolder() && propagateCheckedState) {
-        tree.applySubStateUpdate("checkedItems", (items) => [
-          ...items,
-          ...getAllLoadedDescendants(tree, itemId, canCheckFolders)
-        ]);
-      } else if (!item.isFolder() || canCheckFolders) {
-        tree.applySubStateUpdate("checkedItems", (items) => [...items, itemId]);
-      }
-    },
-    setUnchecked: ({ item, tree, itemId }) => {
-      const { propagateCheckedState, canCheckFolders } = tree.getConfig();
-      if (item.isFolder() && propagateCheckedState) {
-        const descendants = getAllLoadedDescendants(
-          tree,
-          itemId,
-          canCheckFolders
-        );
-        tree.applySubStateUpdate(
-          "checkedItems",
-          (items) => items.filter((id) => !descendants.includes(id) && id !== itemId)
-        );
-      } else {
-        tree.applySubStateUpdate(
-          "checkedItems",
-          (items) => items.filter((id) => id !== itemId)
-        );
-      }
-    }
+    setChecked: (_0) => __async(null, [_0], function* ({ item, tree, itemId }) {
+      yield withLoadingState(tree, itemId, () => __async(null, null, function* () {
+        const { propagateCheckedState, canCheckFolders } = tree.getConfig();
+        if (item.isFolder() && propagateCheckedState) {
+          const descendants = yield getAllDescendants(
+            tree,
+            itemId,
+            canCheckFolders
+          );
+          tree.applySubStateUpdate("checkedItems", (items) => [
+            ...items,
+            ...descendants
+          ]);
+        } else if (!item.isFolder() || canCheckFolders) {
+          tree.applySubStateUpdate("checkedItems", (items) => [
+            ...items,
+            itemId
+          ]);
+        }
+      }));
+    }),
+    setUnchecked: (_0) => __async(null, [_0], function* ({ item, tree, itemId }) {
+      yield withLoadingState(tree, itemId, () => __async(null, null, function* () {
+        const { propagateCheckedState, canCheckFolders } = tree.getConfig();
+        if (item.isFolder() && propagateCheckedState) {
+          const descendants = yield getAllDescendants(
+            tree,
+            itemId,
+            canCheckFolders
+          );
+          tree.applySubStateUpdate(
+            "checkedItems",
+            (items) => items.filter((id) => !descendants.includes(id) && id !== itemId)
+          );
+        } else {
+          tree.applySubStateUpdate(
+            "checkedItems",
+            (items) => items.filter((id) => id !== itemId)
+          );
+        }
+      }));
+    })
   }
 };
 
@@ -929,7 +1006,8 @@ var specialKeys = {
   plus: /^(NumpadAdd|Plus)$/,
   minus: /^(NumpadSubtract|Minus)$/,
   control: /^(ControlLeft|ControlRight)$/,
-  shift: /^(ShiftLeft|ShiftRight)$/
+  shift: /^(ShiftLeft|ShiftRight)$/,
+  metaorcontrol: /^(MetaLeft|MetaRight|ControlLeft|ControlRight)$/
 };
 var testHotkeyMatch = (pressedKeys, tree, hotkey) => {
   const supposedKeys = hotkey.hotkey.toLowerCase().split("+");
@@ -1034,6 +1112,12 @@ var loadItemData = (tree, itemId) => __async(null, null, function* () {
   var _a;
   const config = tree.getConfig();
   const dataRef = getDataRef(tree);
+  if (!dataRef.current.itemData[itemId]) {
+    tree.applySubStateUpdate("loadingItemData", (loadingItemData) => [
+      ...loadingItemData,
+      itemId
+    ]);
+  }
   const item = yield config.dataLoader.getItem(itemId);
   dataRef.current.itemData[itemId] = item;
   (_a = config.onLoadedItem) == null ? void 0 : _a.call(config, itemId, item);
@@ -1048,6 +1132,12 @@ var loadChildrenIds = (tree, itemId) => __async(null, null, function* () {
   const config = tree.getConfig();
   const dataRef = getDataRef(tree);
   let childrenIds;
+  if (!dataRef.current.childrenIds[itemId]) {
+    tree.applySubStateUpdate("loadingItemChildrens", (loadingItemChildrens) => [
+      ...loadingItemChildrens,
+      itemId
+    ]);
+  }
   if ("getChildrenWithData" in config.dataLoader) {
     const children = yield config.dataLoader.getChildrenWithData(itemId);
     childrenIds = children.map((c) => c.id);
@@ -1108,11 +1198,7 @@ var asyncDataLoaderFeature = {
         return dataRef.current.itemData[itemId];
       }
       if (!tree.getState().loadingItemData.includes(itemId) && !skipFetch) {
-        tree.applySubStateUpdate("loadingItemData", (loadingItemData) => [
-          ...loadingItemData,
-          itemId
-        ]);
-        loadItemData(tree, itemId);
+        setTimeout(() => loadItemData(tree, itemId));
       }
       return (_b = (_a = config.createLoadingItemData) == null ? void 0 : _a.call(config)) != null ? _b : null;
     },
@@ -1124,11 +1210,7 @@ var asyncDataLoaderFeature = {
       if (tree.getState().loadingItemChildrens.includes(itemId) || skipFetch) {
         return [];
       }
-      tree.applySubStateUpdate(
-        "loadingItemChildrens",
-        (loadingItemChildrens) => [...loadingItemChildrens, itemId]
-      );
-      loadChildrenIds(tree, itemId);
+      setTimeout(() => loadChildrenIds(tree, itemId));
       return [];
     }
   },
@@ -1138,10 +1220,6 @@ var asyncDataLoaderFeature = {
       var _a;
       if (!optimistic) {
         (_a = getDataRef(tree).current.itemData) == null ? true : delete _a[itemId];
-        tree.applySubStateUpdate("loadingItemData", (loadingItemData) => [
-          ...loadingItemData,
-          itemId
-        ]);
       }
       yield loadItemData(tree, itemId);
     }),
@@ -1149,10 +1227,6 @@ var asyncDataLoaderFeature = {
       var _a;
       if (!optimistic) {
         (_a = getDataRef(tree).current.childrenIds) == null ? true : delete _a[itemId];
-        tree.applySubStateUpdate(
-          "loadingItemChildrens",
-          (loadingItemChildrens) => [...loadingItemChildrens, itemId]
-        );
       }
       yield loadChildrenIds(tree, itemId);
     }),
@@ -1296,8 +1370,7 @@ var getTargetPlacement = (e, item, tree, canMakeChild) => {
   }
   return { type: makeChildType };
 };
-var getDragCode = (e, item, tree) => {
-  const placement = getTargetPlacement(e, item, tree, true);
+var getDragCode = (item, placement) => {
   return [
     item.getId(),
     placement.type,
@@ -1338,6 +1411,9 @@ var getDragTarget = (e, item, tree, canReorder = tree.getConfig().canReorder) =>
   const canMakeChild = canDrop(e.dataTransfer, itemTarget, tree);
   const placement = getTargetPlacement(e, item, tree, canMakeChild);
   if (!canReorder && parent && canBecomeSibling && placement.type !== 2 /* MakeChild */) {
+    if (draggedItems == null ? void 0 : draggedItems.some((item2) => item2.isDescendentOf(parent.getId()))) {
+      return itemTarget;
+    }
     return parentTarget;
   }
   if (!canReorder && parent && !canBecomeSibling) {
@@ -1372,16 +1448,29 @@ var getDragTarget = (e, item, tree, canReorder = tree.getConfig().canReorder) =>
 };
 
 // src/features/drag-and-drop/feature.ts
+var handleAutoOpenFolder = (dataRef, tree, item, placement) => {
+  const { openOnDropDelay } = tree.getConfig();
+  const dragCode = dataRef.current.lastDragCode;
+  if (!openOnDropDelay || !item.isFolder() || item.isExpanded() || placement.type !== 2 /* MakeChild */) {
+    return;
+  }
+  clearTimeout(dataRef.current.autoExpandTimeout);
+  dataRef.current.autoExpandTimeout = setTimeout(() => {
+    if (dragCode !== dataRef.current.lastDragCode || !dataRef.current.lastAllowDrop)
+      return;
+    item.expand();
+  }, openOnDropDelay);
+};
 var defaultCanDropForeignDragObject = () => false;
 var dragAndDropFeature = {
   key: "drag-and-drop",
-  deps: ["selection"],
   getDefaultConfig: (defaultConfig, tree) => __spreadValues({
     canDrop: (_, target) => target.item.isFolder(),
     canDropForeignDragObject: defaultCanDropForeignDragObject,
     canDragForeignDragObjectOver: defaultConfig.canDropForeignDragObject !== defaultCanDropForeignDragObject ? (dataTransfer) => dataTransfer.effectAllowed !== "none" : () => false,
     setDndState: makeStateUpdater("dnd", tree),
-    canReorder: true
+    canReorder: true,
+    openOnDropDelay: 800
   }, defaultConfig),
   stateHandlerNames: {
     dnd: "setDndState"
@@ -1422,7 +1511,7 @@ var dragAndDropFeature = {
           };
         }
       }
-      const bb = (_f = targetItem.getElement()) == null ? void 0 : _f.getBoundingClientRect();
+      const bb = (_f = targetItem == null ? void 0 : targetItem.getElement()) == null ? void 0 : _f.getBoundingClientRect();
       if (bb) {
         return {
           indent,
@@ -1478,20 +1567,20 @@ var dragAndDropFeature = {
       draggable: true,
       onDragEnter: (e) => e.preventDefault(),
       onDragStart: (e) => {
-        var _a, _b, _c;
-        const selectedItems = tree.getSelectedItems();
+        var _a, _b, _c, _d;
+        const selectedItems = tree.getSelectedItems ? tree.getSelectedItems() : [tree.getFocusedItem()];
         const items = selectedItems.includes(item) ? selectedItems : [item];
         const config = tree.getConfig();
         if (!selectedItems.includes(item)) {
-          tree.setSelectedItems([item.getItemMeta().itemId]);
+          (_a = tree.setSelectedItems) == null ? void 0 : _a.call(tree, [item.getItemMeta().itemId]);
         }
-        if (!((_b = (_a = config.canDrag) == null ? void 0 : _a.call(config, items)) != null ? _b : true)) {
+        if (!((_c = (_b = config.canDrag) == null ? void 0 : _b.call(config, items)) != null ? _c : true)) {
           e.preventDefault();
           return;
         }
         if (config.setDragImage) {
           const { imgElement, xOffset, yOffset } = config.setDragImage(items);
-          (_c = e.dataTransfer) == null ? void 0 : _c.setDragImage(imgElement, xOffset != null ? xOffset : 0, yOffset != null ? yOffset : 0);
+          (_d = e.dataTransfer) == null ? void 0 : _d.setDragImage(imgElement, xOffset != null ? xOffset : 0, yOffset != null ? yOffset : 0);
         }
         if (config.createForeignDragObject && e.dataTransfer) {
           const { format, data, dropEffect, effectAllowed } = config.createForeignDragObject(items);
@@ -1508,7 +1597,8 @@ var dragAndDropFeature = {
         var _a, _b, _c;
         e.stopPropagation();
         const dataRef = tree.getDataRef();
-        const nextDragCode = getDragCode(e, item, tree);
+        const placement = getTargetPlacement(e, item, tree, true);
+        const nextDragCode = getDragCode(item, placement);
         if (nextDragCode === dataRef.current.lastDragCode) {
           if (dataRef.current.lastAllowDrop) {
             e.preventDefault();
@@ -1517,6 +1607,7 @@ var dragAndDropFeature = {
         }
         dataRef.current.lastDragCode = nextDragCode;
         dataRef.current.lastDragEnter = Date.now();
+        handleAutoOpenFolder(dataRef, tree, item, placement);
         const target = getDragTarget(e, item, tree);
         if (!((_a = tree.getState().dnd) == null ? void 0 : _a.draggedItems) && (!e.dataTransfer || !((_c = (_b = tree.getConfig()).canDragForeignDragObjectOver) == null ? void 0 : _c.call(_b, e.dataTransfer, target)))) {
           dataRef.current.lastAllowDrop = false;
@@ -1563,12 +1654,18 @@ var dragAndDropFeature = {
         e.stopPropagation();
         const dataRef = tree.getDataRef();
         const target = getDragTarget(e, item, tree);
-        if (!canDrop(e.dataTransfer, target, tree)) {
+        const draggedItems = (_a = tree.getState().dnd) == null ? void 0 : _a.draggedItems;
+        const isValidDrop = canDrop(e.dataTransfer, target, tree);
+        tree.applySubStateUpdate("dnd", {
+          draggedItems: void 0,
+          draggingOverItem: void 0,
+          dragTarget: void 0
+        });
+        if (!isValidDrop) {
           return;
         }
         e.preventDefault();
         const config = tree.getConfig();
-        const draggedItems = (_a = tree.getState().dnd) == null ? void 0 : _a.draggedItems;
         dataRef.current.lastDragCode = void 0;
         if (draggedItems) {
           yield (_b = config.onDrop) == null ? void 0 : _b.call(config, draggedItems, target);
@@ -1581,6 +1678,10 @@ var dragAndDropFeature = {
       const target = tree.getDragTarget();
       return target ? target.item.getId() === item.getId() : false;
     },
+    isUnorderedDragTarget: ({ tree, item }) => {
+      const target = tree.getDragTarget();
+      return target ? !isOrderedDragTarget(target) && target.item.getId() === item.getId() : false;
+    },
     isDragTargetAbove: ({ tree, item }) => {
       const target = tree.getDragTarget();
       if (!target || !isOrderedDragTarget(target) || target.item !== item.getParent())
@@ -1740,7 +1841,10 @@ var keyboardDragAndDropFeature = {
       preventDefault: true,
       isEnabled: (tree) => !tree.getState().dnd,
       handler: (_, tree) => {
-        const selectedItems = tree.getSelectedItems();
+        var _a, _b;
+        const selectedItems = (_b = (_a = tree.getSelectedItems) == null ? void 0 : _a.call(tree)) != null ? _b : [
+          tree.getFocusedItem()
+        ];
         const focusedItem = tree.getFocusedItem();
         tree.startKeyboardDrag(
           selectedItems.includes(focusedItem) ? selectedItems : selectedItems.concat(focusedItem)