@sprawlify/primitives 0.1.10 → 0.1.12

package/dist/machines/date-picker/index.d.cts

@@ -8,7 +8,7 @@ import { c as Placement, d as PositioningOptions } from "../../types-CZAtqGqH.cj
 import { Calendar, CalendarDate, CalendarDateTime, CalendarIdentifier, DateDuration, DateFormatter, ZonedDateTime } from "@internationalized/date";
 
 //#region src/machines/date-picker/date-picker.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "input" | "label" | "control" | "trigger" | "content" | "nextTrigger" | "prevTrigger" | "table" | "view" | "clearTrigger" | "positioner" | "tableHeader" | "tableBody" | "tableRow" | "viewTrigger" | "monthSelect" | "yearSelect" | "presetTrigger" | "rangeText" | "tableCell" | "tableCellTrigger" | "tableHead" | "viewControl">;
+declare const anatomy: AnatomyInstance<"root" | "content" | "label" | "control" | "trigger" | "input" | "positioner" | "table" | "view" | "nextTrigger" | "prevTrigger" | "clearTrigger" | "monthSelect" | "presetTrigger" | "rangeText" | "tableBody" | "tableCell" | "tableCellTrigger" | "tableHead" | "tableHeader" | "tableRow" | "viewControl" | "viewTrigger" | "yearSelect">;
 //#endregion
 //#region src/machines/date-picker/date-picker.types.d.ts
 type DateView = "day" | "month" | "year";

package/dist/machines/date-picker/index.d.mts

@@ -8,7 +8,7 @@ import { p as PositioningOptions, u as Placement } from "../../index-fMh0VDkR.mj
 import { Calendar, CalendarDate, CalendarDateTime, CalendarIdentifier, DateDuration, DateFormatter, ZonedDateTime } from "@internationalized/date";
 
 //#region src/machines/date-picker/date-picker.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "input" | "label" | "control" | "trigger" | "content" | "nextTrigger" | "prevTrigger" | "table" | "view" | "clearTrigger" | "positioner" | "tableHeader" | "tableBody" | "tableRow" | "viewTrigger" | "monthSelect" | "yearSelect" | "presetTrigger" | "rangeText" | "tableCell" | "tableCellTrigger" | "tableHead" | "viewControl">;
+declare const anatomy: AnatomyInstance<"root" | "content" | "label" | "control" | "trigger" | "input" | "positioner" | "table" | "view" | "nextTrigger" | "prevTrigger" | "clearTrigger" | "monthSelect" | "presetTrigger" | "rangeText" | "tableBody" | "tableCell" | "tableCellTrigger" | "tableHead" | "tableHeader" | "tableRow" | "viewControl" | "viewTrigger" | "yearSelect">;
 //#endregion
 //#region src/machines/date-picker/date-picker.types.d.ts
 type DateView = "day" | "month" | "year";

package/dist/machines/dialog/index.cjs

@@ -6,7 +6,7 @@ const require_utils = require("../../utils-ByNiZU8f.cjs");
 const require_core = require("../../core-Bw_czdwX.cjs");
 require("../../interact-outside-Bg-QSXqp.cjs");
 const require_dismissable = require("../../dismissable-DxjbwsOf.cjs");
-const require_focus_trap = require("../../focus-trap-BewqTQFt.cjs");
+const require_focus_trap = require("../../focus-trap-BbU9QXMe.cjs");
 const require_create_props = require("../../create-props-DP39rHnH.cjs");
 const require_remove_scroll = require("../../remove-scroll-D4CMJmU2.cjs");
 //#region src/machines/dialog/dialog.anatomy.ts

package/dist/machines/dialog/index.d.cts

