@eightshift/ui-components 2.0.2 → 3.0.0

package/dist/{Button-OQ5EIPvt.js → Button-D7c-vzAt.js}

@@ -1,10 +1,10 @@
-import { a as $64fa3d84918910a7$export$29f1550f4b0d4415, b as $64fa3d84918910a7$export$4d86445c2cf5e3, f as $bdb11010cef70236$export$f680877a34711e37, d as $3ef42575df84b30b$export$9d1611c77c2fe928 } from "./utils-39D0mStj.js";
+import { a as $64fa3d84918910a7$export$29f1550f4b0d4415, b as $64fa3d84918910a7$export$4d86445c2cf5e3, e as $bdb11010cef70236$export$f680877a34711e37, d as $3ef42575df84b30b$export$9d1611c77c2fe928 } from "./utils-DkCSC521.js";
 import React__default, { createContext, useRef, useEffect } from "react";
-import { $ as $f39a9eba43920ace$export$86427a43e3e48ebb } from "./Hidden-DnOd_jPX.js";
+import { $ as $f39a9eba43920ace$export$86427a43e3e48ebb } from "./Hidden-rE6uR-lr.js";
 import { $ as $65484d02dcb7eb3e$export$457c3d6518dd4c6f } from "./filterDOMProps-EDDcM64A.js";
