@salt-ds/lab 1.0.0-alpha.96 → 1.0.0-alpha.97

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @salt-ds/lab
 
+## 1.0.0-alpha.97
+
+### Minor Changes
+
+- 2516755: Removed `ToolbarNext`, `ToolbarContentNext`, and `TooltrayNext` from lab and promoted to core. As part of the promotion the components were renamed e.g., `ToolbarNext` is now `Toolbar`.
+
+  The legacy `Toolbar` and `Tooltray` exports in lab are unchanged.
+
+### Patch Changes
+
+- Updated dependencies [906c94e]
+- Updated dependencies [2516755]
+- Updated dependencies [027f8c4]
+- Updated dependencies [027f8c4]
+  - @salt-ds/core@1.65.0
+
 ## 1.0.0-alpha.96
 
 ### Minor Changes

package/css/salt-lab.css

@@ -3148,206 +3148,6 @@
   flex-basis: 0;
 }
 
-/* src/toolbar-next/ToolbarContentNext.css */
-.saltToolbarContentNext {
-  display: flex;
-  align-items: center;
-  gap: var(--salt-spacing-100);
-  min-width: 0;
-  flex-shrink: 0;
-}
-.saltToolbarContentNext[data-position=start] {
-  justify-content: flex-start;
-}
-.saltToolbarContentNext[data-position=center] {
-  justify-content: center;
-}
-.saltToolbarContentNext[data-position=end] {
-  justify-content: flex-end;
-}
-.saltToolbarContentNext[data-implicit] > .saltTooltrayNext[data-align=center],
-.saltToolbarContentNext[data-implicit] > .saltTooltrayNext[data-align=end] {
-  margin-inline-start: 0;
-  margin-inline-end: 0;
-}
-
-/* src/toolbar-next/ToolbarNext.css */
-.saltToolbarNext {
-  box-sizing: border-box;
-  inline-size: 100%;
-  min-width: 0;
-  position: relative;
-}
-.saltToolbarNext-layout {
-  align-items: center;
-  --saltToolbarNext-band-gap: var(--salt-spacing-100);
-}
-.saltToolbarNext-layout:not([data-centered]) {
-  display: flex;
-  column-gap: var(--saltToolbarNext-band-gap);
-}
-.saltToolbarNext-layout[data-centered] {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr);
-}
-.saltToolbarNext-band {
-  display: flex;
-  align-items: center;
-  gap: var(--saltToolbarNext-band-gap);
-  min-width: 0;
-}
-.saltToolbarNext-layout:not([data-centered]) > .saltToolbarNext-band[data-band-position=end] {
-  justify-content: flex-end;
-  margin-inline-start: auto;
-}
-.saltToolbarNext-layout[data-centered] > .saltToolbarNext-band[data-band-position=start] {
-  grid-column: 1;
-}
-.saltToolbarNext-layout[data-centered] > .saltToolbarNext-band[data-band-position=center] {
-  grid-column: 2;
-  justify-content: center;
-}
-.saltToolbarNext-layout[data-centered] > .saltToolbarNext-band[data-band-position=end] {
-  grid-column: 3;
-  justify-content: flex-end;
-}
-.saltToolbarNext-fallback {
-  display: flex;
-  align-items: center;
-  gap: var(--salt-spacing-100);
-}
-.saltToolbarNext-layout > * {
-  min-width: 0;
-}
-.saltToolbarNext-primary {
-  --toolbarNext-background: var(--salt-container-primary-background);
-  --toolbarNext-borderColor: var(--salt-container-primary-borderColor);
-}
-.saltToolbarNext-secondary {
-  --toolbarNext-background: var(--salt-container-secondary-background);
-  --toolbarNext-borderColor: var(--salt-container-secondary-borderColor);
-}
-.saltToolbarNext-tertiary {
-  --toolbarNext-background: var(--salt-container-tertiary-background);
-  --toolbarNext-borderColor: var(--salt-container-tertiary-borderColor);
-}
-.saltToolbarNext-bordered {
-  background: var(--saltToolbarNext-background, var(--toolbarNext-background));
-  border: var(--salt-size-fixed-100) var(--salt-borderStyle-solid) var(--saltToolbarNext-borderColor, var(--toolbarNext-borderColor));
-  border-radius: var(--salt-palette-corner, 0);
-  padding: var(--salt-spacing-100);
-}
-.saltToolbarNext-transparent {
-  background: transparent;
-  border: none;
-  padding: 0;
-}
-.saltToolbarNext-measurements {
-  display: flex;
-  gap: var(--salt-spacing-100);
-  position: absolute;
-  visibility: hidden;
-  pointer-events: none;
-  inset: 0 auto auto 0;
-  block-size: 0;
-  overflow: hidden;
-}
-.saltToolbarNext-measureTrigger {
-  white-space: nowrap;
-}
-
-/* src/toolbar-next/ToolbarNextOverflow.css */
-.saltToolbarNextOverflow-content {
-  position: relative;
-}
-.saltToolbarNextOverflow-slot,
-.saltToolbarNextOverflow-panelItem {
-  align-items: center;
-  display: flex;
-  flex-shrink: 0;
-  gap: var(--salt-spacing-100);
-  min-width: 0;
-}
-.saltToolbarNextOverflow-slot[data-align=end] {
-  margin-inline-start: auto;
-}
-.saltToolbarNextOverflow-slot[data-align=center] {
-  margin-inline-start: auto;
-  margin-inline-end: auto;
-}
-.saltToolbarNextOverflow-item {
-  align-items: center;
-  display: flex;
-  flex-shrink: 0;
-  min-width: 0;
-}
-.saltToolbarNextOverflow-menu {
-  display: flex;
-  flex-shrink: 0;
-}
-.saltToolbarNextOverflow-itemHost,
-.saltToolbarNextOverflow-contentHost {
-  display: contents;
-}
-.saltToolbarNextOverflow-trigger {
-  white-space: nowrap;
-}
-.saltToolbarNextOverflow-panel {
-  background: var(--salt-container-primary-background);
-  border: var(--salt-size-fixed-100) var(--salt-borderStyle-solid) var(--salt-selectable-borderColor-selected);
-  border-radius: var(--salt-palette-corner, 0);
-  box-shadow: var(--salt-overlayable-shadow-popout);
-  box-sizing: border-box;
-  max-width: min(32rem, calc(100vw - var(--salt-spacing-300)));
-  overflow: auto;
-  position: absolute;
-  z-index: var(--salt-zIndex-flyover);
-}
-.saltToolbarNextOverflow-floatingDescendant.saltToolbarNextOverflow-floatingDescendant {
-  z-index: calc(var(--salt-zIndex-flyover) + var(--salt-zIndex-default));
-}
-.saltToolbarNextOverflow-panelContent {
-  align-items: center;
-  display: flex;
-  flex-wrap: wrap;
-  gap: var(--salt-spacing-100);
-  max-width: inherit;
-  min-width: max-content;
-  padding: var(--salt-spacing-100);
-}
-.saltToolbarNextOverflow-panel .saltTooltrayNext[data-align=center],
-.saltToolbarNextOverflow-panel .saltTooltrayNext[data-align=end] {
-  margin-inline-start: 0;
-  margin-inline-end: 0;
-}
-.saltToolbarNextOverflow-panel .saltTooltrayNext > * {
-  inline-size: auto;
-}
-.saltToolbarNextOverflow-content > .saltToolbarNextOverflow-slot .saltTooltrayNext[data-align=center],
-.saltToolbarNextOverflow-content > .saltToolbarNextOverflow-slot .saltTooltrayNext[data-align=end] {
-  margin-inline-start: 0;
-  margin-inline-end: 0;
-}
-
-/* src/toolbar-next/TooltrayNext.css */
-.saltTooltrayNext {
-  display: flex;
-  align-items: center;
-  flex: 0 0 auto;
-  gap: var(--salt-spacing-100);
-  min-width: 0;
-}
-.saltTooltrayNext > * {
-  flex-shrink: 0;
-}
-.saltTooltrayNext[data-align=end] {
-  margin-inline-start: auto;
-}
-.saltTooltrayNext[data-align=center] {
-  margin-inline-start: auto;
-  margin-inline-end: auto;
-}
-
 /* src/window/ElectronWindow.css */
 .saltWindow {
   --saltDialog-boxShadow: none;
@@ -3458,4 +3258,4 @@
   margin: calc(var(--salt-size-unit) / 2) 0;
 }
 
-/* src/e4ab0e63-880d-4ad2-9759-4acceca8a38d.css */
+/* src/8f16bdce-6a2c-43c5-bef1-c547bffcc9de.css */

package/dist-cjs/common-hooks/useSelection.js

@@ -2,6 +2,7 @@
 
 var core = require('@salt-ds/core');
 var react = require('react');
+var listDomUtils = require('./list-dom-utils.js');
 
 const defaultSelectionKeys = ["Enter", " "];
 const isSelectable = (item) => item && item.disabled !== true && item.selectable !== false;
