@react-aria/focus - npm Package Compare versions

Comparing version 3.0.0-nightly-4f85a359f-241022 to 3.0.0-nightly-50c7ada5d-241219

dist/FocusScope.main.js

@@ -229,3 +229,3 @@ var $1c7f9157d722357d$exports = require("./focusSafely.main.js");
     'video[controls]',
-    '[contenteditable]'
+    '[contenteditable]:not([contenteditable^="false"])'
 ];
@@ -479,3 +479,3 @@ const $a7a032acae3ddda9$var$FOCUSABLE_ELEMENT_SELECTOR = $a7a032acae3ddda9$var$focusableElements.join(':not([hidden]),') + ',[tabindex]:not([disabled]):not([hidden])';
             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);
@@ -497,7 +497,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();
@@ -535,4 +535,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
@@ -539,0 +538,0 @@ let clonedTree = $a7a032acae3ddda9$export$d06fae2ee68b101e.clone();

dist/FocusScope.module.js

@@ -214,3 +214,3 @@ import {focusSafely as $6a99195332edec8b$export$80f3e147d781571c} from "./focusSafely.module.js";
     'video[controls]',
-    '[contenteditable]'
+    '[contenteditable]:not([contenteditable^="false"])'
 ];
@@ -464,3 +464,3 @@ const $9bf71ea28793e738$var$FOCUSABLE_ELEMENT_SELECTOR = $9bf71ea28793e738$var$focusableElements.join(':not([hidden]),') + ',[tabindex]:not([disabled]):not([hidden])';
             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);
@@ -482,7 +482,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();
@@ -520,4 +520,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
@@ -524,0 +523,0 @@ let clonedTree = $9bf71ea28793e738$export$d06fae2ee68b101e.clone();

dist/types.d.ts

@@ -122,3 +122,3 @@ import { FocusableElement, RefObject, DOMAttributes, FocusableDOMProps, FocusableProps } from "@react-types/shared";
 export function FocusRing(props: FocusRingProps): React.ReactElement<unknown, string | React.JSXElementConstructor<any>>;
-export interface FocusableOptions extends FocusableProps, FocusableDOMProps {
+export interface FocusableOptions<T = FocusableElement> extends FocusableProps<T>, FocusableDOMProps {
     /** Whether focus should be disabled. */
@@ -131,3 +131,6 @@ isDisabled?: boolean;
 }
-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 {
@@ -140,3 +143,3 @@ /** Props for the focusable element. */
  */
-export function useFocusable(props: FocusableOptions, domRef: RefObject<FocusableElement | null>): FocusableAria;
+export function useFocusable<T extends FocusableElement = FocusableElement>(props: FocusableOptions<T>, domRef: RefObject<FocusableElement | null>): FocusableAria;
 interface AriaHasTabbableChildOptions {
@@ -143,0 +146,0 @@ isDisabled?: boolean;

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-4f85a359f-241022",
+  "version": "3.0.0-nightly-50c7ada5d-241219",
   "description": "Spectrum UI components in React",
@@ -25,5 +25,5 @@ "license": "Apache-2.0",
   "dependencies": {
-    "@react-aria/interactions": "^3.0.0-nightly-4f85a359f-241022",
-    "@react-aria/utils": "^3.0.0-nightly-4f85a359f-241022",
-    "@react-types/shared": "^3.0.0-nightly-4f85a359f-241022",
+    "@react-aria/interactions": "3.0.0-nightly-50c7ada5d-241219",
+    "@react-aria/utils": "3.0.0-nightly-50c7ada5d-241219",
+    "@react-types/shared": "3.0.0-nightly-50c7ada5d-241219",
     "@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

Worsened metrics

Total package byte prevSize

383251

decreased by-0.01%

Lines of code

4419

decreased by-0.27%

Dependency changes

• + Added@react-aria/interactions@3.0.0-nightly-50c7ada5d-241219(transitive)

• + Added@react-aria/ssr@3.0.0-nightly-50c7ada5d-241219(transitive)

• + Added@react-aria/utils@3.0.0-nightly-50c7ada5d-241219(transitive)

• + Added@react-stately/utils@3.0.0-nightly-50c7ada5d-241219(transitive)

• + Added@react-types/shared@3.0.0-nightly-50c7ada5d-241219(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-50c7ada5d-241219

• Updated@react-aria/utils@3.0.0-nightly-50c7ada5d-241219

• Updated@react-types/shared@3.0.0-nightly-50c7ada5d-241219