@@ -5,7 +5,7 @@ import { c as PointerDownOutsideEvent, n as FocusOutsideEvent, r as InteractOuts
 import { r as PersistentElementOptions, t as DismissableElementHandlers } from "../../dismissable-layer-ZgyqN8AD.cjs";
 
 //#region src/machines/dialog/dialog.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"trigger" | "content" | "title" | "positioner" | "description" | "closeTrigger" | "backdrop">;
+declare const anatomy: AnatomyInstance<"content" | "trigger" | "title" | "description" | "closeTrigger" | "positioner" | "backdrop">;
 //#endregion
 //#region src/machines/dialog/dialog.types.d.ts
 interface OpenChangeDetails {

package/dist/machines/dialog/index.d.mts

@@ -5,7 +5,7 @@ import { c as PointerDownOutsideEvent, n as FocusOutsideEvent, r as InteractOuts
 import { r as PersistentElementOptions, t as DismissableElementHandlers } from "../../dismissable-layer-h14gHVbJ.mjs";
 
 //#region src/machines/dialog/dialog.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"trigger" | "content" | "title" | "positioner" | "description" | "closeTrigger" | "backdrop">;
+declare const anatomy: AnatomyInstance<"content" | "trigger" | "title" | "description" | "closeTrigger" | "positioner" | "backdrop">;
 //#endregion
 //#region src/machines/dialog/dialog.types.d.ts
 interface OpenChangeDetails {

package/dist/machines/dialog/index.mjs

@@ -5,7 +5,7 @@ import { u as createSplitProps } from "../../utils-VVoZ_v29.mjs";
 import { a as createMachine } from "../../core-CTtbW9qh.mjs";
 import "../../interact-outside-Ba50N1a5.mjs";
 import { n as trackDismissableElement } from "../../dismissable-B9k5K6f9.mjs";
-import { t as trapFocus } from "../../focus-trap-Do8IUXYh.mjs";
+import { t as trapFocus } from "../../focus-trap-CzhQ01j4.mjs";
 import { t as createProps } from "../../create-props-DFW8DUsC.mjs";
 import { t as preventBodyScroll } from "../../remove-scroll-D55GZoBb.mjs";
 //#region src/machines/dialog/dialog.anatomy.ts

package/dist/machines/drawer/index.cjs

@@ -7,7 +7,7 @@ const require_utils = require("../../utils-ByNiZU8f.cjs");
 const require_core = require("../../core-Bw_czdwX.cjs");
 require("../../interact-outside-Bg-QSXqp.cjs");
 const require_dismissable = require("../../dismissable-DxjbwsOf.cjs");
-const require_focus_trap = require("../../focus-trap-BewqTQFt.cjs");
+const require_focus_trap = require("../../focus-trap-BbU9QXMe.cjs");
 const require_create_props = require("../../create-props-DP39rHnH.cjs");
 const require_remove_scroll = require("../../remove-scroll-D4CMJmU2.cjs");
 //#region src/machines/drawer/drawer.anatomy.ts

package/dist/machines/drawer/index.d.cts

@@ -5,7 +5,7 @@ import { c as PointerDownOutsideEvent, n as FocusOutsideEvent, r as InteractOuts
 import { t as DismissableElementHandlers } from "../../dismissable-layer-ZgyqN8AD.cjs";
 
 //#region src/machines/drawer/drawer.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"trigger" | "content" | "title" | "positioner" | "description" | "closeTrigger" | "backdrop" | "grabber" | "grabberIndicator" | "swipeArea">;
+declare const anatomy: AnatomyInstance<"content" | "trigger" | "title" | "description" | "closeTrigger" | "positioner" | "backdrop" | "grabber" | "grabberIndicator" | "swipeArea">;
 //#endregion
 //#region src/machines/drawer/utils/session.d.ts
 type GestureAxis = "x" | "y";

package/dist/machines/drawer/index.d.mts

@@ -5,7 +5,7 @@ import { c as PointerDownOutsideEvent, n as FocusOutsideEvent, r as InteractOuts
 import { t as DismissableElementHandlers } from "../../dismissable-layer-h14gHVbJ.mjs";
 
 //#region src/machines/drawer/drawer.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"trigger" | "content" | "title" | "positioner" | "description" | "closeTrigger" | "backdrop" | "grabber" | "grabberIndicator" | "swipeArea">;
+declare const anatomy: AnatomyInstance<"content" | "trigger" | "title" | "description" | "closeTrigger" | "positioner" | "backdrop" | "grabber" | "grabberIndicator" | "swipeArea">;
 //#endregion
 //#region src/machines/drawer/utils/session.d.ts
 type GestureAxis = "x" | "y";

package/dist/machines/drawer/index.mjs

@@ -6,7 +6,7 @@ import { H as toPx, g as clampValue, l as compact, u as createSplitProps } from
 import { a as createMachine, i as createGuards } from "../../core-CTtbW9qh.mjs";
 import "../../interact-outside-Ba50N1a5.mjs";
 import { n as trackDismissableElement } from "../../dismissable-B9k5K6f9.mjs";
-import { t as trapFocus } from "../../focus-trap-Do8IUXYh.mjs";
+import { t as trapFocus } from "../../focus-trap-CzhQ01j4.mjs";
 import { t as createProps } from "../../create-props-DFW8DUsC.mjs";
 import { t as preventBodyScroll } from "../../remove-scroll-D55GZoBb.mjs";
 //#region src/machines/drawer/drawer.anatomy.ts

package/dist/machines/dropdown-menu/index.d.cts

@@ -8,7 +8,7 @@ import { c as Placement, d as PositioningOptions } from "../../types-CZAtqGqH.cj
 import { a as Point } from "../../types-CLXYEgfm.cjs";
 
 //#region src/machines/dropdown-menu/dropdown-menu.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"trigger" | "indicator" | "content" | "item" | "itemIndicator" | "itemGroup" | "itemText" | "positioner" | "arrow" | "separator" | "itemGroupLabel" | "arrowTip" | "triggerItem">;
+declare const anatomy: AnatomyInstance<"content" | "trigger" | "indicator" | "item" | "itemIndicator" | "itemText" | "separator" | "arrow" | "arrowTip" | "positioner" | "itemGroup" | "itemGroupLabel" | "triggerItem">;
 //#endregion
 //#region src/machines/dropdown-menu/dropdown-menu.types.d.ts
 interface OpenChangeDetails {

package/dist/machines/dropdown-menu/index.d.mts

@@ -8,7 +8,7 @@ import { p as PositioningOptions, u as Placement } from "../../index-fMh0VDkR.mj
 import { a as Point } from "../../types-DU764tY_.mjs";
 
 //#region src/machines/dropdown-menu/dropdown-menu.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"trigger" | "indicator" | "content" | "item" | "itemIndicator" | "itemGroup" | "itemText" | "positioner" | "arrow" | "separator" | "itemGroupLabel" | "arrowTip" | "triggerItem">;
+declare const anatomy: AnatomyInstance<"content" | "trigger" | "indicator" | "item" | "itemIndicator" | "itemText" | "separator" | "arrow" | "arrowTip" | "positioner" | "itemGroup" | "itemGroupLabel" | "triggerItem">;
 //#endregion
 //#region src/machines/dropdown-menu/dropdown-menu.types.d.ts
 interface OpenChangeDetails {

package/dist/machines/editable/index.d.cts

@@ -4,7 +4,7 @@ import { b as NormalizeProps, g as RequiredBy, r as DirectionProperty, t as Comm
 import { c as PointerDownOutsideEvent, i as InteractOutsideHandlers, n as FocusOutsideEvent, r as InteractOutsideEvent } from "../../index-DzWGFhcS.cjs";
 
 //#region src/machines/editable/editable.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "input" | "label" | "control" | "area" | "preview" | "editTrigger" | "submitTrigger" | "cancelTrigger">;
+declare const anatomy: AnatomyInstance<"root" | "label" | "control" | "input" | "area" | "preview" | "editTrigger" | "submitTrigger" | "cancelTrigger">;
 //#endregion
 //#region src/machines/editable/editable.types.d.ts
 interface ValueChangeDetails {

package/dist/machines/editable/index.d.mts

@@ -4,7 +4,7 @@ import { b as NormalizeProps, g as RequiredBy, r as DirectionProperty, t as Comm
 import { c as PointerDownOutsideEvent, i as InteractOutsideHandlers, n as FocusOutsideEvent, r as InteractOutsideEvent } from "../../index-CGNNiDyE.mjs";
 
 //#region src/machines/editable/editable.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "input" | "label" | "control" | "area" | "preview" | "editTrigger" | "submitTrigger" | "cancelTrigger">;
+declare const anatomy: AnatomyInstance<"root" | "label" | "control" | "input" | "area" | "preview" | "editTrigger" | "submitTrigger" | "cancelTrigger">;
 //#endregion
 //#region src/machines/editable/editable.types.d.ts
 interface ValueChangeDetails {

package/dist/machines/file-upload/index.d.cts

@@ -4,7 +4,7 @@ import { b as NormalizeProps, g as RequiredBy, o as LocaleProperties, t as Commo
 import { i as FileMimeType, r as FileError } from "../../types-CylWsfOz.cjs";
 
 //#region src/machines/file-upload/file-upload.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "label" | "trigger" | "item" | "itemGroup" | "clearTrigger" | "itemPreview" | "itemDeleteTrigger" | "dropzone" | "itemName" | "itemPreviewImage" | "itemSizeText">;
+declare const anatomy: AnatomyInstance<"root" | "label" | "trigger" | "item" | "itemGroup" | "clearTrigger" | "dropzone" | "itemDeleteTrigger" | "itemName" | "itemPreview" | "itemPreviewImage" | "itemSizeText">;
 //#endregion
 //#region src/machines/file-upload/file-upload.types.d.ts
 interface FileRejection {

package/dist/machines/file-upload/index.d.mts

@@ -4,7 +4,7 @@ import { b as NormalizeProps, g as RequiredBy, o as LocaleProperties, t as Commo
 import { i as FileMimeType, r as FileError } from "../../types-Cctd5dol.mjs";
 
 //#region src/machines/file-upload/file-upload.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "label" | "trigger" | "item" | "itemGroup" | "clearTrigger" | "itemPreview" | "itemDeleteTrigger" | "dropzone" | "itemName" | "itemPreviewImage" | "itemSizeText">;
+declare const anatomy: AnatomyInstance<"root" | "label" | "trigger" | "item" | "itemGroup" | "clearTrigger" | "dropzone" | "itemDeleteTrigger" | "itemName" | "itemPreview" | "itemPreviewImage" | "itemSizeText">;
 //#endregion
 //#region src/machines/file-upload/file-upload.types.d.ts
 interface FileRejection {

package/dist/machines/floating-panel/index.d.cts

@@ -4,7 +4,7 @@ import { b as NormalizeProps, g as RequiredBy, r as DirectionProperty, t as Comm
 import { a as Point, o as Rect, y as Size } from "../../types-CLXYEgfm.cjs";
 
 //#region src/machines/floating-panel/floating-panel.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"control" | "trigger" | "content" | "body" | "header" | "title" | "positioner" | "closeTrigger" | "resizeTrigger" | "dragTrigger" | "stageTrigger">;
+declare const anatomy: AnatomyInstance<"content" | "control" | "trigger" | "title" | "closeTrigger" | "positioner" | "body" | "header" | "resizeTrigger" | "dragTrigger" | "stageTrigger">;
 //#endregion
 //#region src/machines/floating-panel/floating-panel.types.d.ts
 interface PositionChangeDetails {

package/dist/machines/floating-panel/index.d.mts

@@ -4,7 +4,7 @@ import { b as NormalizeProps, g as RequiredBy, r as DirectionProperty, t as Comm
 import { a as Point, o as Rect, y as Size } from "../../types-DU764tY_.mjs";
 
 //#region src/machines/floating-panel/floating-panel.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"control" | "trigger" | "content" | "body" | "header" | "title" | "positioner" | "closeTrigger" | "resizeTrigger" | "dragTrigger" | "stageTrigger">;
+declare const anatomy: AnatomyInstance<"content" | "control" | "trigger" | "title" | "closeTrigger" | "positioner" | "body" | "header" | "resizeTrigger" | "dragTrigger" | "stageTrigger">;
 //#endregion
 //#region src/machines/floating-panel/floating-panel.types.d.ts
 interface PositionChangeDetails {

package/dist/machines/hover-card/index.d.cts

@@ -5,7 +5,7 @@ import { c as PointerDownOutsideEvent, i as InteractOutsideHandlers, n as FocusO
 import { c as Placement, d as PositioningOptions } from "../../types-CZAtqGqH.cjs";
 
 //#region src/machines/hover-card/hover-card.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"trigger" | "content" | "positioner" | "arrow" | "arrowTip">;
+declare const anatomy: AnatomyInstance<"content" | "trigger" | "arrow" | "arrowTip" | "positioner">;
 //#endregion
 //#region src/machines/hover-card/hover-card.types.d.ts
 interface OpenChangeDetails {

package/dist/machines/hover-card/index.d.mts

@@ -5,7 +5,7 @@ import { c as PointerDownOutsideEvent, i as InteractOutsideHandlers, n as FocusO
 import { p as PositioningOptions, u as Placement } from "../../index-fMh0VDkR.mjs";
 
 //#region src/machines/hover-card/hover-card.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"trigger" | "content" | "positioner" | "arrow" | "arrowTip">;
+declare const anatomy: AnatomyInstance<"content" | "trigger" | "arrow" | "arrowTip" | "positioner">;
 //#endregion
 //#region src/machines/hover-card/hover-card.types.d.ts
 interface OpenChangeDetails {

package/dist/machines/listbox/index.cjs

@@ -2,7 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_create_anatomy = require("../../create-anatomy-BnwEmNnc.cjs");
 const require_dom_query = require("../../dom-query-BUO7rGsg.cjs");
 const require_utils = require("../../utils-ByNiZU8f.cjs");
-const require_collection = require("../../collection-BBgC8xCb.cjs");
+const require_collection = require("../../collection-D0Abtxc0.cjs");
 const require_core = require("../../core-Bw_czdwX.cjs");
 const require_focus_visible = require("../../focus-visible-Co_9bW09.cjs");
 const require_create_props = require("../../create-props-DP39rHnH.cjs");
@@ -47,7 +47,7 @@ function connect(service, normalize) {
 	const focusVisible = refs.get("focusVisible") && focused;
 	const inputState = refs.get("inputState");
 	const value = context.get("value");
-	const selectedItems = context.get("selectedItems");
+	const selectedItems = computed("selectedItems");
 	const highlightedValue = context.get("highlightedValue");
 	const highlightedItem = context.get("highlightedItem");
 	const isTypingAhead = computed("isTypingAhead");
@@ -465,17 +465,32 @@ const machine = createMachine({
 			...props
 		};
 	},
-	context({ prop, bindable }) {
+	context({ prop, bindable, getContext }) {
+		const initialValue = prop("value") ?? prop("defaultValue") ?? [];
+		const initialSelectedItems = prop("collection").findMany(initialValue);
 		return {
 			value: bindable(() => ({
 				defaultValue: prop("defaultValue"),
 				value: prop("value"),
 				isEqual: require_utils.isEqual,
 				onChange(value) {
-					const items = prop("collection").findMany(value);
+					const context = getContext();
+					const collection = prop("collection");
+					const proposed = require_collection.deriveSelectionState({
+						values: value,
+						collection,
+						selectedItemMap: context.get("selectedItemMap")
+					});
+					const effectiveValue = prop("value") ?? value;
+					const effective = effectiveValue === value ? proposed : require_collection.deriveSelectionState({
+						values: effectiveValue,
+						collection,
+						selectedItemMap: proposed.nextSelectedItemMap
+					});
+					context.set("selectedItemMap", effective.nextSelectedItemMap);
 					return prop("onValueChange")?.({
 						value,
-						items
+						items: proposed.selectedItems
 					});
 				}
 			})),
@@ -492,9 +507,11 @@ const machine = createMachine({
 				}
 			})),
 			highlightedItem: bindable(() => ({ defaultValue: null })),
-			selectedItems: bindable(() => {
-				const value = prop("value") ?? prop("defaultValue") ?? [];
-				return { defaultValue: prop("collection").findMany(value) };
+			selectedItemMap: bindable(() => {
+				return { defaultValue: require_collection.createSelectedItemMap({
+					selectedItems: initialSelectedItems,
+					collection: prop("collection")
+				}) };
 			}),
 			focused: bindable(() => ({
 				sync: true,
@@ -523,7 +540,12 @@ const machine = createMachine({
 			return selection;
 		},
 		multiple: ({ prop }) => prop("selectionMode") === "multiple" || prop("selectionMode") === "extended",
-		valueAsString: ({ context, prop }) => prop("collection").stringifyItems(context.get("selectedItems"))
+		selectedItems: ({ context, prop }) => require_collection.resolveSelectedItems({
+			values: context.get("value"),
+			collection: prop("collection"),
+			selectedItemMap: context.get("selectedItemMap")
+		}),
+		valueAsString: ({ computed, prop }) => prop("collection").stringifyItems(computed("selectedItems"))
 	},
 	initialState() {
 		return "idle";
@@ -585,7 +607,7 @@ const machine = createMachine({
 				const exec = (immediate) => {
 					const highlightedValue = context.get("highlightedValue");
 					if (highlightedValue == null) return;
-					if (require_focus_visible.getInteractionModality() !== "keyboard") return;
+					if (require_focus_visible.getInteractionModality() === "pointer") return;
 					const contentEl = getContentEl(scope);
 					const scrollToIndexFn = prop("scrollToIndexFn");
 					if (scrollToIndexFn) {
@@ -604,7 +626,10 @@ const machine = createMachine({
 						block: "nearest"
 					});
 				};
-				require_dom_query.raf(() => exec(true));
+				require_dom_query.raf(() => {
+					require_focus_visible.setInteractionModality("virtual");
+					exec(true);
+				});
 				const contentEl = () => getContentEl(scope);
 				return require_dom_query.observeAttributes(contentEl, {
 					defer: true,
@@ -681,12 +706,12 @@ const machine = createMachine({
 				context.set("value", []);
 			},
 			syncSelectedItems({ context, prop }) {
-				const collection = prop("collection");
-				const prevSelectedItems = context.get("selectedItems");
-				const selectedItems = context.get("value").map((value) => {
-					return prevSelectedItems.find((item) => collection.getItemValue(item) === value) || collection.find(value);
+				const next = require_collection.deriveSelectionState({
+					values: context.get("value"),
+					collection: prop("collection"),
+					selectedItemMap: context.get("selectedItemMap")
 				});
-				context.set("selectedItems", selectedItems);
+				context.set("selectedItemMap", next.nextSelectedItemMap);
 			},
 			syncHighlightedItem({ context, prop }) {
 				const collection = prop("collection");

package/dist/machines/listbox/index.d.cts

@@ -1,13 +1,13 @@
 import { n as AnatomyInstance } from "../../create-anatomy-9eFQs7lO.cjs";
 import { r as CollectionOptions, t as CollectionItem } from "../../types-D-7AMgSE.cjs";
-import { t as ListCollection } from "../../list-collection-B_8BN0XB.cjs";
-import { i as GridCollectionOptions, n as SelectionMode, r as GridCollection, t as Selection } from "../../selection-Bb_ZSVxe.cjs";
+import { t as ListCollection } from "../../list-collection-Cjgbx_9l.cjs";
+import { i as GridCollectionOptions, n as SelectionMode, r as GridCollection, t as Selection } from "../../selection-BmS2RDMq.cjs";
 import { b as Service, p as Machine, u as EventObject } from "../../types-u-LWCSDE.cjs";
 import { b as NormalizeProps, g as RequiredBy, r as DirectionProperty, t as CommonProperties, x as PropTypes } from "../../index-CLRsezW5.cjs";
 import { n as TypeaheadState } from "../../typeahead-DMooWbbX.cjs";
 
 //#region src/machines/listbox/listbox.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "input" | "label" | "content" | "item" | "itemIndicator" | "itemGroup" | "valueText" | "itemText" | "itemGroupLabel">;
+declare const anatomy: AnatomyInstance<"root" | "content" | "label" | "valueText" | "item" | "itemIndicator" | "input" | "itemText" | "itemGroup" | "itemGroupLabel">;
 //#endregion
 //#region src/machines/listbox/listbox.collection.d.ts
 declare const collection: {
@@ -73,7 +73,7 @@ interface ListboxSchema<T extends CollectionItem = CollectionItem> {
     value: string[];
     highlightedValue: string | null;
     highlightedItem: T | null;
-    selectedItems: T[];
+    selectedItemMap: Map<string, T>;
     focused: boolean;
   };
   computed: {
@@ -82,6 +82,7 @@ interface ListboxSchema<T extends CollectionItem = CollectionItem> {
     isInteractive: boolean;
     selection: Selection;
     multiple: boolean;
+    selectedItems: T[];
     valueAsString: string;
   };
   refs: {

package/dist/machines/listbox/index.d.mts

@@ -1,13 +1,13 @@
 import { n as AnatomyInstance } from "../../create-anatomy-BedZVdg0.mjs";
 import { r as CollectionOptions, t as CollectionItem } from "../../types-9uw8LHpE.mjs";
-import { t as ListCollection } from "../../list-collection-DkRA5LOq.mjs";
-import { i as GridCollectionOptions, n as SelectionMode, r as GridCollection, t as Selection } from "../../selection-DdNvrKbj.mjs";
+import { t as ListCollection } from "../../list-collection-IF510iNl.mjs";
+import { i as GridCollectionOptions, n as SelectionMode, r as GridCollection, t as Selection } from "../../selection-6urf-c8j.mjs";
 import { b as Service, p as Machine, u as EventObject } from "../../types-DvUmCWsb.mjs";
 import { b as NormalizeProps, g as RequiredBy, r as DirectionProperty, t as CommonProperties, x as PropTypes } from "../../index-BVFlU3b9.mjs";
 import { n as TypeaheadState } from "../../typeahead-Bbeb1fAR.mjs";
 
 //#region src/machines/listbox/listbox.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "input" | "label" | "content" | "item" | "itemIndicator" | "itemGroup" | "valueText" | "itemText" | "itemGroupLabel">;
+declare const anatomy: AnatomyInstance<"root" | "content" | "label" | "valueText" | "item" | "itemIndicator" | "input" | "itemText" | "itemGroup" | "itemGroupLabel">;
 //#endregion
 //#region src/machines/listbox/listbox.collection.d.ts
 declare const collection: {
@@ -73,7 +73,7 @@ interface ListboxSchema<T extends CollectionItem = CollectionItem> {
     value: string[];
     highlightedValue: string | null;
     highlightedItem: T | null;
-    selectedItems: T[];
+    selectedItemMap: Map<string, T>;
     focused: boolean;
   };
   computed: {
@@ -82,6 +82,7 @@ interface ListboxSchema<T extends CollectionItem = CollectionItem> {
     isInteractive: boolean;
     selection: Selection;
     multiple: boolean;
+    selectedItems: T[];
     valueAsString: string;
   };
   refs: {

package/dist/machines/listbox/index.mjs

@@ -1,9 +1,9 @@
 import { t as createAnatomy } from "../../create-anatomy-Dr0evdYy.mjs";
 import { $t as contains, I as scrollIntoView, W as raf, _t as isComposingEvent, bn as ariaAttr, ft as getEventKey, gt as getNativeEvent, ht as getEventTarget, s as getByTypeahead, un as isEditableElement, xn as dataAttr, yt as isCtrlOrMetaKey, z as observeAttributes } from "../../dom-query-BFuRs3l4.mjs";
 import { ft as isEqual, t as ensure, u as createSplitProps } from "../../utils-VVoZ_v29.mjs";
-import { a as GridCollection, i as Selection, o as isGridCollection, s as ListCollection } from "../../collection-DgzidRvr.mjs";
+import { a as createSelectedItemMap, d as ListCollection, i as Selection, l as GridCollection, o as deriveSelectionState, s as resolveSelectedItems, u as isGridCollection } from "../../collection-GSpaYJ2f.mjs";
 import { o as setup } from "../../core-CTtbW9qh.mjs";
-import { o as trackFocusVisible, t as getInteractionModality } from "../../focus-visible-BuLf8M9F.mjs";
+import { a as setInteractionModality, o as trackFocusVisible, t as getInteractionModality } from "../../focus-visible-BuLf8M9F.mjs";
 import { t as createProps } from "../../create-props-DFW8DUsC.mjs";
 //#region src/machines/listbox/listbox.anatomy.ts
 const anatomy = createAnatomy("listbox").parts("label", "input", "item", "itemText", "itemIndicator", "itemGroup", "itemGroupLabel", "content", "root", "valueText");
@@ -46,7 +46,7 @@ function connect(service, normalize) {
 	const focusVisible = refs.get("focusVisible") && focused;
 	const inputState = refs.get("inputState");
 	const value = context.get("value");
-	const selectedItems = context.get("selectedItems");
+	const selectedItems = computed("selectedItems");
 	const highlightedValue = context.get("highlightedValue");
 	const highlightedItem = context.get("highlightedItem");
 	const isTypingAhead = computed("isTypingAhead");
@@ -464,17 +464,32 @@ const machine = createMachine({
 			...props
 		};
 	},
-	context({ prop, bindable }) {
+	context({ prop, bindable, getContext }) {
+		const initialValue = prop("value") ?? prop("defaultValue") ?? [];
+		const initialSelectedItems = prop("collection").findMany(initialValue);
 		return {
 			value: bindable(() => ({
 				defaultValue: prop("defaultValue"),
 				value: prop("value"),
 				isEqual,
 				onChange(value) {
-					const items = prop("collection").findMany(value);
+					const context = getContext();
+					const collection = prop("collection");
+					const proposed = deriveSelectionState({
+						values: value,
+						collection,
+						selectedItemMap: context.get("selectedItemMap")
+					});
+					const effectiveValue = prop("value") ?? value;
+					const effective = effectiveValue === value ? proposed : deriveSelectionState({
+						values: effectiveValue,
+						collection,
+						selectedItemMap: proposed.nextSelectedItemMap
+					});
+					context.set("selectedItemMap", effective.nextSelectedItemMap);
 					return prop("onValueChange")?.({
 						value,
-						items
+						items: proposed.selectedItems
 					});
 				}
 			})),
@@ -491,9 +506,11 @@ const machine = createMachine({
 				}
 			})),
 			highlightedItem: bindable(() => ({ defaultValue: null })),
-			selectedItems: bindable(() => {
-				const value = prop("value") ?? prop("defaultValue") ?? [];
-				return { defaultValue: prop("collection").findMany(value) };
+			selectedItemMap: bindable(() => {
+				return { defaultValue: createSelectedItemMap({
+					selectedItems: initialSelectedItems,
+					collection: prop("collection")
+				}) };
 			}),
 			focused: bindable(() => ({
 				sync: true,
@@ -522,7 +539,12 @@ const machine = createMachine({
 			return selection;
 		},
 		multiple: ({ prop }) => prop("selectionMode") === "multiple" || prop("selectionMode") === "extended",
-		valueAsString: ({ context, prop }) => prop("collection").stringifyItems(context.get("selectedItems"))
+		selectedItems: ({ context, prop }) => resolveSelectedItems({
+			values: context.get("value"),
+			collection: prop("collection"),
+			selectedItemMap: context.get("selectedItemMap")
+		}),
+		valueAsString: ({ computed, prop }) => prop("collection").stringifyItems(computed("selectedItems"))
 	},
 	initialState() {
 		return "idle";
@@ -584,7 +606,7 @@ const machine = createMachine({
 				const exec = (immediate) => {
 					const highlightedValue = context.get("highlightedValue");
 					if (highlightedValue == null) return;
-					if (getInteractionModality() !== "keyboard") return;
+					if (getInteractionModality() === "pointer") return;
 					const contentEl = getContentEl(scope);
 					const scrollToIndexFn = prop("scrollToIndexFn");
 					if (scrollToIndexFn) {
@@ -603,7 +625,10 @@ const machine = createMachine({
 						block: "nearest"
 					});
 				};
-				raf(() => exec(true));
+				raf(() => {
+					setInteractionModality("virtual");
+					exec(true);
+				});
 				const contentEl = () => getContentEl(scope);
 				return observeAttributes(contentEl, {
 					defer: true,
@@ -680,12 +705,12 @@ const machine = createMachine({
 				context.set("value", []);
 			},
 			syncSelectedItems({ context, prop }) {
-				const collection = prop("collection");
-				const prevSelectedItems = context.get("selectedItems");
-				const selectedItems = context.get("value").map((value) => {
-					return prevSelectedItems.find((item) => collection.getItemValue(item) === value) || collection.find(value);
+				const next = deriveSelectionState({
+					values: context.get("value"),
+					collection: prop("collection"),
+					selectedItemMap: context.get("selectedItemMap")
 				});
-				context.set("selectedItems", selectedItems);
+				context.set("selectedItemMap", next.nextSelectedItemMap);
 			},
 			syncHighlightedItem({ context, prop }) {
 				const collection = prop("collection");

package/dist/machines/marquee/index.d.cts

@@ -96,7 +96,7 @@ declare function connect<T extends PropTypes>(service: MarqueeService, normalize
 declare const machine: Machine<MarqueeSchema>;
 //#endregion
 //#region src/machines/marquee/marquee.props.d.ts
-declare const props: ("ids" | "id" | "getRootNode" | "paused" | "onComplete" | ("reverse" | "dir" | "translations" | "spacing" | "delay" | "side" | "speed" | "loopCount" | "autoFill" | "pauseOnInteraction" | "defaultPaused") | "onPauseChange" | "onLoopComplete")[];
-declare const splitProps: <Props extends Partial<UserDefinedContext>>(props: Props) => [Partial<UserDefinedContext>, Omit<Props, "ids" | "id" | "getRootNode" | "paused" | "onComplete" | ("reverse" | "dir" | "translations" | "spacing" | "delay" | "side" | "speed" | "loopCount" | "autoFill" | "pauseOnInteraction" | "defaultPaused") | "onPauseChange" | "onLoopComplete">];
+declare const props: ("ids" | "id" | "getRootNode" | "paused" | "onComplete" | ("dir" | "reverse" | "translations" | "side" | "speed" | "delay" | "loopCount" | "spacing" | "autoFill" | "pauseOnInteraction" | "defaultPaused") | "onPauseChange" | "onLoopComplete")[];
+declare const splitProps: <Props extends Partial<UserDefinedContext>>(props: Props) => [Partial<UserDefinedContext>, Omit<Props, "ids" | "id" | "getRootNode" | "paused" | "onComplete" | ("dir" | "reverse" | "translations" | "side" | "speed" | "delay" | "loopCount" | "spacing" | "autoFill" | "pauseOnInteraction" | "defaultPaused") | "onPauseChange" | "onLoopComplete">];
 //#endregion
 export { type MarqueeApi as Api, type ContentProps, type DimensionSnapshot, type EdgeProps, type ElementIds, type IntlTranslations, type MarqueeMachine as Machine, type Orientation, type PauseStatusDetails, type MarqueeProps as Props, type MarqueeService as Service, type Side, type UserDefinedContext, anatomy, connect, machine, props, splitProps };

package/dist/machines/marquee/index.d.mts

@@ -96,7 +96,7 @@ declare function connect<T extends PropTypes>(service: MarqueeService, normalize
 declare const machine: Machine<MarqueeSchema>;
 //#endregion
 //#region src/machines/marquee/marquee.props.d.ts
-declare const props: ("ids" | "id" | "getRootNode" | "paused" | "onComplete" | ("reverse" | "dir" | "translations" | "spacing" | "delay" | "side" | "speed" | "loopCount" | "autoFill" | "pauseOnInteraction" | "defaultPaused") | "onPauseChange" | "onLoopComplete")[];
-declare const splitProps: <Props extends Partial<UserDefinedContext>>(props: Props) => [Partial<UserDefinedContext>, Omit<Props, "ids" | "id" | "getRootNode" | "paused" | "onComplete" | ("reverse" | "dir" | "translations" | "spacing" | "delay" | "side" | "speed" | "loopCount" | "autoFill" | "pauseOnInteraction" | "defaultPaused") | "onPauseChange" | "onLoopComplete">];
+declare const props: ("ids" | "id" | "getRootNode" | "paused" | "onComplete" | ("dir" | "reverse" | "translations" | "side" | "speed" | "delay" | "loopCount" | "spacing" | "autoFill" | "pauseOnInteraction" | "defaultPaused") | "onPauseChange" | "onLoopComplete")[];
+declare const splitProps: <Props extends Partial<UserDefinedContext>>(props: Props) => [Partial<UserDefinedContext>, Omit<Props, "ids" | "id" | "getRootNode" | "paused" | "onComplete" | ("dir" | "reverse" | "translations" | "side" | "speed" | "delay" | "loopCount" | "spacing" | "autoFill" | "pauseOnInteraction" | "defaultPaused") | "onPauseChange" | "onLoopComplete">];
 //#endregion
 export { type MarqueeApi as Api, type ContentProps, type DimensionSnapshot, type EdgeProps, type ElementIds, type IntlTranslations, type MarqueeMachine as Machine, type Orientation, type PauseStatusDetails, type MarqueeProps as Props, type MarqueeService as Service, type Side, type UserDefinedContext, anatomy, connect, machine, props, splitProps };

package/dist/machines/navigation-menu/index.d.cts

@@ -3,7 +3,7 @@ import { b as Service, p as Machine, u as EventObject } from "../../types-u-LWCS
 import { _ as Size, b as NormalizeProps, d as Orientation, f as OrientationProperty, g as RequiredBy, m as Rect, p as Point, r as DirectionProperty, t as CommonProperties, x as PropTypes } from "../../index-CLRsezW5.cjs";
 
 //#region src/machines/navigation-menu/navigation-menu.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "trigger" | "indicator" | "content" | "item" | "itemIndicator" | "link" | "list" | "viewport" | "viewportPositioner" | "arrow">;
+declare const anatomy: AnatomyInstance<"root" | "content" | "trigger" | "indicator" | "item" | "itemIndicator" | "list" | "arrow" | "link" | "viewport" | "viewportPositioner">;
 //#endregion
 //#region src/machines/navigation-menu/navigation-menu.types.d.ts
 interface ValueChangeDetails {

package/dist/machines/navigation-menu/index.d.mts

@@ -3,7 +3,7 @@ import { b as Service, p as Machine, u as EventObject } from "../../types-DvUmCW
 import { _ as Size, b as NormalizeProps, d as Orientation, f as OrientationProperty, g as RequiredBy, m as Rect, p as Point, r as DirectionProperty, t as CommonProperties, x as PropTypes } from "../../index-BVFlU3b9.mjs";
 
 //#region src/machines/navigation-menu/navigation-menu.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "trigger" | "indicator" | "content" | "item" | "itemIndicator" | "link" | "list" | "viewport" | "viewportPositioner" | "arrow">;
+declare const anatomy: AnatomyInstance<"root" | "content" | "trigger" | "indicator" | "item" | "itemIndicator" | "list" | "arrow" | "link" | "viewport" | "viewportPositioner">;
 //#endregion
 //#region src/machines/navigation-menu/navigation-menu.types.d.ts
 interface ValueChangeDetails {

package/dist/machines/number-input/index.d.cts

@@ -4,7 +4,7 @@ import { b as NormalizeProps, g as RequiredBy, o as LocaleProperties, t as Commo
 import { NumberFormatter, NumberParser } from "@internationalized/number";
 
 //#region src/machines/number-input/number-input.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "input" | "label" | "control" | "valueText" | "incrementTrigger" | "decrementTrigger" | "scrubber">;
+declare const anatomy: AnatomyInstance<"root" | "label" | "valueText" | "control" | "input" | "incrementTrigger" | "decrementTrigger" | "scrubber">;
 //#endregion
 //#region src/machines/number-input/number-input.types.d.ts
 interface ValueChangeDetails {

package/dist/machines/number-input/index.d.mts

@@ -4,7 +4,7 @@ import { b as NormalizeProps, g as RequiredBy, o as LocaleProperties, t as Commo
 import { NumberFormatter, NumberParser } from "@internationalized/number";
 
 //#region src/machines/number-input/number-input.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "input" | "label" | "control" | "valueText" | "incrementTrigger" | "decrementTrigger" | "scrubber">;
+declare const anatomy: AnatomyInstance<"root" | "label" | "valueText" | "control" | "input" | "incrementTrigger" | "decrementTrigger" | "scrubber">;
 //#endregion
 //#region src/machines/number-input/number-input.types.d.ts
 interface ValueChangeDetails {