-import { $ as $701a24aa0da5b062$export$ea18c227d4417cc3 } from "./useButton-CmLbE5vg.js";
-import { $ as $f7dceffc5ad7768b$export$4e328f61c538687f } from "./useFocusRing-CGp3guTX.js";
-import { $ as $6179b936705e76d3$export$ae780daf29e6d456 } from "./focusSafely-CiqTTjWy.js";
+import { $ as $701a24aa0da5b062$export$ea18c227d4417cc3 } from "./useButton-Dl1C1478.js";
+import { $ as $f7dceffc5ad7768b$export$4e328f61c538687f } from "./useFocusRing-CxlVCVpL.js";
+import { $ as $6179b936705e76d3$export$ae780daf29e6d456 } from "./useHover-B-8Wji4B.js";
 const $319e236875307eab$var$LIVEREGION_TIMEOUT_DELAY = 7e3;
 let $319e236875307eab$var$liveAnnouncer = null;
 function $319e236875307eab$export$a9b970dcc4ae71a9(message, assertiveness = "assertive", timeout = $319e236875307eab$var$LIVEREGION_TIMEOUT_DELAY) {

package/dist/{Collection-CJM_asJz.js → Collection-CDEKDgvV.js}

@@ -1,13 +1,12 @@
-import { a as $f39a9eba43920ace$export$8dc98ba7eadeaa56 } from "./Hidden-DnOd_jPX.js";
+import { a as $f39a9eba43920ace$export$8dc98ba7eadeaa56 } from "./Hidden-rE6uR-lr.js";
 import { r as reactDomExports } from "./index-BRp93Yfa.js";
+import { A as $c87311424ea30a05$export$9ac100e40613ea10, g as $03deb23ff14920c4$export$4eaf04e54aa8eed6, d as $431fbd86ca7dc216$export$b204af158042fbac, y as $7215afc6de606d6b$export$de79e2c695e052f3, I as $f645667febf57a63$export$f9762fab77588ecb, i as $d4ee10de306f2510$export$cd4e5573fbe2b576, J as $c87311424ea30a05$export$e1865c3bedcd822b, r as $3ad3f6e1647bc98d$export$80f3e147d781571c, w as $507fabe10e71c6fb$export$630ff653c5ada6a9, b as $458b0a5536c1a7cf$export$40bfa8c7b0832715 } from "./useHover-B-8Wji4B.js";
 import React__default, { useRef, useState, useMemo, cloneElement, useContext, useCallback, forwardRef, createContext, useEffect } from "react";
-import { l as $f0a04ccd8dbdd83b$export$e5c5a5f917a5871c, e as $b5e257d569688ac6$export$535bd6ca7f90a273, d as $3ef42575df84b30b$export$9d1611c77c2fe928, g as $8ae05eaa5c114e9c$export$7f54fc3180508a52, f as $bdb11010cef70236$export$f680877a34711e37 } from "./utils-39D0mStj.js";
-import { q as $c87311424ea30a05$export$9ac100e40613ea10, w as $c87311424ea30a05$export$e1865c3bedcd822b, h as $6a99195332edec8b$export$80f3e147d781571c, k as $507fabe10e71c6fb$export$630ff653c5ada6a9, p as $7215afc6de606d6b$export$de79e2c695e052f3, e as $458b0a5536c1a7cf$export$40bfa8c7b0832715 } from "./focusSafely-CiqTTjWy.js";
-import { $ as $f6c31cce2adf654f$export$45712eceda6fad21, b as $ea8dcbcb9ea1b556$export$9a302a45f65d0572, c as $ea8dcbcb9ea1b556$export$95185d699e05d4d7 } from "./usePress-rg_OQIGW.js";
-import { $ as $e9faafb641e167db$export$90fc3a17d93f704c } from "./useEvent-cLDJlznQ.js";
-import { a as $9bf71ea28793e738$export$2d6ec8fc375ceafa } from "./FocusScope-Cs5_OoeA.js";
-import { $ as $18f2051aff69b9bf$export$43bb16f9c6d9e3f7 } from "./context-CDOs-GuR.js";
-import { $ as $03deb23ff14920c4$export$4eaf04e54aa8eed6 } from "./textSelection-BlTDSskG.js";
+import { k as $f0a04ccd8dbdd83b$export$e5c5a5f917a5871c, d as $3ef42575df84b30b$export$9d1611c77c2fe928, n as $b5e257d569688ac6$export$535bd6ca7f90a273, e as $bdb11010cef70236$export$f680877a34711e37, f as $8ae05eaa5c114e9c$export$7f54fc3180508a52 } from "./utils-DkCSC521.js";
+import { $ as $f6c31cce2adf654f$export$45712eceda6fad21, b as $ea8dcbcb9ea1b556$export$9a302a45f65d0572, c as $ea8dcbcb9ea1b556$export$95185d699e05d4d7 } from "./usePress-C3dxzVyi.js";
+import { $ as $e9faafb641e167db$export$90fc3a17d93f704c } from "./useEvent-B0b-6KBr.js";
+import { a as $9bf71ea28793e738$export$2d6ec8fc375ceafa } from "./FocusScope-DbqfVa2Z.js";
+import { $ as $18f2051aff69b9bf$export$43bb16f9c6d9e3f7 } from "./context-D2KUdwNL.js";
 function $ca9b37712f007381$export$72ef708ab07251f1(effect, dependencies) {
   const isInitialMount = useRef(true);
   const lastDeps = useRef(null);
@@ -139,7 +138,6 @@ function $2f04cbc44ee30ce0$export$c826860796309d1b(targetElement, opts) {
 }
 const $5671b20cf9b562b2$export$447a38995de2c711 = "react-aria-clear-focus";
 const $5671b20cf9b562b2$export$831c820ad60f9d12 = "react-aria-focus";
-const $5671b20cf9b562b2$export$9db568f6321ad9dc = "react-aria-update-activedescendant";
 function $21f1aa98acb08317$export$16792effe837dba3(e) {
   if ($c87311424ea30a05$export$9ac100e40613ea10()) return e.metaKey;
   return e.ctrlKey;
@@ -164,6 +162,8 @@ class $23b9f4fcf0fe224b$export$d68d59712b04d9d1 {
     node.lastChildKey = this.lastChildKey;
     node.props = this.props;
     node.render = this.render;
+    node.colSpan = this.colSpan;
+    node.colIndex = this.colIndex;
     return node;
   }
   constructor(type, key) {
@@ -180,6 +180,8 @@ class $23b9f4fcf0fe224b$export$d68d59712b04d9d1 {
     this.firstChildKey = null;
     this.lastChildKey = null;
     this.props = {};
+    this.colSpan = null;
+    this.colIndex = null;
     this.type = type;
     this.key = key;
   }
@@ -275,14 +277,14 @@ class $23b9f4fcf0fe224b$export$408d25a4e12db025 {
   // Will need to handle varying levels I assume but will revisit after I get searchable menu working for base menu
   // TODO: an alternative is to simply walk the collection and add all item nodes that match the filter and any sections/separators we encounter
   // to an array, then walk that new array and fix all the next/Prev keys while adding them to the new collection
-  filter(filterFn) {
+  UNSTABLE_filter(filterFn) {
     let newCollection = new $23b9f4fcf0fe224b$export$408d25a4e12db025();
     let lastNode = null;
     for (let node of this) {
       if (node.type === "section" && node.hasChildNodes) {
         let clonedSection = node.clone();
         let lastChildInSection = null;
-        for (let child of this.getChildren(node.key)) if (filterFn(child.textValue) || child.type === "header") {
+        for (let child of this.getChildren(node.key)) if ($23b9f4fcf0fe224b$var$shouldKeepNode(child, filterFn, this, newCollection)) {
           let clonedChild = child.clone();
           if (lastChildInSection == null) clonedSection.firstChildKey = clonedChild.key;
           if (newCollection.firstKey == null) newCollection.firstKey = clonedSection.key;
@@ -319,16 +321,18 @@ class $23b9f4fcf0fe224b$export$408d25a4e12db025 {
           lastNode = clonedSeparator;
           newCollection.addNode(clonedSeparator);
         }
-      } else if (filterFn(node.textValue)) {
+      } else {
         let clonedNode = node.clone();
-        if (newCollection.firstKey == null) newCollection.firstKey = clonedNode.key;
-        if (lastNode != null && lastNode.type !== "section" && lastNode.type !== "separator" && lastNode.parentKey === clonedNode.parentKey) {
-          lastNode.nextKey = clonedNode.key;
-          clonedNode.prevKey = lastNode.key;
-        } else clonedNode.prevKey = null;
-        clonedNode.nextKey = null;
-        newCollection.addNode(clonedNode);
-        lastNode = clonedNode;
+        if ($23b9f4fcf0fe224b$var$shouldKeepNode(clonedNode, filterFn, this, newCollection)) {
+          if (newCollection.firstKey == null) newCollection.firstKey = clonedNode.key;
+          if (lastNode != null && lastNode.type !== "section" && lastNode.type !== "separator" && lastNode.parentKey === clonedNode.parentKey) {
+            lastNode.nextKey = clonedNode.key;
+            clonedNode.prevKey = lastNode.key;
+          } else clonedNode.prevKey = null;
+          clonedNode.nextKey = null;
+          newCollection.addNode(clonedNode);
+          lastNode = clonedNode;
+        }
       }
     }
     if ((lastNode === null || lastNode === void 0 ? void 0 : lastNode.type) === "separator" && lastNode.nextKey === null) {
@@ -350,6 +354,19 @@ class $23b9f4fcf0fe224b$export$408d25a4e12db025 {
     this.frozen = false;
   }
 }
+function $23b9f4fcf0fe224b$var$shouldKeepNode(node, filterFn, oldCollection, newCollection) {
+  if (node.type === "subdialogtrigger" || node.type === "submenutrigger") {
+    let triggerChild = [
+      ...oldCollection.getChildren(node.key)
+    ][0];
+    if (triggerChild && filterFn(triggerChild.textValue)) {
+      let clonedChild = triggerChild.clone();
+      newCollection.addNode(clonedChild);
+      return true;
+    } else return false;
+  } else if (node.type === "header") return true;
+  else return filterFn(node.textValue);
+}
 class $681cc3c98f569e39$export$410b0c854570d131 {
   *[Symbol.iterator]() {
     let node = this.firstChild;
@@ -498,6 +515,14 @@ class $681cc3c98f569e39$export$dc064fe9e59310fd extends $681cc3c98f569e39$export
     node.firstChildKey = (_this_firstChild_node_key = (_this_firstChild = this.firstChild) === null || _this_firstChild === void 0 ? void 0 : _this_firstChild.node.key) !== null && _this_firstChild_node_key !== void 0 ? _this_firstChild_node_key : null;
     var _this_lastChild_node_key;
     node.lastChildKey = (_this_lastChild_node_key = (_this_lastChild = this.lastChild) === null || _this_lastChild === void 0 ? void 0 : _this_lastChild.node.key) !== null && _this_lastChild_node_key !== void 0 ? _this_lastChild_node_key : null;
+    if ((node.colSpan != null || node.colIndex != null) && this.nextSibling) {
+      var _node_colIndex, _node_colSpan;
+      let nextColIndex = ((_node_colIndex = node.colIndex) !== null && _node_colIndex !== void 0 ? _node_colIndex : node.index) + ((_node_colSpan = node.colSpan) !== null && _node_colSpan !== void 0 ? _node_colSpan : 1);
+      if (nextColIndex !== this.nextSibling.node.colIndex) {
+        let siblingNode = this.ownerDocument.getMutableNode(this.nextSibling);
+        siblingNode.colIndex = nextColIndex;
+      }
+    }
   }
   setProps(obj, ref, rendered, render) {
     let node = this.ownerDocument.getMutableNode(this);
@@ -512,6 +537,7 @@ class $681cc3c98f569e39$export$dc064fe9e59310fd extends $681cc3c98f569e39$export
       if (this.hasSetProps) throw new Error("Cannot change the id of an item");
       node.key = id;
     }
+    if (props.colSpan != null) node.colSpan = props.colSpan;
     if (!this.hasSetProps) {
       this.ownerDocument.addNode(this);
       this.ownerDocument.endTransaction();
@@ -600,9 +626,9 @@ class $681cc3c98f569e39$export$b34a105447964f9f extends $681cc3c98f569e39$export
       var _this_firstChild, _this_lastChild;
       let collection = this.getMutableCollection();
       for (let element of this.mutatedNodes) if (element.isConnected) collection.addNode(element.node);
+      this.mutatedNodes.clear();
       var _this_firstChild_node_key, _this_lastChild_node_key;
       collection.commit((_this_firstChild_node_key = (_this_firstChild = this.firstChild) === null || _this_firstChild === void 0 ? void 0 : _this_firstChild.node.key) !== null && _this_firstChild_node_key !== void 0 ? _this_firstChild_node_key : null, (_this_lastChild_node_key = (_this_lastChild = this.lastChild) === null || _this_lastChild === void 0 ? void 0 : _this_lastChild.node.key) !== null && _this_lastChild_node_key !== void 0 ? _this_lastChild_node_key : null, this.isSSR);
-      this.mutatedNodes.clear();
     }
     this.collectionMutated = false;
   }
@@ -663,6 +689,61 @@ function $e948873055cbafe4$export$727c8fc270210f13(props) {
     addIdAndValue
   ]);
 }
+const $8a26561d2877236e$var$DEFAULT_THRESHOLD = 500;
+function $8a26561d2877236e$export$c24ed0104d07eab9(props) {
+  let { isDisabled, onLongPressStart, onLongPressEnd, onLongPress, threshold = $8a26561d2877236e$var$DEFAULT_THRESHOLD, accessibilityDescription } = props;
+  const timeRef = useRef(void 0);
+  let { addGlobalListener, removeGlobalListener } = $03deb23ff14920c4$export$4eaf04e54aa8eed6();
+  let { pressProps } = $f6c31cce2adf654f$export$45712eceda6fad21({
+    isDisabled,
+    onPressStart(e) {
+      e.continuePropagation();
+      if (e.pointerType === "mouse" || e.pointerType === "touch") {
+        if (onLongPressStart) onLongPressStart({
+          ...e,
+          type: "longpressstart"
+        });
+        timeRef.current = setTimeout(() => {
+          e.target.dispatchEvent(new PointerEvent("pointercancel", {
+            bubbles: true
+          }));
+          if ($431fbd86ca7dc216$export$b204af158042fbac(e.target).activeElement !== e.target) $7215afc6de606d6b$export$de79e2c695e052f3(e.target);
+          if (onLongPress) onLongPress({
+            ...e,
+            type: "longpress"
+          });
+          timeRef.current = void 0;
+        }, threshold);
+        if (e.pointerType === "touch") {
+          let onContextMenu = (e2) => {
+            e2.preventDefault();
+          };
+          addGlobalListener(e.target, "contextmenu", onContextMenu, {
+            once: true
+          });
+          addGlobalListener(window, "pointerup", () => {
+            setTimeout(() => {
+              removeGlobalListener(e.target, "contextmenu", onContextMenu);
+            }, 30);
+          }, {
+            once: true
+          });
+        }
+      }
+    },
+    onPressEnd(e) {
+      if (timeRef.current) clearTimeout(timeRef.current);
+      if (onLongPressEnd && (e.pointerType === "mouse" || e.pointerType === "touch")) onLongPressEnd({
+        ...e,
+        type: "longpressend"
+      });
+    }
+  });
+  let descriptionProps = $ef06256079686ba0$export$f8aeda7b10753fa1(onLongPress && !isDisabled ? accessibilityDescription : void 0);
+  return {
+    longPressProps: $3ef42575df84b30b$export$9d1611c77c2fe928(pressProps, descriptionProps)
+  };
+}
 var shim = { exports: {} };
 var useSyncExternalStoreShim_production = {};
 /**
@@ -901,14 +982,20 @@ function $e1995378a142960e$var$useSSRCollectionNode(Type, props, ref, rendered,
 function $e1995378a142960e$export$18af5c7a9e9b3664(type, render) {
   let Component = ({ node }) => render(node.props, node.props.ref, node);
   let Result = forwardRef((props, ref) => {
+    let focusableProps = useContext($f645667febf57a63$export$f9762fab77588ecb);
     let isShallow = useContext($e1995378a142960e$var$ShallowRenderContext);
     if (!isShallow) {
       if (render.length >= 3) throw new Error(render.name + " cannot be rendered outside a collection.");
       return render(props, ref);
     }
-    return $e1995378a142960e$var$useSSRCollectionNode(type, props, ref, "children" in props ? props.children : null, null, (node) => /* @__PURE__ */ React__default.createElement(Component, {
-      node
-    }));
+    return $e1995378a142960e$var$useSSRCollectionNode(type, props, ref, "children" in props ? props.children : null, null, (node) => (
+      // Forward FocusableContext to real DOM tree so tooltips work.
+      /* @__PURE__ */ React__default.createElement($f645667febf57a63$export$f9762fab77588ecb.Provider, {
+        value: focusableProps
+      }, /* @__PURE__ */ React__default.createElement(Component, {
+        node
+      }))
+    ));
   });
   Result.displayName = render.name;
   return Result;
@@ -967,63 +1054,56 @@ function $e1995378a142960e$var$CollectionRoot({ children }) {
     value: doc
   }, wrappedChildren) : /* @__PURE__ */ reactDomExports.createPortal(wrappedChildren, doc);
 }
-const $8a26561d2877236e$var$DEFAULT_THRESHOLD = 500;
-function $8a26561d2877236e$export$c24ed0104d07eab9(props) {
-  let { isDisabled, onLongPressStart, onLongPressEnd, onLongPress, threshold = $8a26561d2877236e$var$DEFAULT_THRESHOLD, accessibilityDescription } = props;
-  const timeRef = useRef(void 0);
-  let { addGlobalListener, removeGlobalListener } = $03deb23ff14920c4$export$4eaf04e54aa8eed6();
-  let { pressProps } = $f6c31cce2adf654f$export$45712eceda6fad21({
-    isDisabled,
-    onPressStart(e) {
-      e.continuePropagation();
-      if (e.pointerType === "mouse" || e.pointerType === "touch") {
-        if (onLongPressStart) onLongPressStart({
-          ...e,
-          type: "longpressstart"
-        });
-        timeRef.current = setTimeout(() => {
-          e.target.dispatchEvent(new PointerEvent("pointercancel", {
-            bubbles: true
-          }));
-          if (onLongPress) onLongPress({
-            ...e,
-            type: "longpress"
-          });
-          timeRef.current = void 0;
-        }, threshold);
-        if (e.pointerType === "touch") {
-          let onContextMenu = (e2) => {
-            e2.preventDefault();
-          };
-          addGlobalListener(e.target, "contextmenu", onContextMenu, {
-            once: true
-          });
-          addGlobalListener(window, "pointerup", () => {
-            setTimeout(() => {
-              removeGlobalListener(e.target, "contextmenu", onContextMenu);
-            }, 30);
-          }, {
-            once: true
-          });
-        }
-      }
-    },
-    onPressEnd(e) {
-      if (timeRef.current) clearTimeout(timeRef.current);
-      if (onLongPressEnd && (e.pointerType === "mouse" || e.pointerType === "touch")) onLongPressEnd({
-        ...e,
-        type: "longpressend"
-      });
-    }
-  });
-  let descriptionProps = $ef06256079686ba0$export$f8aeda7b10753fa1(onLongPress && !isDisabled ? accessibilityDescription : void 0);
-  return {
-    longPressProps: $3ef42575df84b30b$export$9d1611c77c2fe928(pressProps, descriptionProps)
-  };
+function $55f9b1ae81f22853$export$76e4e37e5339496d(to) {
+  let from = $55f9b1ae81f22853$export$759df0d867455a91($431fbd86ca7dc216$export$b204af158042fbac(to));
+  if (from !== to) {
+    if (from) $55f9b1ae81f22853$export$6c5dc7e81d2cc29a(from, to);
+    if (to) $55f9b1ae81f22853$export$2b35b76d2e30e129(to, from);
+  }
+}
+function $55f9b1ae81f22853$export$6c5dc7e81d2cc29a(from, to) {
+  from.dispatchEvent(new FocusEvent("blur", {
+    relatedTarget: to
+  }));
+  from.dispatchEvent(new FocusEvent("focusout", {
+    bubbles: true,
+    relatedTarget: to
+  }));
+}
+function $55f9b1ae81f22853$export$2b35b76d2e30e129(to, from) {
+  to.dispatchEvent(new FocusEvent("focus", {
+    relatedTarget: from
+  }));
+  to.dispatchEvent(new FocusEvent("focusin", {
+    bubbles: true,
+    relatedTarget: from
+  }));
+}
+function $55f9b1ae81f22853$export$759df0d867455a91(document2) {
+  let activeElement = $d4ee10de306f2510$export$cd4e5573fbe2b576(document2);
+  let activeDescendant = activeElement === null || activeElement === void 0 ? void 0 : activeElement.getAttribute("aria-activedescendant");
+  if (activeDescendant) return document2.getElementById(activeDescendant) || activeElement;
+  return activeElement;
 }
 function $feb5ffebff200149$export$d3e3bd3e26688c04(e) {
   return $c87311424ea30a05$export$e1865c3bedcd822b() ? e.altKey : e.ctrlKey;
 }
+function $feb5ffebff200149$export$c3d8340acf92597f(collectionRef, key) {
+  var _collectionRef_current, _collectionRef_current1;
+  let selector = `[data-key="${CSS.escape(String(key))}"]`;
+  let collection = (_collectionRef_current = collectionRef.current) === null || _collectionRef_current === void 0 ? void 0 : _collectionRef_current.dataset.collection;
+  if (collection) selector = `[data-collection="${CSS.escape(collection)}"]${selector}`;
+  return (_collectionRef_current1 = collectionRef.current) === null || _collectionRef_current1 === void 0 ? void 0 : _collectionRef_current1.querySelector(selector);
+}
+const $feb5ffebff200149$var$collectionMap = /* @__PURE__ */ new WeakMap();
+function $feb5ffebff200149$export$881eb0d9f3605d9d(collection) {
+  let id = $bdb11010cef70236$export$f680877a34711e37();
+  $feb5ffebff200149$var$collectionMap.set(collection, id);
+  return id;
+}
+function $feb5ffebff200149$export$6aeb1680a0ae8741(collection) {
+  return $feb5ffebff200149$var$collectionMap.get(collection);
+}
 const $fb3050f43d946246$var$TYPEAHEAD_DEBOUNCE_WAIT_MS = 1e3;
 function $fb3050f43d946246$export$e32c88dfddc6e1d8(options) {
   let { keyboardDelegate, selectionManager, onTypeSelect } = options;
@@ -1075,11 +1155,10 @@ function $ae20dd8cbca75726$export$d6daf82dcd84e87c(options) {
     const navigateToKey = (key, childFocus) => {
       if (key != null) {
         if (manager.isLink(key) && linkBehavior === "selection" && selectOnFocus && !$feb5ffebff200149$export$d3e3bd3e26688c04(e)) {
-          var _scrollRef_current;
           reactDomExports.flushSync(() => {
             manager.setFocusedKey(key, childFocus);
           });
-          let item = (_scrollRef_current = scrollRef.current) === null || _scrollRef_current === void 0 ? void 0 : _scrollRef_current.querySelector(`[data-key="${CSS.escape(key.toString())}"]`);
+          let item = $feb5ffebff200149$export$c3d8340acf92597f(ref, key);
           let itemProps = manager.getItemProps(key);
           if (item) router.open(item, e, itemProps.href, itemProps.routerOptions);
           return;
@@ -1230,24 +1309,24 @@ function $ae20dd8cbca75726$export$d6daf82dcd84e87c(options) {
     manager.setFocused(true);
     if (manager.focusedKey == null) {
       var _delegate_getLastKey, _delegate_getFirstKey;
-      let navigateToFirstKey = (key) => {
+      let navigateToKey = (key) => {
         if (key != null) {
           manager.setFocusedKey(key);
-          if (selectOnFocus) manager.replaceSelection(key);
+          if (selectOnFocus && !manager.isSelected(key)) manager.replaceSelection(key);
         }
       };
       let relatedTarget = e.relatedTarget;
       var _manager_lastSelectedKey, _manager_firstSelectedKey;
-      if (relatedTarget && e.currentTarget.compareDocumentPosition(relatedTarget) & Node.DOCUMENT_POSITION_FOLLOWING) navigateToFirstKey((_manager_lastSelectedKey = manager.lastSelectedKey) !== null && _manager_lastSelectedKey !== void 0 ? _manager_lastSelectedKey : (_delegate_getLastKey = delegate.getLastKey) === null || _delegate_getLastKey === void 0 ? void 0 : _delegate_getLastKey.call(delegate));
-      else navigateToFirstKey((_manager_firstSelectedKey = manager.firstSelectedKey) !== null && _manager_firstSelectedKey !== void 0 ? _manager_firstSelectedKey : (_delegate_getFirstKey = delegate.getFirstKey) === null || _delegate_getFirstKey === void 0 ? void 0 : _delegate_getFirstKey.call(delegate));
+      if (relatedTarget && e.currentTarget.compareDocumentPosition(relatedTarget) & Node.DOCUMENT_POSITION_FOLLOWING) navigateToKey((_manager_lastSelectedKey = manager.lastSelectedKey) !== null && _manager_lastSelectedKey !== void 0 ? _manager_lastSelectedKey : (_delegate_getLastKey = delegate.getLastKey) === null || _delegate_getLastKey === void 0 ? void 0 : _delegate_getLastKey.call(delegate));
+      else navigateToKey((_manager_firstSelectedKey = manager.firstSelectedKey) !== null && _manager_firstSelectedKey !== void 0 ? _manager_firstSelectedKey : (_delegate_getFirstKey = delegate.getFirstKey) === null || _delegate_getFirstKey === void 0 ? void 0 : _delegate_getFirstKey.call(delegate));
     } else if (!isVirtualized && scrollRef.current) {
       scrollRef.current.scrollTop = scrollPos.current.top;
       scrollRef.current.scrollLeft = scrollPos.current.left;
     }
     if (manager.focusedKey != null && scrollRef.current) {
-      let element = scrollRef.current.querySelector(`[data-key="${CSS.escape(manager.focusedKey.toString())}"]`);
-      if (element) {
-        if (!element.contains(document.activeElement)) $7215afc6de606d6b$export$de79e2c695e052f3(element);
+      let element = $feb5ffebff200149$export$c3d8340acf92597f(ref, manager.focusedKey);
+      if (element instanceof HTMLElement) {
+        if (!element.contains(document.activeElement) && !shouldUseVirtualFocus) $7215afc6de606d6b$export$de79e2c695e052f3(element);
         let modality = $507fabe10e71c6fb$export$630ff653c5ada6a9();
         if (modality === "keyboard") $2f04cbc44ee30ce0$export$c826860796309d1b(element, {
           containingElement: ref.current
@@ -1270,11 +1349,7 @@ function $ae20dd8cbca75726$export$d6daf82dcd84e87c(options) {
     var _delegate_getFirstKey1;
     let keyToFocus = (_delegate_getFirstKey1 = (_delegate_getFirstKey = delegate.getFirstKey) === null || _delegate_getFirstKey === void 0 ? void 0 : _delegate_getFirstKey.call(delegate)) !== null && _delegate_getFirstKey1 !== void 0 ? _delegate_getFirstKey1 : null;
     if (keyToFocus == null) {
-      var _ref_current;
-      (_ref_current = ref.current) === null || _ref_current === void 0 ? void 0 : _ref_current.dispatchEvent(new CustomEvent($5671b20cf9b562b2$export$9db568f6321ad9dc, {
-        cancelable: true,
-        bubbles: true
-      }));
+      $55f9b1ae81f22853$export$76e4e37e5339496d(ref.current);
       if (manager.collection.size > 0) shouldVirtualFocusFirst.current = false;
     } else {
       manager.setFocusedKey(keyToFocus);
@@ -1297,11 +1372,13 @@ function $ae20dd8cbca75726$export$d6daf82dcd84e87c(options) {
     resetFocusFirstFlag
   ]);
   $e9faafb641e167db$export$90fc3a17d93f704c(ref, $5671b20cf9b562b2$export$447a38995de2c711, !shouldUseVirtualFocus ? void 0 : (e) => {
+    var _e_detail;
     e.stopPropagation();
     manager.setFocused(false);
-    manager.setFocusedKey(null);
+    if ((_e_detail = e.detail) === null || _e_detail === void 0 ? void 0 : _e_detail.clearFocusKey) manager.setFocusedKey(null);
   });
   const autoFocusRef = useRef(autoFocus);
+  const didAutoFocusRef = useRef(false);
   useEffect(() => {
     if (autoFocusRef.current) {
       var _delegate_getFirstKey, _delegate_getLastKey;
@@ -1319,26 +1396,30 @@ function $ae20dd8cbca75726$export$d6daf82dcd84e87c(options) {
       }
       manager.setFocused(true);
       manager.setFocusedKey(focusedKey);
-      if (focusedKey == null && !shouldUseVirtualFocus && ref.current) $6a99195332edec8b$export$80f3e147d781571c(ref.current);
+      if (focusedKey == null && !shouldUseVirtualFocus && ref.current) $3ad3f6e1647bc98d$export$80f3e147d781571c(ref.current);
+      if (manager.collection.size > 0) {
+        autoFocusRef.current = false;
+        didAutoFocusRef.current = true;
+      }
     }
-  }, []);
+  });
   let lastFocusedKey = useRef(manager.focusedKey);
   useEffect(() => {
-    if (manager.isFocused && manager.focusedKey != null && (manager.focusedKey !== lastFocusedKey.current || autoFocusRef.current) && scrollRef.current && ref.current) {
+    if (manager.isFocused && manager.focusedKey != null && (manager.focusedKey !== lastFocusedKey.current || didAutoFocusRef.current) && scrollRef.current && ref.current) {
       let modality = $507fabe10e71c6fb$export$630ff653c5ada6a9();
-      let element = ref.current.querySelector(`[data-key="${CSS.escape(manager.focusedKey.toString())}"]`);
-      if (!element)
+      let element = $feb5ffebff200149$export$c3d8340acf92597f(ref, manager.focusedKey);
+      if (!(element instanceof HTMLElement))
         return;
-      if (modality === "keyboard" || autoFocusRef.current) {
+      if (modality === "keyboard" || didAutoFocusRef.current) {
         $2f04cbc44ee30ce0$export$53a0910f038337bd(scrollRef.current, element);
         if (modality !== "virtual") $2f04cbc44ee30ce0$export$c826860796309d1b(element, {
           containingElement: ref.current
         });
       }
     }
-    if (!shouldUseVirtualFocus && manager.isFocused && manager.focusedKey == null && lastFocusedKey.current != null && ref.current) $6a99195332edec8b$export$80f3e147d781571c(ref.current);
+    if (!shouldUseVirtualFocus && manager.isFocused && manager.focusedKey == null && lastFocusedKey.current != null && ref.current) $3ad3f6e1647bc98d$export$80f3e147d781571c(ref.current);
     lastFocusedKey.current = manager.focusedKey;
-    autoFocusRef.current = false;
+    didAutoFocusRef.current = false;
   });
   $e9faafb641e167db$export$90fc3a17d93f704c(ref, "react-aria-focus-scope-restore", (e) => {
     e.preventDefault();
@@ -1360,12 +1441,12 @@ function $ae20dd8cbca75726$export$d6daf82dcd84e87c(options) {
   if (!disallowTypeAhead) handlers = $3ef42575df84b30b$export$9d1611c77c2fe928(typeSelectProps, handlers);
   let tabIndex = void 0;
   if (!shouldUseVirtualFocus) tabIndex = manager.focusedKey == null ? 0 : -1;
-  else tabIndex = -1;
+  let collectionId = $feb5ffebff200149$export$881eb0d9f3605d9d(manager.collection);
   return {
-    collectionProps: {
-      ...handlers,
-      tabIndex
-    }
+    collectionProps: $3ef42575df84b30b$export$9d1611c77c2fe928(handlers, {
+      tabIndex,
+      "data-collection": collectionId
+    })
   };
 }
 function $880e95eb8b93ba9a$export$ecf600387e221c37(options) {
@@ -1398,15 +1479,8 @@ function $880e95eb8b93ba9a$export$ecf600387e221c37(options) {
     if (isFocused && manager.isFocused) {
       if (!shouldUseVirtualFocus) {
         if (focus) focus();
-        else if (document.activeElement !== ref.current && ref.current) $6a99195332edec8b$export$80f3e147d781571c(ref.current);
-      } else {
-        var _ref_current;
-        let updateActiveDescendant = new CustomEvent($5671b20cf9b562b2$export$9db568f6321ad9dc, {
-          cancelable: true,
-          bubbles: true
-        });
-        (_ref_current = ref.current) === null || _ref_current === void 0 ? void 0 : _ref_current.dispatchEvent(updateActiveDescendant);
-      }
+        else if (document.activeElement !== ref.current && ref.current) $3ad3f6e1647bc98d$export$80f3e147d781571c(ref.current);
+      } else $55f9b1ae81f22853$export$76e4e37e5339496d(ref.current);
     }
   }, [
     ref,
@@ -1480,8 +1554,23 @@ function $880e95eb8b93ba9a$export$ecf600387e221c37(options) {
       }
     };
   }
+  itemProps["data-collection"] = $feb5ffebff200149$export$6aeb1680a0ae8741(manager.collection);
   itemProps["data-key"] = key;
   itemPressProps.preventFocusOnPress = shouldUseVirtualFocus;
+  if (shouldUseVirtualFocus) itemPressProps = $3ef42575df84b30b$export$9d1611c77c2fe928(itemPressProps, {
+    onPressStart(e) {
+      if (e.pointerType !== "touch") {
+        manager.setFocused(true);
+        manager.setFocusedKey(key);
+      }
+    },
+    onPress(e) {
+      if (e.pointerType === "touch") {
+        manager.setFocused(true);
+        manager.setFocusedKey(key);
+      }
+    }
+  });
   let { pressProps, isPressed } = $f6c31cce2adf654f$export$45712eceda6fad21(itemPressProps);
   let onDoubleClick = hasSecondaryAction ? (e) => {
     if (modality.current === "mouse") {
@@ -1506,12 +1595,21 @@ function $880e95eb8b93ba9a$export$ecf600387e221c37(options) {
     if (!$ea8dcbcb9ea1b556$export$95185d699e05d4d7.isOpening) e.preventDefault();
   } : void 0;
   return {
-    itemProps: $3ef42575df84b30b$export$9d1611c77c2fe928(itemProps, allowsSelection || hasPrimaryAction ? pressProps : {}, longPressEnabled ? longPressProps : {}, {
-      onDoubleClick,
-      onDragStartCapture,
-      onClick,
-      id
-    }),
+    itemProps: $3ef42575df84b30b$export$9d1611c77c2fe928(
+      itemProps,
+      allowsSelection || hasPrimaryAction || shouldUseVirtualFocus ? pressProps : {},
+      longPressEnabled ? longPressProps : {},
+      {
+        onDoubleClick,
+        onDragStartCapture,
+        onClick,
+        id
+      },
+      // Prevent DOM focus from moving on mouse down when using virtual focus
+      shouldUseVirtualFocus ? {
+        onMouseDown: (e) => e.preventDefault()
+      } : void 0
+    ),
     isPressed,
     isSelected: manager.isSelected(key),
     isFocused: manager.isFocused && manager.focusedKey === key,
@@ -2155,6 +2253,12 @@ class $d496c0a20b6e58ec$export$6c8a5aaad13c9852 {
     var _this_collection_getItem;
     return (_this_collection_getItem = this.collection.getItem(key)) === null || _this_collection_getItem === void 0 ? void 0 : _this_collection_getItem.props;
   }
+  withCollection(collection) {
+    return new $d496c0a20b6e58ec$export$6c8a5aaad13c9852(collection, this.state, {
+      allowsCellSelection: this.allowsCellSelection,
+      layoutDelegate: this.layoutDelegate || void 0
+    });
+  }
   constructor(collection, state, options) {
     this.collection = collection;
     this.state = state;
@@ -2215,12 +2319,14 @@ export {
   $7135fc7d473fd974$export$4feb769f8ddf26c5 as f,
   $7135fc7d473fd974$export$d40e14dec8b060a8 as g,
   $e1995378a142960e$export$18af5c7a9e9b3664 as h,
-  $ae20dd8cbca75726$export$d6daf82dcd84e87c as i,
-  $7135fc7d473fd974$export$90e00781bc59d8f9 as j,
-  $7135fc7d473fd974$export$a164736487e3f0ae as k,
-  $cc38e7bd3fc7b213$export$2bb74740c4e19def as l,
-  $c5a24bc478652b5f$export$1005530eda016c13 as m,
-  $fb3050f43d946246$export$e32c88dfddc6e1d8 as n,
-  $8a26561d2877236e$export$c24ed0104d07eab9 as o,
-  $e1995378a142960e$export$e953bb1cd0f19726 as p
+  $feb5ffebff200149$export$c3d8340acf92597f as i,
+  $cc38e7bd3fc7b213$export$2bb74740c4e19def as j,
+  $ae20dd8cbca75726$export$d6daf82dcd84e87c as k,
+  $c5a24bc478652b5f$export$1005530eda016c13 as l,
+  $7135fc7d473fd974$export$90e00781bc59d8f9 as m,
+  $7135fc7d473fd974$export$a164736487e3f0ae as n,
+  $fb3050f43d946246$export$e32c88dfddc6e1d8 as o,
+  $55f9b1ae81f22853$export$2b35b76d2e30e129 as p,
+  $8a26561d2877236e$export$c24ed0104d07eab9 as q,
+  $e1995378a142960e$export$e953bb1cd0f19726 as r
 };

package/dist/{Color-B0HgM8f4.js → Color-MV5kBVXr.js}

@@ -1,5 +1,5 @@
 import { a as $9446cca9a3875146$export$7d15b64cf5a3a4c4, b as $9446cca9a3875146$export$b6268554fba451f } from "./number-GajL10e1.js";
-import { a as $5b160d28a433310d$export$c17fa47878dc55b6, b as $6db58dc88e78b024$export$2f817fcdc4b89ae0 } from "./useLocalizedStringFormatter-BQ4TF72x.js";
+import { a as $5b160d28a433310d$export$c17fa47878dc55b6, b as $6db58dc88e78b024$export$2f817fcdc4b89ae0 } from "./useLocalizedStringFormatter-CFP1YZWQ.js";
 import { $ as $488c6ddbf4ef74c2$export$cc77c4ff7e8673c5 } from "./NumberFormatter-DA8u1Ot7.js";
 var $eccab2b0118aef08$exports = {};
 $eccab2b0118aef08$exports = {

package/dist/{ColorSwatch-Dv3Wxdl_.js → ColorSwatch-BqQfVu4L.js}

@@ -1,9 +1,9 @@
-import { f as $bdb11010cef70236$export$f680877a34711e37, a as $64fa3d84918910a7$export$29f1550f4b0d4415, b as $64fa3d84918910a7$export$4d86445c2cf5e3 } from "./utils-39D0mStj.js";
-import { $ as $799cddbef784668f$export$6e865ea70d7724f, a as $3493a52097159720$exports } from "./Color-B0HgM8f4.js";
-import { $ as $65484d02dcb7eb3e$export$457c3d6518dd4c6f } from "./filterDOMProps-EDDcM64A.js";
+import { e as $bdb11010cef70236$export$f680877a34711e37, a as $64fa3d84918910a7$export$29f1550f4b0d4415, b as $64fa3d84918910a7$export$4d86445c2cf5e3 } from "./utils-DkCSC521.js";
 import React__default, { useMemo, forwardRef, createContext } from "react";
-import { $ as $18f2051aff69b9bf$export$43bb16f9c6d9e3f7 } from "./context-CDOs-GuR.js";
-import { $ as $fca6afa0e843324b$export$f12b703ca79dfbb1 } from "./useLocalizedStringFormatter-BQ4TF72x.js";
+import { $ as $799cddbef784668f$export$6e865ea70d7724f, a as $3493a52097159720$exports } from "./Color-MV5kBVXr.js";
+import { $ as $65484d02dcb7eb3e$export$457c3d6518dd4c6f } from "./filterDOMProps-EDDcM64A.js";
+import { $ as $18f2051aff69b9bf$export$43bb16f9c6d9e3f7 } from "./context-D2KUdwNL.js";
+import { $ as $fca6afa0e843324b$export$f12b703ca79dfbb1 } from "./useLocalizedStringFormatter-CFP1YZWQ.js";
 function $parcel$interopDefault(a) {
   return a && a.__esModule ? a.default : a;
 }