@@ -157,19 +158,21 @@ const useSelection = ({
   );
   const handleClick = react.useCallback(
     (evt) => {
-      const item = indexPositions[highlightedIdx];
+      const targetIdx = listDomUtils.closestListItemIndex(evt.target);
+      const idx = targetIdx >= 0 ? targetIdx : highlightedIdx;
+      const item = indexPositions[idx];
       if (!disableSelection && isSelectable(item)) {
         evt.preventDefault();
         evt.stopPropagation();
         selectItemAtIndex(
           evt,
-          highlightedIdx,
+          idx,
           item,
           evt.shiftKey,
           evt.ctrlKey || evt.metaKey
         );
         if (isExtendedSelect) {
-          lastActive.current = highlightedIdx;
+          lastActive.current = idx;
         }
       }
     },

package/dist-cjs/common-hooks/useSelection.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSelection.js","sources":["../src/common-hooks/useSelection.ts"],"sourcesContent":["import { useControlled } from \"@salt-ds/core\";\nimport {\n  type KeyboardEvent,\n  type MouseEvent,\n  type SyntheticEvent,\n  useCallback,\n  useRef,\n} from \"react\";\nimport type { CollectionItem } from \"./collectionTypes\";\nimport type {\n  SelectionHookProps,\n  SelectionHookResult,\n  SelectionStrategy,\n  SingleSelectionStrategy,\n} from \"./selectionTypes\";\n\nexport const CHECKBOX = \"checkbox\";\n\nexport const GROUP_SELECTION_NONE = \"none\";\nexport const GROUP_SELECTION_SINGLE = \"single\";\nexport const GROUP_SELECTION_CASCADE = \"cascade\";\n\nexport type GroupSelectionMode = \"none\" | \"single\" | \"cascade\";\n\nconst defaultSelectionKeys = [\"Enter\", \" \"];\n\nconst isSelectable = (item?: CollectionItem<unknown>) =>\n  item && item.disabled !== true && item.selectable !== false;\n\nconst byItemIndex = (\n  i1: CollectionItem<unknown>,\n  i2: CollectionItem<unknown>,\n) => (i1.index ?? 0) - (i2.index ?? 0);\n\nexport const groupSelectionEnabled = (\n  groupSelection: GroupSelectionMode,\n): boolean => groupSelection && groupSelection !== GROUP_SELECTION_NONE;\n\nexport const useSelection = <\n  Item,\n  Selection extends SelectionStrategy = \"default\",\n>({\n  defaultSelected,\n  disableSelection = false,\n  // groupSelection = GROUP_SELECTION_NONE,\n  highlightedIdx,\n  indexPositions,\n  label: _label = \"\",\n  onSelect,\n  onSelectionChange,\n  selected: selectedProp,\n  selectionStrategy,\n  selectionKeys = defaultSelectionKeys,\n  tabToSelect,\n}: SelectionHookProps<Item, Selection>): SelectionHookResult<\n  Item,\n  Selection\n> => {\n  type collectionItem = CollectionItem<Item>;\n\n  const isDeselectable = selectionStrategy === \"deselectable\";\n  const isMultipleSelect = selectionStrategy === \"multiple\";\n  const isExtendedSelect = selectionStrategy === \"extended\";\n\n  const lastActive = useRef(-1);\n\n  const isSelectionEvent = useCallback(\n    (evt: KeyboardEvent) => selectionKeys.includes(evt.key),\n    [selectionKeys],\n  );\n\n  const emptyValue = useCallback(<\n    Item,\n  >(): Selection extends SingleSelectionStrategy\n    ? null\n    : CollectionItem<Item>[] => {\n    type returnType = Selection extends SingleSelectionStrategy\n      ? null\n      : CollectionItem<Item>[];\n    return isMultipleSelect || isExtendedSelect\n      ? ([] as unknown as returnType)\n      : (null as returnType);\n  }, [isMultipleSelect, isExtendedSelect]);\n\n  const [selected, setSelected] = useControlled<\n    Selection extends SingleSelectionStrategy\n      ? CollectionItem<Item> | null\n      : CollectionItem<Item>[]\n  >({\n    controlled: selectedProp,\n    default: defaultSelected ?? emptyValue(),\n    name: \"UseSelection\",\n    state: \"selected\",\n  });\n\n  const isItemSelected = useCallback(\n    (item: collectionItem) => {\n      return Array.isArray(selected)\n        ? selected.includes(item)\n        : selected === item;\n    },\n    [selected],\n  );\n\n  const selectDefault = useCallback((item: collectionItem) => item, []);\n  const selectDeselectable = useCallback(\n    (item: collectionItem) => (isItemSelected(item) ? null : item),\n    [isItemSelected],\n  );\n  const selectMultiple = useCallback(\n    (item: collectionItem) => {\n      const nextItems = isItemSelected(item)\n        ? (selected as collectionItem[]).filter((i) => i !== item)\n        : (selected as collectionItem[]).concat(item);\n      nextItems.sort(byItemIndex);\n      return nextItems;\n    },\n    [isItemSelected, selected],\n  );\n  const selectRange = useCallback(\n    (idx: number, preserveExistingSelection?: boolean) => {\n      const currentSelection = preserveExistingSelection\n        ? (selected as collectionItem[])\n        : ([] as collectionItem[]);\n\n      const [lastSelectedItem] = (selected as collectionItem[]).slice(-1);\n      const lastSelectedItemIndex = lastSelectedItem\n        ? indexPositions.indexOf(lastSelectedItem)\n        : 0;\n\n      const startRegion = Math.min(idx, lastSelectedItemIndex);\n      const endRegion = Math.max(idx, lastSelectedItemIndex);\n      const rangeSelection = indexPositions.slice(startRegion, endRegion + 1);\n      // concat the current selection with a new selection and remove duplicates for overlaps\n      const nextItems = [...new Set([...currentSelection, ...rangeSelection])];\n      nextItems.sort(byItemIndex);\n      return nextItems;\n    },\n    [indexPositions, selected],\n  );\n\n  const selectItemAtIndex = useCallback(\n    (\n      evt: SyntheticEvent,\n      idx: number,\n      item: collectionItem,\n      rangeSelect: boolean,\n      preserveExistingSelection?: boolean,\n    ) => {\n      type returnType = Selection extends SingleSelectionStrategy\n        ? CollectionItem<Item> | null\n        : CollectionItem<Item>[];\n      let newSelected: returnType;\n      if (isMultipleSelect) {\n        newSelected = selectMultiple(item) as returnType;\n      } else if (isExtendedSelect) {\n        if (preserveExistingSelection && !rangeSelect) {\n          newSelected = selectMultiple(item) as returnType;\n        } else if (rangeSelect) {\n          newSelected = selectRange(\n            idx,\n            preserveExistingSelection,\n          ) as returnType;\n        } else {\n          newSelected = [item] as returnType;\n        }\n      } else if (isDeselectable) {\n        newSelected = selectDeselectable(item) as returnType;\n      } else {\n        newSelected = selectDefault(item) as returnType;\n      }\n\n      if (newSelected !== selected) {\n        setSelected(newSelected);\n      }\n\n      // We fire onSelect irrespective of whether selection changes\n      onSelect?.(evt, item);\n\n      if (newSelected !== selected) {\n        if (onSelectionChange) {\n          onSelectionChange(evt, newSelected);\n        }\n      }\n    },\n    [\n      isMultipleSelect,\n      isExtendedSelect,\n      isDeselectable,\n      selected,\n      onSelect,\n      selectMultiple,\n      selectRange,\n      selectDeselectable,\n      selectDefault,\n      onSelectionChange,\n    ],\n  );\n\n  const handleKeyDown = useCallback(\n    (evt: KeyboardEvent) => {\n      const item = indexPositions[highlightedIdx];\n      if (isSelectable(item)) {\n        if (isSelectionEvent(evt) || (tabToSelect && evt.key === \"Tab\")) {\n          // We do not inhibit Tab behaviour, if we are selecting on Tab then we apply\n          // selection as a side effect of the Tab, not as a replacement for Tabbing.\n          if (evt.key !== \"Tab\") {\n            evt.preventDefault();\n          }\n          selectItemAtIndex(\n            evt,\n            highlightedIdx,\n            item,\n            false,\n            evt.ctrlKey || evt.metaKey,\n          );\n          if (isExtendedSelect) {\n            lastActive.current = highlightedIdx;\n          }\n        }\n      }\n    },\n    [\n      indexPositions,\n      highlightedIdx,\n      isSelectionEvent,\n      tabToSelect,\n      selectItemAtIndex,\n      isExtendedSelect,\n    ],\n  );\n\n  const handleKeyboardNavigation = useCallback(\n    (evt: KeyboardEvent, currentIndex: number) => {\n      if (isExtendedSelect && evt.shiftKey) {\n        const item = indexPositions[currentIndex];\n        if (isSelectable(item)) {\n          selectItemAtIndex(evt, currentIndex, item, true);\n        }\n      }\n    },\n    [isExtendedSelect, indexPositions, selectItemAtIndex],\n  );\n\n  const handleClick = useCallback(\n    (evt: MouseEvent) => {\n      const item = indexPositions[highlightedIdx];\n      if (!disableSelection && isSelectable(item)) {\n        // if (!isCollapsibleItem(item)) {\n        evt.preventDefault();\n        evt.stopPropagation();\n        selectItemAtIndex(\n          evt,\n          highlightedIdx,\n          item,\n          evt.shiftKey,\n          evt.ctrlKey || evt.metaKey,\n        );\n        if (isExtendedSelect) {\n          lastActive.current = highlightedIdx;\n        }\n        // }\n      }\n    },\n    [\n      disableSelection,\n      isExtendedSelect,\n      highlightedIdx,\n      indexPositions,\n      selectItemAtIndex,\n    ],\n  );\n\n  const listHandlers = {\n    onClick: handleClick,\n    onKeyDown: handleKeyDown,\n    onKeyboardNavigation: handleKeyboardNavigation,\n  };\n\n  return {\n    listHandlers,\n    selected,\n    setSelected,\n  };\n};\n"],"names":["useRef","useCallback","useControlled"],"mappings":"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"}
+{"version":3,"file":"useSelection.js","sources":["../src/common-hooks/useSelection.ts"],"sourcesContent":["import { useControlled } from \"@salt-ds/core\";\nimport {\n  type KeyboardEvent,\n  type MouseEvent,\n  type SyntheticEvent,\n  useCallback,\n  useRef,\n} from \"react\";\nimport type { CollectionItem } from \"./collectionTypes\";\nimport { closestListItemIndex } from \"./list-dom-utils\";\nimport type {\n  SelectionHookProps,\n  SelectionHookResult,\n  SelectionStrategy,\n  SingleSelectionStrategy,\n} from \"./selectionTypes\";\n\nexport const CHECKBOX = \"checkbox\";\n\nexport const GROUP_SELECTION_NONE = \"none\";\nexport const GROUP_SELECTION_SINGLE = \"single\";\nexport const GROUP_SELECTION_CASCADE = \"cascade\";\n\nexport type GroupSelectionMode = \"none\" | \"single\" | \"cascade\";\n\nconst defaultSelectionKeys = [\"Enter\", \" \"];\n\nconst isSelectable = (item?: CollectionItem<unknown>) =>\n  item && item.disabled !== true && item.selectable !== false;\n\nconst byItemIndex = (\n  i1: CollectionItem<unknown>,\n  i2: CollectionItem<unknown>,\n) => (i1.index ?? 0) - (i2.index ?? 0);\n\nexport const groupSelectionEnabled = (\n  groupSelection: GroupSelectionMode,\n): boolean => groupSelection && groupSelection !== GROUP_SELECTION_NONE;\n\nexport const useSelection = <\n  Item,\n  Selection extends SelectionStrategy = \"default\",\n>({\n  defaultSelected,\n  disableSelection = false,\n  // groupSelection = GROUP_SELECTION_NONE,\n  highlightedIdx,\n  indexPositions,\n  label: _label = \"\",\n  onSelect,\n  onSelectionChange,\n  selected: selectedProp,\n  selectionStrategy,\n  selectionKeys = defaultSelectionKeys,\n  tabToSelect,\n}: SelectionHookProps<Item, Selection>): SelectionHookResult<\n  Item,\n  Selection\n> => {\n  type collectionItem = CollectionItem<Item>;\n\n  const isDeselectable = selectionStrategy === \"deselectable\";\n  const isMultipleSelect = selectionStrategy === \"multiple\";\n  const isExtendedSelect = selectionStrategy === \"extended\";\n\n  const lastActive = useRef(-1);\n\n  const isSelectionEvent = useCallback(\n    (evt: KeyboardEvent) => selectionKeys.includes(evt.key),\n    [selectionKeys],\n  );\n\n  const emptyValue = useCallback(<\n    Item,\n  >(): Selection extends SingleSelectionStrategy\n    ? null\n    : CollectionItem<Item>[] => {\n    type returnType = Selection extends SingleSelectionStrategy\n      ? null\n      : CollectionItem<Item>[];\n    return isMultipleSelect || isExtendedSelect\n      ? ([] as unknown as returnType)\n      : (null as returnType);\n  }, [isMultipleSelect, isExtendedSelect]);\n\n  const [selected, setSelected] = useControlled<\n    Selection extends SingleSelectionStrategy\n      ? CollectionItem<Item> | null\n      : CollectionItem<Item>[]\n  >({\n    controlled: selectedProp,\n    default: defaultSelected ?? emptyValue(),\n    name: \"UseSelection\",\n    state: \"selected\",\n  });\n\n  const isItemSelected = useCallback(\n    (item: collectionItem) => {\n      return Array.isArray(selected)\n        ? selected.includes(item)\n        : selected === item;\n    },\n    [selected],\n  );\n\n  const selectDefault = useCallback((item: collectionItem) => item, []);\n  const selectDeselectable = useCallback(\n    (item: collectionItem) => (isItemSelected(item) ? null : item),\n    [isItemSelected],\n  );\n  const selectMultiple = useCallback(\n    (item: collectionItem) => {\n      const nextItems = isItemSelected(item)\n        ? (selected as collectionItem[]).filter((i) => i !== item)\n        : (selected as collectionItem[]).concat(item);\n      nextItems.sort(byItemIndex);\n      return nextItems;\n    },\n    [isItemSelected, selected],\n  );\n  const selectRange = useCallback(\n    (idx: number, preserveExistingSelection?: boolean) => {\n      const currentSelection = preserveExistingSelection\n        ? (selected as collectionItem[])\n        : ([] as collectionItem[]);\n\n      const [lastSelectedItem] = (selected as collectionItem[]).slice(-1);\n      const lastSelectedItemIndex = lastSelectedItem\n        ? indexPositions.indexOf(lastSelectedItem)\n        : 0;\n\n      const startRegion = Math.min(idx, lastSelectedItemIndex);\n      const endRegion = Math.max(idx, lastSelectedItemIndex);\n      const rangeSelection = indexPositions.slice(startRegion, endRegion + 1);\n      // concat the current selection with a new selection and remove duplicates for overlaps\n      const nextItems = [...new Set([...currentSelection, ...rangeSelection])];\n      nextItems.sort(byItemIndex);\n      return nextItems;\n    },\n    [indexPositions, selected],\n  );\n\n  const selectItemAtIndex = useCallback(\n    (\n      evt: SyntheticEvent,\n      idx: number,\n      item: collectionItem,\n      rangeSelect: boolean,\n      preserveExistingSelection?: boolean,\n    ) => {\n      type returnType = Selection extends SingleSelectionStrategy\n        ? CollectionItem<Item> | null\n        : CollectionItem<Item>[];\n      let newSelected: returnType;\n      if (isMultipleSelect) {\n        newSelected = selectMultiple(item) as returnType;\n      } else if (isExtendedSelect) {\n        if (preserveExistingSelection && !rangeSelect) {\n          newSelected = selectMultiple(item) as returnType;\n        } else if (rangeSelect) {\n          newSelected = selectRange(\n            idx,\n            preserveExistingSelection,\n          ) as returnType;\n        } else {\n          newSelected = [item] as returnType;\n        }\n      } else if (isDeselectable) {\n        newSelected = selectDeselectable(item) as returnType;\n      } else {\n        newSelected = selectDefault(item) as returnType;\n      }\n\n      if (newSelected !== selected) {\n        setSelected(newSelected);\n      }\n\n      // We fire onSelect irrespective of whether selection changes\n      onSelect?.(evt, item);\n\n      if (newSelected !== selected) {\n        if (onSelectionChange) {\n          onSelectionChange(evt, newSelected);\n        }\n      }\n    },\n    [\n      isMultipleSelect,\n      isExtendedSelect,\n      isDeselectable,\n      selected,\n      onSelect,\n      selectMultiple,\n      selectRange,\n      selectDeselectable,\n      selectDefault,\n      onSelectionChange,\n    ],\n  );\n\n  const handleKeyDown = useCallback(\n    (evt: KeyboardEvent) => {\n      const item = indexPositions[highlightedIdx];\n      if (isSelectable(item)) {\n        if (isSelectionEvent(evt) || (tabToSelect && evt.key === \"Tab\")) {\n          // We do not inhibit Tab behaviour, if we are selecting on Tab then we apply\n          // selection as a side effect of the Tab, not as a replacement for Tabbing.\n          if (evt.key !== \"Tab\") {\n            evt.preventDefault();\n          }\n          selectItemAtIndex(\n            evt,\n            highlightedIdx,\n            item,\n            false,\n            evt.ctrlKey || evt.metaKey,\n          );\n          if (isExtendedSelect) {\n            lastActive.current = highlightedIdx;\n          }\n        }\n      }\n    },\n    [\n      indexPositions,\n      highlightedIdx,\n      isSelectionEvent,\n      tabToSelect,\n      selectItemAtIndex,\n      isExtendedSelect,\n    ],\n  );\n\n  const handleKeyboardNavigation = useCallback(\n    (evt: KeyboardEvent, currentIndex: number) => {\n      if (isExtendedSelect && evt.shiftKey) {\n        const item = indexPositions[currentIndex];\n        if (isSelectable(item)) {\n          selectItemAtIndex(evt, currentIndex, item, true);\n        }\n      }\n    },\n    [isExtendedSelect, indexPositions, selectItemAtIndex],\n  );\n\n  const handleClick = useCallback(\n    (evt: MouseEvent) => {\n      // Resolve the clicked item from the event target rather than relying on\n      // `highlightedIdx`. The highlighted index is updated asynchronously from\n      // a `mousemove` handler on the list; in fast/synthetic interactions\n      // (notably Cypress `realClick`) the click can fire before React has\n      // re-rendered with the updated highlight, which previously caused the\n      // click to be silently ignored (root cause of flaky selection tests).\n      const targetIdx = closestListItemIndex(evt.target as HTMLElement);\n      const idx = targetIdx >= 0 ? targetIdx : highlightedIdx;\n      const item = indexPositions[idx];\n      if (!disableSelection && isSelectable(item)) {\n        // if (!isCollapsibleItem(item)) {\n        evt.preventDefault();\n        evt.stopPropagation();\n        selectItemAtIndex(\n          evt,\n          idx,\n          item,\n          evt.shiftKey,\n          evt.ctrlKey || evt.metaKey,\n        );\n        if (isExtendedSelect) {\n          lastActive.current = idx;\n        }\n        // }\n      }\n    },\n    [\n      disableSelection,\n      isExtendedSelect,\n      highlightedIdx,\n      indexPositions,\n      selectItemAtIndex,\n    ],\n  );\n\n  const listHandlers = {\n    onClick: handleClick,\n    onKeyDown: handleKeyDown,\n    onKeyboardNavigation: handleKeyboardNavigation,\n  };\n\n  return {\n    listHandlers,\n    selected,\n    setSelected,\n  };\n};\n"],"names":["useRef","useCallback","useControlled","closestListItemIndex"],"mappings":"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"}

