@headless-tree/core 1.6.0 → 1.6.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @headless-tree/core
 
+## 1.6.1
+
+### Patch Changes
+
+- 4ddeaf3: Fixed behavior where shift-selecting an item with no previously selected or focused item would multiselect all items from the top to the clicked item. Now, shift-selecting an item with no previously clicked items will only select the clicked item (#176)
+
 ## 1.6.0
 
 ### Minor Changes

package/dist/index.js

@@ -759,10 +759,15 @@ var selectionFeature = {
       const { selectedItems } = tree.getState();
       return selectedItems.includes(itemId);
     },
-    selectUpTo: ({ tree, item }, ctrl) => {
+    selectUpTo: ({ tree, item, itemId }, ctrl) => {
       const indexA = item.getItemMeta().index;
-      const { selectUpToAnchorId } = tree.getDataRef().current;
-      const itemB = selectUpToAnchorId ? tree.getItemInstance(selectUpToAnchorId) : tree.getFocusedItem();
+      const dataRef = tree.getDataRef();
+      if (!dataRef.current.selectUpToAnchorId) {
+        dataRef.current.selectUpToAnchorId = itemId;
+        tree.setSelectedItems([itemId]);
+        return;
+      }
+      const itemB = tree.getItemInstance(dataRef.current.selectUpToAnchorId);
       const indexB = itemB.getItemMeta().index;
       const [a, b] = indexA < indexB ? [indexA, indexB] : [indexB, indexA];
       const newSelectedItems = tree.getItems().slice(a, b + 1).map((treeItem) => treeItem.getItemMeta().itemId);
@@ -783,7 +788,7 @@ var selectionFeature = {
         item.select();
       }
     },
-    getProps: ({ tree, item, prev }) => __spreadProps(__spreadValues({}, prev == null ? void 0 : prev()), {
+    getProps: ({ tree, item, itemId, prev }) => __spreadProps(__spreadValues({}, prev == null ? void 0 : prev()), {
       "aria-selected": item.isSelected() ? "true" : "false",
       onClick: (e) => {
         var _a, _b;
@@ -792,10 +797,10 @@ var selectionFeature = {
         } else if (e.ctrlKey || e.metaKey) {
           item.toggleSelect();
         } else {
-          tree.setSelectedItems([item.getItemMeta().itemId]);
+          tree.setSelectedItems([itemId]);
         }
         if (!e.shiftKey) {
-          tree.getDataRef().current.selectUpToAnchorId = item.getId();
+          tree.getDataRef().current.selectUpToAnchorId = itemId;
         }
         (_b = (_a = prev == null ? void 0 : prev()) == null ? void 0 : _a.onClick) == null ? void 0 : _b.call(_a, e);
       }

package/dist/index.mjs

@@ -715,10 +715,15 @@ var selectionFeature = {
       const { selectedItems } = tree.getState();
       return selectedItems.includes(itemId);
     },
-    selectUpTo: ({ tree, item }, ctrl) => {
+    selectUpTo: ({ tree, item, itemId }, ctrl) => {
       const indexA = item.getItemMeta().index;
-      const { selectUpToAnchorId } = tree.getDataRef().current;
-      const itemB = selectUpToAnchorId ? tree.getItemInstance(selectUpToAnchorId) : tree.getFocusedItem();
+      const dataRef = tree.getDataRef();
+      if (!dataRef.current.selectUpToAnchorId) {
+        dataRef.current.selectUpToAnchorId = itemId;
+        tree.setSelectedItems([itemId]);
+        return;
+      }
+      const itemB = tree.getItemInstance(dataRef.current.selectUpToAnchorId);
       const indexB = itemB.getItemMeta().index;
       const [a, b] = indexA < indexB ? [indexA, indexB] : [indexB, indexA];
       const newSelectedItems = tree.getItems().slice(a, b + 1).map((treeItem) => treeItem.getItemMeta().itemId);
@@ -739,7 +744,7 @@ var selectionFeature = {
         item.select();
       }
     },
-    getProps: ({ tree, item, prev }) => __spreadProps(__spreadValues({}, prev == null ? void 0 : prev()), {
+    getProps: ({ tree, item, itemId, prev }) => __spreadProps(__spreadValues({}, prev == null ? void 0 : prev()), {
       "aria-selected": item.isSelected() ? "true" : "false",
       onClick: (e) => {
         var _a, _b;
@@ -748,10 +753,10 @@ var selectionFeature = {
         } else if (e.ctrlKey || e.metaKey) {
           item.toggleSelect();
         } else {
-          tree.setSelectedItems([item.getItemMeta().itemId]);
+          tree.setSelectedItems([itemId]);
         }
         if (!e.shiftKey) {
-          tree.getDataRef().current.selectUpToAnchorId = item.getId();
+          tree.getDataRef().current.selectUpToAnchorId = itemId;
         }
         (_b = (_a = prev == null ? void 0 : prev()) == null ? void 0 : _a.onClick) == null ? void 0 : _b.call(_a, e);
       }

package/package.json

@@ -13,7 +13,7 @@
     "checkbox",
     "hook"
   ],
-  "version": "1.6.0",
+  "version": "1.6.1",
   "main": "dist/index.d.ts",
   "module": "dist/index.mjs",
   "types": "dist/index.d.mts",

package/src/features/selection/feature.ts

@@ -49,13 +49,17 @@ export const selectionFeature: FeatureImplementation = {
       return selectedItems.includes(itemId);
     },
 
-    selectUpTo: ({ tree, item }, ctrl: boolean) => {
+    selectUpTo: ({ tree, item, itemId }, ctrl: boolean) => {
       const indexA = item.getItemMeta().index;
-      const { selectUpToAnchorId } =
-        tree.getDataRef<SelectionDataRef>().current;
-      const itemB = selectUpToAnchorId
-        ? tree.getItemInstance(selectUpToAnchorId)
-        : tree.getFocusedItem();
+      const dataRef = tree.getDataRef<SelectionDataRef>();
+
+      if (!dataRef.current.selectUpToAnchorId) {
+        dataRef.current.selectUpToAnchorId = itemId;
+        tree.setSelectedItems([itemId]);
+        return;
+      }
+
+      const itemB = tree.getItemInstance(dataRef.current.selectUpToAnchorId);
       const indexB = itemB.getItemMeta().index;
       const [a, b] = indexA < indexB ? [indexA, indexB] : [indexB, indexA];
       const newSelectedItems = tree
@@ -83,7 +87,7 @@ export const selectionFeature: FeatureImplementation = {
       }
     },
 
-    getProps: ({ tree, item, prev }) => ({
+    getProps: ({ tree, item, itemId, prev }) => ({
       ...prev?.(),
       "aria-selected": item.isSelected() ? "true" : "false",
       onClick: (e: MouseEvent) => {
@@ -92,12 +96,12 @@ export const selectionFeature: FeatureImplementation = {
         } else if (e.ctrlKey || e.metaKey) {
           item.toggleSelect();
         } else {
-          tree.setSelectedItems([item.getItemMeta().itemId]);
+          tree.setSelectedItems([itemId]);
         }
 
         if (!e.shiftKey) {
           tree.getDataRef<SelectionDataRef>().current.selectUpToAnchorId =
-            item.getId();
+            itemId;
         }
 
         prev?.()?.onClick?.(e);

package/src/features/selection/selection.spec.ts

@@ -176,9 +176,8 @@ describe("core-feature/selections", () => {
 
         it("should handle selectUpTo without ctrl", () => {
           const setSelectedItems = tree.mockedHandler("setSelectedItems");
-          tree.instance.getItemInstance("x111").toggleSelect();
-          tree.instance.getItemInstance("x112").toggleSelect();
-          tree.instance.getItemInstance("x112").setFocused();
+          tree.do.ctrlSelectItem("x111");
+          tree.do.ctrlSelectItem("x112");
           tree.instance.getItemInstance("x114").selectUpTo(false);
           expect(setSelectedItems).toHaveBeenCalledWith([
             "x112",
@@ -190,9 +189,8 @@ describe("core-feature/selections", () => {
 
         it("should handle selectUpTo with ctrl", () => {
           const setSelectedItems = tree.mockedHandler("setSelectedItems");
-          tree.instance.getItemInstance("x111").toggleSelect();
-          tree.instance.getItemInstance("x112").toggleSelect();
-          tree.instance.getItemInstance("x112").setFocused();
+          tree.do.ctrlSelectItem("x111");
+          tree.do.ctrlSelectItem("x112");
           tree.instance.getItemInstance("x114").selectUpTo(true);
           expect(setSelectedItems).toHaveBeenCalledWith([
             "x111",