@react-aria/focus - npm Package Compare versions

Comparing version 3.0.0-nightly-e37ad74f5-241101 to 3.0.0-nightly-e4497fdb6-250110

dist/FocusScope.main.js

 var $1c7f9157d722357d$exports = require("./focusSafely.main.js");
 var $d5156037ad898a4d$exports = require("./isElementVisible.main.js");
+var $euGna$reactariainteractions = require("@react-aria/interactions");
 var $euGna$reactariautils = require("@react-aria/utils");
@@ -35,2 +36,3 @@ var $euGna$react = require("react");
 
+
 const $a7a032acae3ddda9$var$FocusContext = /*#__PURE__*/ (0, ($parcel$interopDefault($euGna$react))).createContext(null);
@@ -230,3 +232,3 @@ const $a7a032acae3ddda9$var$RESTORE_FOCUS_EVENT = 'react-aria-focus-scope-restore';
     'video[controls]',
-    '[contenteditable]'
+    '[contenteditable]:not([contenteditable^="false"])'
 ];
@@ -301,4 +303,9 @@ const $a7a032acae3ddda9$var$FOCUSABLE_ELEMENT_SELECTOR = $a7a032acae3ddda9$var$focusableElements.join(':not([hidden]),') + ',[tabindex]:not([disabled]):not([hidden])';
             raf.current = requestAnimationFrame(()=>{
+                // Patches infinite focus coersion loop for Android Talkback where the user isn't able to move the virtual cursor
+                // if within a containing focus scope. Bug filed against Chrome: https://issuetracker.google.com/issues/384844019.
+                // Note that this means focus can leave focus containing modals due to this, but it is isolated to Chrome Talkback.
+                let modality = (0, $euGna$reactariainteractions.getInteractionModality)();
+                let shouldSkipFocusRestore = (modality === 'virtual' || modality === null) && (0, $euGna$reactariautils.isAndroid)() && (0, $euGna$reactariautils.isChrome)();
                 // Use document.activeElement instead of e.relatedTarget so we can tell if user clicked into iframe
-                if (ownerDocument.activeElement && $a7a032acae3ddda9$var$shouldContainFocus(scopeRef) && !$a7a032acae3ddda9$var$isElementInChildScope(ownerDocument.activeElement, scopeRef)) {
+                if (!shouldSkipFocusRestore && ownerDocument.activeElement && $a7a032acae3ddda9$var$shouldContainFocus(scopeRef) && !$a7a032acae3ddda9$var$isElementInChildScope(ownerDocument.activeElement, scopeRef)) {
                     $a7a032acae3ddda9$var$activeScope = scopeRef;
@@ -481,3 +488,3 @@ if (ownerDocument.body.contains(e.target)) {
             let focusedElement = ownerDocument.activeElement;
-            if (!$a7a032acae3ddda9$var$isElementInScope(focusedElement, scopeRef.current)) return;
+            if (!$a7a032acae3ddda9$var$isElementInChildScope(focusedElement, scopeRef) || !$a7a032acae3ddda9$var$shouldRestoreFocus(scopeRef)) return;
             let treeNode = $a7a032acae3ddda9$export$d06fae2ee68b101e.getTreeNode(scopeRef);
@@ -499,7 +506,7 @@ if (!treeNode) return;
             // next element after the node to restore to instead.
-            if ((!nextElement || !$a7a032acae3ddda9$var$isElementInScope(nextElement, scopeRef.current)) && nodeToRestore) {
+            if ((!nextElement || !$a7a032acae3ddda9$var$isElementInChildScope(nextElement, scopeRef)) && nodeToRestore) {
                 walker.currentNode = nodeToRestore;
                 // Skip over elements within the scope, in case the scope immediately follows the node to restore.
                 do nextElement = e.shiftKey ? walker.previousNode() : walker.nextNode();
-                while ($a7a032acae3ddda9$var$isElementInScope(nextElement, scopeRef.current));
+                while ($a7a032acae3ddda9$var$isElementInChildScope(nextElement, scopeRef));
                 e.preventDefault();
@@ -537,4 +544,3 @@ e.stopPropagation();
             // if we already lost focus to the body and this was the active scope, then we should attempt to restore
-            if (restoreFocus && nodeToRestore && // eslint-disable-next-line react-hooks/exhaustive-deps
-            ($a7a032acae3ddda9$var$isElementInScope(ownerDocument.activeElement, scopeRef.current) || ownerDocument.activeElement === ownerDocument.body && $a7a032acae3ddda9$var$shouldRestoreFocus(scopeRef))) {
+            if (restoreFocus && nodeToRestore && (ownerDocument.activeElement && $a7a032acae3ddda9$var$isElementInChildScope(ownerDocument.activeElement, scopeRef) || ownerDocument.activeElement === ownerDocument.body && $a7a032acae3ddda9$var$shouldRestoreFocus(scopeRef))) {
                 // freeze the focusScopeTree so it persists after the raf, otherwise during unmount nodes are removed from it
@@ -541,0 +547,0 @@ let clonedTree = $a7a032acae3ddda9$export$d06fae2ee68b101e.clone();

dist/FocusScope.module.js

 import {focusSafely as $6a99195332edec8b$export$80f3e147d781571c} from "./focusSafely.module.js";
 import {isElementVisible as $645f2e67b85a24c9$export$e989c0fffaa6b27a} from "./isElementVisible.module.js";
-import {useLayoutEffect as $cgawC$useLayoutEffect, getOwnerDocument as $cgawC$getOwnerDocument} from "@react-aria/utils";
+import {getInteractionModality as $cgawC$getInteractionModality} from "@react-aria/interactions";
+import {useLayoutEffect as $cgawC$useLayoutEffect, getOwnerDocument as $cgawC$getOwnerDocument, isAndroid as $cgawC$isAndroid, isChrome as $cgawC$isChrome} from "@react-aria/utils";
 import $cgawC$react, {useRef as $cgawC$useRef, useContext as $cgawC$useContext, useMemo as $cgawC$useMemo, useEffect as $cgawC$useEffect} from "react";
@@ -20,2 +21,3 @@
 
+
 const $9bf71ea28793e738$var$FocusContext = /*#__PURE__*/ (0, $cgawC$react).createContext(null);
@@ -215,3 +217,3 @@ const $9bf71ea28793e738$var$RESTORE_FOCUS_EVENT = 'react-aria-focus-scope-restore';
     'video[controls]',
-    '[contenteditable]'
+    '[contenteditable]:not([contenteditable^="false"])'
 ];
@@ -286,4 +288,9 @@ const $9bf71ea28793e738$var$FOCUSABLE_ELEMENT_SELECTOR = $9bf71ea28793e738$var$focusableElements.join(':not([hidden]),') + ',[tabindex]:not([disabled]):not([hidden])';
             raf.current = requestAnimationFrame(()=>{
+                // Patches infinite focus coersion loop for Android Talkback where the user isn't able to move the virtual cursor
+                // if within a containing focus scope. Bug filed against Chrome: https://issuetracker.google.com/issues/384844019.
+                // Note that this means focus can leave focus containing modals due to this, but it is isolated to Chrome Talkback.
+                let modality = (0, $cgawC$getInteractionModality)();
+                let shouldSkipFocusRestore = (modality === 'virtual' || modality === null) && (0, $cgawC$isAndroid)() && (0, $cgawC$isChrome)();
                 // Use document.activeElement instead of e.relatedTarget so we can tell if user clicked into iframe
-                if (ownerDocument.activeElement && $9bf71ea28793e738$var$shouldContainFocus(scopeRef) && !$9bf71ea28793e738$var$isElementInChildScope(ownerDocument.activeElement, scopeRef)) {
+                if (!shouldSkipFocusRestore && ownerDocument.activeElement && $9bf71ea28793e738$var$shouldContainFocus(scopeRef) && !$9bf71ea28793e738$var$isElementInChildScope(ownerDocument.activeElement, scopeRef)) {
                     $9bf71ea28793e738$var$activeScope = scopeRef;
@@ -466,3 +473,3 @@ if (ownerDocument.body.contains(e.target)) {
             let focusedElement = ownerDocument.activeElement;
-            if (!$9bf71ea28793e738$var$isElementInScope(focusedElement, scopeRef.current)) return;
+            if (!$9bf71ea28793e738$var$isElementInChildScope(focusedElement, scopeRef) || !$9bf71ea28793e738$var$shouldRestoreFocus(scopeRef)) return;
             let treeNode = $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef);
@@ -484,7 +491,7 @@ if (!treeNode) return;
             // next element after the node to restore to instead.
-            if ((!nextElement || !$9bf71ea28793e738$var$isElementInScope(nextElement, scopeRef.current)) && nodeToRestore) {
+            if ((!nextElement || !$9bf71ea28793e738$var$isElementInChildScope(nextElement, scopeRef)) && nodeToRestore) {
                 walker.currentNode = nodeToRestore;
                 // Skip over elements within the scope, in case the scope immediately follows the node to restore.
                 do nextElement = e.shiftKey ? walker.previousNode() : walker.nextNode();
-                while ($9bf71ea28793e738$var$isElementInScope(nextElement, scopeRef.current));
+                while ($9bf71ea28793e738$var$isElementInChildScope(nextElement, scopeRef));
                 e.preventDefault();
@@ -522,4 +529,3 @@ e.stopPropagation();
             // if we already lost focus to the body and this was the active scope, then we should attempt to restore
-            if (restoreFocus && nodeToRestore && // eslint-disable-next-line react-hooks/exhaustive-deps
-            ($9bf71ea28793e738$var$isElementInScope(ownerDocument.activeElement, scopeRef.current) || ownerDocument.activeElement === ownerDocument.body && $9bf71ea28793e738$var$shouldRestoreFocus(scopeRef))) {
+            if (restoreFocus && nodeToRestore && (ownerDocument.activeElement && $9bf71ea28793e738$var$isElementInChildScope(ownerDocument.activeElement, scopeRef) || ownerDocument.activeElement === ownerDocument.body && $9bf71ea28793e738$var$shouldRestoreFocus(scopeRef))) {
                 // freeze the focusScopeTree so it persists after the raf, otherwise during unmount nodes are removed from it
@@ -526,0 +532,0 @@ let clonedTree = $9bf71ea28793e738$export$d06fae2ee68b101e.clone();

dist/types.d.ts

@@ -130,3 +130,6 @@ import { FocusableElement, RefObject, DOMAttributes, FocusableDOMProps, FocusableProps } from "@react-types/shared";
 }
-export let FocusableProvider: React.ForwardRefExoticComponent<FocusableProviderProps & React.RefAttributes<FocusableElement>>;
+/**
+ * Provides DOM props to the nearest focusable child.
+ */
+export const FocusableProvider: React.ForwardRefExoticComponent<FocusableProviderProps & React.RefAttributes<FocusableElement>>;
 export interface FocusableAria {
@@ -133,0 +136,0 @@ /** Props for the focusable element. */

dist/useFocusable.main.js

@@ -39,5 +39,3 @@ var $1c7f9157d722357d$exports = require("./focusSafely.main.js");
 }
-/**
- * Provides DOM props to the nearest focusable child.
- */ function $fb504d83237fd6ac$var$FocusableProvider(props, ref) {
+const $fb504d83237fd6ac$export$13f3202a3e5ddd5 = /*#__PURE__*/ (0, ($parcel$interopDefault($ggOO2$react))).forwardRef(function FocusableProvider(props, ref) {
     let { children: children, ...otherProps } = props;
@@ -52,4 +50,3 @@ let objRef = (0, $ggOO2$reactariautils.useObjectRef)(ref);
     }, children);
-}
-let $fb504d83237fd6ac$export$13f3202a3e5ddd5 = /*#__PURE__*/ (0, ($parcel$interopDefault($ggOO2$react))).forwardRef($fb504d83237fd6ac$var$FocusableProvider);
+});
 function $fb504d83237fd6ac$export$4c014de7c8940b4c(props, domRef) {
@@ -56,0 +53,0 @@ let { focusProps: focusProps } = (0, $ggOO2$reactariainteractions.useFocus)(props);

dist/useFocusable.module.js

@@ -28,5 +28,3 @@ import {focusSafely as $6a99195332edec8b$export$80f3e147d781571c} from "./focusSafely.module.js";
 }
-/**
- * Provides DOM props to the nearest focusable child.
- */ function $e6afbd83fe6ebbd2$var$FocusableProvider(props, ref) {
+const $e6afbd83fe6ebbd2$export$13f3202a3e5ddd5 = /*#__PURE__*/ (0, $h8xso$react).forwardRef(function FocusableProvider(props, ref) {
     let { children: children, ...otherProps } = props;
@@ -41,4 +39,3 @@ let objRef = (0, $h8xso$useObjectRef)(ref);
     }, children);
-}
-let $e6afbd83fe6ebbd2$export$13f3202a3e5ddd5 = /*#__PURE__*/ (0, $h8xso$react).forwardRef($e6afbd83fe6ebbd2$var$FocusableProvider);
+});
 function $e6afbd83fe6ebbd2$export$4c014de7c8940b4c(props, domRef) {
@@ -45,0 +42,0 @@ let { focusProps: focusProps } = (0, $h8xso$useFocus)(props);

package.json

 {
   "name": "@react-aria/focus",
-  "version": "3.0.0-nightly-e37ad74f5-241101",
+  "version": "3.0.0-nightly-e4497fdb6-250110",
   "description": "Spectrum UI components in React",
@@ -25,5 +25,5 @@ "license": "Apache-2.0",
   "dependencies": {
-    "@react-aria/interactions": "^3.0.0-nightly-e37ad74f5-241101",
-    "@react-aria/utils": "^3.0.0-nightly-e37ad74f5-241101",
-    "@react-types/shared": "^3.0.0-nightly-e37ad74f5-241101",
+    "@react-aria/interactions": "3.0.0-nightly-e4497fdb6-250110",
+    "@react-aria/utils": "3.0.0-nightly-e4497fdb6-250110",
+    "@react-types/shared": "3.0.0-nightly-e4497fdb6-250110",
     "@swc/helpers": "^0.5.0",
@@ -33,8 +33,7 @@ "clsx": "^2.0.0"
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
-  },
-  "stableVersion": "3.18.4"
+  }
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

387906

increased by1.11%

Lines of code

4443

increased by0.27%

Dependency changes

• + Added@react-aria/interactions@3.0.0-nightly-e4497fdb6-250110(transitive)

• + Added@react-aria/ssr@3.0.0-nightly-e4497fdb6-250110(transitive)

• + Added@react-aria/utils@3.0.0-nightly-e4497fdb6-250110(transitive)

• + Added@react-stately/utils@3.0.0-nightly-e4497fdb6-250110(transitive)

• + Added@react-types/shared@3.0.0-nightly-e4497fdb6-250110(transitive)

• + Addedreact-dom@19.0.0(transitive)

• + Addedscheduler@0.25.0(transitive)

• - Removed@react-aria/interactions@3.22.5(transitive)

• - Removed@react-aria/ssr@3.9.7(transitive)

• - Removed@react-aria/utils@3.26.0(transitive)

• - Removed@react-stately/utils@3.10.5(transitive)

• - Removed@react-types/shared@3.26.0(transitive)

• Updated@react-aria/interactions@3.0.0-nightly-e4497fdb6-250110

• Updated@react-aria/utils@3.0.0-nightly-e4497fdb6-250110

• Updated@react-types/shared@3.0.0-nightly-e4497fdb6-250110