@react-aria/focus - npm Package Compare versions

Comparing version 3.0.0-nightly-a98da553e-241116 to 3.0.0-nightly-ab9fd5c68-241122

dist/FocusScope.main.js

@@ -478,3 +478,3 @@ var $1c7f9157d722357d$exports = require("./focusSafely.main.js");
             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);
@@ -496,7 +496,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();
@@ -534,4 +534,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
@@ -538,0 +537,0 @@ let clonedTree = $a7a032acae3ddda9$export$d06fae2ee68b101e.clone();

dist/FocusScope.module.js

@@ -463,3 +463,3 @@ import {focusSafely as $6a99195332edec8b$export$80f3e147d781571c} from "./focusSafely.module.js";
             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);
@@ -481,7 +481,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();
@@ -519,4 +519,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
@@ -523,0 +522,0 @@ let clonedTree = $9bf71ea28793e738$export$d06fae2ee68b101e.clone();

package.json

 {
   "name": "@react-aria/focus",
-  "version": "3.0.0-nightly-a98da553e-241116",
+  "version": "3.0.0-nightly-ab9fd5c68-241122",
   "description": "Spectrum UI components in React",
@@ -25,5 +25,5 @@ "license": "Apache-2.0",
   "dependencies": {
-    "@react-aria/interactions": "^3.0.0-nightly-a98da553e-241116",
-    "@react-aria/utils": "^3.0.0-nightly-a98da553e-241116",
-    "@react-types/shared": "^3.0.0-nightly-a98da553e-241116",
+    "@react-aria/interactions": "^3.0.0-nightly-ab9fd5c68-241122",
+    "@react-aria/utils": "^3.0.0-nightly-ab9fd5c68-241122",
+    "@react-types/shared": "^3.0.0-nightly-ab9fd5c68-241122",
     "@swc/helpers": "^0.5.0",
@@ -33,3 +33,3 @@ "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"
   },
@@ -39,3 +39,3 @@ "publishConfig": {
   },
-  "stableVersion": "3.18.4"
+  "stableVersion": "3.19.0"
 }

No alert changes

Worsened metrics

Total package byte prevSize

383603

decreased by-0.01%

Lines of code

4427

decreased by-0.09%

Dependency changes

• Updated@react-aria/interactions@^3.0.0-nightly-ab9fd5c68-241122

• Updated@react-aria/utils@^3.0.0-nightly-ab9fd5c68-241122

• Updated@react-types/shared@^3.0.0-nightly-ab9fd5c68-241122