Merge branch 'main' into bug-fix/8686/table-cell-incorrectly-returns-focus-to-button

Author: jsmitrah

.oxlintrc.json

@@ -6,10 +6,6 @@
     {
       "name": "monorepo",
       "specifier": "@jdb8/eslint-plugin-monorepo"
-    },
-    {
-      "name": "react-hooks-js",
-      "specifier": "eslint-plugin-react-hooks"
     }
   ],
   "categories": {
@@ -169,19 +165,7 @@
     "react/rules-of-hooks": "error",
     "react/exhaustive-deps": "warn",
 
-    // React Compiler rules
-    "react-hooks-js/config": "error",
-    "react-hooks-js/error-boundaries": "error",
-    "react-hooks-js/component-hook-factories": "error",
-    "react-hooks-js/gating": "error",
-    "react-hooks-js/globals": "error",
-    "react-hooks-js/purity": "error",
-    "react-hooks-js/set-state-in-effect": "warn",
-    "react-hooks-js/set-state-in-render": "error",
-    "react-hooks-js/static-components": "error",
-    "react-hooks-js/unsupported-syntax": "warn",
-    "react-hooks-js/use-memo": "error",
-    "react-hooks-js/incompatible-library": "warn",
+    "react/react-compiler": "error",
 
     "rsp-rules/no-react-key": ["error"],
     "rsp-rules/sort-imports": ["error"],

examples/rac-spectrum-tailwind/.yarn/install-state.gz

@@ -19,7 +19,7 @@
     "react-dom": "^18.2.0",
     "react-stately": "latest",
     "tailwindcss": "^4.0.0",
-    "tailwindcss-animate": "^1.0.5"
+    "tw-animate-css": "^1.4.0"
   },
   "devDependencies": {
     "process": "^0.11.10"

examples/rac-spectrum-tailwind/package.json

@@ -547,5 +547,5 @@ module.exports = {
       4: 'var(--spectrum-global-color-opacity-4)'
     }
   },
-  plugins: [require('tailwindcss-animate')]
+  plugins: []
 };

examples/rac-spectrum-tailwind/src/spectrum-preset.js

@@ -1,6 +1,7 @@
 @import 'tailwindcss' source('./');
 
 @config '../tailwind.config.js';
