@headless-tree/core 0.0.4 → 0.0.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @headless-tree/core
 
+## 0.0.6
+
+### Patch Changes
+
+- bc9c446: dev release
+
+## 0.0.5
+
+### Patch Changes
+
+- 751682a: dev release
+
 ## 0.0.4
 
 ### Patch Changes

package/lib/cjs/core/create-tree.js

@@ -11,11 +11,12 @@ const buildItemInstance = (features, tree, itemId) => {
     return itemInstance;
 };
 const createTree = (initialConfig) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const treeInstance = {};
     const additionalFeatures = [feature_1.treeFeature, ...((_a = initialConfig.features) !== null && _a !== void 0 ? _a : [])];
-    let state = additionalFeatures.reduce((acc, feature) => { var _a, _b; return (_b = (_a = feature.getInitialState) === null || _a === void 0 ? void 0 : _a.call(feature, acc, treeInstance)) !== null && _b !== void 0 ? _b : acc; }, (_b = initialConfig.state) !== null && _b !== void 0 ? _b : {});
+    let state = additionalFeatures.reduce((acc, feature) => { var _a, _b; return (_b = (_a = feature.getInitialState) === null || _a === void 0 ? void 0 : _a.call(feature, acc, treeInstance)) !== null && _b !== void 0 ? _b : acc; }, (_c = (_b = initialConfig.initialState) !== null && _b !== void 0 ? _b : initialConfig.state) !== null && _c !== void 0 ? _c : {});
     let config = additionalFeatures.reduce((acc, feature) => { var _a, _b; return (_b = (_a = feature.getDefaultConfig) === null || _a === void 0 ? void 0 : _a.call(feature, acc, treeInstance)) !== null && _b !== void 0 ? _b : acc; }, initialConfig);
+    const stateHandlerNames = additionalFeatures.reduce((acc, feature) => (Object.assign(Object.assign({}, acc), feature.stateHandlerNames)), {});
     let treeElement;
     const treeDataRef = { current: {} };
     const itemInstancesMap = {};