package/dist-cjs/index.js

@@ -128,9 +128,6 @@ var Toolbar = require('./toolbar/Toolbar.js');
 var ToolbarButton = require('./toolbar/ToolbarButton.js');
 var Tooltray = require('./toolbar/Tooltray.js');
 var ToolbarField = require('./toolbar/toolbar-field/ToolbarField.js');
-var ToolbarContentNext = require('./toolbar-next/ToolbarContentNext.js');
-var ToolbarNext = require('./toolbar-next/ToolbarNext.js');
-var TooltrayNext = require('./toolbar-next/TooltrayNext.js');
 var ElectronWindow = require('./window/ElectronWindow.js');
 var WindowContext = require('./window/WindowContext.js');
 
@@ -292,9 +289,6 @@ exports.Toolbar = Toolbar.Toolbar;
 exports.ToolbarButton = ToolbarButton.ToolbarButton;
 exports.Tooltray = Tooltray.Tooltray;
 exports.ToolbarField = ToolbarField.ToolbarField;
-exports.ToolbarContentNext = ToolbarContentNext.ToolbarContentNext;
-exports.ToolbarNext = ToolbarNext.ToolbarNext;
-exports.TooltrayNext = TooltrayNext.TooltrayNext;
 exports.ElectronWindow = ElectronWindow.ElectronWindow;
 exports.Window = WindowContext.Window;
 exports.WindowContext = WindowContext.WindowContext;

package/dist-cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist-cjs/list/useList.js