+@import 'tw-animate-css';
 
 * {
   -webkit-tap-highlight-color: transparent;

examples/rac-spectrum-tailwind/src/style.css

@@ -6065,7 +6065,7 @@ __metadata:
     react-dom: "npm:^18.2.0"
     react-stately: "npm:latest"
     tailwindcss: "npm:^4.0.0"
-    tailwindcss-animate: "npm:^1.0.5"
+    tw-animate-css: "npm:^1.4.0"
   languageName: unknown
   linkType: soft
 
@@ -6410,15 +6410,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tailwindcss-animate@npm:^1.0.5":
-  version: 1.0.7
-  resolution: "tailwindcss-animate@npm:1.0.7"
-  peerDependencies:
-    tailwindcss: "*"
-  checksum: 10c0/ec7dbd1631076b97d66a1fbaaa06e0725fccfa63119221e8d87a997b02dcede98ad88bb1ef6665b968f5d260fcefb10592e0299ca70208d365b37761edf5e19a
-  languageName: node
-  linkType: hard
-
 "tailwindcss@npm:4.1.13, tailwindcss@npm:^4.0.0":
   version: 4.1.13
   resolution: "tailwindcss@npm:4.1.13"
@@ -6479,6 +6470,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tw-animate-css@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "tw-animate-css@npm:1.4.0"
+  checksum: 10c0/6cfbc19ccc73883ec80ef1f9147f43e736cb01ee99c8172968b37eb81b720523d30e38b1a96aef92db3c586d864204db5510b51744ddacbbf0ad8e3c7fb56ec7
+  languageName: node
+  linkType: hard
+
 "type-fest@npm:^0.20.2":
   version: 0.20.2
   resolution: "type-fest@npm:0.20.2"

examples/rac-spectrum-tailwind/yarn.lock

@@ -153,7 +153,6 @@
     "diff": "^5.1.0",
     "eslint-import-resolver-node": "^0.3.10",
     "eslint-plugin-jest": "29.15.2",
-    "eslint-plugin-react-hooks": "^7.0.0",
     "exceljs": "^4.4.0",
     "fast-check": "^2.19.0",
     "fast-glob": "^3.1.0",
@@ -175,7 +174,7 @@
     "motion": "^12.23.6",
     "npm-cli-login": "^1.0.0",
     "oxfmt": "^0.48.0",
-    "oxlint": "^1.63.0",
+    "oxlint": "^1.71.0",
     "parcel": "^2.16.3",
     "parcel-optimizer-strict-mode": "workspace:^",
     "patch-package": "^6.2.0",
@@ -199,8 +198,8 @@
     "storybook-react-parcel": "workspace:^",
     "tailwind-variants": "patch:tailwind-variants@npm%3A0.3.1#~/.yarn/patches/tailwind-variants-npm-0.3.1-48888516de.patch",
     "tailwindcss": "^4.0.0",
-    "tailwindcss-animate": "^1.0.7",
     "tempy": "^0.5.0",
+    "tw-animate-css": "^1.4.0",
     "typescript": "^5.8.2",
     "unplugin-parcel-macros": "^0.1.1",
     "verdaccio": "^6.0.0",

package.json

@@ -127,6 +127,7 @@ const ResponsiveStyleTemplate = (props: ProviderProps): JSX.Element => (
 
 const CustomResponsivStylePropsTemplate = (props: ProviderProps): JSX.Element => {
   let Breakpoint = () => {
+    // oxlint-disable-next-line react/react-compiler
     let {matchedBreakpoints} = useBreakpoint()!;
     let breakpoint = matchedBreakpoints[0];
     let width = {
@@ -149,13 +150,15 @@ const CustomResponsivStylePropsTemplate = (props: ProviderProps): JSX.Element =>
   };
   return (
     <Provider breakpoints={{S: 480, M: 640, L: 1024}} UNSAFE_style={{padding: 50}} {...props}>
+      {/* oxlint-disable-next-line react/react-compiler */}
       <Breakpoint />
     </Provider>
   );
 };
 
 const BreakpointOmittedTemplate = (props: ProviderProps): JSX.Element => {
   let Breakpoint = () => {
+    // oxlint-disable-next-line react/react-compiler
     let {matchedBreakpoints} = useBreakpoint()!;
     let breakpoint = matchedBreakpoints[0];
     let width = {base: 'size-1600', S: 'size-2400', L: 'size-3400'};
@@ -170,6 +173,7 @@ const BreakpointOmittedTemplate = (props: ProviderProps): JSX.Element => {
   };
   return (
     <Provider UNSAFE_style={{padding: 50}} {...props}>
+      {/* oxlint-disable-next-line react/react-compiler */}
       <Breakpoint />
     </Provider>
   );

packages/@adobe/react-spectrum/chromatic/provider/Provider.stories.tsx

@@ -110,9 +110,8 @@ function ActionBarInner<T>(props: ActionBarInnerProps<T>, ref: Ref<HTMLDivElemen
   }
 
   let {keyboardProps} = useKeyboard({
-    onKeyDown(e) {
-      if (e.key === 'Escape') {
-        e.preventDefault();
+    shortcuts: {
+      Escape: () => {
         onClearSelection();
       }
     }

packages/@adobe/react-spectrum/src/actionbar/ActionBar.tsx

@@ -260,6 +260,7 @@ export const ActionGroup = forwardRef(function ActionGroup<T extends object>(
         return wrapperRef.current?.parentElement;
       }
     }),
+    // oxlint-disable-next-line react/react-compiler
     [wrapperRef]
   );
   useResizeObserver({
@@ -484,8 +485,11 @@ function ActionGroupMenu<T>({
   let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-spectrum/actiongroup');
 
   // The menu button shouldn't act like an actual action group item.
+  // oxlint-disable-next-line react/react-compiler
   delete buttonProps.onPress;
+  // oxlint-disable-next-line react/react-compiler
   delete buttonProps.role;
+  // oxlint-disable-next-line react/react-compiler
   delete buttonProps['aria-checked'];
 
   let {hoverProps, isHovered} = useHover({isDisabled});