@@ -60,10 +61,13 @@ const createTree = (initialConfig) => {
         key: "main",
         createTreeInstance: (prev) => (Object.assign(Object.assign({}, prev), { getState: () => state, setState: (updater) => {
                 var _a;
-                state = typeof updater === "function" ? updater(state) : updater;
+                // Not necessary, since I think the subupdate below keeps the state fresh anyways?
+                // state = typeof updater === "function" ? updater(state) : updater;
                 (_a = config.setState) === null || _a === void 0 ? void 0 : _a.call(config, state);
-                eachFeature((feature) => { var _a; return (_a = feature.setState) === null || _a === void 0 ? void 0 : _a.call(feature, treeInstance); });
-                eachFeature((feature) => { var _a; return (_a = feature.onStateOrConfigChange) === null || _a === void 0 ? void 0 : _a.call(feature, treeInstance); });
+            }, applySubStateUpdate: (stateName, updater) => {
+                state[stateName] =
+                    typeof updater === "function" ? updater(state[stateName]) : updater;
+                config[stateHandlerNames[stateName]](state[stateName]);
             }, rebuildTree: () => {
                 var _a;
                 rebuildItemMeta(mainFeature);
@@ -72,10 +76,7 @@ const createTree = (initialConfig) => {
                 config = typeof updater === "function" ? updater(config) : updater;
                 if (config.state) {
                     state = Object.assign(Object.assign({}, state), config.state);
-                    eachFeature((feature) => { var _a; return (_a = feature.setState) === null || _a === void 0 ? void 0 : _a.call(feature, treeInstance); });
                 }
-                eachFeature((feature) => { var _a; return (_a = feature.onConfigChange) === null || _a === void 0 ? void 0 : _a.call(feature, treeInstance); });
-                eachFeature((feature) => { var _a; return (_a = feature.onStateOrConfigChange) === null || _a === void 0 ? void 0 : _a.call(feature, treeInstance); });
             }, getItemInstance: (itemId) => itemInstancesMap[itemId], getItems: () => itemInstances, registerElement: (element) => {
                 if (treeElement === element) {
                     return;
@@ -107,8 +108,8 @@ const createTree = (initialConfig) => {
     // todo sort features
     const features = [mainFeature, ...additionalFeatures];
     for (const feature of features) {
-        Object.assign(treeInstance, (_d = (_c = feature.createTreeInstance) === null || _c === void 0 ? void 0 : _c.call(feature, Object.assign({}, treeInstance), treeInstance)) !== null && _d !== void 0 ? _d : {});
-        Object.assign(hotkeyPresets, (_e = feature.hotkeys) !== null && _e !== void 0 ? _e : {});
+        Object.assign(treeInstance, (_e = (_d = feature.createTreeInstance) === null || _d === void 0 ? void 0 : _d.call(feature, Object.assign({}, treeInstance), treeInstance)) !== null && _e !== void 0 ? _e : {});
+        Object.assign(hotkeyPresets, (_f = feature.hotkeys) !== null && _f !== void 0 ? _f : {});
     }
     rebuildItemMeta(mainFeature);
     return treeInstance;

package/lib/cjs/features/async-data-loader/feature.js

@@ -7,43 +7,52 @@ exports.asyncDataLoaderFeature = {
     dependingFeatures: ["main"],
     getInitialState: (initialState) => (Object.assign({ loadingItems: [] }, initialState)),
     getDefaultConfig: (defaultConfig, tree) => (Object.assign({ setLoadingItems: (0, utils_1.makeStateUpdater)("loadingItems", tree) }, defaultConfig)),
+    stateHandlerNames: {
+        loadingItems: "setLoadingItems",
+    },
     createTreeInstance: (prev, instance) => (Object.assign(Object.assign({}, prev), { retrieveItemData: (itemId) => {
-            var _a, _b, _c, _d, _e, _f;
-            var _g, _h;
+            var _a, _b, _c, _d, _e;
+            var _f, _g;
             const config = instance.getConfig();
             const dataRef = instance.getDataRef();
-            (_a = (_g = dataRef.current).itemData) !== null && _a !== void 0 ? _a : (_g.itemData = {});
-            (_b = (_h = dataRef.current).childrenIds) !== null && _b !== void 0 ? _b : (_h.childrenIds = {});
+            (_a = (_f = dataRef.current).itemData) !== null && _a !== void 0 ? _a : (_f.itemData = {});
+            (_b = (_g = dataRef.current).childrenIds) !== null && _b !== void 0 ? _b : (_g.childrenIds = {});
             if (dataRef.current.itemData[itemId]) {
                 return dataRef.current.itemData[itemId];
             }
             if (!instance.getState().loadingItems.includes(itemId)) {
-                (_c = config.setLoadingItems) === null || _c === void 0 ? void 0 : _c.call(config, (loadingItems) => [...loadingItems, itemId]);
-                (_d = config.asyncDataLoader) === null || _d === void 0 ? void 0 : _d.getItem(itemId).then((item) => {
-                    var _a, _b;
+                instance.applySubStateUpdate("loadingItems", (loadingItems) => [
+                    ...loadingItems,
+                    itemId,
+                ]);
+                (_c = config.asyncDataLoader) === null || _c === void 0 ? void 0 : _c.getItem(itemId).then((item) => {
+                    var _a;
                     dataRef.current.itemData[itemId] = item;
                     (_a = config.onLoadedItem) === null || _a === void 0 ? void 0 : _a.call(config, itemId, item);
-                    (_b = config.setLoadingItems) === null || _b === void 0 ? void 0 : _b.call(config, (loadingItems) => loadingItems.filter((id) => id !== itemId));
+                    instance.applySubStateUpdate("loadingItems", (loadingItems) => loadingItems.filter((id) => id !== itemId));
                 });
             }
-            return (_f = (_e = config.createLoadingItemData) === null || _e === void 0 ? void 0 : _e.call(config)) !== null && _f !== void 0 ? _f : null;
+            return (_e = (_d = config.createLoadingItemData) === null || _d === void 0 ? void 0 : _d.call(config)) !== null && _e !== void 0 ? _e : null;
         }, retrieveChildrenIds: (itemId) => {
-            var _a, _b, _c, _d, _e, _f;
-            var _g, _h;
+            var _a, _b, _c, _d, _e;
+            var _f, _g;
             const config = instance.getConfig();
             const dataRef = instance.getDataRef();
-            (_a = (_g = dataRef.current).itemData) !== null && _a !== void 0 ? _a : (_g.itemData = {});
-            (_b = (_h = dataRef.current).childrenIds) !== null && _b !== void 0 ? _b : (_h.childrenIds = {});
+            (_a = (_f = dataRef.current).itemData) !== null && _a !== void 0 ? _a : (_f.itemData = {});
+            (_b = (_g = dataRef.current).childrenIds) !== null && _b !== void 0 ? _b : (_g.childrenIds = {});
             if (dataRef.current.childrenIds[itemId]) {
                 return dataRef.current.childrenIds[itemId];
             }
             if (instance.getState().loadingItems.includes(itemId)) {
                 return [];
             }
-            (_c = config.setLoadingItems) === null || _c === void 0 ? void 0 : _c.call(config, (loadingItems) => [...loadingItems, itemId]);
-            if ((_d = config.asyncDataLoader) === null || _d === void 0 ? void 0 : _d.getChildrenWithData) {
-                (_e = config.asyncDataLoader) === null || _e === void 0 ? void 0 : _e.getChildrenWithData(itemId).then((children) => {
-                    var _a, _b, _c;
+            instance.applySubStateUpdate("loadingItems", (loadingItems) => [
+                ...loadingItems,
+                itemId,
+            ]);
+            if ((_c = config.asyncDataLoader) === null || _c === void 0 ? void 0 : _c.getChildrenWithData) {
+                (_d = config.asyncDataLoader) === null || _d === void 0 ? void 0 : _d.getChildrenWithData(itemId).then((children) => {
+                    var _a, _b;
                     for (const { id, data } of children) {
                         dataRef.current.itemData[id] = data;
                         (_a = config.onLoadedItem) === null || _a === void 0 ? void 0 : _a.call(config, id, data);
@@ -51,16 +60,16 @@ exports.asyncDataLoaderFeature = {
                     const childrenIds = children.map(({ id }) => id);
                     dataRef.current.childrenIds[itemId] = childrenIds;
                     (_b = config.onLoadedChildren) === null || _b === void 0 ? void 0 : _b.call(config, itemId, childrenIds);
-                    (_c = config.setLoadingItems) === null || _c === void 0 ? void 0 : _c.call(config, (loadingItems) => loadingItems.filter((id) => id !== itemId));
+                    instance.applySubStateUpdate("loadingItems", (loadingItems) => loadingItems.filter((id) => id !== itemId));
                     instance.rebuildTree();
                 });
             }
             else {
-                (_f = config.asyncDataLoader) === null || _f === void 0 ? void 0 : _f.getChildren(itemId).then((childrenIds) => {
-                    var _a, _b;
+                (_e = config.asyncDataLoader) === null || _e === void 0 ? void 0 : _e.getChildren(itemId).then((childrenIds) => {
+                    var _a;
                     dataRef.current.childrenIds[itemId] = childrenIds;
                     (_a = config.onLoadedChildren) === null || _a === void 0 ? void 0 : _a.call(config, itemId, childrenIds);
-                    (_b = config.setLoadingItems) === null || _b === void 0 ? void 0 : _b.call(config, (loadingItems) => loadingItems.filter((id) => id !== itemId));
+                    instance.applySubStateUpdate("loadingItems", (loadingItems) => loadingItems.filter((id) => id !== itemId));
                     instance.rebuildTree();
                 });
             }

package/lib/cjs/features/drag-and-drop/feature.js

@@ -6,15 +6,18 @@ const utils_2 = require("../../utils");
 exports.dragAndDropFeature = {
     key: "dragAndDrop",
     dependingFeatures: ["main", "tree", "selection"],
-    getDefaultConfig: (defaultConfig, tree) => (Object.assign({ canDrop: (_, target) => target.item.isFolder(), setDndState: (0, utils_2.makeStateUpdater)("dnd", tree) }, defaultConfig)),
+    getDefaultConfig: (defaultConfig, tree) => (Object.assign({ canDrop: (_, target) => target.item.isFolder(), canDropForeignDragObject: () => false, setDndState: (0, utils_2.makeStateUpdater)("dnd", tree) }, defaultConfig)),
+    stateHandlerNames: {
+        dnd: "setDndState",
+    },
     createTreeInstance: (prev, tree) => (Object.assign(Object.assign({}, prev), { getDropTarget: () => {
             var _a, _b;
             return (_b = (_a = tree.getState().dnd) === null || _a === void 0 ? void 0 : _a.dragTarget) !== null && _b !== void 0 ? _b : null;
         } })),
     createItemInstance: (prev, item, tree) => (Object.assign(Object.assign({}, prev), { getProps: () => {
             var _a, _b, _c;
-            return (Object.assign(Object.assign({}, prev.getProps()), { draggable: (_c = (_b = (_a = tree.getConfig()).isItemDraggable) === null || _b === void 0 ? void 0 : _b.call(_a, item)) !== null && _c !== void 0 ? _c : true, onDragStart: (e) => {
-                    var _a, _b, _c, _d, _e;
+            return (Object.assign(Object.assign({}, prev.getProps()), { draggable: (_c = (_b = (_a = tree.getConfig()).isItemDraggable) === null || _b === void 0 ? void 0 : _b.call(_a, item)) !== null && _c !== void 0 ? _c : true, onDragStart: item.getMemoizedProp("dnd/onDragStart", () => (e) => {
+                    var _a, _b, _c;
                     const selectedItems = tree.getSelectedItems();
                     const items = selectedItems.includes(item) ? selectedItems : [item];
                     const config = tree.getConfig();
@@ -29,12 +32,12 @@ exports.dragAndDropFeature = {
                         const { format, data } = config.createForeignDragObject(items);
                         (_c = e.dataTransfer) === null || _c === void 0 ? void 0 : _c.setData(format, data);
                     }
-                    (_e = (_d = tree.getConfig()).setDndState) === null || _e === void 0 ? void 0 : _e.call(_d, {
+                    tree.applySubStateUpdate("dnd", {
                         draggedItems: items,
                         draggingOverItem: tree.getFocusedItem(),
                     });
-                }, onDragOver: (e) => {
-                    var _a, _b, _c, _d, _e;
+                }), onDragOver: item.getMemoizedProp("dnd/onDragOver", () => (e) => {
+                    var _a, _b, _c;
                     const target = (0, utils_1.getDropTarget)(e, item, tree);
                     const dataRef = tree.getDataRef();
                     if (!((_a = tree.getState().dnd) === null || _a === void 0 ? void 0 : _a.draggedItems) &&
@@ -50,14 +53,21 @@ exports.dragAndDropFeature = {
                         return;
                     }
                     dataRef.current.lastDragCode = nextDragCode;
-                    (_e = (_d = tree.getConfig()).setDndState) === null || _e === void 0 ? void 0 : _e.call(_d, (state) => (Object.assign(Object.assign({}, state), { dragTarget: target, draggingOverItem: item })));
-                }, onDragLeave: () => {
-                    var _a, _b;
+                    tree.applySubStateUpdate("dnd", (state) => (Object.assign(Object.assign({}, state), { dragTarget: target, draggingOverItem: item })));
+                }), onDragLeave: item.getMemoizedProp("dnd/onDragLeave", () => () => {
                     const dataRef = tree.getDataRef();
                     dataRef.current.lastDragCode = "no-drag";
-                    (_b = (_a = tree.getConfig()).setDndState) === null || _b === void 0 ? void 0 : _b.call(_a, (state) => (Object.assign(Object.assign({}, state), { draggingOverItem: undefined, dragTarget: undefined })));
-                }, onDrop: (e) => {
-                    var _a, _b, _c, _d, _e;
+                    tree.applySubStateUpdate("dnd", (state) => (Object.assign(Object.assign({}, state), { draggingOverItem: undefined, dragTarget: undefined })));
+                }), onDragEnd: item.getMemoizedProp("dnd/onDragEnd", () => (e) => {
+                    var _a, _b, _c;
+                    const draggedItems = (_a = tree.getState().dnd) === null || _a === void 0 ? void 0 : _a.draggedItems;
+                    tree.applySubStateUpdate("dnd", null);
+                    if (e.dataTransfer.dropEffect === "none" || !draggedItems) {
+                        return;
+                    }
+                    (_c = (_b = tree.getConfig()).onCompleteForeignDrop) === null || _c === void 0 ? void 0 : _c.call(_b, draggedItems);
+                }), onDrop: item.getMemoizedProp("dnd/onDrop", () => (e) => {
+                    var _a, _b, _c;
                     const dataRef = tree.getDataRef();
                     const target = (0, utils_1.getDropTarget)(e, item, tree);
                     if (!(0, utils_1.canDrop)(e.dataTransfer, target, tree)) {
@@ -67,30 +77,32 @@ exports.dragAndDropFeature = {
                     const config = tree.getConfig();
                     const draggedItems = (_a = tree.getState().dnd) === null || _a === void 0 ? void 0 : _a.draggedItems;
                     dataRef.current.lastDragCode = undefined;
-                    (_c = (_b = tree.getConfig()).setDndState) === null || _c === void 0 ? void 0 : _c.call(_b, null);
+                    tree.applySubStateUpdate("dnd", null);
                     if (draggedItems) {
-                        (_d = config.onDrop) === null || _d === void 0 ? void 0 : _d.call(config, draggedItems, target);
+                        (_b = config.onDrop) === null || _b === void 0 ? void 0 : _b.call(config, draggedItems, target);
                     }
                     else {
-                        (_e = config.onDropForeignDragObject) === null || _e === void 0 ? void 0 : _e.call(config, e.dataTransfer, target);
+                        (_c = config.onDropForeignDragObject) === null || _c === void 0 ? void 0 : _c.call(config, e.dataTransfer, target);
                     }
                     // TODO rebuild tree?
-                } }));
+                }) }));
         }, isDropTarget: () => {
             const target = tree.getDropTarget();
             return target ? target.item.getId() === item.getId() : false;
         }, isDropTargetAbove: () => {
             const target = tree.getDropTarget();
-            if (!target || target.childIndex === null)
+            if (!target ||
+                target.childIndex === null ||
+                target.item !== item.getParent())
                 return false;
-            const targetIndex = target.item.getItemMeta().index;
-            return targetIndex + target.childIndex + 1 === item.getItemMeta().index;
+            return target.childIndex === item.getItemMeta().posInSet;
         }, isDropTargetBelow: () => {
             const target = tree.getDropTarget();
-            if (!target || target.childIndex === null)
+            if (!target ||
+                target.childIndex === null ||
+                target.item !== item.getParent())
                 return false;
-            const targetIndex = target.item.getItemMeta().index;
-            return targetIndex + target.childIndex === item.getItemMeta().index;
+            return target.childIndex - 1 === item.getItemMeta().posInSet;
         }, isDraggingOver: () => {
             var _a, _b;
             return ((_b = (_a = tree.getState().dnd) === null || _a === void 0 ? void 0 : _a.draggingOverItem) === null || _b === void 0 ? void 0 : _b.getId()) === item.getId();

package/lib/cjs/features/drag-and-drop/types.d.ts

@@ -9,7 +9,12 @@ export type DndState<T> = {
 };
 export type DropTarget<T> = {
     item: ItemInstance<T>;
-    childIndex: number | null;
+    childIndex: number;
+    insertionIndex: number;
+} | {
+    item: ItemInstance<T>;
+    childIndex: null;
+    insertionIndex: null;
 };
 export declare enum DropTargetPosition {
     Top = "top",
@@ -35,6 +40,14 @@ export type DragAndDropFeatureDef<T> = {
         canDropForeignDragObject?: (dataTransfer: DataTransfer, target: DropTarget<T>) => boolean;
         onDrop?: (items: ItemInstance<T>[], target: DropTarget<T>) => void;
         onDropForeignDragObject?: (dataTransfer: DataTransfer, target: DropTarget<T>) => void;
+        /** Runs in the onDragEnd event, if `ev.dataTransfer.dropEffect` is not `none`, i.e. the drop
+         * was not aborted. No target is provided as parameter since the target may be a foreign drop target.
+         * This is useful to seperate out the logic to move dragged items out of their previous parents.
+         * Use `onDrop` to handle drop-related logic.
+         *
+         * This ignores the `canDrop` handler, since the drop target is unknown in this handler.
+         */
+        onCompleteForeignDrop?: (items: ItemInstance<T>[]) => void;
     };
     treeInstance: {
         getDropTarget: () => DropTarget<T> | null;

package/lib/cjs/features/drag-and-drop/utils.d.ts

@@ -3,4 +3,4 @@ import { DropTarget } from "./types";
 export declare const getDragCode: ({ item, childIndex }: DropTarget<any>) => string;
 export declare const getDropOffset: (e: any, item: ItemInstance<any>) => number;
 export declare const canDrop: (dataTransfer: DataTransfer | null, target: DropTarget<any>, tree: TreeInstance<any>) => boolean;
-export declare const getDropTarget: (e: any, item: ItemInstance<any>, tree: TreeInstance<any>) => DropTarget<any>;
+export declare const getDropTarget: (e: any, item: ItemInstance<any>, tree: TreeInstance<any>, canDropInbetween?: boolean | undefined) => DropTarget<any>;

package/lib/cjs/features/drag-and-drop/utils.js

@@ -34,29 +34,46 @@ const getDropTargetPosition = (offset, topLinePercentage, bottomLinePercentage)
     }
     return types_1.DropTargetPosition.Item;
 };
-const getDropTarget = (e, item, tree) => {
-    var _a, _b;
+const getDropTarget = (e, item, tree, canDropInbetween = tree.getConfig().canDropInbetween) => {
+    var _a, _b, _c, _d;
     const config = tree.getConfig();
-    const offset = (0, exports.getDropOffset)(e, item);
-    const dropOnItemTarget = { item, childIndex: null };
-    const pos = getDropTargetPosition(offset, (_a = config.topLinePercentage) !== null && _a !== void 0 ? _a : 0.3, (_b = config.bottomLinePercentage) !== null && _b !== void 0 ? _b : 0.7);
-    const inbetweenPos = getDropTargetPosition(offset, 0.5, 0.5);
-    if (!config.canDropInbetween) {
-        return dropOnItemTarget;
-    }
-    if (!(0, exports.canDrop)(e.dataTransfer, dropOnItemTarget, tree)) {
-        return {
-            item: item.getParent(),
-            childIndex: item.getIndexInParent() +
-                (inbetweenPos === types_1.DropTargetPosition.Top ? 0 : 1),
-        };
+    const draggedItems = (_b = (_a = tree.getState().dnd) === null || _a === void 0 ? void 0 : _a.draggedItems) !== null && _b !== void 0 ? _b : [];
+    const itemTarget = { item, childIndex: null, insertionIndex: null };
+    const parentTarget = {
+        item: item.getParent(),
+        childIndex: null,
+        insertionIndex: null,
+    };
+    if (!canDropInbetween) {
+        if (!(0, exports.canDrop)(e.dataTransfer, parentTarget, tree)) {
+            return (0, exports.getDropTarget)(e, item.getParent(), tree, false);
+        }
+        return itemTarget;
     }
+    const canDropInside = (0, exports.canDrop)(e.dataTransfer, itemTarget, tree);
+    const offset = (0, exports.getDropOffset)(e, item);
+    const pos = canDropInside
+        ? getDropTargetPosition(offset, (_c = config.topLinePercentage) !== null && _c !== void 0 ? _c : 0.3, (_d = config.bottomLinePercentage) !== null && _d !== void 0 ? _d : 0.7)
+        : getDropTargetPosition(offset, 0.5, 0.5);
     if (pos === types_1.DropTargetPosition.Item) {
-        return dropOnItemTarget;
+        return itemTarget;
+    }
+    if (!(0, exports.canDrop)(e.dataTransfer, parentTarget, tree)) {
+        return (0, exports.getDropTarget)(e, item.getParent(), tree, false);
     }
+    const childIndex = item.getIndexInParent() + (pos === types_1.DropTargetPosition.Top ? 0 : 1);
+    const numberOfDragItemsBeforeTarget = item
+        .getParent()
+        .getChildren()
+        .slice(0, childIndex)
+        .reduce((counter, child) => child && (draggedItems === null || draggedItems === void 0 ? void 0 : draggedItems.some((i) => i.getId() === child.getId()))
+        ? ++counter
+        : counter, 0);
     return {
         item: item.getParent(),
-        childIndex: item.getIndexInParent() + (pos === types_1.DropTargetPosition.Top ? 0 : 1),
+        childIndex,
+        // TODO performance could be improved by computing this only when dragcode changed
+        insertionIndex: childIndex - numberOfDragItemsBeforeTarget,
     };
 };
 exports.getDropTarget = getDropTarget;

package/lib/cjs/features/expand-all/feature.js

@@ -16,24 +16,27 @@ exports.expandAllFeature = {
     dependingFeatures: ["main", "tree"],
     createTreeInstance: (prev, tree) => (Object.assign(Object.assign({}, prev), { expandAll: (cancelToken) => __awaiter(void 0, void 0, void 0, function* () {
             yield Promise.all(tree.getItems().map((item) => item.expandAll(cancelToken)));
-        }), collapseAll: () => __awaiter(void 0, void 0, void 0, function* () {
-            var _a, _b;
-            (_b = (_a = tree.getConfig()).setExpandedItems) === null || _b === void 0 ? void 0 : _b.call(_a, []);
-        }) })),
+        }), collapseAll: () => {
+            tree.applySubStateUpdate("expandedItems", []);
+            tree.rebuildTree();
+        } })),
     createItemInstance: (prev, item, tree) => (Object.assign(Object.assign({}, prev), { expandAll: (cancelToken) => __awaiter(void 0, void 0, void 0, function* () {
             if (cancelToken === null || cancelToken === void 0 ? void 0 : cancelToken.current) {
                 return;
             }
+            if (!item.isFolder()) {
+                return;
+            }
             item.expand();
             yield (0, utils_1.poll)(() => !tree.getState().loadingItems.includes(item.getId()));
             yield Promise.all(item.getChildren().map((child) => __awaiter(void 0, void 0, void 0, function* () {
                 yield (0, utils_1.poll)(() => !tree.getState().loadingItems.includes(child.getId()));
                 yield (child === null || child === void 0 ? void 0 : child.expandAll(cancelToken));
             })));
-        }), collapseAll: () => __awaiter(void 0, void 0, void 0, function* () {
-            yield Promise.all(item.getChildren().map((child) => __awaiter(void 0, void 0, void 0, function* () {
-                yield (child === null || child === void 0 ? void 0 : child.collapseAll());
-            })));
+        }), collapseAll: () => {
+            for (const child of item.getChildren()) {
+                child === null || child === void 0 ? void 0 : child.collapseAll();
+            }
             item.collapse();
-        }) })),
+        } })),
 };

package/lib/cjs/features/expand-all/types.d.ts

@@ -5,13 +5,13 @@ export type ExpandAllFeatureDef = {
         expandAll: (cancelToken?: {
             current: boolean;
         }) => Promise<void>;
-        collapseAll: () => Promise<void>;
+        collapseAll: () => void;
     };
     itemInstance: {
         expandAll: (cancelToken?: {
             current: boolean;
         }) => Promise<void>;
-        collapseAll: () => Promise<void>;
+        collapseAll: () => void;
     };
     hotkeys: never;
 };

package/lib/cjs/features/main/types.d.ts

@@ -1,13 +1,16 @@
-import { FeatureImplementation, HotkeysConfig, ItemInstance, SetStateFn, TreeConfig, TreeState } from "../../types/core";
+import { FeatureImplementation, HotkeysConfig, ItemInstance, SetStateFn, TreeConfig, TreeState, Updater } from "../../types/core";
 import { ItemMeta } from "../tree/types";
 export type MainFeatureDef<T = any> = {
     state: {};
     config: {
         features?: FeatureImplementation<any>[];
+        initialState?: Partial<TreeState<T>>;
         state?: Partial<TreeState<T>>;
         setState?: SetStateFn<TreeState<T>>;
     };
     treeInstance: {
+        /** @internal */
+        applySubStateUpdate: <K extends keyof TreeState<any>>(stateName: K, updater: Updater<TreeState<T>[K]>) => void;
         setState: SetStateFn<TreeState<T>>;
         getState: () => TreeState<T>;
         setConfig: SetStateFn<TreeConfig<T>>;

package/lib/cjs/features/renaming/feature.js

@@ -6,36 +6,37 @@ exports.renamingFeature = {
     key: "renaming",
     dependingFeatures: ["main", "tree"],
     getDefaultConfig: (defaultConfig, tree) => (Object.assign({ setRenamingItem: (0, utils_1.makeStateUpdater)("renamingItem", tree), setRenamingValue: (0, utils_1.makeStateUpdater)("renamingValue", tree), canRename: () => true }, defaultConfig)),
+    stateHandlerNames: {
+        renamingItem: "setRenamingItem",
+        renamingValue: "setRenamingValue",
+    },
     createTreeInstance: (prev, instance) => (Object.assign(Object.assign({}, prev), { startRenamingItem: (itemId) => {
-            var _a, _b;
             const config = instance.getConfig();
             const item = instance.getItemInstance(itemId);
             if (!item.canRename()) {
                 return;
             }
-            (_a = config.setRenamingItem) === null || _a === void 0 ? void 0 : _a.call(config, itemId);
-            (_b = config.setRenamingValue) === null || _b === void 0 ? void 0 : _b.call(config, item.getItemName());
+            instance.applySubStateUpdate("renamingItem", itemId);
+            instance.applySubStateUpdate("renamingValue", item.getItemName());
         }, getRenamingItem: () => {
             const itemId = instance.getState().renamingItem;
             return itemId ? instance.getItemInstance(itemId) : null;
         }, getRenamingValue: () => instance.getState().renamingValue || "", abortRenaming: () => {
-            var _a, _b;
-            (_b = (_a = instance.getConfig()).setRenamingItem) === null || _b === void 0 ? void 0 : _b.call(_a, null);
+            instance.applySubStateUpdate("renamingItem", null);
         }, completeRenaming: () => {
-            var _a, _b, _c;
+            var _a;
             const config = instance.getConfig();
             const item = instance.getRenamingItem();
             if (item) {
                 (_a = config.onRename) === null || _a === void 0 ? void 0 : _a.call(config, item, instance.getState().renamingValue || "");
             }
-            (_c = (_b = instance.getConfig()).setRenamingItem) === null || _c === void 0 ? void 0 : _c.call(_b, null);
+            instance.applySubStateUpdate("renamingItem", null);
         }, isRenamingItem: () => !!instance.getState().renamingItem })),
     createItemInstance: (prev, instance, tree) => (Object.assign(Object.assign({}, prev), { getRenameInputProps: () => ({
             onBlur: () => tree.abortRenaming(),
             value: tree.getRenamingValue(),
             onChange: (e) => {
-                var _a, _b;
-                (_b = (_a = tree.getConfig()).setRenamingValue) === null || _b === void 0 ? void 0 : _b.call(_a, e.target.value);
+                tree.applySubStateUpdate("renamingValue", e.target.value);
             },
         }), canRename: () => { var _a, _b, _c; return (_c = (_b = (_a = tree.getConfig()).canRename) === null || _b === void 0 ? void 0 : _b.call(_a, instance)) !== null && _c !== void 0 ? _c : true; }, isRenaming: () => instance.getId() === tree.getState().renamingItem })),
     hotkeys: {

package/lib/cjs/features/search/feature.js

@@ -8,16 +8,19 @@ exports.searchFeature = {
     getInitialState: (initialState) => (Object.assign({ search: null }, initialState)),
     getDefaultConfig: (defaultConfig, tree) => (Object.assign({ setSearch: (0, utils_1.makeStateUpdater)("search", tree), isSearchMatchingItem: (search, item) => search.length > 0 &&
             item.getItemName().toLowerCase().includes(search.toLowerCase()) }, defaultConfig)),
+    stateHandlerNames: {
+        search: "setSearch",
+    },
     createTreeInstance: (prev, instance) => (Object.assign(Object.assign({}, prev), { setSearch: (search) => {
-            var _a, _b, _c;
-            (_b = (_a = instance.getConfig()).setSearch) === null || _b === void 0 ? void 0 : _b.call(_a, search);
-            (_c = instance
+            var _a;
+            instance.applySubStateUpdate("search", search);
+            (_a = instance
                 .getItems()
                 .find((item) => {
                 var _a, _b;
                 return (_b = (_a = instance
                     .getConfig()).isSearchMatchingItem) === null || _b === void 0 ? void 0 : _b.call(_a, instance.getSearchValue(), item);
-            })) === null || _c === void 0 ? void 0 : _c.setFocused();
+            })) === null || _a === void 0 ? void 0 : _a.setFocused();
         }, openSearch: (initialValue = "") => {
             instance.setSearch(initialValue);
             setTimeout(() => {
@@ -39,7 +42,7 @@ exports.searchFeature = {
             value: instance.getSearchValue(),
             onChange: (e) => instance.setSearch(e.target.value),
             onBlur: () => instance.closeSearch(),
-        }), getSearchMatchingItems: (0, utils_1.memo)((search, items) => items.filter((item) => { var _a, _b; return (_b = (_a = instance.getConfig()).isSearchMatchingItem) === null || _b === void 0 ? void 0 : _b.call(_a, search, item); }), () => [instance.getSearchValue(), instance.getItems()]) })),
+        }), getSearchMatchingItems: (0, utils_1.memo)((search, items) => items.filter((item) => { var _a, _b; return search && ((_b = (_a = instance.getConfig()).isSearchMatchingItem) === null || _b === void 0 ? void 0 : _b.call(_a, search, item)); }), () => [instance.getSearchValue(), instance.getItems()]) })),
     createItemInstance: (prev, item, tree) => (Object.assign(Object.assign({}, prev), { isMatchingSearch: () => tree.getSearchMatchingItems().some((i) => i.getId() === item.getId()) })),
     hotkeys: {
         openSearch: {
@@ -60,30 +63,41 @@ exports.searchFeature = {
                 tree.closeSearch();
             },
         },
+        submitSearch: {
+            hotkey: "Enter",
+            allowWhenInputFocused: true,
+            isEnabled: (tree) => tree.isSearchOpen(),
+            handler: (e, tree) => {
+                tree.closeSearch();
+                tree.setSelectedItems([tree.getFocusedItem().getId()]);
+            },
+        },
         nextSearchItem: {
             hotkey: "ArrowDown",
             allowWhenInputFocused: true,
+            canRepeat: true,
             isEnabled: (tree) => tree.isSearchOpen(),
             handler: (e, tree) => {
-                // TODO scroll into view
                 const focusItem = tree
                     .getSearchMatchingItems()
                     .find((item) => item.getItemMeta().index >
                     tree.getFocusedItem().getItemMeta().index);
                 focusItem === null || focusItem === void 0 ? void 0 : focusItem.setFocused();
+                focusItem === null || focusItem === void 0 ? void 0 : focusItem.scrollTo({ block: "nearest", inline: "nearest" });
             },
         },
         previousSearchItem: {
             hotkey: "ArrowUp",
             allowWhenInputFocused: true,
+            canRepeat: true,
             isEnabled: (tree) => tree.isSearchOpen(),
             handler: (e, tree) => {
-                // TODO scroll into view
                 const focusItem = [...tree.getSearchMatchingItems()]
                     .reverse()
                     .find((item) => item.getItemMeta().index <
                     tree.getFocusedItem().getItemMeta().index);
                 focusItem === null || focusItem === void 0 ? void 0 : focusItem.setFocused();
+                focusItem === null || focusItem === void 0 ? void 0 : focusItem.scrollTo({ block: "nearest", inline: "nearest" });
             },
         },
     },

package/lib/cjs/features/search/types.d.ts

@@ -29,5 +29,5 @@ export type SearchFeatureDef<T> = {
     itemInstance: {
         isMatchingSearch: () => boolean;
     };
-    hotkeys: "openSearch" | "closeSearch" | "nextSearchItem" | "previousSearchItem";
+    hotkeys: "openSearch" | "closeSearch" | "submitSearch" | "nextSearchItem" | "previousSearchItem";
 };

package/lib/cjs/features/selection/feature.js

@@ -7,9 +7,11 @@ exports.selectionFeature = {
     dependingFeatures: ["main", "tree"],
     getInitialState: (initialState) => (Object.assign({ selectedItems: [] }, initialState)),
     getDefaultConfig: (defaultConfig, tree) => (Object.assign({ setSelectedItems: (0, utils_1.makeStateUpdater)("selectedItems", tree) }, defaultConfig)),
+    stateHandlerNames: {
+        selectedItems: "setSelectedItems",
+    },
     createTreeInstance: (prev, instance) => (Object.assign(Object.assign({}, prev), { setSelectedItems: (selectedItems) => {
-            var _a, _b;
-            (_b = (_a = instance.getConfig()).setSelectedItems) === null || _b === void 0 ? void 0 : _b.call(_a, selectedItems);
+            instance.applySubStateUpdate("selectedItems", selectedItems);
         }, 
         // TODO memo
         getSelectedItems: () => {
@@ -51,7 +53,7 @@ exports.selectionFeature = {
             else {
                 item.select();
             }
-        }, getProps: () => (Object.assign(Object.assign({}, prev.getProps()), { onClick: (e) => {
+        }, getProps: () => (Object.assign(Object.assign({}, prev.getProps()), { "aria-selected": item.isSelected() ? "true" : "false", onClick: item.getMemoizedProp("selection/onClick", () => (e) => {
                 var _a, _b;
                 if (e.shiftKey) {
                     item.selectUpTo(e.ctrlKey || e.metaKey);
@@ -63,7 +65,7 @@ exports.selectionFeature = {
                     tree.setSelectedItems([item.getItemMeta().itemId]);
                 }
                 (_b = (_a = prev.getProps()).onClick) === null || _b === void 0 ? void 0 : _b.call(_a, e);
-            } })) })),
+            }) })) })),
     hotkeys: {
         // setSelectedItem: {
         //   hotkey: "space",