@@ -180,7 +180,13 @@ const useList = ({
     onMouseLeave: navigationControlProps.onMouseLeave
   };
   const listHandlers = listHandlersProp || {
-    onClick: selectionHook.listHandlers.onClick,
+    // Don't expose a click handler when the list is disabled. Previously,
+    // selection on disabled lists was prevented only as a side-effect of
+    // `handleMouseMove` gating on `disabled` (which kept `highlightedIdx` at
+    // -1, so `useSelection.handleClick` no-op'd). Now that `handleClick`
+    // resolves the clicked item directly from the event target, we must
+    // explicitly suppress the handler here.
+    onClick: disabled ? void 0 : selectionHook.listHandlers.onClick,
     // MouseEnter would be much better for this. There is a bug in Cypress
     // wheby it emits spurious MouseEnter (and MouseOver) events around
     // keypress events, which break many tests.

package/dist-cjs/list/useList.js.map

@@ -1 +1 @@
-{"version":3,"file":"useList.js","sources":["../src/list/useList.ts"],"sourcesContent":["import {\n  isValidElement,\n  type KeyboardEvent,\n  type MouseEvent,\n  useCallback,\n  useRef,\n} from \"react\";\nimport {\n  type CollectionItem,\n  closestListItemIndex,\n  type ListHandlers,\n  type SelectHandler,\n  type SelectionChangeHandler,\n  type SelectionStrategy,\n  type SingleSelectionStrategy,\n  useCollapsibleGroups,\n  useKeyboardNavigation,\n  useSelection,\n  useTypeahead,\n  useViewportTracking,\n} from \"../common-hooks\";\n\nimport type {\n  ListControlProps,\n  ListHookProps,\n  ListHookResult,\n} from \"./listTypes\";\n\nexport const useList = <Item, Selection extends SelectionStrategy = \"default\">({\n  collapsibleHeaders,\n  collectionHook: dataHook,\n  containerRef,\n  contentRef,\n  defaultHighlightedIndex,\n  defaultSelected,\n  disabled,\n  disableAriaActiveDescendant,\n  disableHighlightOnFocus,\n  disableTypeToSelect,\n  highlightedIndex: highlightedIndexProp,\n  label = \"\",\n  listHandlers: listHandlersProp,\n  onSelect,\n  onSelectionChange,\n  onHighlight,\n  onKeyboardNavigation,\n  onKeyDown,\n  restoreLastFocus,\n  selected,\n  selectionStrategy,\n  selectionKeys,\n  stickyHeaders,\n  tabToSelect,\n}: ListHookProps<Item, Selection>): ListHookResult<Item, Selection> => {\n  const lastSelection = useRef<typeof selected>(selected || defaultSelected);\n  const handleKeyboardNavigation = (\n    evt: KeyboardEvent<HTMLElement>,\n    nextIndex: number,\n  ) => {\n    selectionHook.listHandlers.onKeyboardNavigation?.(evt, nextIndex);\n    onKeyboardNavigation?.(evt, nextIndex);\n  };\n\n  // TODO where do these belong ?\n  const handleSelect = useCallback<SelectHandler<CollectionItem<Item>>>(\n    (evt, selectedItem) => {\n      if (onSelect) {\n        if (isValidElement(selectedItem.value)) {\n          onSelect(evt, selectedItem.label as Item);\n        } else if (selectedItem.value !== null) {\n          onSelect(evt, selectedItem.value);\n        }\n      }\n    },\n    [onSelect],\n  );\n\n  const handleSelectionChange = useCallback<\n    SelectionChangeHandler<CollectionItem<Item>, Selection>\n  >(\n    (evt, selected) => {\n      if (onSelectionChange) {\n        onSelectionChange(\n          evt,\n          (Array.isArray(selected)\n            ? selected.map((s) => (isValidElement(s.value) ? s.label : s.value))\n            : selected &&\n              (isValidElement(selected.value)\n                ? selected.label\n                : selected.value)) as Selection extends SingleSelectionStrategy\n            ? Item\n            : Item[],\n        );\n      }\n    },\n    [onSelectionChange],\n  );\n\n  const {\n    highlightedIndex,\n    listProps: {\n      onKeyDown: navigationKeyDown,\n      onMouseMove: navigationMouseMove,\n      ...navigationControlProps\n    },\n    setHighlightedIndex,\n    ...keyboardHook\n  } = useKeyboardNavigation<Item, Selection>({\n    containerRef,\n    defaultHighlightedIndex,\n    disableHighlightOnFocus,\n    highlightedIndex: highlightedIndexProp,\n    indexPositions: dataHook.data,\n    label,\n    onHighlight,\n    onKeyboardNavigation: handleKeyboardNavigation,\n    restoreLastFocus,\n    selected: lastSelection.current,\n  });\n\n  const collapsibleHook = useCollapsibleGroups({\n    collapsibleHeaders,\n    highlightedIdx: highlightedIndex,\n    collectionHook: dataHook,\n  });\n\n  const selectionHook = useSelection<Item, Selection>({\n    defaultSelected,\n    highlightedIdx: highlightedIndex,\n    indexPositions: dataHook.data,\n    label,\n    onSelect: handleSelect,\n    onSelectionChange: handleSelectionChange,\n    selected,\n    selectionStrategy,\n    selectionKeys,\n    tabToSelect,\n  });\n\n  const { onKeyDown: typeaheadOnKeyDown } = useTypeahead<Item>({\n    disableTypeToSelect,\n    highlightedIdx: highlightedIndex,\n    highlightItemAtIndex: setHighlightedIndex,\n    typeToNavigate: true,\n    items: dataHook.data,\n  });\n\n  const handleKeyDown = useCallback(\n    (evt: KeyboardEvent<HTMLElement>) => {\n      if (!evt.defaultPrevented) {\n        typeaheadOnKeyDown?.(evt);\n      }\n      // We still let the keyboard navigation hook process the event even\n      // if it has been handled by the typeahead hook. That is so it can\n      // correctly manage the focusVisible state.\n      navigationKeyDown(evt);\n      if (!evt.defaultPrevented) {\n        selectionHook.listHandlers.onKeyDown?.(evt);\n      }\n      if (!evt.defaultPrevented) {\n        collapsibleHook?.onKeyDown?.(evt);\n      }\n\n      if (!evt.defaultPrevented) {\n        onKeyDown?.(evt);\n      }\n    },\n    [\n      collapsibleHook,\n      navigationKeyDown,\n      onKeyDown,\n      selectionHook.listHandlers,\n      typeaheadOnKeyDown,\n    ],\n  );\n\n  // This is only appropriate when we are directly controlling a List,\n  // not when a control is manipulating the list\n  const { isScrolling, scrollIntoView } = useViewportTracking({\n    containerRef,\n    contentRef,\n    highlightedIdx: highlightedIndex,\n    indexPositions: dataHook.data,\n    stickyHeaders,\n  });\n\n  const handleMouseMove = useCallback(\n    (evt: MouseEvent) => {\n      if (!isScrolling.current && !disabled) {\n        navigationMouseMove();\n        const idx = closestListItemIndex(evt.target as HTMLElement);\n        if (idx !== highlightedIndex) {\n          const item = dataHook.data[idx];\n          if (!item || item.disabled) {\n            setHighlightedIndex(-1);\n          } else {\n            setHighlightedIndex(idx);\n          }\n        }\n      }\n    },\n    [\n      isScrolling,\n      disabled,\n      setHighlightedIndex,\n      navigationMouseMove,\n      highlightedIndex,\n      dataHook.data,\n    ],\n  );\n\n  const getActiveDescendant = () =>\n    highlightedIndex === undefined ||\n    highlightedIndex === -1 ||\n    disableAriaActiveDescendant\n      ? undefined\n      : dataHook.data[highlightedIndex]?.id;\n\n  // We need this on reEntry for navigation hook to handle focus\n  lastSelection.current = selectionHook.selected;\n\n  // controlProps ?\n  const listControlProps: ListControlProps = {\n    \"aria-activedescendant\": getActiveDescendant(),\n    onBlur: navigationControlProps.onBlur,\n    onFocus: navigationControlProps.onFocus,\n    onKeyDown: handleKeyDown,\n    onMouseDownCapture: navigationControlProps.onMouseDownCapture,\n    onMouseLeave: navigationControlProps.onMouseLeave,\n  };\n\n  const listHandlers: ListHandlers = listHandlersProp || {\n    onClick: selectionHook.listHandlers.onClick,\n    // MouseEnter would be much better for this. There is a bug in Cypress\n    // wheby it emits spurious MouseEnter (and MouseOver) events around\n    // keypress events, which break many tests.\n    onMouseMove: handleMouseMove,\n  };\n\n  return {\n    focusVisible: keyboardHook.focusVisible,\n    controlledHighlighting: keyboardHook.controlledHighlighting,\n    highlightedIndex,\n    keyboardNavigation: keyboardHook.keyboardNavigation,\n    listHandlers,\n    listItemHeaderHandlers: collapsibleHook,\n    listControlProps,\n    scrollIntoView,\n    selected: selectionHook.selected,\n    setHighlightedIndex,\n    setIgnoreFocus: keyboardHook.setIgnoreFocus,\n    setSelected: selectionHook.setSelected,\n  };\n};\n"],"names":["useRef","useCallback","isValidElement","selected","useKeyboardNavigation","useCollapsibleGroups","useSelection","useTypeahead","useViewportTracking","closestListItemIndex"],"mappings":"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"}
+{"version":3,"file":"useList.js","sources":["../src/list/useList.ts"],"sourcesContent":["import {\n  isValidElement,\n  type KeyboardEvent,\n  type MouseEvent,\n  useCallback,\n  useRef,\n} from \"react\";\nimport {\n  type CollectionItem,\n  closestListItemIndex,\n  type ListHandlers,\n  type SelectHandler,\n  type SelectionChangeHandler,\n  type SelectionStrategy,\n  type SingleSelectionStrategy,\n  useCollapsibleGroups,\n  useKeyboardNavigation,\n  useSelection,\n  useTypeahead,\n  useViewportTracking,\n} from \"../common-hooks\";\n\nimport type {\n  ListControlProps,\n  ListHookProps,\n  ListHookResult,\n} from \"./listTypes\";\n\nexport const useList = <Item, Selection extends SelectionStrategy = \"default\">({\n  collapsibleHeaders,\n  collectionHook: dataHook,\n  containerRef,\n  contentRef,\n  defaultHighlightedIndex,\n  defaultSelected,\n  disabled,\n  disableAriaActiveDescendant,\n  disableHighlightOnFocus,\n  disableTypeToSelect,\n  highlightedIndex: highlightedIndexProp,\n  label = \"\",\n  listHandlers: listHandlersProp,\n  onSelect,\n  onSelectionChange,\n  onHighlight,\n  onKeyboardNavigation,\n  onKeyDown,\n  restoreLastFocus,\n  selected,\n  selectionStrategy,\n  selectionKeys,\n  stickyHeaders,\n  tabToSelect,\n}: ListHookProps<Item, Selection>): ListHookResult<Item, Selection> => {\n  const lastSelection = useRef<typeof selected>(selected || defaultSelected);\n  const handleKeyboardNavigation = (\n    evt: KeyboardEvent<HTMLElement>,\n    nextIndex: number,\n  ) => {\n    selectionHook.listHandlers.onKeyboardNavigation?.(evt, nextIndex);\n    onKeyboardNavigation?.(evt, nextIndex);\n  };\n\n  // TODO where do these belong ?\n  const handleSelect = useCallback<SelectHandler<CollectionItem<Item>>>(\n    (evt, selectedItem) => {\n      if (onSelect) {\n        if (isValidElement(selectedItem.value)) {\n          onSelect(evt, selectedItem.label as Item);\n        } else if (selectedItem.value !== null) {\n          onSelect(evt, selectedItem.value);\n        }\n      }\n    },\n    [onSelect],\n  );\n\n  const handleSelectionChange = useCallback<\n    SelectionChangeHandler<CollectionItem<Item>, Selection>\n  >(\n    (evt, selected) => {\n      if (onSelectionChange) {\n        onSelectionChange(\n          evt,\n          (Array.isArray(selected)\n            ? selected.map((s) => (isValidElement(s.value) ? s.label : s.value))\n            : selected &&\n              (isValidElement(selected.value)\n                ? selected.label\n                : selected.value)) as Selection extends SingleSelectionStrategy\n            ? Item\n            : Item[],\n        );\n      }\n    },\n    [onSelectionChange],\n  );\n\n  const {\n    highlightedIndex,\n    listProps: {\n      onKeyDown: navigationKeyDown,\n      onMouseMove: navigationMouseMove,\n      ...navigationControlProps\n    },\n    setHighlightedIndex,\n    ...keyboardHook\n  } = useKeyboardNavigation<Item, Selection>({\n    containerRef,\n    defaultHighlightedIndex,\n    disableHighlightOnFocus,\n    highlightedIndex: highlightedIndexProp,\n    indexPositions: dataHook.data,\n    label,\n    onHighlight,\n    onKeyboardNavigation: handleKeyboardNavigation,\n    restoreLastFocus,\n    selected: lastSelection.current,\n  });\n\n  const collapsibleHook = useCollapsibleGroups({\n    collapsibleHeaders,\n    highlightedIdx: highlightedIndex,\n    collectionHook: dataHook,\n  });\n\n  const selectionHook = useSelection<Item, Selection>({\n    defaultSelected,\n    highlightedIdx: highlightedIndex,\n    indexPositions: dataHook.data,\n    label,\n    onSelect: handleSelect,\n    onSelectionChange: handleSelectionChange,\n    selected,\n    selectionStrategy,\n    selectionKeys,\n    tabToSelect,\n  });\n\n  const { onKeyDown: typeaheadOnKeyDown } = useTypeahead<Item>({\n    disableTypeToSelect,\n    highlightedIdx: highlightedIndex,\n    highlightItemAtIndex: setHighlightedIndex,\n    typeToNavigate: true,\n    items: dataHook.data,\n  });\n\n  const handleKeyDown = useCallback(\n    (evt: KeyboardEvent<HTMLElement>) => {\n      if (!evt.defaultPrevented) {\n        typeaheadOnKeyDown?.(evt);\n      }\n      // We still let the keyboard navigation hook process the event even\n      // if it has been handled by the typeahead hook. That is so it can\n      // correctly manage the focusVisible state.\n      navigationKeyDown(evt);\n      if (!evt.defaultPrevented) {\n        selectionHook.listHandlers.onKeyDown?.(evt);\n      }\n      if (!evt.defaultPrevented) {\n        collapsibleHook?.onKeyDown?.(evt);\n      }\n\n      if (!evt.defaultPrevented) {\n        onKeyDown?.(evt);\n      }\n    },\n    [\n      collapsibleHook,\n      navigationKeyDown,\n      onKeyDown,\n      selectionHook.listHandlers,\n      typeaheadOnKeyDown,\n    ],\n  );\n\n  // This is only appropriate when we are directly controlling a List,\n  // not when a control is manipulating the list\n  const { isScrolling, scrollIntoView } = useViewportTracking({\n    containerRef,\n    contentRef,\n    highlightedIdx: highlightedIndex,\n    indexPositions: dataHook.data,\n    stickyHeaders,\n  });\n\n  const handleMouseMove = useCallback(\n    (evt: MouseEvent) => {\n      if (!isScrolling.current && !disabled) {\n        navigationMouseMove();\n        const idx = closestListItemIndex(evt.target as HTMLElement);\n        if (idx !== highlightedIndex) {\n          const item = dataHook.data[idx];\n          if (!item || item.disabled) {\n            setHighlightedIndex(-1);\n          } else {\n            setHighlightedIndex(idx);\n          }\n        }\n      }\n    },\n    [\n      isScrolling,\n      disabled,\n      setHighlightedIndex,\n      navigationMouseMove,\n      highlightedIndex,\n      dataHook.data,\n    ],\n  );\n\n  const getActiveDescendant = () =>\n    highlightedIndex === undefined ||\n    highlightedIndex === -1 ||\n    disableAriaActiveDescendant\n      ? undefined\n      : dataHook.data[highlightedIndex]?.id;\n\n  // We need this on reEntry for navigation hook to handle focus\n  lastSelection.current = selectionHook.selected;\n\n  // controlProps ?\n  const listControlProps: ListControlProps = {\n    \"aria-activedescendant\": getActiveDescendant(),\n    onBlur: navigationControlProps.onBlur,\n    onFocus: navigationControlProps.onFocus,\n    onKeyDown: handleKeyDown,\n    onMouseDownCapture: navigationControlProps.onMouseDownCapture,\n    onMouseLeave: navigationControlProps.onMouseLeave,\n  };\n\n  const listHandlers: ListHandlers = listHandlersProp || {\n    // Don't expose a click handler when the list is disabled. Previously,\n    // selection on disabled lists was prevented only as a side-effect of\n    // `handleMouseMove` gating on `disabled` (which kept `highlightedIdx` at\n    // -1, so `useSelection.handleClick` no-op'd). Now that `handleClick`\n    // resolves the clicked item directly from the event target, we must\n    // explicitly suppress the handler here.\n    onClick: disabled ? undefined : selectionHook.listHandlers.onClick,\n    // MouseEnter would be much better for this. There is a bug in Cypress\n    // wheby it emits spurious MouseEnter (and MouseOver) events around\n    // keypress events, which break many tests.\n    onMouseMove: handleMouseMove,\n  };\n\n  return {\n    focusVisible: keyboardHook.focusVisible,\n    controlledHighlighting: keyboardHook.controlledHighlighting,\n    highlightedIndex,\n    keyboardNavigation: keyboardHook.keyboardNavigation,\n    listHandlers,\n    listItemHeaderHandlers: collapsibleHook,\n    listControlProps,\n    scrollIntoView,\n    selected: selectionHook.selected,\n    setHighlightedIndex,\n    setIgnoreFocus: keyboardHook.setIgnoreFocus,\n    setSelected: selectionHook.setSelected,\n  };\n};\n"],"names":["useRef","useCallback","isValidElement","selected","useKeyboardNavigation","useCollapsibleGroups","useSelection","useTypeahead","useViewportTracking","closestListItemIndex"],"mappings":";;;;;;;;;;;;;AA4BO,MAAM,UAAU,CAAwD;AAAA,EAC7E,kBAAA;AAAA,EACA,cAAA,EAAgB,QAAA;AAAA,EAChB,YAAA;AAAA,EACA,UAAA;AAAA,EACA,uBAAA;AAAA,EACA,eAAA;AAAA,EACA,QAAA;AAAA,EACA,2BAAA;AAAA,EACA,uBAAA;AAAA,EACA,mBAAA;AAAA,EACA,gBAAA,EAAkB,oBAAA;AAAA,EAClB,KAAA,GAAQ,EAAA;AAAA,EACR,YAAA,EAAc,gBAAA;AAAA,EACd,QAAA;AAAA,EACA,iBAAA;AAAA,EACA,WAAA;AAAA,EACA,oBAAA;AAAA,EACA,SAAA;AAAA,EACA,gBAAA;AAAA,EACA,QAAA;AAAA,EACA,iBAAA;AAAA,EACA,aAAA;AAAA,EACA,aAAA;AAAA,EACA;AACF,CAAA,KAAuE;AACrE,EAAA,MAAM,aAAA,GAAgBA,YAAA,CAAwB,QAAA,IAAY,eAAe,CAAA;AACzE,EAAA,MAAM,wBAAA,GAA2B,CAC/B,GAAA,EACA,SAAA,KACG;AA1DP,IAAA,IAAA,EAAA,EAAA,EAAA;AA2DI,IAAA,CAAA,EAAA,GAAA,CAAA,EAAA,GAAA,aAAA,CAAc,YAAA,EAAa,oBAAA,KAA3B,IAAA,GAAA,MAAA,GAAA,EAAA,CAAA,IAAA,CAAA,EAAA,EAAkD,GAAA,EAAK,SAAA,CAAA;AACvD,IAAA,oBAAA,IAAA,IAAA,GAAA,MAAA,GAAA,oBAAA,CAAuB,GAAA,EAAK,SAAA,CAAA;AAAA,EAC9B,CAAA;AAGA,EAAA,MAAM,YAAA,GAAeC,iBAAA;AAAA,IACnB,CAAC,KAAK,YAAA,KAAiB;AACrB,MAAA,IAAI,QAAA,EAAU;AACZ,QAAA,IAAIC,oBAAA,CAAe,YAAA,CAAa,KAAK,CAAA,EAAG;AACtC,UAAA,QAAA,CAAS,GAAA,EAAK,aAAa,KAAa,CAAA;AAAA,QAC1C,CAAA,MAAA,IAAW,YAAA,CAAa,KAAA,KAAU,IAAA,EAAM;AACtC,UAAA,QAAA,CAAS,GAAA,EAAK,aAAa,KAAK,CAAA;AAAA,QAClC;AAAA,MACF;AAAA,IACF,CAAA;AAAA,IACA,CAAC,QAAQ;AAAA,GACX;AAEA,EAAA,MAAM,qBAAA,GAAwBD,iBAAA;AAAA,IAG5B,CAAC,KAAKE,SAAAA,KAAa;AACjB,MAAA,IAAI,iBAAA,EAAmB;AACrB,QAAA,iBAAA;AAAA,UACE,GAAA;AAAA,UACC,KAAA,CAAM,OAAA,CAAQA,SAAQ,CAAA,GACnBA,SAAAA,CAAS,IAAI,CAAC,CAAA,KAAOD,oBAAA,CAAe,CAAA,CAAE,KAAK,CAAA,GAAI,EAAE,KAAA,GAAQ,CAAA,CAAE,KAAM,CAAA,GACjEC,SAAAA,KACCD,oBAAA,CAAeC,UAAS,KAAK,CAAA,GAC1BA,SAAAA,CAAS,KAAA,GACTA,SAAAA,CAAS,KAAA;AAAA,SAGnB;AAAA,MACF;AAAA,IACF,CAAA;AAAA,IACA,CAAC,iBAAiB;AAAA,GACpB;AAEA,EAAA,MAAM;AAAA,IACJ,gBAAA;AAAA,IACA,SAAA,EAAW;AAAA,MACT,SAAA,EAAW,iBAAA;AAAA,MACX,WAAA,EAAa,mBAAA;AAAA,MACb,GAAG;AAAA,KACL;AAAA,IACA,mBAAA;AAAA,IACA,GAAG;AAAA,MACDC,2CAAA,CAAuC;AAAA,IACzC,YAAA;AAAA,IACA,uBAAA;AAAA,IACA,uBAAA;AAAA,IACA,gBAAA,EAAkB,oBAAA;AAAA,IAClB,gBAAgB,QAAA,CAAS,IAAA;AAAA,IAEzB,WAAA;AAAA,IACA,oBAAA,EAAsB,wBAAA;AAAA,IACtB,gBAAA;AAAA,IACA,UAAU,aAAA,CAAc;AAAA,GACzB,CAAA;AAED,EAAA,MAAM,kBAAkBC,yCAAA,CAAqB;AAAA,IAC3C,kBAAA;AAAA,IACA,cAAA,EAAgB,gBAAA;AAAA,IAChB,cAAA,EAAgB;AAAA,GACjB,CAAA;AAED,EAAA,MAAM,gBAAgBC,yBAAA,CAA8B;AAAA,IAClD,eAAA;AAAA,IACA,cAAA,EAAgB,gBAAA;AAAA,IAChB,gBAAgB,QAAA,CAAS,IAAA;AAAA,IACzB,KAAA;AAAA,IACA,QAAA,EAAU,YAAA;AAAA,IACV,iBAAA,EAAmB,qBAAA;AAAA,IACnB,QAAA;AAAA,IACA,iBAAA;AAAA,IACA,aAAA;AAAA,IACA;AAAA,GACD,CAAA;AAED,EAAA,MAAM,EAAE,SAAA,EAAW,kBAAA,EAAmB,GAAIC,yBAAA,CAAmB;AAAA,IAC3D,mBAAA;AAAA,IACA,cAAA,EAAgB,gBAAA;AAAA,IAChB,oBAAA,EAAsB,mBAAA;AAAA,IACtB,cAAA,EAAgB,IAAA;AAAA,IAChB,OAAO,QAAA,CAAS;AAAA,GACjB,CAAA;AAED,EAAA,MAAM,aAAA,GAAgBN,iBAAA;AAAA,IACpB,CAAC,GAAA,KAAoC;AApJzC,MAAA,IAAA,EAAA,EAAA,EAAA,EAAA,EAAA;AAqJM,MAAA,IAAI,CAAC,IAAI,gBAAA,EAAkB;AACzB,QAAA,kBAAA,IAAA,IAAA,GAAA,MAAA,GAAA,kBAAA,CAAqB,GAAA,CAAA;AAAA,MACvB;AAIA,MAAA,iBAAA,CAAkB,GAAG,CAAA;AACrB,MAAA,IAAI,CAAC,IAAI,gBAAA,EAAkB;AACzB,QAAA,CAAA,EAAA,GAAA,CAAA,EAAA,GAAA,aAAA,CAAc,YAAA,EAAa,cAA3B,IAAA,GAAA,MAAA,GAAA,EAAA,CAAA,IAAA,CAAA,EAAA,EAAuC,GAAA,CAAA;AAAA,MACzC;AACA,MAAA,IAAI,CAAC,IAAI,gBAAA,EAAkB;AACzB,QAAA,CAAA,EAAA,GAAA,eAAA,IAAA,IAAA,GAAA,MAAA,GAAA,eAAA,CAAiB,cAAjB,IAAA,GAAA,MAAA,GAAA,EAAA,CAAA,IAAA,CAAA,eAAA,EAA6B,GAAA,CAAA;AAAA,MAC/B;AAEA,MAAA,IAAI,CAAC,IAAI,gBAAA,EAAkB;AACzB,QAAA,SAAA,IAAA,IAAA,GAAA,MAAA,GAAA,SAAA,CAAY,GAAA,CAAA;AAAA,MACd;AAAA,IACF,CAAA;AAAA,IACA;AAAA,MACE,eAAA;AAAA,MACA,iBAAA;AAAA,MACA,SAAA;AAAA,MACA,aAAA,CAAc,YAAA;AAAA,MACd;AAAA;AACF,GACF;AAIA,EAAA,MAAM,EAAE,WAAA,EAAa,cAAA,EAAe,GAAIO,uCAAA,CAAoB;AAAA,IAC1D,YAAA;AAAA,IACA,UAAA;AAAA,IACA,cAAA,EAAgB,gBAAA;AAAA,IAChB,gBAAgB,QAAA,CAAS,IAAA;AAAA,IACzB;AAAA,GACD,CAAA;AAED,EAAA,MAAM,eAAA,GAAkBP,iBAAA;AAAA,IACtB,CAAC,GAAA,KAAoB;AACnB,MAAA,IAAI,CAAC,WAAA,CAAY,OAAA,IAAW,CAAC,QAAA,EAAU;AACrC,QAAA,mBAAA,EAAoB;AACpB,QAAA,MAAM,GAAA,GAAMQ,iCAAA,CAAqB,GAAA,CAAI,MAAqB,CAAA;AAC1D,QAAA,IAAI,QAAQ,gBAAA,EAAkB;AAC5B,UAAA,MAAM,IAAA,GAAO,QAAA,CAAS,IAAA,CAAK,GAAG,CAAA;AAC9B,UAAA,IAAI,CAAC,IAAA,IAAQ,IAAA,CAAK,QAAA,EAAU;AAC1B,YAAA,mBAAA,CAAoB,EAAE,CAAA;AAAA,UACxB,CAAA,MAAO;AACL,YAAA,mBAAA,CAAoB,GAAG,CAAA;AAAA,UACzB;AAAA,QACF;AAAA,MACF;AAAA,IACF,CAAA;AAAA,IACA;AAAA,MACE,WAAA;AAAA,MACA,QAAA;AAAA,MACA,mBAAA;AAAA,MACA,mBAAA;AAAA,MACA,gBAAA;AAAA,MACA,QAAA,CAAS;AAAA;AACX,GACF;AAEA,EAAA,MAAM,sBAAsB,MAAG;AAnNjC,IAAA,IAAA,EAAA;AAoNI,IAAA,OAAA,gBAAA,KAAqB,MAAA,IACrB,qBAAqB,EAAA,IACrB,2BAAA,GACI,UACA,EAAA,GAAA,QAAA,CAAS,IAAA,CAAK,gBAAgB,CAAA,KAA9B,IAAA,GAAA,MAAA,GAAA,EAAA,CAAiC,EAAA;AAAA,EAAA,CAAA;AAGvC,EAAA,aAAA,CAAc,UAAU,aAAA,CAAc,QAAA;AAGtC,EAAA,MAAM,gBAAA,GAAqC;AAAA,IACzC,yBAAyB,mBAAA,EAAoB;AAAA,IAC7C,QAAQ,sBAAA,CAAuB,MAAA;AAAA,IAC/B,SAAS,sBAAA,CAAuB,OAAA;AAAA,IAChC,SAAA,EAAW,aAAA;AAAA,IACX,oBAAoB,sBAAA,CAAuB,kBAAA;AAAA,IAC3C,cAAc,sBAAA,CAAuB;AAAA,GACvC;AAEA,EAAA,MAAM,eAA6B,gBAAA,IAAoB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAOrD,OAAA,EAAS,QAAA,GAAW,MAAA,GAAY,aAAA,CAAc,YAAA,CAAa,OAAA;AAAA;AAAA;AAAA;AAAA,IAI3D,WAAA,EAAa;AAAA,GACf;AAEA,EAAA,OAAO;AAAA,IACL,cAAc,YAAA,CAAa,YAAA;AAAA,IAC3B,wBAAwB,YAAA,CAAa,sBAAA;AAAA,IACrC,gBAAA;AAAA,IACA,oBAAoB,YAAA,CAAa,kBAAA;AAAA,IACjC,YAAA;AAAA,IACA,sBAAA,EAAwB,eAAA;AAAA,IACxB,gBAAA;AAAA,IACA,cAAA;AAAA,IACA,UAAU,aAAA,CAAc,QAAA;AAAA,IACxB,mBAAA;AAAA,IACA,gBAAgB,YAAA,CAAa,cAAA;AAAA,IAC7B,aAAa,aAAA,CAAc;AAAA,GAC7B;AACF;;;;"}

package/dist-es/common-hooks/useSelection.js

@@ -1,5 +1,6 @@
 import { useControlled } from '@salt-ds/core';
 import { useRef, useCallback } from 'react';
+import { closestListItemIndex } from './list-dom-utils.js';
 
 const defaultSelectionKeys = ["Enter", " "];
 const isSelectable = (item) => item && item.disabled !== true && item.selectable !== false;
@@ -155,19 +156,21 @@ const useSelection = ({
   );
   const handleClick = useCallback(
     (evt) => {
-      const item = indexPositions[highlightedIdx];
+      const targetIdx = closestListItemIndex(evt.target);
+      const idx = targetIdx >= 0 ? targetIdx : highlightedIdx;
+      const item = indexPositions[idx];
       if (!disableSelection && isSelectable(item)) {
         evt.preventDefault();
         evt.stopPropagation();
         selectItemAtIndex(
           evt,
-          highlightedIdx,
+          idx,
           item,
           evt.shiftKey,
           evt.ctrlKey || evt.metaKey
         );
         if (isExtendedSelect) {
-          lastActive.current = highlightedIdx;
+          lastActive.current = idx;
         }
       }
     },

package/dist-es/common-hooks/useSelection.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSelection.js","sources":["../src/common-hooks/useSelection.ts"],"sourcesContent":["import { useControlled } from \"@salt-ds/core\";\nimport {\n  type KeyboardEvent,\n  type MouseEvent,\n  type SyntheticEvent,\n  useCallback,\n  useRef,\n} from \"react\";\nimport type { CollectionItem } from \"./collectionTypes\";\nimport type {\n  SelectionHookProps,\n  SelectionHookResult,\n  SelectionStrategy,\n  SingleSelectionStrategy,\n} from \"./selectionTypes\";\n\nexport const CHECKBOX = \"checkbox\";\n\nexport const GROUP_SELECTION_NONE = \"none\";\nexport const GROUP_SELECTION_SINGLE = \"single\";\nexport const GROUP_SELECTION_CASCADE = \"cascade\";\n\nexport type GroupSelectionMode = \"none\" | \"single\" | \"cascade\";\n\nconst defaultSelectionKeys = [\"Enter\", \" \"];\n\nconst isSelectable = (item?: CollectionItem<unknown>) =>\n  item && item.disabled !== true && item.selectable !== false;\n\nconst byItemIndex = (\n  i1: CollectionItem<unknown>,\n  i2: CollectionItem<unknown>,\n) => (i1.index ?? 0) - (i2.index ?? 0);\n\nexport const groupSelectionEnabled = (\n  groupSelection: GroupSelectionMode,\n): boolean => groupSelection && groupSelection !== GROUP_SELECTION_NONE;\n\nexport const useSelection = <\n  Item,\n  Selection extends SelectionStrategy = \"default\",\n>({\n  defaultSelected,\n  disableSelection = false,\n  // groupSelection = GROUP_SELECTION_NONE,\n  highlightedIdx,\n  indexPositions,\n  label: _label = \"\",\n  onSelect,\n  onSelectionChange,\n  selected: selectedProp,\n  selectionStrategy,\n  selectionKeys = defaultSelectionKeys,\n  tabToSelect,\n}: SelectionHookProps<Item, Selection>): SelectionHookResult<\n  Item,\n  Selection\n> => {\n  type collectionItem = CollectionItem<Item>;\n\n  const isDeselectable = selectionStrategy === \"deselectable\";\n  const isMultipleSelect = selectionStrategy === \"multiple\";\n  const isExtendedSelect = selectionStrategy === \"extended\";\n\n  const lastActive = useRef(-1);\n\n  const isSelectionEvent = useCallback(\n    (evt: KeyboardEvent) => selectionKeys.includes(evt.key),\n    [selectionKeys],\n  );\n\n  const emptyValue = useCallback(<\n    Item,\n  >(): Selection extends SingleSelectionStrategy\n    ? null\n    : CollectionItem<Item>[] => {\n    type returnType = Selection extends SingleSelectionStrategy\n      ? null\n      : CollectionItem<Item>[];\n    return isMultipleSelect || isExtendedSelect\n      ? ([] as unknown as returnType)\n      : (null as returnType);\n  }, [isMultipleSelect, isExtendedSelect]);\n\n  const [selected, setSelected] = useControlled<\n    Selection extends SingleSelectionStrategy\n      ? CollectionItem<Item> | null\n      : CollectionItem<Item>[]\n  >({\n    controlled: selectedProp,\n    default: defaultSelected ?? emptyValue(),\n    name: \"UseSelection\",\n    state: \"selected\",\n  });\n\n  const isItemSelected = useCallback(\n    (item: collectionItem) => {\n      return Array.isArray(selected)\n        ? selected.includes(item)\n        : selected === item;\n    },\n    [selected],\n  );\n\n  const selectDefault = useCallback((item: collectionItem) => item, []);\n  const selectDeselectable = useCallback(\n    (item: collectionItem) => (isItemSelected(item) ? null : item),\n    [isItemSelected],\n  );\n  const selectMultiple = useCallback(\n    (item: collectionItem) => {\n      const nextItems = isItemSelected(item)\n        ? (selected as collectionItem[]).filter((i) => i !== item)\n        : (selected as collectionItem[]).concat(item);\n      nextItems.sort(byItemIndex);\n      return nextItems;\n    },\n    [isItemSelected, selected],\n  );\n  const selectRange = useCallback(\n    (idx: number, preserveExistingSelection?: boolean) => {\n      const currentSelection = preserveExistingSelection\n        ? (selected as collectionItem[])\n        : ([] as collectionItem[]);\n\n      const [lastSelectedItem] = (selected as collectionItem[]).slice(-1);\n      const lastSelectedItemIndex = lastSelectedItem\n        ? indexPositions.indexOf(lastSelectedItem)\n        : 0;\n\n      const startRegion = Math.min(idx, lastSelectedItemIndex);\n      const endRegion = Math.max(idx, lastSelectedItemIndex);\n      const rangeSelection = indexPositions.slice(startRegion, endRegion + 1);\n      // concat the current selection with a new selection and remove duplicates for overlaps\n      const nextItems = [...new Set([...currentSelection, ...rangeSelection])];\n      nextItems.sort(byItemIndex);\n      return nextItems;\n    },\n    [indexPositions, selected],\n  );\n\n  const selectItemAtIndex = useCallback(\n    (\n      evt: SyntheticEvent,\n      idx: number,\n      item: collectionItem,\n      rangeSelect: boolean,\n      preserveExistingSelection?: boolean,\n    ) => {\n      type returnType = Selection extends SingleSelectionStrategy\n        ? CollectionItem<Item> | null\n        : CollectionItem<Item>[];\n      let newSelected: returnType;\n      if (isMultipleSelect) {\n        newSelected = selectMultiple(item) as returnType;\n      } else if (isExtendedSelect) {\n        if (preserveExistingSelection && !rangeSelect) {\n          newSelected = selectMultiple(item) as returnType;\n        } else if (rangeSelect) {\n          newSelected = selectRange(\n            idx,\n            preserveExistingSelection,\n          ) as returnType;\n        } else {\n          newSelected = [item] as returnType;\n        }\n      } else if (isDeselectable) {\n        newSelected = selectDeselectable(item) as returnType;\n      } else {\n        newSelected = selectDefault(item) as returnType;\n      }\n\n      if (newSelected !== selected) {\n        setSelected(newSelected);\n      }\n\n      // We fire onSelect irrespective of whether selection changes\n      onSelect?.(evt, item);\n\n      if (newSelected !== selected) {\n        if (onSelectionChange) {\n          onSelectionChange(evt, newSelected);\n        }\n      }\n    },\n    [\n      isMultipleSelect,\n      isExtendedSelect,\n      isDeselectable,\n      selected,\n      onSelect,\n      selectMultiple,\n      selectRange,\n      selectDeselectable,\n      selectDefault,\n      onSelectionChange,\n    ],\n  );\n\n  const handleKeyDown = useCallback(\n    (evt: KeyboardEvent) => {\n      const item = indexPositions[highlightedIdx];\n      if (isSelectable(item)) {\n        if (isSelectionEvent(evt) || (tabToSelect && evt.key === \"Tab\")) {\n          // We do not inhibit Tab behaviour, if we are selecting on Tab then we apply\n          // selection as a side effect of the Tab, not as a replacement for Tabbing.\n          if (evt.key !== \"Tab\") {\n            evt.preventDefault();\n          }\n          selectItemAtIndex(\n            evt,\n            highlightedIdx,\n            item,\n            false,\n            evt.ctrlKey || evt.metaKey,\n          );\n          if (isExtendedSelect) {\n            lastActive.current = highlightedIdx;\n          }\n        }\n      }\n    },\n    [\n      indexPositions,\n      highlightedIdx,\n      isSelectionEvent,\n      tabToSelect,\n      selectItemAtIndex,\n      isExtendedSelect,\n    ],\n  );\n\n  const handleKeyboardNavigation = useCallback(\n    (evt: KeyboardEvent, currentIndex: number) => {\n      if (isExtendedSelect && evt.shiftKey) {\n        const item = indexPositions[currentIndex];\n        if (isSelectable(item)) {\n          selectItemAtIndex(evt, currentIndex, item, true);\n        }\n      }\n    },\n    [isExtendedSelect, indexPositions, selectItemAtIndex],\n  );\n\n  const handleClick = useCallback(\n    (evt: MouseEvent) => {\n      const item = indexPositions[highlightedIdx];\n      if (!disableSelection && isSelectable(item)) {\n        // if (!isCollapsibleItem(item)) {\n        evt.preventDefault();\n        evt.stopPropagation();\n        selectItemAtIndex(\n          evt,\n          highlightedIdx,\n          item,\n          evt.shiftKey,\n          evt.ctrlKey || evt.metaKey,\n        );\n        if (isExtendedSelect) {\n          lastActive.current = highlightedIdx;\n        }\n        // }\n      }\n    },\n    [\n      disableSelection,\n      isExtendedSelect,\n      highlightedIdx,\n      indexPositions,\n      selectItemAtIndex,\n    ],\n  );\n\n  const listHandlers = {\n    onClick: handleClick,\n    onKeyDown: handleKeyDown,\n    onKeyboardNavigation: handleKeyboardNavigation,\n  };\n\n  return {\n    listHandlers,\n    selected,\n    setSelected,\n  };\n};\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"useSelection.js","sources":["../src/common-hooks/useSelection.ts"],"sourcesContent":["import { useControlled } from \"@salt-ds/core\";\nimport {\n  type KeyboardEvent,\n  type MouseEvent,\n  type SyntheticEvent,\n  useCallback,\n  useRef,\n} from \"react\";\nimport type { CollectionItem } from \"./collectionTypes\";\nimport { closestListItemIndex } from \"./list-dom-utils\";\nimport type {\n  SelectionHookProps,\n  SelectionHookResult,\n  SelectionStrategy,\n  SingleSelectionStrategy,\n} from \"./selectionTypes\";\n\nexport const CHECKBOX = \"checkbox\";\n\nexport const GROUP_SELECTION_NONE = \"none\";\nexport const GROUP_SELECTION_SINGLE = \"single\";\nexport const GROUP_SELECTION_CASCADE = \"cascade\";\n\nexport type GroupSelectionMode = \"none\" | \"single\" | \"cascade\";\n\nconst defaultSelectionKeys = [\"Enter\", \" \"];\n\nconst isSelectable = (item?: CollectionItem<unknown>) =>\n  item && item.disabled !== true && item.selectable !== false;\n\nconst byItemIndex = (\n  i1: CollectionItem<unknown>,\n  i2: CollectionItem<unknown>,\n) => (i1.index ?? 0) - (i2.index ?? 0);\n\nexport const groupSelectionEnabled = (\n  groupSelection: GroupSelectionMode,\n): boolean => groupSelection && groupSelection !== GROUP_SELECTION_NONE;\n\nexport const useSelection = <\n  Item,\n  Selection extends SelectionStrategy = \"default\",\n>({\n  defaultSelected,\n  disableSelection = false,\n  // groupSelection = GROUP_SELECTION_NONE,\n  highlightedIdx,\n  indexPositions,\n  label: _label = \"\",\n  onSelect,\n  onSelectionChange,\n  selected: selectedProp,\n  selectionStrategy,\n  selectionKeys = defaultSelectionKeys,\n  tabToSelect,\n}: SelectionHookProps<Item, Selection>): SelectionHookResult<\n  Item,\n  Selection\n> => {\n  type collectionItem = CollectionItem<Item>;\n\n  const isDeselectable = selectionStrategy === \"deselectable\";\n  const isMultipleSelect = selectionStrategy === \"multiple\";\n  const isExtendedSelect = selectionStrategy === \"extended\";\n\n  const lastActive = useRef(-1);\n\n  const isSelectionEvent = useCallback(\n    (evt: KeyboardEvent) => selectionKeys.includes(evt.key),\n    [selectionKeys],\n  );\n\n  const emptyValue = useCallback(<\n    Item,\n  >(): Selection extends SingleSelectionStrategy\n    ? null\n    : CollectionItem<Item>[] => {\n    type returnType = Selection extends SingleSelectionStrategy\n      ? null\n      : CollectionItem<Item>[];\n    return isMultipleSelect || isExtendedSelect\n      ? ([] as unknown as returnType)\n      : (null as returnType);\n  }, [isMultipleSelect, isExtendedSelect]);\n\n  const [selected, setSelected] = useControlled<\n    Selection extends SingleSelectionStrategy\n      ? CollectionItem<Item> | null\n      : CollectionItem<Item>[]\n  >({\n    controlled: selectedProp,\n    default: defaultSelected ?? emptyValue(),\n    name: \"UseSelection\",\n    state: \"selected\",\n  });\n\n  const isItemSelected = useCallback(\n    (item: collectionItem) => {\n      return Array.isArray(selected)\n        ? selected.includes(item)\n        : selected === item;\n    },\n    [selected],\n  );\n\n  const selectDefault = useCallback((item: collectionItem) => item, []);\n  const selectDeselectable = useCallback(\n    (item: collectionItem) => (isItemSelected(item) ? null : item),\n    [isItemSelected],\n  );\n  const selectMultiple = useCallback(\n    (item: collectionItem) => {\n      const nextItems = isItemSelected(item)\n        ? (selected as collectionItem[]).filter((i) => i !== item)\n        : (selected as collectionItem[]).concat(item);\n      nextItems.sort(byItemIndex);\n      return nextItems;\n    },\n    [isItemSelected, selected],\n  );\n  const selectRange = useCallback(\n    (idx: number, preserveExistingSelection?: boolean) => {\n      const currentSelection = preserveExistingSelection\n        ? (selected as collectionItem[])\n        : ([] as collectionItem[]);\n\n      const [lastSelectedItem] = (selected as collectionItem[]).slice(-1);\n      const lastSelectedItemIndex = lastSelectedItem\n        ? indexPositions.indexOf(lastSelectedItem)\n        : 0;\n\n      const startRegion = Math.min(idx, lastSelectedItemIndex);\n      const endRegion = Math.max(idx, lastSelectedItemIndex);\n      const rangeSelection = indexPositions.slice(startRegion, endRegion + 1);\n      // concat the current selection with a new selection and remove duplicates for overlaps\n      const nextItems = [...new Set([...currentSelection, ...rangeSelection])];\n      nextItems.sort(byItemIndex);\n      return nextItems;\n    },\n    [indexPositions, selected],\n  );\n\n  const selectItemAtIndex = useCallback(\n    (\n      evt: SyntheticEvent,\n      idx: number,\n      item: collectionItem,\n      rangeSelect: boolean,\n      preserveExistingSelection?: boolean,\n    ) => {\n      type returnType = Selection extends SingleSelectionStrategy\n        ? CollectionItem<Item> | null\n        : CollectionItem<Item>[];\n      let newSelected: returnType;\n      if (isMultipleSelect) {\n        newSelected = selectMultiple(item) as returnType;\n      } else if (isExtendedSelect) {\n        if (preserveExistingSelection && !rangeSelect) {\n          newSelected = selectMultiple(item) as returnType;\n        } else if (rangeSelect) {\n          newSelected = selectRange(\n            idx,\n            preserveExistingSelection,\n          ) as returnType;\n        } else {\n          newSelected = [item] as returnType;\n        }\n      } else if (isDeselectable) {\n        newSelected = selectDeselectable(item) as returnType;\n      } else {\n        newSelected = selectDefault(item) as returnType;\n      }\n\n      if (newSelected !== selected) {\n        setSelected(newSelected);\n      }\n\n      // We fire onSelect irrespective of whether selection changes\n      onSelect?.(evt, item);\n\n      if (newSelected !== selected) {\n        if (onSelectionChange) {\n          onSelectionChange(evt, newSelected);\n        }\n      }\n    },\n    [\n      isMultipleSelect,\n      isExtendedSelect,\n      isDeselectable,\n      selected,\n      onSelect,\n      selectMultiple,\n      selectRange,\n      selectDeselectable,\n      selectDefault,\n      onSelectionChange,\n    ],\n  );\n\n  const handleKeyDown = useCallback(\n    (evt: KeyboardEvent) => {\n      const item = indexPositions[highlightedIdx];\n      if (isSelectable(item)) {\n        if (isSelectionEvent(evt) || (tabToSelect && evt.key === \"Tab\")) {\n          // We do not inhibit Tab behaviour, if we are selecting on Tab then we apply\n          // selection as a side effect of the Tab, not as a replacement for Tabbing.\n          if (evt.key !== \"Tab\") {\n            evt.preventDefault();\n          }\n          selectItemAtIndex(\n            evt,\n            highlightedIdx,\n            item,\n            false,\n            evt.ctrlKey || evt.metaKey,\n          );\n          if (isExtendedSelect) {\n            lastActive.current = highlightedIdx;\n          }\n        }\n      }\n    },\n    [\n      indexPositions,\n      highlightedIdx,\n      isSelectionEvent,\n      tabToSelect,\n      selectItemAtIndex,\n      isExtendedSelect,\n    ],\n  );\n\n  const handleKeyboardNavigation = useCallback(\n    (evt: KeyboardEvent, currentIndex: number) => {\n      if (isExtendedSelect && evt.shiftKey) {\n        const item = indexPositions[currentIndex];\n        if (isSelectable(item)) {\n          selectItemAtIndex(evt, currentIndex, item, true);\n        }\n      }\n    },\n    [isExtendedSelect, indexPositions, selectItemAtIndex],\n  );\n\n  const handleClick = useCallback(\n    (evt: MouseEvent) => {\n      // Resolve the clicked item from the event target rather than relying on\n      // `highlightedIdx`. The highlighted index is updated asynchronously from\n      // a `mousemove` handler on the list; in fast/synthetic interactions\n      // (notably Cypress `realClick`) the click can fire before React has\n      // re-rendered with the updated highlight, which previously caused the\n      // click to be silently ignored (root cause of flaky selection tests).\n      const targetIdx = closestListItemIndex(evt.target as HTMLElement);\n      const idx = targetIdx >= 0 ? targetIdx : highlightedIdx;\n      const item = indexPositions[idx];\n      if (!disableSelection && isSelectable(item)) {\n        // if (!isCollapsibleItem(item)) {\n        evt.preventDefault();\n        evt.stopPropagation();\n        selectItemAtIndex(\n          evt,\n          idx,\n          item,\n          evt.shiftKey,\n          evt.ctrlKey || evt.metaKey,\n        );\n        if (isExtendedSelect) {\n          lastActive.current = idx;\n        }\n        // }\n      }\n    },\n    [\n      disableSelection,\n      isExtendedSelect,\n      highlightedIdx,\n      indexPositions,\n      selectItemAtIndex,\n    ],\n  );\n\n  const listHandlers = {\n    onClick: handleClick,\n    onKeyDown: handleKeyDown,\n    onKeyboardNavigation: handleKeyboardNavigation,\n  };\n\n  return {\n    listHandlers,\n    selected,\n    setSelected,\n  };\n};\n"],"names":[],"mappings":"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"}

package/dist-es/index.js

@@ -126,9 +126,6 @@ export { Toolbar } from './toolbar/Toolbar.js';
 export { ToolbarButton } from './toolbar/ToolbarButton.js';
 export { Tooltray } from './toolbar/Tooltray.js';
 export { ToolbarField } from './toolbar/toolbar-field/ToolbarField.js';
-export { ToolbarContentNext } from './toolbar-next/ToolbarContentNext.js';
-export { ToolbarNext } from './toolbar-next/ToolbarNext.js';
-export { TooltrayNext } from './toolbar-next/TooltrayNext.js';
 export { ElectronWindow } from './window/ElectronWindow.js';
 export { Window, WindowContext, isDesktop, useWindow } from './window/WindowContext.js';
 //# sourceMappingURL=index.js.map

package/dist-es/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist-es/list/useList.js

@@ -178,7 +178,13 @@ const useList = ({
     onMouseLeave: navigationControlProps.onMouseLeave
   };
   const listHandlers = listHandlersProp || {
-    onClick: selectionHook.listHandlers.onClick,
+    // Don't expose a click handler when the list is disabled. Previously,
+    // selection on disabled lists was prevented only as a side-effect of
+    // `handleMouseMove` gating on `disabled` (which kept `highlightedIdx` at
+    // -1, so `useSelection.handleClick` no-op'd). Now that `handleClick`
+    // resolves the clicked item directly from the event target, we must
+    // explicitly suppress the handler here.
+    onClick: disabled ? void 0 : selectionHook.listHandlers.onClick,
     // MouseEnter would be much better for this. There is a bug in Cypress
     // wheby it emits spurious MouseEnter (and MouseOver) events around
     // keypress events, which break many tests.