@headless-tree/core 0.0.15 → 1.0.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @headless-tree/core
 
+## 1.0.0
+
+### Minor Changes
+
+- 9e5027b: The propMemoization feature now memoizes all prop-generation related functions, including searchinput and renameinput related props
+
 ## 0.0.15
 
 ### Patch Changes

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

@@ -29,7 +29,7 @@ exports.dragAndDropFeature = {
             const target = tree.getDragTarget();
             const indent = ((_a = target === null || target === void 0 ? void 0 : target.item.getItemMeta().level) !== null && _a !== void 0 ? _a : 0) + 1;
             const treeBb = (_b = tree.getElement()) === null || _b === void 0 ? void 0 : _b.getBoundingClientRect();
-            if (!target || !treeBb || !("childIndex" in target))
+            if (!target || !treeBb || !(0, utils_1.isOrderedDragTarget)(target))
                 return null;
             const leftOffset = target.dragLineLevel * ((_c = tree.getConfig().indent) !== null && _c !== void 0 ? _c : 1);
             const targetItem = tree.getItems()[target.dragLineIndex];
@@ -157,7 +157,7 @@ exports.dragAndDropFeature = {
         isDragTargetAbove: ({ tree, item }) => {
             const target = tree.getDragTarget();
             if (!target ||
-                !("childIndex" in target) ||
+                !(0, utils_1.isOrderedDragTarget)(target) ||
                 target.item !== item.getParent())
                 return false;
             return target.childIndex === item.getItemMeta().posInSet;
@@ -165,7 +165,7 @@ exports.dragAndDropFeature = {
         isDragTargetBelow: ({ tree, item }) => {
             const target = tree.getDragTarget();
             if (!target ||
-                !("childIndex" in target) ||
+                !(0, utils_1.isOrderedDragTarget)(target) ||
                 target.item !== item.getParent())
                 return false;
             return target.childIndex - 1 === item.getItemMeta().posInSet;

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

@@ -5,6 +5,13 @@ export declare enum ItemDropCategory {
     ExpandedFolder = 1,
     LastInGroup = 2
 }
+export declare const isOrderedDragTarget: <T>(dragTarget: DragTarget<T>) => dragTarget is {
+    item: ItemInstance<T>;
+    childIndex: number;
+    insertionIndex: number;
+    dragLineIndex: number;
+    dragLineLevel: number;
+};
 export declare const canDrop: (dataTransfer: DataTransfer | null, target: DragTarget<any>, tree: TreeInstance<any>) => boolean;
 export declare const getItemDropCategory: (item: ItemInstance<any>) => ItemDropCategory;
 export declare const getInsertionIndex: <T>(children: ItemInstance<T>[], childIndex: number, draggedItems: ItemInstance<T>[] | undefined) => number;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDragTarget = exports.getReparentTarget = exports.getDragCode = exports.getInsertionIndex = exports.getItemDropCategory = exports.canDrop = exports.ItemDropCategory = void 0;
+exports.getDragTarget = exports.getReparentTarget = exports.getDragCode = exports.getInsertionIndex = exports.getItemDropCategory = exports.canDrop = exports.isOrderedDragTarget = exports.ItemDropCategory = void 0;
 var ItemDropCategory;
 (function (ItemDropCategory) {
     ItemDropCategory[ItemDropCategory["Item"] = 0] = "Item";
@@ -14,6 +14,8 @@ var PlacementType;
     PlacementType[PlacementType["MakeChild"] = 2] = "MakeChild";
     PlacementType[PlacementType["Reparent"] = 3] = "Reparent";
 })(PlacementType || (PlacementType = {}));
+const isOrderedDragTarget = (dragTarget) => "childIndex" in dragTarget;
+exports.isOrderedDragTarget = isOrderedDragTarget;
 const canDrop = (dataTransfer, target, tree) => {
     var _a, _b, _c;
     const draggedItems = (_a = tree.getState().dnd) === null || _a === void 0 ? void 0 : _a.draggedItems;

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

@@ -18,8 +18,7 @@ const getNextDragTarget = (tree, isUp, dragTarget) => {
     const direction = isUp ? 0 : 1;
     const draggedItems = (_a = tree.getState().dnd) === null || _a === void 0 ? void 0 : _a.draggedItems;
     // currently hovering between items
-    if ("childIndex" in dragTarget) {
-        // TODO move check in reusable function
+    if ((0, utils_1.isOrderedDragTarget)(dragTarget)) {
         const parent = dragTarget.item.getParent();
         const targetedItem = tree.getItems()[dragTarget.dragLineIndex - 1]; // item above dragline
         const targetCategory = targetedItem
@@ -77,7 +76,7 @@ const getNextValidDragTarget = (tree, isUp, previousTarget) => {
 };
 const updateScroll = (tree) => {
     const state = tree.getState().dnd;
-    if (!(state === null || state === void 0 ? void 0 : state.dragTarget) || "childIndex" in state.dragTarget)
+    if (!(state === null || state === void 0 ? void 0 : state.dragTarget) || (0, utils_1.isOrderedDragTarget)(state.dragTarget))
         return;
     state.dragTarget.item.scrollTo({ block: "nearest", inline: "nearest" });
 };
@@ -118,7 +117,7 @@ const moveDragPosition = (tree, isUp) => {
         dragTarget,
     });
     tree.applySubStateUpdate("assistiveDndState", types_1.AssistiveDndState.Dragging);
-    if (!("childIndex" in dragTarget)) {
+    if (!(0, utils_1.isOrderedDragTarget)(dragTarget)) {
         dragTarget.item.setFocused();
     }
     updateScroll(tree);

package/lib/cjs/features/prop-memoization/feature.js

@@ -1,16 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.propMemoizationFeature = void 0;
-const memoize = (props, dataRef) => {
-    var _a;
-    (_a = dataRef.memoizedProps) !== null && _a !== void 0 ? _a : (dataRef.memoizedProps = {});
+const memoize = (props, memoizedProps) => {
     for (const key in props) {
         if (typeof props[key] === "function") {
-            if (key in dataRef.memoizedProps) {
-                props[key] = dataRef.memoizedProps[key];
+            if (memoizedProps && key in memoizedProps) {
+                props[key] = memoizedProps[key];
             }
             else {
-                dataRef.memoizedProps[key] = props[key];
+                memoizedProps[key] = props[key];
             }
         }
     }
@@ -31,18 +29,42 @@ exports.propMemoizationFeature = {
     ],
     treeInstance: {
         getContainerProps: ({ tree, prev }, treeLabel) => {
-            var _a;
+            var _a, _b, _c;
+            var _d, _e;
             const dataRef = tree.getDataRef();
             const props = (_a = prev === null || prev === void 0 ? void 0 : prev(treeLabel)) !== null && _a !== void 0 ? _a : {};
-            return memoize(props, dataRef.current);
+            (_b = (_d = dataRef.current).memo) !== null && _b !== void 0 ? _b : (_d.memo = {});
+            (_c = (_e = dataRef.current.memo).tree) !== null && _c !== void 0 ? _c : (_e.tree = {});
+            return memoize(props, dataRef.current.memo.tree);
+        },
+        getSearchInputElementProps: ({ tree, prev }) => {
+            var _a, _b, _c;
+            var _d, _e;
+            const dataRef = tree.getDataRef();
+            const props = (_a = prev === null || prev === void 0 ? void 0 : prev()) !== null && _a !== void 0 ? _a : {};
+            (_b = (_d = dataRef.current).memo) !== null && _b !== void 0 ? _b : (_d.memo = {});
+            (_c = (_e = dataRef.current.memo).search) !== null && _c !== void 0 ? _c : (_e.search = {});
+            return memoize(props, dataRef.current.memo.search);
         },
     },
     itemInstance: {
         getProps: ({ item, prev }) => {
-            var _a;
+            var _a, _b, _c;
+            var _d, _e;
+            const dataRef = item.getDataRef();
+            const props = (_a = prev === null || prev === void 0 ? void 0 : prev()) !== null && _a !== void 0 ? _a : {};
+            (_b = (_d = dataRef.current).memo) !== null && _b !== void 0 ? _b : (_d.memo = {});
+            (_c = (_e = dataRef.current.memo).item) !== null && _c !== void 0 ? _c : (_e.item = {});
+            return memoize(props, dataRef.current.memo.item);
+        },
+        getRenameInputProps: ({ item, prev }) => {
+            var _a, _b, _c;
+            var _d, _e;
             const dataRef = item.getDataRef();
             const props = (_a = prev === null || prev === void 0 ? void 0 : prev()) !== null && _a !== void 0 ? _a : {};
-            return memoize(props, dataRef.current);
+            (_b = (_d = dataRef.current).memo) !== null && _b !== void 0 ? _b : (_d.memo = {});
+            (_c = (_e = dataRef.current.memo).rename) !== null && _c !== void 0 ? _c : (_e.rename = {});
+            return memoize(props, dataRef.current.memo.rename);
         },
     },
 };

package/lib/cjs/features/prop-memoization/types.d.ts

@@ -1,5 +1,10 @@
 export interface PropMemoizationDataRef {
-    memoizedProps?: Record<string, any>;
+    memo?: {
+        tree?: Record<string, any>;
+        item?: Record<string, any>;
+        search?: Record<string, any>;
+        rename?: Record<string, any>;
+    };
 }
 export type PropMemoizationFeatureDef = {
     state: {};

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

@@ -50,7 +50,6 @@ exports.treeFeature = {
             }
             return flatItems;
         },
-        // TODO memo
         getFocusedItem: ({ tree }) => {
             var _a, _b;
             return ((_b = tree.getItemInstance((_a = tree.getState().focusedItem) !== null && _a !== void 0 ? _a : "")) !== null && _b !== void 0 ? _b : tree.getItems()[0]);
@@ -80,7 +79,6 @@ exports.treeFeature = {
                 focusedElement.focus();
             }));
         },
-        // TODO add label parameter
         getContainerProps: ({ prev, tree }, treeLabel) => (Object.assign(Object.assign({}, prev === null || prev === void 0 ? void 0 : prev()), { role: "tree", "aria-label": treeLabel !== null && treeLabel !== void 0 ? treeLabel : "", ref: tree.registerElement })),
         // relevant for hotkeys of this feature
         isSearchOpen: () => false,

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

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { canDrop, getDragCode, getDragTarget } from "./utils";
+import { canDrop, getDragCode, getDragTarget, isOrderedDragTarget, } from "./utils";
 import { makeStateUpdater } from "../../utils";
 export const dragAndDropFeature = {
     key: "drag-and-drop",
@@ -26,7 +26,7 @@ export const dragAndDropFeature = {
             const target = tree.getDragTarget();
             const indent = ((_a = target === null || target === void 0 ? void 0 : target.item.getItemMeta().level) !== null && _a !== void 0 ? _a : 0) + 1;
             const treeBb = (_b = tree.getElement()) === null || _b === void 0 ? void 0 : _b.getBoundingClientRect();
-            if (!target || !treeBb || !("childIndex" in target))
+            if (!target || !treeBb || !isOrderedDragTarget(target))
                 return null;
             const leftOffset = target.dragLineLevel * ((_c = tree.getConfig().indent) !== null && _c !== void 0 ? _c : 1);
             const targetItem = tree.getItems()[target.dragLineIndex];
@@ -154,7 +154,7 @@ export const dragAndDropFeature = {
         isDragTargetAbove: ({ tree, item }) => {
             const target = tree.getDragTarget();
             if (!target ||
-                !("childIndex" in target) ||
+                !isOrderedDragTarget(target) ||
                 target.item !== item.getParent())
                 return false;
             return target.childIndex === item.getItemMeta().posInSet;
@@ -162,7 +162,7 @@ export const dragAndDropFeature = {
         isDragTargetBelow: ({ tree, item }) => {
             const target = tree.getDragTarget();
             if (!target ||
-                !("childIndex" in target) ||
+                !isOrderedDragTarget(target) ||
                 target.item !== item.getParent())
                 return false;
             return target.childIndex - 1 === item.getItemMeta().posInSet;

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

@@ -5,6 +5,13 @@ export declare enum ItemDropCategory {
     ExpandedFolder = 1,
     LastInGroup = 2
 }
+export declare const isOrderedDragTarget: <T>(dragTarget: DragTarget<T>) => dragTarget is {
+    item: ItemInstance<T>;
+    childIndex: number;
+    insertionIndex: number;
+    dragLineIndex: number;
+    dragLineLevel: number;
+};
 export declare const canDrop: (dataTransfer: DataTransfer | null, target: DragTarget<any>, tree: TreeInstance<any>) => boolean;
 export declare const getItemDropCategory: (item: ItemInstance<any>) => ItemDropCategory;
 export declare const getInsertionIndex: <T>(children: ItemInstance<T>[], childIndex: number, draggedItems: ItemInstance<T>[] | undefined) => number;

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

@@ -11,6 +11,7 @@ var PlacementType;
     PlacementType[PlacementType["MakeChild"] = 2] = "MakeChild";
     PlacementType[PlacementType["Reparent"] = 3] = "Reparent";
 })(PlacementType || (PlacementType = {}));
+export const isOrderedDragTarget = (dragTarget) => "childIndex" in dragTarget;
 export const canDrop = (dataTransfer, target, tree) => {
     var _a, _b, _c;
     const draggedItems = (_a = tree.getState().dnd) === null || _a === void 0 ? void 0 : _a.draggedItems;

package/lib/esm/features/keyboard-drag-and-drop/feature.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { ItemDropCategory, canDrop, getInsertionIndex, getItemDropCategory, getReparentTarget, } from "../drag-and-drop/utils";
+import { ItemDropCategory, canDrop, getInsertionIndex, getItemDropCategory, getReparentTarget, isOrderedDragTarget, } from "../drag-and-drop/utils";
 import { makeStateUpdater } from "../../utils";
 import { AssistiveDndState } from "./types";
 const getNextDragTarget = (tree, isUp, dragTarget) => {
@@ -15,8 +15,7 @@ const getNextDragTarget = (tree, isUp, dragTarget) => {
     const direction = isUp ? 0 : 1;
     const draggedItems = (_a = tree.getState().dnd) === null || _a === void 0 ? void 0 : _a.draggedItems;
     // currently hovering between items
-    if ("childIndex" in dragTarget) {
-        // TODO move check in reusable function
+    if (isOrderedDragTarget(dragTarget)) {
         const parent = dragTarget.item.getParent();
         const targetedItem = tree.getItems()[dragTarget.dragLineIndex - 1]; // item above dragline
         const targetCategory = targetedItem
@@ -74,7 +73,7 @@ const getNextValidDragTarget = (tree, isUp, previousTarget) => {
 };
 const updateScroll = (tree) => {
     const state = tree.getState().dnd;
-    if (!(state === null || state === void 0 ? void 0 : state.dragTarget) || "childIndex" in state.dragTarget)
+    if (!(state === null || state === void 0 ? void 0 : state.dragTarget) || isOrderedDragTarget(state.dragTarget))
         return;
     state.dragTarget.item.scrollTo({ block: "nearest", inline: "nearest" });
 };
@@ -115,7 +114,7 @@ const moveDragPosition = (tree, isUp) => {
         dragTarget,
     });
     tree.applySubStateUpdate("assistiveDndState", AssistiveDndState.Dragging);
-    if (!("childIndex" in dragTarget)) {
+    if (!isOrderedDragTarget(dragTarget)) {
         dragTarget.item.setFocused();
     }
     updateScroll(tree);

package/lib/esm/features/prop-memoization/feature.js

@@ -1,13 +1,11 @@
-const memoize = (props, dataRef) => {
-    var _a;
-    (_a = dataRef.memoizedProps) !== null && _a !== void 0 ? _a : (dataRef.memoizedProps = {});
+const memoize = (props, memoizedProps) => {
     for (const key in props) {
         if (typeof props[key] === "function") {
-            if (key in dataRef.memoizedProps) {
-                props[key] = dataRef.memoizedProps[key];
+            if (memoizedProps && key in memoizedProps) {
+                props[key] = memoizedProps[key];
             }
             else {
-                dataRef.memoizedProps[key] = props[key];
+                memoizedProps[key] = props[key];
             }
         }
     }
@@ -28,18 +26,42 @@ export const propMemoizationFeature = {
     ],
     treeInstance: {
         getContainerProps: ({ tree, prev }, treeLabel) => {
-            var _a;
+            var _a, _b, _c;
+            var _d, _e;
             const dataRef = tree.getDataRef();
             const props = (_a = prev === null || prev === void 0 ? void 0 : prev(treeLabel)) !== null && _a !== void 0 ? _a : {};
-            return memoize(props, dataRef.current);
+            (_b = (_d = dataRef.current).memo) !== null && _b !== void 0 ? _b : (_d.memo = {});
+            (_c = (_e = dataRef.current.memo).tree) !== null && _c !== void 0 ? _c : (_e.tree = {});
+            return memoize(props, dataRef.current.memo.tree);
+        },
+        getSearchInputElementProps: ({ tree, prev }) => {
+            var _a, _b, _c;
+            var _d, _e;
+            const dataRef = tree.getDataRef();
+            const props = (_a = prev === null || prev === void 0 ? void 0 : prev()) !== null && _a !== void 0 ? _a : {};
+            (_b = (_d = dataRef.current).memo) !== null && _b !== void 0 ? _b : (_d.memo = {});
+            (_c = (_e = dataRef.current.memo).search) !== null && _c !== void 0 ? _c : (_e.search = {});
+            return memoize(props, dataRef.current.memo.search);
         },
     },
     itemInstance: {
         getProps: ({ item, prev }) => {
-            var _a;
+            var _a, _b, _c;
+            var _d, _e;
+            const dataRef = item.getDataRef();
+            const props = (_a = prev === null || prev === void 0 ? void 0 : prev()) !== null && _a !== void 0 ? _a : {};
+            (_b = (_d = dataRef.current).memo) !== null && _b !== void 0 ? _b : (_d.memo = {});
+            (_c = (_e = dataRef.current.memo).item) !== null && _c !== void 0 ? _c : (_e.item = {});
+            return memoize(props, dataRef.current.memo.item);
+        },
+        getRenameInputProps: ({ item, prev }) => {
+            var _a, _b, _c;
+            var _d, _e;
             const dataRef = item.getDataRef();
             const props = (_a = prev === null || prev === void 0 ? void 0 : prev()) !== null && _a !== void 0 ? _a : {};
-            return memoize(props, dataRef.current);
+            (_b = (_d = dataRef.current).memo) !== null && _b !== void 0 ? _b : (_d.memo = {});
+            (_c = (_e = dataRef.current.memo).rename) !== null && _c !== void 0 ? _c : (_e.rename = {});
+            return memoize(props, dataRef.current.memo.rename);
         },
     },
 };

package/lib/esm/features/prop-memoization/types.d.ts

@@ -1,5 +1,10 @@
 export interface PropMemoizationDataRef {
-    memoizedProps?: Record<string, any>;
+    memo?: {
+        tree?: Record<string, any>;
+        item?: Record<string, any>;
+        search?: Record<string, any>;
+        rename?: Record<string, any>;
+    };
 }
 export type PropMemoizationFeatureDef = {
     state: {};

package/lib/esm/features/tree/feature.js

@@ -47,7 +47,6 @@ export const treeFeature = {
             }
             return flatItems;
         },
-        // TODO memo
         getFocusedItem: ({ tree }) => {
             var _a, _b;
             return ((_b = tree.getItemInstance((_a = tree.getState().focusedItem) !== null && _a !== void 0 ? _a : "")) !== null && _b !== void 0 ? _b : tree.getItems()[0]);
@@ -77,7 +76,6 @@ export const treeFeature = {
                 focusedElement.focus();
             }));
         },
-        // TODO add label parameter
         getContainerProps: ({ prev, tree }, treeLabel) => (Object.assign(Object.assign({}, prev === null || prev === void 0 ? void 0 : prev()), { role: "tree", "aria-label": treeLabel !== null && treeLabel !== void 0 ? treeLabel : "", ref: tree.registerElement })),
         // relevant for hotkeys of this feature
         isSearchOpen: () => false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@headless-tree/core",
-  "version": "0.0.15",
+  "version": "1.0.0",
   "type": "module",
   "main": "lib/cjs/index.js",
   "module": "lib/esm/index.js",

package/src/features/drag-and-drop/feature.ts

@@ -1,6 +1,11 @@
 import { FeatureImplementation } from "../../types/core";
 import { DndDataRef, DragLineData } from "./types";
-import { canDrop, getDragCode, getDragTarget } from "./utils";
+import {
+  canDrop,
+  getDragCode,
+  getDragTarget,
+  isOrderedDragTarget,
+} from "./utils";
 import { makeStateUpdater } from "../../utils";
 
 export const dragAndDropFeature: FeatureImplementation = {
@@ -30,7 +35,7 @@ export const dragAndDropFeature: FeatureImplementation = {
 
       const treeBb = tree.getElement()?.getBoundingClientRect();
 
-      if (!target || !treeBb || !("childIndex" in target)) return null;
+      if (!target || !treeBb || !isOrderedDragTarget(target)) return null;
 
       const leftOffset = target.dragLineLevel * (tree.getConfig().indent ?? 1);
       const targetItem = tree.getItems()[target.dragLineIndex];
@@ -212,7 +217,7 @@ export const dragAndDropFeature: FeatureImplementation = {
 
       if (
         !target ||
-        !("childIndex" in target) ||
+        !isOrderedDragTarget(target) ||
         target.item !== item.getParent()
       )
         return false;
@@ -224,7 +229,7 @@ export const dragAndDropFeature: FeatureImplementation = {
 
       if (
         !target ||
-        !("childIndex" in target) ||
+        !isOrderedDragTarget(target) ||
         target.item !== item.getParent()
       )
         return false;

package/src/features/drag-and-drop/utils.ts

@@ -26,6 +26,9 @@ type TargetPlacement =
       reparentLevel: number;
     };
 
+export const isOrderedDragTarget = <T>(dragTarget: DragTarget<T>) =>
+  "childIndex" in dragTarget;
+
 export const canDrop = (
   dataTransfer: DataTransfer | null,
   target: DragTarget<any>,

package/src/features/keyboard-drag-and-drop/feature.ts

@@ -10,6 +10,7 @@ import {
   getInsertionIndex,
   getItemDropCategory,
   getReparentTarget,
+  isOrderedDragTarget,
 } from "../drag-and-drop/utils";
 import { makeStateUpdater } from "../../utils";
 import { AssistiveDndState, KDndDataRef } from "./types";
@@ -23,8 +24,7 @@ const getNextDragTarget = <T>(
   const draggedItems = tree.getState().dnd?.draggedItems;
 
   // currently hovering between items
-  if ("childIndex" in dragTarget) {
-    // TODO move check in reusable function
+  if (isOrderedDragTarget(dragTarget)) {
     const parent = dragTarget.item.getParent();
     const targetedItem = tree.getItems()[dragTarget.dragLineIndex - 1]; // item above dragline
 
@@ -107,7 +107,7 @@ const getNextValidDragTarget = <T>(
 
 const updateScroll = <T>(tree: TreeInstance<T>) => {
   const state = tree.getState().dnd;
-  if (!state?.dragTarget || "childIndex" in state.dragTarget) return;
+  if (!state?.dragTarget || isOrderedDragTarget(state.dragTarget)) return;
   state.dragTarget.item.scrollTo({ block: "nearest", inline: "nearest" });
 };
 
@@ -152,7 +152,7 @@ const moveDragPosition = <T>(tree: TreeInstance<T>, isUp: boolean) => {
     dragTarget,
   });
   tree.applySubStateUpdate("assistiveDndState", AssistiveDndState.Dragging);
-  if (!("childIndex" in dragTarget)) {
+  if (!isOrderedDragTarget(dragTarget)) {
     dragTarget.item.setFocused();
   }
   updateScroll(tree);

package/src/features/keyboard-drag-and-drop/keyboard-drag-and-drop.spec.ts

@@ -6,6 +6,7 @@ import { propMemoizationFeature } from "../prop-memoization/feature";
 import { keyboardDragAndDropFeature } from "./feature";
 import { dragAndDropFeature } from "../drag-and-drop/feature";
 import { AssistiveDndState } from "./types";
+import { isOrderedDragTarget } from "../drag-and-drop/utils";
 
 const isItem = (item: unknown): item is ItemInstance<any> =>
   !!item && typeof item === "object" && "getId" in item;
@@ -318,7 +319,7 @@ describe("core-feature/keyboard-drag-and-drop", () => {
     describe("drag restrictions", () => {
       const expectChildIndex = (index: number) => {
         const state = tree.instance.getState().dnd?.dragTarget;
-        if (!state || !("childIndex" in state))
+        if (!state || !isOrderedDragTarget(state))
           throw new Error("No childIndex");
         expect(state.childIndex).toEqual(index);
       };

package/src/features/prop-memoization/feature.ts

@@ -3,15 +3,14 @@ import { PropMemoizationDataRef } from "./types";
 
 const memoize = (
   props: Record<string, any>,
-  dataRef: PropMemoizationDataRef,
+  memoizedProps: Record<string, any>,
 ) => {
-  dataRef.memoizedProps ??= {};
   for (const key in props) {
     if (typeof props[key] === "function") {
-      if (key in dataRef.memoizedProps) {
-        props[key] = dataRef.memoizedProps[key];
+      if (memoizedProps && key in memoizedProps) {
+        props[key] = memoizedProps[key];
       } else {
-        dataRef.memoizedProps[key] = props[key];
+        memoizedProps[key] = props[key];
       }
     }
   }
@@ -37,7 +36,17 @@ export const propMemoizationFeature: FeatureImplementation = {
     getContainerProps: ({ tree, prev }, treeLabel) => {
       const dataRef = tree.getDataRef<PropMemoizationDataRef>();
       const props = prev?.(treeLabel) ?? {};
-      return memoize(props, dataRef.current);
+      dataRef.current.memo ??= {};
+      dataRef.current.memo.tree ??= {};
+      return memoize(props, dataRef.current.memo.tree);
+    },
+
+    getSearchInputElementProps: ({ tree, prev }) => {
+      const dataRef = tree.getDataRef<PropMemoizationDataRef>();
+      const props = prev?.() ?? {};
+      dataRef.current.memo ??= {};
+      dataRef.current.memo.search ??= {};
+      return memoize(props, dataRef.current.memo.search);
     },
   },
 
@@ -45,7 +54,17 @@ export const propMemoizationFeature: FeatureImplementation = {
     getProps: ({ item, prev }) => {
       const dataRef = item.getDataRef<PropMemoizationDataRef>();
       const props = prev?.() ?? {};
-      return memoize(props, dataRef.current);
+      dataRef.current.memo ??= {};
+      dataRef.current.memo.item ??= {};
+      return memoize(props, dataRef.current.memo.item);
+    },
+
+    getRenameInputProps: ({ item, prev }) => {
+      const dataRef = item.getDataRef<PropMemoizationDataRef>();
+      const props = prev?.() ?? {};
+      dataRef.current.memo ??= {};
+      dataRef.current.memo.rename ??= {};
+      return memoize(props, dataRef.current.memo.rename);
     },
   },
 };

package/src/features/prop-memoization/types.ts

@@ -1,5 +1,10 @@
 export interface PropMemoizationDataRef {
-  memoizedProps?: Record<string, any>;
+  memo?: {
+    tree?: Record<string, any>;
+    item?: Record<string, any>;
+    search?: Record<string, any>;
+    rename?: Record<string, any>;
+  };
 }
 
 export type PropMemoizationFeatureDef = {

package/src/features/tree/feature.ts

@@ -63,7 +63,6 @@ export const treeFeature: FeatureImplementation<any> = {
       return flatItems;
     },
 
-    // TODO memo
     getFocusedItem: ({ tree }) => {
       return (
         tree.getItemInstance(tree.getState().focusedItem ?? "") ??
@@ -95,7 +94,6 @@ export const treeFeature: FeatureImplementation<any> = {
       });
     },
 
-    // TODO add label parameter
     getContainerProps: ({ prev, tree }, treeLabel) => ({
       ...prev?.(),
       role: "tree",