@ariakit/react 0.4.27 → 0.4.29

package/cjs/__chunks/{NG34QRI6.cjs → BTARPES4.cjs}

@@ -15,7 +15,8 @@
 
 
 
-var _QAUJZR6Ycjs = require('./QAUJZR6Y.cjs');
+
+var _JBOLBTVUcjs = require('./JBOLBTVU.cjs');
 
 // ../ariakit-react-components/dist/focusable/focusable-context.js
 var _react = require('react');
@@ -25,7 +26,7 @@ var FocusableContext = _react.createContext.call(void 0, true);
 
 var TagName = "div";
 var accessibleWhenDisabledSymbol = /* @__PURE__ */ Symbol("accessibleWhenDisabled");
-var isSafariBrowser = _QAUJZR6Ycjs.isSafari.call(void 0, );
+var isSafariBrowser = _JBOLBTVUcjs.isSafari.call(void 0, );
 var alwaysFocusVisibleInputTypes = [
   "text",
   "search",
@@ -74,6 +75,17 @@ function needsSafariTabIndex(tagName, inputType) {
   }
   return false;
 }
+function isNativeSubmitControl(element) {
+  if (element.tagName === "BUTTON") {
+    const { type } = element;
+    return type === "submit";
+  }
+  if (element.tagName === "INPUT") {
+    const { type } = element;
+    return type === "submit" || type === "image";
+  }
+  return false;
+}
 function getTabIndex({ focusable, trulyDisabled, nativeTabbable, supportsDisabled, safariTabIndex, tabIndexProp }) {
   if (!focusable) return tabIndexProp;
   if (trulyDisabled) {
@@ -87,7 +99,7 @@ function getTabIndex({ focusable, trulyDisabled, nativeTabbable, supportsDisable
   return tabIndexProp != null ? tabIndexProp : 0;
 }
 function useDisableEvent(onEvent, disabled) {
-  return _QAUJZR6Ycjs.useEvent.call(void 0, (event) => {
+  return _JBOLBTVUcjs.useEvent.call(void 0, (event) => {
     onEvent == null ? void 0 : onEvent(event);
     if (event.defaultPrevented) return;
     if (disabled) {
@@ -100,9 +112,7 @@ var hasInstalledGlobalEventListeners = false;
 var isKeyboardModality = true;
 function onGlobalMouseDown(event) {
   const target = event.target;
-  if (target && "hasAttribute" in target) {
-    if (!target.hasAttribute("data-focus-visible")) isKeyboardModality = false;
-  }
+  if (_JBOLBTVUcjs.isElement.call(void 0, target) && !target.hasAttribute("data-focus-visible")) isKeyboardModality = false;
 }
 function onGlobalKeyDown(event) {
   if (event.metaKey) return;
@@ -110,27 +120,39 @@ function onGlobalKeyDown(event) {
   if (event.altKey) return;
   isKeyboardModality = true;
 }
-var useFocusable = _QAUJZR6Ycjs.createHook.call(void 0, function useFocusable2({ focusable = true, accessibleWhenDisabled, autoFocus, onFocusVisible, ...props }) {
+var useFocusable = _JBOLBTVUcjs.createHook.call(void 0, function useFocusable2({ focusable = true, accessibleWhenDisabled, autoFocus, onFocusVisible, ...props }) {
   const ref = _react.useRef.call(void 0, null);
-  const [parentAccessibleWhenDisabled, metadataProps] = _QAUJZR6Ycjs.useMetadataProps.call(void 0, props, accessibleWhenDisabledSymbol, accessibleWhenDisabled);
+  const [parentAccessibleWhenDisabled, metadataProps] = _JBOLBTVUcjs.useMetadataProps.call(void 0, props, accessibleWhenDisabledSymbol, accessibleWhenDisabled);
   accessibleWhenDisabled != null ? accessibleWhenDisabled : accessibleWhenDisabled = parentAccessibleWhenDisabled;
   _react.useEffect.call(void 0, () => {
     if (!focusable) return;
     if (hasInstalledGlobalEventListeners) return;
-    _QAUJZR6Ycjs.addGlobalEventListener.call(void 0, "mousedown", onGlobalMouseDown, true);
-    _QAUJZR6Ycjs.addGlobalEventListener.call(void 0, "keydown", onGlobalKeyDown, true);
+    _JBOLBTVUcjs.addGlobalEventListener.call(void 0, "mousedown", onGlobalMouseDown, true);
+    _JBOLBTVUcjs.addGlobalEventListener.call(void 0, "keydown", onGlobalKeyDown, true);
     hasInstalledGlobalEventListeners = true;
   }, [focusable]);
-  const disabled = focusable && _QAUJZR6Ycjs.disabledFromProps.call(void 0, props);
+  const disabled = focusable && _JBOLBTVUcjs.disabledFromProps.call(void 0, props);
   const trulyDisabled = disabled && !accessibleWhenDisabled;
   const [focusVisible, setFocusVisible] = _react.useState.call(void 0, false);
+  const focusVisibleRef = _react.useRef.call(void 0, false);
+  const nativeSubmitObserverCleanupRef = _react.useRef.call(void 0, null);
+  const cleanupFocusVisible = _JBOLBTVUcjs.useEvent.call(void 0, (element) => {
+    var _a;
+    (_a = nativeSubmitObserverCleanupRef.current) == null ? void 0 : _a.call(nativeSubmitObserverCleanupRef);
+    nativeSubmitObserverCleanupRef.current = null;
+    focusVisibleRef.current = false;
+    element == null ? void 0 : element.removeAttribute("data-focus-visible");
+  });
   _react.useEffect.call(void 0, () => {
     if (!focusable) return;
-    if (trulyDisabled && focusVisible) setFocusVisible(false);
+    if (!trulyDisabled) return;
+    cleanupFocusVisible(ref.current);
+    if (focusVisible) setFocusVisible(false);
   }, [
     focusable,
     trulyDisabled,
-    focusVisible
+    focusVisible,
+    cleanupFocusVisible
   ]);
   _react.useEffect.call(void 0, () => {
     if (!focusable) return;
@@ -139,74 +161,99 @@ var useFocusable = _QAUJZR6Ycjs.createHook.call(void 0, function useFocusable2({
     if (!element) return;
     if (typeof IntersectionObserver === "undefined") return;
     const observer = new IntersectionObserver(() => {
-      if (!_QAUJZR6Ycjs.isFocusable.call(void 0, element)) setFocusVisible(false);
+      if (!_JBOLBTVUcjs.isFocusable.call(void 0, element)) {
+        focusVisibleRef.current = false;
+        setFocusVisible(false);
+      }
     });
     observer.observe(element);
     return () => observer.disconnect();
   }, [focusable, focusVisible]);
+  _react.useEffect.call(void 0, () => {
+    return () => {
+      var _a;
+      return (_a = nativeSubmitObserverCleanupRef.current) == null ? void 0 : _a.call(nativeSubmitObserverCleanupRef);
+    };
+  }, []);
   const onKeyPressCapture = useDisableEvent(props.onKeyPressCapture, disabled);
   const onMouseDownCapture = useDisableEvent(props.onMouseDownCapture, disabled);
   const onClickCapture = useDisableEvent(props.onClickCapture, disabled);
   const handleFocusVisible = (event, currentTarget) => {
+    var _a;
     if (currentTarget) event.currentTarget = currentTarget;
     if (!focusable) return;
     const element = event.currentTarget;
     if (!element) return;
-    if (!_QAUJZR6Ycjs.hasFocus.call(void 0, element)) return;
+    if (!_JBOLBTVUcjs.hasFocus.call(void 0, element)) return;
     onFocusVisible == null ? void 0 : onFocusVisible(event);
     if (event.defaultPrevented) return;
     element.dataset.focusVisible = "true";
+    focusVisibleRef.current = true;
+    if (isNativeSubmitControl(element)) {
+      (_a = nativeSubmitObserverCleanupRef.current) == null ? void 0 : _a.call(nativeSubmitObserverCleanupRef);
+      nativeSubmitObserverCleanupRef.current = null;
+      if (typeof IntersectionObserver !== "undefined") {
+        const observer = new IntersectionObserver(() => {
+          if (_JBOLBTVUcjs.isFocusable.call(void 0, element)) return;
+          cleanupFocusVisible(element);
+        });
+        observer.observe(element);
+        nativeSubmitObserverCleanupRef.current = () => observer.disconnect();
+      }
+      return;
+    }
     setFocusVisible(true);
   };
   const onKeyDownCaptureProp = props.onKeyDownCapture;
-  const onKeyDownCapture = _QAUJZR6Ycjs.useEvent.call(void 0, (event) => {
+  const onKeyDownCapture = _JBOLBTVUcjs.useEvent.call(void 0, (event) => {
     onKeyDownCaptureProp == null ? void 0 : onKeyDownCaptureProp(event);
     if (event.defaultPrevented) return;
     if (!focusable) return;
     if (focusVisible) return;
+    if (focusVisibleRef.current) return;
     if (event.metaKey) return;
     if (event.altKey) return;
     if (event.ctrlKey) return;
-    if (!_QAUJZR6Ycjs.isSelfTarget.call(void 0, event)) return;
+    if (!_JBOLBTVUcjs.isSelfTarget.call(void 0, event)) return;
     const element = event.currentTarget;
     const applyFocusVisible = () => handleFocusVisible(event, element);
-    _QAUJZR6Ycjs.queueBeforeEvent.call(void 0, element, "focusout", applyFocusVisible);
+    _JBOLBTVUcjs.queueBeforeEvent.call(void 0, element, "focusout", applyFocusVisible);
   });
   const onFocusCaptureProp = props.onFocusCapture;
-  const onFocusCapture = _QAUJZR6Ycjs.useEvent.call(void 0, (event) => {
+  const onFocusCapture = _JBOLBTVUcjs.useEvent.call(void 0, (event) => {
     onFocusCaptureProp == null ? void 0 : onFocusCaptureProp(event);
     if (event.defaultPrevented) return;
     if (!focusable) return;
-    if (!_QAUJZR6Ycjs.isSelfTarget.call(void 0, event)) {
+    if (!_JBOLBTVUcjs.isSelfTarget.call(void 0, event)) {
       setFocusVisible(false);
       return;
     }
     const element = event.currentTarget;
     const applyFocusVisible = () => handleFocusVisible(event, element);
-    if (isKeyboardModality || isAlwaysFocusVisible(event.target)) _QAUJZR6Ycjs.queueBeforeEvent.call(void 0, event.target, "focusout", applyFocusVisible);
+    if (isKeyboardModality || isAlwaysFocusVisible(event.target)) _JBOLBTVUcjs.queueBeforeEvent.call(void 0, event.target, "focusout", applyFocusVisible);
     else setFocusVisible(false);
   });
   const onBlurProp = props.onBlur;
-  const onBlur = _QAUJZR6Ycjs.useEvent.call(void 0, (event) => {
+  const onBlur = _JBOLBTVUcjs.useEvent.call(void 0, (event) => {
     onBlurProp == null ? void 0 : onBlurProp(event);
     if (!focusable) return;
-    if (!_QAUJZR6Ycjs.isFocusEventOutside.call(void 0, event)) return;
-    event.currentTarget.removeAttribute("data-focus-visible");
+    if (!_JBOLBTVUcjs.isFocusEventOutside.call(void 0, event)) return;
+    cleanupFocusVisible(event.currentTarget);
     setFocusVisible(false);
   });
   const autoFocusOnShow = _react.useContext.call(void 0, FocusableContext);
-  const autoFocusRef = _QAUJZR6Ycjs.useEvent.call(void 0, (element) => {
+  const autoFocusRef = _JBOLBTVUcjs.useEvent.call(void 0, (element) => {
     if (!focusable) return;
     if (!autoFocus) return;
     if (!element) return;
     if (!autoFocusOnShow) return;
     queueMicrotask(() => {
-      if (_QAUJZR6Ycjs.hasFocus.call(void 0, element)) return;
-      if (!_QAUJZR6Ycjs.isFocusable.call(void 0, element)) return;
+      if (_JBOLBTVUcjs.hasFocus.call(void 0, element)) return;
+      if (!_JBOLBTVUcjs.isFocusable.call(void 0, element)) return;
       element.focus();
     });
   });
-  const tagName = _QAUJZR6Ycjs.useTagName.call(void 0, ref);
+  const tagName = _JBOLBTVUcjs.useTagName.call(void 0, ref);
   const nativeTabbable = focusable && isNativeTabbable(tagName);
   const supportsDisabled = focusable && supportsDisabledAttribute(tagName);
   const [safariTabIndex, setSafariTabIndex] = _react.useState.call(void 0, false);
@@ -232,7 +279,7 @@ var useFocusable = _QAUJZR6Ycjs.createHook.call(void 0, function useFocusable2({
     "aria-disabled": disabled || void 0,
     ...props,
     ...metadataProps,
-    ref: _QAUJZR6Ycjs.useMergeRefs.call(void 0, ref, autoFocusRef, props.ref),
+    ref: _JBOLBTVUcjs.useMergeRefs.call(void 0, ref, autoFocusRef, props.ref),
     style,
     tabIndex: getTabIndex({
       focusable,
@@ -251,10 +298,10 @@ var useFocusable = _QAUJZR6Ycjs.createHook.call(void 0, function useFocusable2({
     onFocusCapture,
     onBlur
   };
-  return _QAUJZR6Ycjs.removeUndefinedValues.call(void 0, props);
+  return _JBOLBTVUcjs.removeUndefinedValues.call(void 0, props);
 });
-var Focusable = _QAUJZR6Ycjs.forwardRef.call(void 0, function Focusable2(props) {
-  return _QAUJZR6Ycjs.createElement.call(void 0, TagName, useFocusable(props));
+var Focusable = _JBOLBTVUcjs.forwardRef.call(void 0, function Focusable2(props) {
+  return _JBOLBTVUcjs.createElement.call(void 0, TagName, useFocusable(props));
 });
 
 

package/cjs/__chunks/{LCX235VJ.cjs → CKHOJYDQ.cjs}

@@ -2,7 +2,7 @@
 
 
 
-var _QAUJZR6Ycjs = require('./QAUJZR6Y.cjs');
+var _JBOLBTVUcjs = require('./JBOLBTVU.cjs');
 
 // ../ariakit-react-components/dist/role/role.js
 var TagName = "div";
@@ -35,15 +35,15 @@ var elements = [
   "ul",
   "svg"
 ];
-var useRole = _QAUJZR6Ycjs.createHook.call(void 0, function useRole2(props) {
+var useRole = _JBOLBTVUcjs.createHook.call(void 0, function useRole2(props) {
   return props;
 });
-var Role = _QAUJZR6Ycjs.forwardRef.call(void 0, function Role2(props) {
-  return _QAUJZR6Ycjs.createElement.call(void 0, TagName, props);
+var Role = _JBOLBTVUcjs.forwardRef.call(void 0, function Role2(props) {
+  return _JBOLBTVUcjs.createElement.call(void 0, TagName, props);
 });
 Object.assign(Role, elements.reduce((acc, element) => {
-  acc[element] = _QAUJZR6Ycjs.forwardRef.call(void 0, function Role3(props) {
-    return _QAUJZR6Ycjs.createElement.call(void 0, element, props);
+  acc[element] = _JBOLBTVUcjs.forwardRef.call(void 0, function Role3(props) {
+    return _JBOLBTVUcjs.createElement.call(void 0, element, props);
   });
   return acc;
 }, {}));