@sprawlify/primitives 0.0.111 → 0.0.112

package/dist/collection.d.cts

@@ -1,5 +1,5 @@
 import { a as CollectionSearchState, c as FlatTreeNode, d as TreeCollectionMethods, f as TreeCollectionOptions, g as ValuePath, i as CollectionSearchOptions, l as FlatTreeNodeMeta, m as TreeSkipFn, n as CollectionMethods, p as TreeNode, r as CollectionOptions, s as FilePathTreeNode, t as CollectionItem, u as IndexPath } from "./types-D-7AMgSE.cjs";
-import { n as isListCollection, t as ListCollection } from "./list-collection-Cjgbx_9l.cjs";
-import { a as isGridCollection, i as GridCollectionOptions, n as SelectionMode, r as GridCollection, t as Selection } from "./selection-BmS2RDMq.cjs";
+import { n as isListCollection, t as ListCollection } from "./list-collection-B_8BN0XB.cjs";
+import { a as isGridCollection, i as GridCollectionOptions, n as SelectionMode, r as GridCollection, t as Selection } from "./selection-Bb_ZSVxe.cjs";
 import { n as filePathToTree, r as flattenedToTree, t as TreeCollection } from "./tree-collection-DlqV5kYO.cjs";
 export { CollectionItem, CollectionMethods, CollectionOptions, CollectionSearchOptions, CollectionSearchState, FilePathTreeNode, FlatTreeNode, FlatTreeNodeMeta, GridCollection, GridCollectionOptions, IndexPath, ListCollection, Selection, SelectionMode, TreeCollection, TreeCollectionMethods, TreeCollectionOptions, TreeNode, TreeSkipFn, ValuePath, filePathToTree, flattenedToTree, isGridCollection, isListCollection };

package/dist/collection.d.mts

@@ -1,5 +1,5 @@
 import { a as CollectionSearchState, c as FlatTreeNode, d as TreeCollectionMethods, f as TreeCollectionOptions, g as ValuePath, i as CollectionSearchOptions, l as FlatTreeNodeMeta, m as TreeSkipFn, n as CollectionMethods, p as TreeNode, r as CollectionOptions, s as FilePathTreeNode, t as CollectionItem, u as IndexPath } from "./types-9uw8LHpE.mjs";
-import { n as isListCollection, t as ListCollection } from "./list-collection-IF510iNl.mjs";
-import { a as isGridCollection, i as GridCollectionOptions, n as SelectionMode, r as GridCollection, t as Selection } from "./selection-6urf-c8j.mjs";
+import { n as isListCollection, t as ListCollection } from "./list-collection-DkRA5LOq.mjs";
+import { a as isGridCollection, i as GridCollectionOptions, n as SelectionMode, r as GridCollection, t as Selection } from "./selection-DdNvrKbj.mjs";
 import { n as filePathToTree, r as flattenedToTree, t as TreeCollection } from "./tree-collection-Dlf9EUrT.mjs";
 export { CollectionItem, CollectionMethods, CollectionOptions, CollectionSearchOptions, CollectionSearchState, FilePathTreeNode, FlatTreeNode, FlatTreeNodeMeta, GridCollection, GridCollectionOptions, IndexPath, ListCollection, Selection, SelectionMode, TreeCollection, TreeCollectionMethods, TreeCollectionOptions, TreeNode, TreeSkipFn, ValuePath, filePathToTree, flattenedToTree, isGridCollection, isListCollection };

package/dist/{focus-visible-GXKbbuiq.mjs → focus-visible-BuLf8M9F.mjs}

@@ -1,4 +1,4 @@
-import { Bt as isMac, Ot as isVirtualClick, ht as getEventTarget, on as getWindow, tn as getDocument } from "./dom-query-BFuRs3l4.mjs";
+import { Bt as isMac, Ot as isVirtualClick, en as getActiveElement, ht as getEventTarget, on as getWindow, tn as getDocument } from "./dom-query-BFuRs3l4.mjs";
 //#region src/shared/focus-visible/index.ts
 function isValidKey(e) {
 	return !(e.metaKey || !isMac() && e.altKey || e.ctrlKey || e.key === "Control" || e.key === "Shift" || e.key === "Meta");
@@ -15,9 +15,11 @@ const nonTextInputTypes = new Set([
 	"reset"
 ]);
 function isKeyboardFocusEvent(isTextInput, modality, e) {
-	const target = e ? getEventTarget(e) : null;
-	const win = getWindow(target);
-	isTextInput = isTextInput || target instanceof win.HTMLInputElement && !nonTextInputTypes.has(target?.type) || target instanceof win.HTMLTextAreaElement || target instanceof win.HTMLElement && target.isContentEditable;
+	const eventTarget = e ? getEventTarget(e) : null;
+	const doc = getDocument(eventTarget);
+	const win = getWindow(eventTarget);
+	const activeElement = getActiveElement(doc);
+	isTextInput = isTextInput || activeElement instanceof win.HTMLInputElement && !nonTextInputTypes.has(activeElement?.type) || activeElement instanceof win.HTMLTextAreaElement || activeElement instanceof win.HTMLElement && activeElement.isContentEditable;
 	return !(isTextInput && modality === "keyboard" && e instanceof win.KeyboardEvent && !Reflect.has(FOCUS_VISIBLE_INPUT_KEYS, e.key));
 }
 let currentModality = null;
@@ -25,6 +27,7 @@ let changeHandlers = /* @__PURE__ */ new Set();
 let listenerMap = /* @__PURE__ */ new Map();
 let hasEventBeforeFocus = false;
 let hasBlurredWindowRecently = false;
+let ignoreFocusEvent = false;
 const FOCUS_VISIBLE_INPUT_KEYS = {
 	Tab: true,
 	Escape: true
@@ -54,7 +57,7 @@ function handleClickEvent(e) {
 }
 function handleFocusEvent(e) {
 	const target = getEventTarget(e);
-	if (target === getWindow(target) || target === getDocument(target)) return;
+	if (target === getWindow(target) || target === getDocument(target) || !e.isTrusted) return;
 	if (!hasEventBeforeFocus && !hasBlurredWindowRecently) {
 		currentModality = "virtual";
 		triggerChangeHandlers("virtual", e);
@@ -72,8 +75,6 @@ function setupGlobalFocusEvents(root) {
 	const doc = getDocument(root);
 	let focus = win.HTMLElement.prototype.focus;
 	function patchedFocus() {
-		currentModality = "virtual";
-		triggerChangeHandlers("virtual", null);
 		hasEventBeforeFocus = true;
 		focus.apply(this, arguments);
 	}
@@ -148,7 +149,7 @@ function trackInteractionModality(props) {
 	};
 }
 function isFocusVisible() {
-	return currentModality === "keyboard";
+	return currentModality === "keyboard" || currentModality === "virtual";
 }
 function trackFocusVisible(props = {}) {
 	const { isTextInput, autoFocus, onChange, root } = props;
@@ -170,4 +171,4 @@ function trackFocusVisible(props = {}) {
 	};
 }
 //#endregion
-export { trackFocusVisible as a, setInteractionModality as i, isFocusVisible as n, trackInteractionModality as o, listenerMap as r, getInteractionModality as t };
+export { setInteractionModality as a, listenerMap as i, ignoreFocusEvent as n, trackFocusVisible as o, isFocusVisible as r, trackInteractionModality as s, getInteractionModality as t };

package/dist/{focus-visible-JdJXqMic.cjs → focus-visible-Co_9bW09.cjs}

@@ -15,9 +15,11 @@ const nonTextInputTypes = new Set([
 	"reset"
 ]);
 function isKeyboardFocusEvent(isTextInput, modality, e) {
-	const target = e ? require_dom_query.getEventTarget(e) : null;
-	const win = require_dom_query.getWindow(target);
-	isTextInput = isTextInput || target instanceof win.HTMLInputElement && !nonTextInputTypes.has(target?.type) || target instanceof win.HTMLTextAreaElement || target instanceof win.HTMLElement && target.isContentEditable;
+	const eventTarget = e ? require_dom_query.getEventTarget(e) : null;
+	const doc = require_dom_query.getDocument(eventTarget);
+	const win = require_dom_query.getWindow(eventTarget);
+	const activeElement = require_dom_query.getActiveElement(doc);
+	isTextInput = isTextInput || activeElement instanceof win.HTMLInputElement && !nonTextInputTypes.has(activeElement?.type) || activeElement instanceof win.HTMLTextAreaElement || activeElement instanceof win.HTMLElement && activeElement.isContentEditable;
 	return !(isTextInput && modality === "keyboard" && e instanceof win.KeyboardEvent && !Reflect.has(FOCUS_VISIBLE_INPUT_KEYS, e.key));
 }
 let currentModality = null;
@@ -25,6 +27,7 @@ let changeHandlers = /* @__PURE__ */ new Set();
 let listenerMap = /* @__PURE__ */ new Map();
 let hasEventBeforeFocus = false;
 let hasBlurredWindowRecently = false;
+let ignoreFocusEvent = false;
 const FOCUS_VISIBLE_INPUT_KEYS = {
 	Tab: true,
 	Escape: true
@@ -54,7 +57,7 @@ function handleClickEvent(e) {
 }
 function handleFocusEvent(e) {
 	const target = require_dom_query.getEventTarget(e);
-	if (target === require_dom_query.getWindow(target) || target === require_dom_query.getDocument(target)) return;
+	if (target === require_dom_query.getWindow(target) || target === require_dom_query.getDocument(target) || !e.isTrusted) return;
 	if (!hasEventBeforeFocus && !hasBlurredWindowRecently) {
 		currentModality = "virtual";
 		triggerChangeHandlers("virtual", e);
@@ -72,8 +75,6 @@ function setupGlobalFocusEvents(root) {
 	const doc = require_dom_query.getDocument(root);
 	let focus = win.HTMLElement.prototype.focus;
 	function patchedFocus() {
-		currentModality = "virtual";
-		triggerChangeHandlers("virtual", null);
 		hasEventBeforeFocus = true;
 		focus.apply(this, arguments);
 	}
@@ -148,7 +149,7 @@ function trackInteractionModality(props) {
 	};
 }
 function isFocusVisible() {
-	return currentModality === "keyboard";
+	return currentModality === "keyboard" || currentModality === "virtual";
 }
 function trackFocusVisible(props = {}) {
 	const { isTextInput, autoFocus, onChange, root } = props;
@@ -176,6 +177,12 @@ Object.defineProperty(exports, "getInteractionModality", {
 		return getInteractionModality;
 	}
 });
+Object.defineProperty(exports, "ignoreFocusEvent", {
+	enumerable: true,
+	get: function() {
+		return ignoreFocusEvent;
+	}
+});
 Object.defineProperty(exports, "isFocusVisible", {
 	enumerable: true,
 	get: function() {

package/dist/focus-visible.cjs

@@ -1,7 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./dom-query-BUO7rGsg.cjs");
-const require_focus_visible = require("./focus-visible-JdJXqMic.cjs");
+const require_focus_visible = require("./focus-visible-Co_9bW09.cjs");
 exports.getInteractionModality = require_focus_visible.getInteractionModality;
+exports.ignoreFocusEvent = require_focus_visible.ignoreFocusEvent;
 exports.isFocusVisible = require_focus_visible.isFocusVisible;
 exports.listenerMap = require_focus_visible.listenerMap;
 exports.setInteractionModality = require_focus_visible.setInteractionModality;

package/dist/focus-visible.d.cts

@@ -5,6 +5,7 @@ interface GlobalListenerData {
   focus: VoidFunction;
 }
 declare let listenerMap: Map<Window, GlobalListenerData>;
+declare let ignoreFocusEvent: boolean;
 declare function getInteractionModality(): Modality | null;
 declare function setInteractionModality(modality: Modality): void;
 interface InteractionModalityChangeDetails {
@@ -28,4 +29,4 @@ interface FocusVisibleProps {
 }
 declare function trackFocusVisible(props?: FocusVisibleProps): VoidFunction;
 //#endregion
-export { FocusVisibleChangeDetails, FocusVisibleProps, InteractionModalityChangeDetails, InteractionModalityProps, Modality, getInteractionModality, isFocusVisible, listenerMap, setInteractionModality, trackFocusVisible, trackInteractionModality };
+export { FocusVisibleChangeDetails, FocusVisibleProps, InteractionModalityChangeDetails, InteractionModalityProps, Modality, getInteractionModality, ignoreFocusEvent, isFocusVisible, listenerMap, setInteractionModality, trackFocusVisible, trackInteractionModality };

package/dist/focus-visible.d.mts

@@ -5,6 +5,7 @@ interface GlobalListenerData {
   focus: VoidFunction;
 }
 declare let listenerMap: Map<Window, GlobalListenerData>;
+declare let ignoreFocusEvent: boolean;
 declare function getInteractionModality(): Modality | null;
 declare function setInteractionModality(modality: Modality): void;
 interface InteractionModalityChangeDetails {
@@ -28,4 +29,4 @@ interface FocusVisibleProps {
 }
 declare function trackFocusVisible(props?: FocusVisibleProps): VoidFunction;
 //#endregion
-export { FocusVisibleChangeDetails, FocusVisibleProps, InteractionModalityChangeDetails, InteractionModalityProps, Modality, getInteractionModality, isFocusVisible, listenerMap, setInteractionModality, trackFocusVisible, trackInteractionModality };
+export { FocusVisibleChangeDetails, FocusVisibleProps, InteractionModalityChangeDetails, InteractionModalityProps, Modality, getInteractionModality, ignoreFocusEvent, isFocusVisible, listenerMap, setInteractionModality, trackFocusVisible, trackInteractionModality };

package/dist/focus-visible.mjs

@@ -1,3 +1,3 @@
 import "./dom-query-BFuRs3l4.mjs";
-import { a as trackFocusVisible, i as setInteractionModality, n as isFocusVisible, o as trackInteractionModality, r as listenerMap, t as getInteractionModality } from "./focus-visible-GXKbbuiq.mjs";
-export { getInteractionModality, isFocusVisible, listenerMap, setInteractionModality, trackFocusVisible, trackInteractionModality };
+import { a as setInteractionModality, i as listenerMap, n as ignoreFocusEvent, o as trackFocusVisible, r as isFocusVisible, s as trackInteractionModality, t as getInteractionModality } from "./focus-visible-BuLf8M9F.mjs";
+export { getInteractionModality, ignoreFocusEvent, isFocusVisible, listenerMap, setInteractionModality, trackFocusVisible, trackInteractionModality };

package/dist/{list-collection-Cjgbx_9l.d.cts → list-collection-B_8BN0XB.d.cts}

@@ -46,7 +46,7 @@ declare class ListCollection<T extends CollectionItem = CollectionItem> {
   moveBefore: (value: string, ...values: string[]) => ListCollection<T>;
   moveAfter: (value: string, ...values: string[]) => ListCollection<T>;
   reorder: (fromIndex: number, toIndex: number) => ListCollection<T>;
-  compareValue: (a: string, b: string) => 1 | 0 | -1;
+  compareValue: (a: string, b: string) => 0 | 1 | -1;
   private range;
   getValueRange: (from: string | null, to: string | null) => string[];
   toString: () => string;

package/dist/{list-collection-IF510iNl.d.mts → list-collection-DkRA5LOq.d.mts}

@@ -46,7 +46,7 @@ declare class ListCollection<T extends CollectionItem = CollectionItem> {
   moveBefore: (value: string, ...values: string[]) => ListCollection<T>;
   moveAfter: (value: string, ...values: string[]) => ListCollection<T>;
   reorder: (fromIndex: number, toIndex: number) => ListCollection<T>;
-  compareValue: (a: string, b: string) => 1 | 0 | -1;
+  compareValue: (a: string, b: string) => 0 | 1 | -1;
   private range;
   getValueRange: (from: string | null, to: string | null) => string[];
   toString: () => string;

package/dist/machines/angle-slider/index.d.cts

@@ -3,7 +3,7 @@ import { p as Machine, u as EventObject, y as Service } from "../../types-B24gMT
 import { b as NormalizeProps, g as RequiredBy, r as DirectionProperty, t as CommonProperties, x as PropTypes } from "../../index-CLRsezW5.cjs";
 
 //#region src/machines/angle-slider/angle-slider.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "label" | "control" | "track" | "thumb" | "valueText" | "markerGroup" | "marker">;
+declare const anatomy: AnatomyInstance<"root" | "label" | "control" | "thumb" | "track" | "marker" | "valueText" | "markerGroup">;
 //#endregion
 //#region src/machines/angle-slider/angle-slider.types.d.ts
 interface ValueChangeDetails {

package/dist/machines/angle-slider/index.d.mts

@@ -3,7 +3,7 @@ import { p as Machine, u as EventObject, y as Service } from "../../types-DUM9rz
 import { b as NormalizeProps, g as RequiredBy, r as DirectionProperty, t as CommonProperties, x as PropTypes } from "../../index-BVFlU3b9.mjs";
 
 //#region src/machines/angle-slider/angle-slider.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "label" | "control" | "track" | "thumb" | "valueText" | "markerGroup" | "marker">;
+declare const anatomy: AnatomyInstance<"root" | "label" | "control" | "thumb" | "track" | "marker" | "valueText" | "markerGroup">;
 //#endregion
 //#region src/machines/angle-slider/angle-slider.types.d.ts
 interface ValueChangeDetails {

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

@@ -3,7 +3,7 @@ import { p as Machine, u as EventObject, y as Service } from "../../types-B24gMT
 import { b as NormalizeProps, d as Orientation, f as OrientationProperty, g as RequiredBy, r as DirectionProperty, t as CommonProperties, x as PropTypes } from "../../index-CLRsezW5.cjs";
 
 //#region src/machines/carousel/carousel.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "control" | "indicator" | "item" | "itemGroup" | "nextTrigger" | "prevTrigger" | "indicatorGroup" | "autoplayTrigger" | "progressText">;
+declare const anatomy: AnatomyInstance<"root" | "indicator" | "control" | "item" | "prevTrigger" | "nextTrigger" | "itemGroup" | "indicatorGroup" | "autoplayTrigger" | "progressText">;
 //#endregion
 //#region src/machines/carousel/carousel.types.d.ts
 interface PageChangeDetails {

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

@@ -3,7 +3,7 @@ import { p as Machine, u as EventObject, y as Service } from "../../types-DUM9rz
 import { b as NormalizeProps, d as Orientation, f as OrientationProperty, g as RequiredBy, r as DirectionProperty, t as CommonProperties, x as PropTypes } from "../../index-BVFlU3b9.mjs";
 
 //#region src/machines/carousel/carousel.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "control" | "indicator" | "item" | "itemGroup" | "nextTrigger" | "prevTrigger" | "indicatorGroup" | "autoplayTrigger" | "progressText">;
+declare const anatomy: AnatomyInstance<"root" | "indicator" | "control" | "item" | "prevTrigger" | "nextTrigger" | "itemGroup" | "indicatorGroup" | "autoplayTrigger" | "progressText">;
 //#endregion
 //#region src/machines/carousel/carousel.types.d.ts
 interface PageChangeDetails {

package/dist/machines/cascade-select/index.cjs

@@ -6,6 +6,7 @@ const require_collection = require("../../collection-BBgC8xCb.cjs");
 const require_core = require("../../core-DwdPztGA.cjs");
 require("../../interact-outside-Bg-QSXqp.cjs");
 const require_dismissable = require("../../dismissable-DxjbwsOf.cjs");
+const require_focus_visible = require("../../focus-visible-Co_9bW09.cjs");
 const require_popper = require("../../popper-viCrafLC.cjs");
 const require_rect_utils = require("../../rect-utils-D3RkAaHK.cjs");
 const require_create_props = require("../../create-props-DP39rHnH.cjs");
@@ -749,6 +750,7 @@ const machine = require_core.createMachine({
 			exit: ["clearHighlightedValue", "scrollContentToTop"],
 			effects: [
 				"trackDismissableElement",
+				"trackFocusVisible",
 				"computePlacement",
 				"scrollToHighlightedItems"
 			],
@@ -973,6 +975,9 @@ const machine = require_core.createMachine({
 					}
 				});
 			},
+			trackFocusVisible({ scope }) {
+				return require_focus_visible.trackFocusVisible({ root: scope.getRootNode?.() });
+			},
 			trackDismissableElement({ scope, send, prop }) {
 				const contentEl = () => dom.getContentEl(scope);
 				let restoreFocus = true;
@@ -1004,13 +1009,13 @@ const machine = require_core.createMachine({
 					}
 				});
 			},
-			scrollToHighlightedItems({ context, prop, scope, event }) {
+			scrollToHighlightedItems({ context, prop, scope }) {
 				let cleanups = [];
 				const exec = (immediate) => {
 					const highlightedValue = context.get("highlightedValue");
 					const highlightedIndexPath = context.get("highlightedIndexPath");
 					if (!highlightedIndexPath.length) return;
-					if (event.current().type.includes("POINTER")) return;
+					if (require_focus_visible.getInteractionModality() !== "keyboard") return;
 					dom.getListEls(scope).forEach((listEl, index) => {
 						const itemPath = highlightedIndexPath.slice(0, index + 1);
 						const itemEl = dom.getItemEl(scope, highlightedValue.toString());

package/dist/machines/cascade-select/index.d.cts

@@ -8,8 +8,8 @@ import { c as Placement, d as PositioningOptions } from "../../types-CZAtqGqH.cj
 import { a as Point } from "../../types-CLXYEgfm.cjs";
 
 //#region src/machines/cascade-select/cascade-select.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "label" | "control" | "indicator" | "valueText" | "trigger" | "item" | "itemIndicator" | "content" | "positioner" | "itemText" | "list" | "clearTrigger">;
-declare const parts: Record<"root" | "label" | "control" | "indicator" | "valueText" | "trigger" | "item" | "itemIndicator" | "content" | "positioner" | "itemText" | "list" | "clearTrigger", AnatomyPart>;
+declare const anatomy: AnatomyInstance<"root" | "indicator" | "label" | "control" | "content" | "item" | "itemIndicator" | "itemText" | "trigger" | "valueText" | "clearTrigger" | "positioner" | "list">;
+declare const parts: Record<"root" | "indicator" | "label" | "control" | "content" | "item" | "itemIndicator" | "itemText" | "trigger" | "valueText" | "clearTrigger" | "positioner" | "list", AnatomyPart>;
 //#endregion
 //#region src/machines/cascade-select/cascade-select.collection.d.ts
 declare const collection: {

package/dist/machines/cascade-select/index.d.mts

@@ -8,8 +8,8 @@ import { p as PositioningOptions, u as Placement } from "../../index-fMh0VDkR.mj
 import { a as Point } from "../../types-DU764tY_.mjs";
 
 //#region src/machines/cascade-select/cascade-select.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "label" | "control" | "indicator" | "valueText" | "trigger" | "item" | "itemIndicator" | "content" | "positioner" | "itemText" | "list" | "clearTrigger">;
-declare const parts: Record<"root" | "label" | "control" | "indicator" | "valueText" | "trigger" | "item" | "itemIndicator" | "content" | "positioner" | "itemText" | "list" | "clearTrigger", AnatomyPart>;
+declare const anatomy: AnatomyInstance<"root" | "indicator" | "label" | "control" | "content" | "item" | "itemIndicator" | "itemText" | "trigger" | "valueText" | "clearTrigger" | "positioner" | "list">;
+declare const parts: Record<"root" | "indicator" | "label" | "control" | "content" | "item" | "itemIndicator" | "itemText" | "trigger" | "valueText" | "clearTrigger" | "positioner" | "list", AnatomyPart>;
 //#endregion
 //#region src/machines/cascade-select/cascade-select.collection.d.ts
 declare const collection: {

package/dist/machines/cascade-select/index.mjs

@@ -5,6 +5,7 @@ import { t as TreeCollection } from "../../collection-DgzidRvr.mjs";
 import { a as createMachine, i as createGuards } from "../../core-Ci9Yu6QI.mjs";
 import "../../interact-outside-Ba50N1a5.mjs";
 import { n as trackDismissableElement } from "../../dismissable-B9k5K6f9.mjs";
+import { o as trackFocusVisible, t as getInteractionModality } from "../../focus-visible-BuLf8M9F.mjs";
 import { n as getPlacement, t as getPlacementStyles } from "../../popper-BlgbmdAn.mjs";
 import { B as getRectCorners, D as closestSideToPoint, L as createPoint, R as createRect, i as isPointInPolygon } from "../../rect-utils-B5xqFvKC.mjs";
 import { t as createProps } from "../../create-props-DFW8DUsC.mjs";
@@ -748,6 +749,7 @@ const machine = createMachine({
 			exit: ["clearHighlightedValue", "scrollContentToTop"],
 			effects: [
 				"trackDismissableElement",
+				"trackFocusVisible",
 				"computePlacement",
 				"scrollToHighlightedItems"
 			],
@@ -972,6 +974,9 @@ const machine = createMachine({
 					}
 				});
 			},
+			trackFocusVisible({ scope }) {
+				return trackFocusVisible({ root: scope.getRootNode?.() });
+			},
 			trackDismissableElement({ scope, send, prop }) {
 				const contentEl = () => dom.getContentEl(scope);
 				let restoreFocus = true;
@@ -1003,13 +1008,13 @@ const machine = createMachine({
 					}
 				});
 			},
-			scrollToHighlightedItems({ context, prop, scope, event }) {
+			scrollToHighlightedItems({ context, prop, scope }) {
 				let cleanups = [];
 				const exec = (immediate) => {
 					const highlightedValue = context.get("highlightedValue");
 					const highlightedIndexPath = context.get("highlightedIndexPath");
 					if (!highlightedIndexPath.length) return;
-					if (event.current().type.includes("POINTER")) return;
+					if (getInteractionModality() !== "keyboard") return;
 					dom.getListEls(scope).forEach((listEl, index) => {
 						const itemPath = highlightedIndexPath.slice(0, index + 1);
 						const itemEl = dom.getItemEl(scope, highlightedValue.toString());

package/dist/machines/checkbox/index.cjs

@@ -3,7 +3,7 @@ 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_core = require("../../core-DwdPztGA.cjs");
-const require_focus_visible = require("../../focus-visible-JdJXqMic.cjs");
+const require_focus_visible = require("../../focus-visible-Co_9bW09.cjs");
 const require_create_props = require("../../create-props-DP39rHnH.cjs");
 //#region src/machines/checkbox/checkbox.anatomy.ts
 const anatomy = require_create_anatomy.createAnatomy("checkbox").parts("root", "label", "control", "indicator");

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

@@ -3,7 +3,7 @@ import { p as Machine, u as EventObject, y as Service } from "../../types-B24gMT
 import { b as NormalizeProps, g as RequiredBy, r as DirectionProperty, t as CommonProperties, x as PropTypes } from "../../index-CLRsezW5.cjs";
 
 //#region src/machines/checkbox/checkbox.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "label" | "control" | "indicator">;
+declare const anatomy: AnatomyInstance<"root" | "indicator" | "label" | "control">;
 //#endregion
 //#region src/machines/checkbox/checkbox.types.d.ts
 type CheckedState = boolean | "indeterminate";

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

@@ -3,7 +3,7 @@ import { p as Machine, u as EventObject, y as Service } from "../../types-DUM9rz
 import { b as NormalizeProps, g as RequiredBy, r as DirectionProperty, t as CommonProperties, x as PropTypes } from "../../index-BVFlU3b9.mjs";
 
 //#region src/machines/checkbox/checkbox.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "label" | "control" | "indicator">;
+declare const anatomy: AnatomyInstance<"root" | "indicator" | "label" | "control">;
 //#endregion
 //#region src/machines/checkbox/checkbox.types.d.ts
 type CheckedState = boolean | "indeterminate";

package/dist/machines/checkbox/index.mjs

@@ -2,7 +2,7 @@ import { t as createAnatomy } from "../../create-anatomy-Dr0evdYy.mjs";
 import { T as trackPress, a as visuallyHiddenStyle, ht as getEventTarget, lt as trackFormControl, rt as dispatchInputCheckedEvent, st as setElementChecked, xn as dataAttr } from "../../dom-query-BFuRs3l4.mjs";
 import { u as createSplitProps } from "../../utils-VVoZ_v29.mjs";
 import { a as createMachine, i as createGuards } from "../../core-Ci9Yu6QI.mjs";
-import { a as trackFocusVisible, n as isFocusVisible } from "../../focus-visible-GXKbbuiq.mjs";
+import { o as trackFocusVisible, r as isFocusVisible } from "../../focus-visible-BuLf8M9F.mjs";
 import { t as createProps } from "../../create-props-DFW8DUsC.mjs";
 //#region src/machines/checkbox/checkbox.anatomy.ts
 const anatomy = createAnatomy("checkbox").parts("root", "label", "control", "indicator");

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

@@ -3,7 +3,7 @@ import { p as Machine, y as Service } from "../../types-B24gMTKq.cjs";
 import { b as NormalizeProps, g as RequiredBy, t as CommonProperties, x as PropTypes } from "../../index-CLRsezW5.cjs";
 
 //#region src/machines/clipboard/clipboard.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "label" | "control" | "indicator" | "trigger" | "input">;
+declare const anatomy: AnatomyInstance<"root" | "indicator" | "label" | "control" | "input" | "trigger">;
 //#endregion
 //#region src/machines/clipboard/clipboard.types.d.ts
 interface CopyStatusDetails {

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

@@ -3,7 +3,7 @@ import { p as Machine, y as Service } from "../../types-DUM9rzfD.mjs";
 import { b as NormalizeProps, g as RequiredBy, t as CommonProperties, x as PropTypes } from "../../index-BVFlU3b9.mjs";
 
 //#region src/machines/clipboard/clipboard.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "label" | "control" | "indicator" | "trigger" | "input">;
+declare const anatomy: AnatomyInstance<"root" | "indicator" | "label" | "control" | "input" | "trigger">;
 //#endregion
 //#region src/machines/clipboard/clipboard.types.d.ts
 interface CopyStatusDetails {

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

@@ -3,7 +3,7 @@ import { p as Machine, y as Service } from "../../types-B24gMTKq.cjs";
 import { b as NormalizeProps, r as DirectionProperty, t as CommonProperties, x as PropTypes } from "../../index-CLRsezW5.cjs";
 
 //#region src/machines/collapsible/collapsible.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "indicator" | "trigger" | "content">;
+declare const anatomy: AnatomyInstance<"root" | "indicator" | "content" | "trigger">;
 //#endregion
 //#region src/machines/collapsible/collapsible.types.d.ts
 interface OpenChangeDetails {

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

@@ -3,7 +3,7 @@ import { p as Machine, y as Service } from "../../types-DUM9rzfD.mjs";
 import { b as NormalizeProps, r as DirectionProperty, t as CommonProperties, x as PropTypes } from "../../index-BVFlU3b9.mjs";
 
 //#region src/machines/collapsible/collapsible.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "indicator" | "trigger" | "content">;
+declare const anatomy: AnatomyInstance<"root" | "indicator" | "content" | "trigger">;
 //#endregion
 //#region src/machines/collapsible/collapsible.types.d.ts
 interface OpenChangeDetails {

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

@@ -6,7 +6,7 @@ import { c as PointerDownOutsideEvent, i as InteractOutsideHandlers, n as FocusO
 import { d as PositioningOptions } from "../../types-CZAtqGqH.cjs";
 
 //#region src/machines/color-picker/color-picker.anatomy.d.ts
-declare const anatomy: Anatomy<"root" | "label" | "control" | "valueText" | "trigger" | "area" | "content" | "positioner" | "areaThumb" | "areaBackground" | "channelSlider" | "channelSliderLabel" | "channelSliderTrack" | "channelSliderThumb" | "channelSliderValueText" | "channelInput" | "transparencyGrid" | "swatchGroup" | "swatchTrigger" | "swatchIndicator" | "swatch" | "eyeDropperTrigger" | "formatTrigger" | "formatSelect">;
+declare const anatomy: Anatomy<"root" | "label" | "control" | "content" | "trigger" | "area" | "valueText" | "positioner" | "areaThumb" | "areaBackground" | "channelSlider" | "channelSliderLabel" | "channelSliderTrack" | "channelSliderThumb" | "channelSliderValueText" | "channelInput" | "transparencyGrid" | "swatchGroup" | "swatchTrigger" | "swatchIndicator" | "swatch" | "eyeDropperTrigger" | "formatTrigger" | "formatSelect">;
 //#endregion
 //#region src/machines/color-picker/color-picker.types.d.ts
 type ExtendedColorChannel = ColorChannel | "hex" | "css";

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

@@ -6,7 +6,7 @@ import { c as PointerDownOutsideEvent, i as InteractOutsideHandlers, n as FocusO
 import { p as PositioningOptions } from "../../index-fMh0VDkR.mjs";
 
 //#region src/machines/color-picker/color-picker.anatomy.d.ts
-declare const anatomy: Anatomy<"root" | "label" | "control" | "valueText" | "trigger" | "area" | "content" | "positioner" | "areaThumb" | "areaBackground" | "channelSlider" | "channelSliderLabel" | "channelSliderTrack" | "channelSliderThumb" | "channelSliderValueText" | "channelInput" | "transparencyGrid" | "swatchGroup" | "swatchTrigger" | "swatchIndicator" | "swatch" | "eyeDropperTrigger" | "formatTrigger" | "formatSelect">;
+declare const anatomy: Anatomy<"root" | "label" | "control" | "content" | "trigger" | "area" | "valueText" | "positioner" | "areaThumb" | "areaBackground" | "channelSlider" | "channelSliderLabel" | "channelSliderTrack" | "channelSliderThumb" | "channelSliderValueText" | "channelInput" | "transparencyGrid" | "swatchGroup" | "swatchTrigger" | "swatchIndicator" | "swatch" | "eyeDropperTrigger" | "formatTrigger" | "formatSelect">;
 //#endregion
 //#region src/machines/color-picker/color-picker.types.d.ts
 type ExtendedColorChannel = ColorChannel | "hex" | "css";

package/dist/machines/combobox/index.cjs

@@ -6,6 +6,7 @@ const require_collection = require("../../collection-BBgC8xCb.cjs");
 const require_core = require("../../core-DwdPztGA.cjs");
 require("../../interact-outside-Bg-QSXqp.cjs");
 const require_dismissable = require("../../dismissable-DxjbwsOf.cjs");
+const require_focus_visible = require("../../focus-visible-Co_9bW09.cjs");
 const require_popper = require("../../popper-viCrafLC.cjs");
 const require_create_props = require("../../create-props-DP39rHnH.cjs");
 //#region src/machines/combobox/combobox.anatomy.ts
@@ -830,6 +831,7 @@ const machine = createMachine({
 			tags: ["open", "focused"],
 			entry: ["setInitialFocus"],
 			effects: [
+				"trackFocusVisible",
 				"scrollToHighlightedItem",
 				"trackDismissableLayer",
 				"trackPlacement"
@@ -978,6 +980,7 @@ const machine = createMachine({
 		suggesting: {
 			tags: ["open", "focused"],
 			effects: [
+				"trackFocusVisible",
 				"trackDismissableLayer",
 				"scrollToHighlightedItem",
 				"trackPlacement"
@@ -1152,6 +1155,9 @@ const machine = createMachine({
 			hasCollectionItems: ({ prop }) => prop("collection").size > 0
 		},
 		effects: {
+			trackFocusVisible({ scope }) {
+				return require_focus_visible.trackFocusVisible({ root: scope.getRootNode?.() });
+			},
 			trackDismissableLayer({ send, prop, scope }) {
 				if (prop("disableLayer")) return;
 				const contentEl = () => getContentEl(scope);
@@ -1195,13 +1201,13 @@ const machine = createMachine({
 					}
 				});
 			},
-			scrollToHighlightedItem({ context, prop, scope, event }) {
+			scrollToHighlightedItem({ context, prop, scope }) {
 				const inputEl = getInputEl(scope);
 				let cleanups = [];
 				const exec = (immediate) => {
-					const pointer = event.current().type.includes("POINTER");
+					if (require_focus_visible.getInteractionModality() !== "keyboard") return;
 					const highlightedValue = context.get("highlightedValue");
-					if (pointer || !highlightedValue) return;
+					if (!highlightedValue) return;
 					const contentEl = getContentEl(scope);
 					const scrollToIndexFn = prop("scrollToIndexFn");
 					if (scrollToIndexFn) {

package/dist/machines/combobox/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-Cjgbx_9l.cjs";
+import { t as ListCollection } from "../../list-collection-B_8BN0XB.cjs";
 import { p as Machine, u as EventObject, y as Service } from "../../types-B24gMTKq.cjs";
 import { b as NormalizeProps, g as RequiredBy, r as DirectionProperty, t as CommonProperties, x as PropTypes } from "../../index-CLRsezW5.cjs";
 import { c as PointerDownOutsideEvent, i as InteractOutsideHandlers, n as FocusOutsideEvent, r as InteractOutsideEvent } from "../../index-DzWGFhcS.cjs";
 import { c as Placement, d as PositioningOptions } from "../../types-CZAtqGqH.cjs";
 
 //#region src/machines/combobox/combobox.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "label" | "control" | "trigger" | "input" | "item" | "itemIndicator" | "itemGroup" | "content" | "positioner" | "itemText" | "list" | "clearTrigger" | "itemGroupLabel">;
+declare const anatomy: AnatomyInstance<"root" | "label" | "control" | "content" | "item" | "itemIndicator" | "input" | "itemText" | "trigger" | "itemGroup" | "clearTrigger" | "positioner" | "list" | "itemGroupLabel">;
 //#endregion
 //#region src/machines/combobox/combobox.collection.d.ts
 declare const collection: {

package/dist/machines/combobox/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-IF510iNl.mjs";
+import { t as ListCollection } from "../../list-collection-DkRA5LOq.mjs";
 import { p as Machine, u as EventObject, y as Service } from "../../types-DUM9rzfD.mjs";
 import { b as NormalizeProps, g as RequiredBy, r as DirectionProperty, t as CommonProperties, x as PropTypes } from "../../index-BVFlU3b9.mjs";
 import { c as PointerDownOutsideEvent, i as InteractOutsideHandlers, n as FocusOutsideEvent, r as InteractOutsideEvent } from "../../index-CGNNiDyE.mjs";
 import { p as PositioningOptions, u as Placement } from "../../index-fMh0VDkR.mjs";
 
 //#region src/machines/combobox/combobox.anatomy.d.ts
-declare const anatomy: AnatomyInstance<"root" | "label" | "control" | "trigger" | "input" | "item" | "itemIndicator" | "itemGroup" | "content" | "positioner" | "itemText" | "list" | "clearTrigger" | "itemGroupLabel">;
+declare const anatomy: AnatomyInstance<"root" | "label" | "control" | "content" | "item" | "itemIndicator" | "input" | "itemText" | "trigger" | "itemGroup" | "clearTrigger" | "positioner" | "list" | "itemGroupLabel">;
 //#endregion
 //#region src/machines/combobox/combobox.collection.d.ts
 declare const collection: {

package/dist/machines/combobox/index.mjs

@@ -5,6 +5,7 @@ import { s as ListCollection } from "../../collection-DgzidRvr.mjs";
 import { o as setup } from "../../core-Ci9Yu6QI.mjs";
 import "../../interact-outside-Ba50N1a5.mjs";
 import { n as trackDismissableElement } from "../../dismissable-B9k5K6f9.mjs";
+import { o as trackFocusVisible, t as getInteractionModality } from "../../focus-visible-BuLf8M9F.mjs";
 import { n as getPlacement, t as getPlacementStyles } from "../../popper-BlgbmdAn.mjs";
 import { t as createProps } from "../../create-props-DFW8DUsC.mjs";
 //#region src/machines/combobox/combobox.anatomy.ts
@@ -829,6 +830,7 @@ const machine = createMachine({
 			tags: ["open", "focused"],
 			entry: ["setInitialFocus"],
 			effects: [
+				"trackFocusVisible",
 				"scrollToHighlightedItem",
 				"trackDismissableLayer",
 				"trackPlacement"
@@ -977,6 +979,7 @@ const machine = createMachine({
 		suggesting: {
 			tags: ["open", "focused"],
 			effects: [
+				"trackFocusVisible",
 				"trackDismissableLayer",
 				"scrollToHighlightedItem",
 				"trackPlacement"
@@ -1151,6 +1154,9 @@ const machine = createMachine({
 			hasCollectionItems: ({ prop }) => prop("collection").size > 0
 		},
 		effects: {
+			trackFocusVisible({ scope }) {
+				return trackFocusVisible({ root: scope.getRootNode?.() });
+			},
 			trackDismissableLayer({ send, prop, scope }) {
 				if (prop("disableLayer")) return;
 				const contentEl = () => getContentEl(scope);
@@ -1194,13 +1200,13 @@ const machine = createMachine({
 					}
 				});
 			},
-			scrollToHighlightedItem({ context, prop, scope, event }) {
+			scrollToHighlightedItem({ context, prop, scope }) {
 				const inputEl = getInputEl(scope);
 				let cleanups = [];
 				const exec = (immediate) => {
-					const pointer = event.current().type.includes("POINTER");
+					if (getInteractionModality() !== "keyboard") return;
 					const highlightedValue = context.get("highlightedValue");
-					if (pointer || !highlightedValue) return;
+					if (!highlightedValue) return;
 					const contentEl = getContentEl(scope);
 					const scrollToIndexFn = prop("scrollToIndexFn");
 					if (scrollToIndexFn) {