diff --git a/docs/reference/generated/alert-dialog-root.json b/docs/reference/generated/alert-dialog-root.json
index f3e936c936..8457b68adf 100644
--- a/docs/reference/generated/alert-dialog-root.json
+++ b/docs/reference/generated/alert-dialog-root.json
@@ -15,7 +15,7 @@
       "type": "(open, event, reason) => void",
       "description": "Event handler called when the dialog is opened or closed."
     },
-    "action": {
+    "actionsRef": {
       "type": "{ current: { unmount: func } }",
       "description": "A ref to imperative actions."
     },
diff --git a/docs/reference/generated/dialog-root.json b/docs/reference/generated/dialog-root.json
index c5f439d8ca..55279effdb 100644
--- a/docs/reference/generated/dialog-root.json
+++ b/docs/reference/generated/dialog-root.json
@@ -15,7 +15,7 @@
       "type": "(open, event, reason) => void",
       "description": "Event handler called when the dialog is opened or closed."
     },
-    "action": {
+    "actionsRef": {
       "type": "{ current: { unmount: func } }",
       "description": "A ref to imperative actions."
     },
diff --git a/docs/reference/generated/menu-root.json b/docs/reference/generated/menu-root.json
index 1f80366659..0379693706 100644
--- a/docs/reference/generated/menu-root.json
+++ b/docs/reference/generated/menu-root.json
@@ -15,7 +15,7 @@
       "type": "(open, event) => void",
       "description": "Event handler called when the menu is opened or closed."
     },
-    "action": {
+    "actionsRef": {
       "type": "{ current: { unmount: func } }",
       "description": "A ref to imperative actions."
     },
diff --git a/docs/reference/generated/menu-submenu-trigger.json b/docs/reference/generated/menu-submenu-trigger.json
index 0e5ad4665b..cf52883414 100644
--- a/docs/reference/generated/menu-submenu-trigger.json
+++ b/docs/reference/generated/menu-submenu-trigger.json
@@ -6,11 +6,6 @@
       "type": "string",
       "description": "Overrides the text label to use when the item is matched during keyboard text navigation."
     },
-    "disabled": {
-      "type": "boolean",
-      "default": "false",
-      "description": "Whether the component should ignore user interaction."
-    },
     "className": {
       "type": "string | (state) => string",
       "description": "CSS class applied to the element, or a function that\nreturns a class based on the component’s state."
diff --git a/docs/reference/generated/popover-root.json b/docs/reference/generated/popover-root.json
index dafc147344..b2d582c26c 100644
--- a/docs/reference/generated/popover-root.json
+++ b/docs/reference/generated/popover-root.json
@@ -15,7 +15,7 @@
       "type": "(open, event, reason) => void",
       "description": "Event handler called when the popover is opened or closed."
     },
-    "action": {
+    "actionsRef": {
       "type": "{ current: { unmount: func } }",
       "description": "A ref to imperative actions."
     },
diff --git a/docs/reference/generated/preview-card-root.json b/docs/reference/generated/preview-card-root.json
index ada1698505..2bb0f12fbc 100644
--- a/docs/reference/generated/preview-card-root.json
+++ b/docs/reference/generated/preview-card-root.json
@@ -15,7 +15,7 @@
       "type": "(open, event, reason) => void",
       "description": "Event handler called when the preview card is opened or closed."
     },
-    "action": {
+    "actionsRef": {
       "type": "{ current: { unmount: func } }",
       "description": "A ref to imperative actions."
     },
diff --git a/docs/reference/generated/tooltip-root.json b/docs/reference/generated/tooltip-root.json
index 9915a30f70..a43f394c5f 100644
--- a/docs/reference/generated/tooltip-root.json
+++ b/docs/reference/generated/tooltip-root.json
@@ -15,7 +15,7 @@
       "type": "(open, event, reason) => void",
       "description": "Event handler called when the tooltip is opened or closed."
     },
-    "action": {
+    "actionsRef": {
       "type": "{ current: { unmount: func } }",
       "description": "A ref to imperative actions."
     },
diff --git a/docs/src/app/(private)/experiments/menu/menu-fully-featured.tsx b/docs/src/app/(private)/experiments/menu/menu-fully-featured.tsx
index 36a68247b9..d3ccb455b0 100644
--- a/docs/src/app/(private)/experiments/menu/menu-fully-featured.tsx
+++ b/docs/src/app/(private)/experiments/menu/menu-fully-featured.tsx
@@ -12,16 +12,31 @@ interface Settings {
   customAnchor: boolean;
   modal: boolean;
   openOnHover: boolean;
+  disabled: boolean;
+  customTriggerElement: boolean;
+  side: Menu.Positioner.Props['side'];
+  align: Menu.Positioner.Props['align'];
 }
 
 export default function MenuFullyFeatured() {
   const { settings } = useExperimentSettings<Settings>();
+
   const anchorRef = React.useRef<HTMLDivElement>(null);
 
+  const triggerRender = React.useMemo(
+    () => (settings.customTriggerElement ? <span /> : undefined),
+    [settings.customTriggerElement],
+  );
+
   return (
     <div>
-      <Menu.Root openOnHover={settings.openOnHover} modal={settings.modal}>
-        <Menu.Trigger className={classes.Button}>
+      <h1>Fully featured menu</h1>
+      <Menu.Root
+        openOnHover={settings.openOnHover}
+        modal={settings.modal}
+        disabled={settings.disabled}
+      >
+        <Menu.Trigger className={classes.Button} render={triggerRender}>
           Menu <ChevronDownIcon className={classes.ButtonIcon} />
         </Menu.Trigger>
         <Menu.Portal keepMounted>
@@ -29,6 +44,8 @@ export default function MenuFullyFeatured() {
             className={classes.Positioner}
             sideOffset={8}
             anchor={settings.customAnchor ? anchorRef : undefined}
+            side={settings.side}
+            align={settings.align}
           >
             <Menu.Popup className={classes.Popup}>
               <Menu.Arrow className={classes.Arrow}>
@@ -59,7 +76,7 @@ export default function MenuFullyFeatured() {
                           Radio items
                         </Menu.GroupLabel>
                         <Menu.RadioGroup>
-                          <Menu.RadioItem className={classes.RadioItem} value="date">
+                          <Menu.RadioItem className={classes.RadioItem} value="o1">
                             <Menu.RadioItemIndicator
                               className={classes.RadioItemIndicator}
                             >
@@ -69,7 +86,7 @@ export default function MenuFullyFeatured() {
                             </Menu.RadioItemIndicator>
                             <span className={classes.RadioItemText}>Option 1</span>
                           </Menu.RadioItem>
-                          <Menu.RadioItem className={classes.RadioItem} value="name">
+                          <Menu.RadioItem className={classes.RadioItem} value="o2">
                             <Menu.RadioItemIndicator
                               className={classes.RadioItemIndicator}
                             >
@@ -81,7 +98,7 @@ export default function MenuFullyFeatured() {
                           </Menu.RadioItem>
                           <Menu.RadioItem
                             className={classes.RadioItem}
-                            value="type"
+                            value="o3"
                             closeOnClick
                           >
                             <Menu.RadioItemIndicator
@@ -95,6 +112,22 @@ export default function MenuFullyFeatured() {
                               Option 3 (close on click)
                             </span>
                           </Menu.RadioItem>
+                          <Menu.RadioItem
+                            className={classes.RadioItem}
+                            value="o4"
+                            disabled
+                          >
+                            <Menu.RadioItemIndicator
+                              className={classes.RadioItemIndicator}
+                            >
+                              <CheckIcon
+                                className={classes.RadioItemIndicatorIcon}
+                              />
+                            </Menu.RadioItemIndicator>
+                            <span className={classes.RadioItemText}>
+                              Disabled option
+                            </span>
+                          </Menu.RadioItem>
                         </Menu.RadioGroup>
                       </Menu.Group>
 
@@ -139,6 +172,18 @@ export default function MenuFullyFeatured() {
                             Option C (close on click)
                           </span>
                         </Menu.CheckboxItem>
+                        <Menu.CheckboxItem className={classes.CheckboxItem} disabled>
+                          <Menu.CheckboxItemIndicator
+                            className={classes.CheckboxItemIndicator}
+                          >
+                            <CheckIcon
+                              className={classes.CheckboxItemIndicatorIcon}
+                            />
+                          </Menu.CheckboxItemIndicator>
+                          <span className={classes.CheckboxItemText}>
+                            Disabled option
+                          </span>
+                        </Menu.CheckboxItem>
                       </Menu.Group>
 
                       <Menu.Separator className={classes.Separator} />
@@ -171,6 +216,22 @@ export default function MenuFullyFeatured() {
                   </Menu.Positioner>
                 </Menu.Portal>
               </Menu.Root>
+
+              <Menu.Root disabled>
+                <Menu.SubmenuTrigger className={classes.SubmenuTrigger}>
+                  Disabled nested menu
+                  <ChevronRightIcon />
+                </Menu.SubmenuTrigger>
+                <Menu.Portal>
+                  <Menu.Positioner className={classes.Positioner} sideOffset={8}>
+                    <Menu.Popup className={classes.Popup}>
+                      <Menu.Item className={classes.Item}>
+                        This should not appear
+                      </Menu.Item>
+                    </Menu.Popup>
+                  </Menu.Positioner>
+                </Menu.Portal>
+              </Menu.Root>
             </Menu.Popup>
           </Menu.Positioner>
         </Menu.Portal>
@@ -199,6 +260,26 @@ export const settingsMetadata: SettingsMetadata<Settings> = {
     type: 'boolean',
     label: 'Open on hover',
   },
+  disabled: {
+    type: 'boolean',
+    label: 'Disabled',
+  },
+  customTriggerElement: {
+    type: 'boolean',
+    label: 'Trigger as <span>',
+  },
+  side: {
+    type: 'string',
+    label: 'Side',
+    options: ['top', 'right', 'bottom', 'left'],
+    default: 'bottom',
+  },
+  align: {
+    type: 'string',
+    label: 'Align',
+    options: ['start', 'center', 'end'],
+    default: 'center',
+  },
 };
 
 function ChevronDownIcon(props: React.ComponentProps<'svg'>) {
diff --git a/docs/src/app/(private)/experiments/menu/menu-nested.tsx b/docs/src/app/(private)/experiments/menu/menu-nested.tsx
index 54b2ed18ed..fa097cb21a 100644
--- a/docs/src/app/(private)/experiments/menu/menu-nested.tsx
+++ b/docs/src/app/(private)/experiments/menu/menu-nested.tsx
@@ -82,7 +82,7 @@ export default function NestedMenu() {
                         Paragraph
                       </MenuItem>
                       <Menu.Root disabled>
-                        <SubmenuTrigger disabled>List</SubmenuTrigger>
+                        <SubmenuTrigger>List</SubmenuTrigger>
                         <Menu.Portal>
                           <Menu.Positioner
                             align="start"
diff --git a/docs/src/app/(private)/experiments/menu/menu.module.css b/docs/src/app/(private)/experiments/menu/menu.module.css
index ced2906813..5acf16fdeb 100644
--- a/docs/src/app/(private)/experiments/menu/menu.module.css
+++ b/docs/src/app/(private)/experiments/menu/menu.module.css
@@ -196,6 +196,14 @@
     border-radius: 0.25rem;
     background-color: var(--color-gray-900);
   }
+
+  &[data-disabled][data-highlighted]::before {
+    background-color: var(--color-gray-300);
+  }
+
+  &[data-disabled] {
+    color: var(--color-gray-400);
+  }
 }
 
 .CheckboxItemIndicator,
diff --git a/docs/src/app/(private)/experiments/popups/popups-in-popups.tsx b/docs/src/app/(private)/experiments/popups/popups-in-popups.tsx
index 54bc11a7c4..b0c3ecf9b8 100644
--- a/docs/src/app/(private)/experiments/popups/popups-in-popups.tsx
+++ b/docs/src/app/(private)/experiments/popups/popups-in-popups.tsx
@@ -181,7 +181,7 @@ function MenuDemo({ modal }: Props) {
                       Paragraph
                     </MenuItem>
                     <Menu.Root disabled>
-                      <SubmenuTrigger disabled>List</SubmenuTrigger>
+                      <SubmenuTrigger>List</SubmenuTrigger>
                       <Menu.Portal>
                         <Menu.Positioner
                           align="start"
diff --git a/packages/eslint-plugin-material-ui/package.json b/packages/eslint-plugin-material-ui/package.json
index cf7db85feb..17123d7f16 100644
--- a/packages/eslint-plugin-material-ui/package.json
+++ b/packages/eslint-plugin-material-ui/package.json
@@ -7,7 +7,7 @@
   "devDependencies": {
     "@types/eslint": "^8.56.12",
     "@typescript-eslint/experimental-utils": "^5.62.0",
-    "@typescript-eslint/parser": "^8.24.0"
+    "@typescript-eslint/parser": "^8.24.1"
   },
   "license": "MIT"
 }
diff --git a/packages/react/package.json b/packages/react/package.json
index ea2204587b..b6908cfdc6 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -77,7 +77,7 @@
     "typescript": "tsc -b tsconfig.json"
   },
   "dependencies": {
-    "@babel/runtime": "^7.26.7",
+    "@babel/runtime": "^7.26.9",
     "@floating-ui/react": "^0.27.4",
     "@floating-ui/utils": "^0.2.9",
     "@react-aria/overlays": "^3.25.0",
@@ -99,10 +99,10 @@
     "chai": "^4.5.0",
     "fs-extra": "^11.3.0",
     "lodash": "^4.17.21",
-    "publint": "^0.3.4",
+    "publint": "^0.3.5",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "react-router-dom": "^7.1.5",
+    "react-router-dom": "^7.2.0",
     "sinon": "^19.0.2",
     "typescript": "^5.7.3"
   },
diff --git a/packages/react/src/accordion/root/AccordionRoot.test.tsx b/packages/react/src/accordion/root/AccordionRoot.test.tsx
index ed0d42860c..5864f84278 100644
--- a/packages/react/src/accordion/root/AccordionRoot.test.tsx
+++ b/packages/react/src/accordion/root/AccordionRoot.test.tsx
@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { flushMicrotasks } from '@mui/internal-test-utils';
 import { DirectionProvider } from '@base-ui-components/react/direction-provider';
 import { Accordion } from '@base-ui-components/react/accordion';
 import { createRenderer, describeConformance, isJSDOM } from '#test-utils';
@@ -149,8 +148,7 @@ describe('<Accordion.Root />', () => {
       expect(trigger).to.have.attribute('aria-expanded', 'false');
       expect(queryByText(PANEL_CONTENT_1)).to.equal(null);
 
-      setProps({ value: [0] });
-      await flushMicrotasks();
+      await setProps({ value: [0] });
 
       expect(trigger).to.have.attribute('aria-expanded', 'true');
       expect(trigger).to.have.attribute('data-panel-open');
@@ -158,8 +156,7 @@ describe('<Accordion.Root />', () => {
       expect(queryByText(PANEL_CONTENT_1)).toBeVisible();
       expect(queryByText(PANEL_CONTENT_1)).to.have.attribute('data-open');
 
-      setProps({ value: [] });
-      await flushMicrotasks();
+      await setProps({ value: [] });
 
       expect(trigger).to.have.attribute('aria-expanded', 'false');
       expect(queryByText(PANEL_CONTENT_1)).to.equal(null);
diff --git a/packages/react/src/alert-dialog/root/AlertDialogRoot.test.tsx b/packages/react/src/alert-dialog/root/AlertDialogRoot.test.tsx
index f4dbee48a1..0b572d37a6 100644
--- a/packages/react/src/alert-dialog/root/AlertDialogRoot.test.tsx
+++ b/packages/react/src/alert-dialog/root/AlertDialogRoot.test.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { expect } from 'chai';
 import { act, screen, waitFor } from '@mui/internal-test-utils';
 import { AlertDialog } from '@base-ui-components/react/alert-dialog';
-import { createRenderer, isJSDOM } from '#test-utils';
+import { createRenderer, isJSDOM, popupConformanceTests } from '#test-utils';
 import { spy } from 'sinon';
 
 describe('<AlertDialog.Root />', () => {
@@ -12,6 +12,20 @@ describe('<AlertDialog.Root />', () => {
     globalThis.BASE_UI_ANIMATIONS_DISABLED = true;
   });
 
+  popupConformanceTests({
+    createComponent: (props) => (
+      <AlertDialog.Root {...props.root}>
+        <AlertDialog.Trigger {...props.trigger}>Open dialog</AlertDialog.Trigger>
+        <AlertDialog.Portal {...props.portal}>
+          <AlertDialog.Popup {...props.popup}>Dialog</AlertDialog.Popup>
+        </AlertDialog.Portal>
+      </AlertDialog.Root>
+    ),
+    render,
+    triggerMouseAction: 'click',
+    expectedPopupRole: 'alertdialog',
+  });
+
   it('ARIA attributes', async () => {
     const { queryByRole, getByText } = await render(
       <AlertDialog.Root open>
diff --git a/packages/react/src/alert-dialog/root/AlertDialogRoot.tsx b/packages/react/src/alert-dialog/root/AlertDialogRoot.tsx
index 47fc6fd191..0a144cfd66 100644
--- a/packages/react/src/alert-dialog/root/AlertDialogRoot.tsx
+++ b/packages/react/src/alert-dialog/root/AlertDialogRoot.tsx
@@ -67,7 +67,7 @@ AlertDialogRoot.propTypes /* remove-proptypes */ = {
   /**
    * A ref to imperative actions.
    */
-  action: PropTypes.shape({
+  actionsRef: PropTypes.shape({
     current: PropTypes.shape({
       unmount: PropTypes.func.isRequired,
     }).isRequired,
diff --git a/packages/react/src/checkbox/root/CheckboxRoot.test.tsx b/packages/react/src/checkbox/root/CheckboxRoot.test.tsx
index c7f74e7e23..e3b0c4e7b9 100644
--- a/packages/react/src/checkbox/root/CheckboxRoot.test.tsx
+++ b/packages/react/src/checkbox/root/CheckboxRoot.test.tsx
@@ -201,7 +201,7 @@ describe('<Checkbox.Root />', () => {
     expect(indicator).to.have.attribute('data-readonly', '');
     expect(indicator).to.have.attribute('data-required', '');
 
-    setProps({ disabled: false, readOnly: false });
+    await setProps({ disabled: false, readOnly: false });
     fireEvent.click(checkbox);
 
     expect(checkbox).to.have.attribute('data-unchecked', '');
diff --git a/packages/react/src/collapsible/root/CollapsibleRoot.test.tsx b/packages/react/src/collapsible/root/CollapsibleRoot.test.tsx
index f09c088559..044dc9de27 100644
--- a/packages/react/src/collapsible/root/CollapsibleRoot.test.tsx
+++ b/packages/react/src/collapsible/root/CollapsibleRoot.test.tsx
@@ -1,7 +1,6 @@
 'use client';
 import * as React from 'react';
 import { expect } from 'chai';
-import { flushMicrotasks } from '@mui/internal-test-utils';
 import { Collapsible } from '@base-ui-components/react/collapsible';
 import { createRenderer, describeConformance, isJSDOM } from '#test-utils';
 
@@ -33,6 +32,21 @@ describe('<Collapsible.Root />', () => {
     });
   });
 
+  describe('collapsible status', () => {
+    it('disabled status', async () => {
+      const { getByRole } = await render(
+        <Collapsible.Root disabled>
+          <Collapsible.Trigger />
+          <Collapsible.Panel data-testid="panel" />
+        </Collapsible.Root>,
+      );
+
+      const trigger = getByRole('button');
+
+      expect(trigger).to.have.attribute('data-disabled');
+    });
+  });
+
   describe('open state', () => {
     it('controlled mode', async () => {
       const { queryByText, getByRole, setProps } = await render(
@@ -48,8 +62,7 @@ describe('<Collapsible.Root />', () => {
       expect(trigger).to.have.attribute('aria-expanded', 'false');
       expect(queryByText(PANEL_CONTENT)).to.equal(null);
 
-      setProps({ open: true });
-      await flushMicrotasks();
+      await setProps({ open: true });
 
       expect(trigger).to.have.attribute('aria-expanded', 'true');
 
@@ -58,8 +71,7 @@ describe('<Collapsible.Root />', () => {
       expect(queryByText(PANEL_CONTENT)).to.have.attribute('data-open');
       expect(trigger).to.have.attribute('data-panel-open');
 
-      setProps({ open: false });
-      await flushMicrotasks();
+      await setProps({ open: false });
 
       expect(trigger).to.not.have.attribute('aria-controls');
       expect(trigger).to.have.attribute('aria-expanded', 'false');
diff --git a/packages/react/src/collapsible/trigger/CollapsibleTrigger.tsx b/packages/react/src/collapsible/trigger/CollapsibleTrigger.tsx
index 99d5619949..e50912fa24 100644
--- a/packages/react/src/collapsible/trigger/CollapsibleTrigger.tsx
+++ b/packages/react/src/collapsible/trigger/CollapsibleTrigger.tsx
@@ -18,9 +18,9 @@ const CollapsibleTrigger = React.forwardRef(function CollapsibleTrigger(
   props: CollapsibleTrigger.Props,
   forwardedRef: React.ForwardedRef<HTMLButtonElement>,
 ) {
-  const { className, disabled = false, id, render, ...otherProps } = props;
+  const { panelId, open, setOpen, state, disabled: contextDisabled } = useCollapsibleRootContext();
 
-  const { panelId, open, setOpen, state } = useCollapsibleRootContext();
+  const { className, disabled = contextDisabled, id, render, ...otherProps } = props;
 
   const { getRootProps } = useCollapsibleTrigger({
     disabled,
diff --git a/packages/react/src/dialog/root/DialogRoot.test.tsx b/packages/react/src/dialog/root/DialogRoot.test.tsx
index 9683c2aa5e..1f8ace8a7d 100644
--- a/packages/react/src/dialog/root/DialogRoot.test.tsx
+++ b/packages/react/src/dialog/root/DialogRoot.test.tsx
@@ -3,16 +3,30 @@ import { expect } from 'chai';
 import { spy } from 'sinon';
 import { act, fireEvent, screen, waitFor } from '@mui/internal-test-utils';
 import { Dialog } from '@base-ui-components/react/dialog';
-import { createRenderer, isJSDOM } from '#test-utils';
+import { createRenderer, isJSDOM, popupConformanceTests } from '#test-utils';
 import { Menu } from '@base-ui-components/react/menu';
 import { Select } from '@base-ui-components/react/select';
 
 describe('<Dialog.Root />', () => {
+  const { render } = createRenderer();
+
   beforeEach(() => {
     globalThis.BASE_UI_ANIMATIONS_DISABLED = true;
   });
 
-  const { render } = createRenderer();
+  popupConformanceTests({
+    createComponent: (props) => (
+      <Dialog.Root {...props.root}>
+        <Dialog.Trigger {...props.trigger}>Open dialog</Dialog.Trigger>
+        <Dialog.Portal {...props.portal}>
+          <Dialog.Popup {...props.popup}>Dialog</Dialog.Popup>
+        </Dialog.Portal>
+      </Dialog.Root>
+    ),
+    render,
+    triggerMouseAction: 'click',
+    expectedPopupRole: 'dialog',
+  });
 
   it('ARIA attributes', async () => {
     const { queryByRole, getByText } = await render(
@@ -40,139 +54,6 @@ describe('<Dialog.Root />', () => {
     );
   });
 
-  describe('uncontrolled mode', () => {
-    it('should open the dialog with the trigger', async () => {
-      const { queryByRole, getByRole } = await render(
-        <Dialog.Root modal={false}>
-          <Dialog.Trigger />
-          <Dialog.Portal>
-            <Dialog.Popup />
-          </Dialog.Portal>
-        </Dialog.Root>,
-      );
-
-      const button = getByRole('button');
-      expect(queryByRole('dialog')).to.equal(null);
-
-      await act(async () => {
-        button.click();
-      });
-
-      expect(queryByRole('dialog')).not.to.equal(null);
-    });
-  });
-
-  describe('controlled mode', () => {
-    it('should open and close the dialog with the `open` prop', async () => {
-      const { queryByRole, setProps } = await render(
-        <Dialog.Root open={false} modal={false}>
-          <Dialog.Portal>
-            <Dialog.Popup />
-          </Dialog.Portal>
-        </Dialog.Root>,
-      );
-
-      expect(queryByRole('dialog')).to.equal(null);
-
-      setProps({ open: true });
-      expect(queryByRole('dialog')).not.to.equal(null);
-
-      setProps({ open: false });
-      expect(queryByRole('dialog')).to.equal(null);
-    });
-
-    it('should remove the popup when there is no exit animation defined', async ({ skip }) => {
-      if (isJSDOM) {
-        skip();
-      }
-
-      function Test() {
-        const [open, setOpen] = React.useState(true);
-
-        return (
-          <div>
-            <button onClick={() => setOpen(false)}>Close</button>
-            <Dialog.Root open={open}>
-              <Dialog.Portal>
-                <Dialog.Popup />
-              </Dialog.Portal>
-            </Dialog.Root>
-          </div>
-        );
-      }
-
-      const { user } = await render(<Test />);
-
-      const closeButton = screen.getByText('Close');
-      await user.click(closeButton);
-
-      await waitFor(() => {
-        expect(screen.queryByRole('dialog')).to.equal(null);
-      });
-    });
-
-    it('should remove the popup when the animation finishes', async ({ skip }) => {
-      if (isJSDOM) {
-        skip();
-      }
-
-      globalThis.BASE_UI_ANIMATIONS_DISABLED = false;
-
-      let animationFinished = false;
-      const notifyAnimationFinished = () => {
-        animationFinished = true;
-      };
-
-      function Test() {
-        const style = `
-          @keyframes test-anim {
-            to {
-              opacity: 0;
-            }
-          }
-
-          .animation-test-popup[data-open] {
-            opacity: 1;
-          }
-
-          .animation-test-popup[data-ending-style] {
-            animation: test-anim 1ms;
-          }
-        `;
-
-        const [open, setOpen] = React.useState(true);
-
-        return (
-          <div>
-            {/* eslint-disable-next-line react/no-danger */}
-            <style dangerouslySetInnerHTML={{ __html: style }} />
-            <button onClick={() => setOpen(false)}>Close</button>
-            <Dialog.Root open={open}>
-              <Dialog.Portal keepMounted>
-                <Dialog.Popup
-                  className="animation-test-popup"
-                  data-testid="popup"
-                  onAnimationEnd={notifyAnimationFinished}
-                />
-              </Dialog.Portal>
-            </Dialog.Root>
-          </div>
-        );
-      }
-
-      const { user } = await render(<Test />);
-
-      const closeButton = screen.getByText('Close');
-      await user.click(closeButton);
-
-      await waitFor(() => {
-        expect(screen.getByTestId('popup')).to.have.attribute('hidden');
-      });
-
-      expect(animationFinished).to.equal(true);
-    });
-  });
-
   describe('prop: onOpenChange', () => {
     it('calls onOpenChange with the new open state', async () => {
       const handleOpenChange = spy();
@@ -415,7 +296,7 @@ describe('<Dialog.Root />', () => {
       </Dialog.Root>,
     );
 
-    setProps({ open: false });
+    await setProps({ open: false });
     expect(queryByRole('dialog')).not.to.equal(null);
 
     await waitFor(() => {
@@ -579,15 +460,21 @@ describe('<Dialog.Root />', () => {
     const backdrops = Array.from(document.querySelectorAll('[role="presentation"]'));
     await user.click(backdrops[backdrops.length - 1]);
 
-    expect(screen.queryByTestId('level-3')).to.equal(null);
+    await waitFor(() => {
+      expect(screen.queryByTestId('level-3')).to.equal(null);
+    });
 
     await user.click(backdrops[backdrops.length - 2]);
 
-    expect(screen.queryByTestId('level-2')).to.equal(null);
+    await waitFor(() => {
+      expect(screen.queryByTestId('level-2')).to.equal(null);
+    });
 
     await user.click(backdrops[backdrops.length - 3]);
 
-    expect(screen.queryByTestId('level-1')).to.equal(null);
+    await waitFor(() => {
+      expect(screen.queryByTestId('level-1')).to.equal(null);
+    });
   });
 
   describe.skipIf(isJSDOM)('nested popups', () => {
diff --git a/packages/react/src/dialog/root/DialogRoot.tsx b/packages/react/src/dialog/root/DialogRoot.tsx
index d7c5c0b909..e8f2ffb76a 100644
--- a/packages/react/src/dialog/root/DialogRoot.tsx
+++ b/packages/react/src/dialog/root/DialogRoot.tsx
@@ -74,7 +74,7 @@ DialogRoot.propTypes /* remove-proptypes */ = {
   /**
    * A ref to imperative actions.
    */
-  action: PropTypes.shape({
+  actionsRef: PropTypes.shape({
     current: PropTypes.shape({
       unmount: PropTypes.func.isRequired,
     }).isRequired,
diff --git a/packages/react/src/dialog/root/useDialogRoot.ts b/packages/react/src/dialog/root/useDialogRoot.ts
index 2bdc2b2847..d3a6370b3c 100644
--- a/packages/react/src/dialog/root/useDialogRoot.ts
+++ b/packages/react/src/dialog/root/useDialogRoot.ts
@@ -167,7 +167,12 @@ export function useDialogRoot(params: useDialogRoot.Parameters): useDialogRoot.R
       mounted,
       transitionStatus,
       getTriggerProps: (externalProps?: React.HTMLProps<Element>) =>
-        getReferenceProps(mergeReactProps(externalProps, triggerProps)),
+        getReferenceProps(
+          mergeReactProps(
+            mergeReactProps(externalProps, { 'aria-controls': popupElementId }),
+            triggerProps,
+          ),
+        ),
       getPopupProps: getFloatingProps,
       setTriggerElement,
       setPopupElement,
diff --git a/packages/react/src/index.test.js b/packages/react/src/index.test.js
deleted file mode 100644
index f723e18a2a..0000000000
--- a/packages/react/src/index.test.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/* eslint import/namespace: ['error', { allowComputed: true }] */
-/**
- * Important: This test also serves as a point to
- * import the entire lib for coverage reporting
- */
-import { expect } from 'chai';
-import { describe, it } from 'vitest';
-import * as BaseUI from './index';
-
-describe('@base-ui-components/react', () => {
-  it('should have exports', () => {
-    expect(typeof BaseUI).to.equal('object');
-  });
-
-  it('should not have undefined exports', () => {
-    Object.keys(BaseUI).forEach((exportKey) => {
-      expect(Boolean(BaseUI[exportKey])).to.equal(true);
-    });
-  });
-});
diff --git a/packages/react/src/index.test.ts b/packages/react/src/index.test.ts
new file mode 100644
index 0000000000..c539d40b10
--- /dev/null
+++ b/packages/react/src/index.test.ts
@@ -0,0 +1,44 @@
+/**
+ * Important: This test also serves as a point to
+ * import the entire lib for coverage reporting
+ */
+import { expect } from 'chai';
+import { describe, it } from 'vitest';
+import { isJSDOM } from '#test-utils';
+import * as BaseUI from './index';
+
+describe('@base-ui-components/react', () => {
+  it('should have exports', () => {
+    expect(typeof BaseUI).to.equal('object');
+  });
+
+  it('should not have undefined exports', () => {
+    (Object.keys(BaseUI) as (keyof typeof BaseUI)[]).forEach((exportKey) => {
+      expect(Boolean(BaseUI[exportKey])).to.equal(true);
+    });
+  });
+
+  it.skipIf(!isJSDOM)('should have the correct root exports', async () => {
+    const packageJson = await import('../package.json');
+    const subpathExports = packageJson.exports;
+
+    await Promise.all(
+      Object.keys(subpathExports)
+        .filter((key) => !['.', './utils'].includes(key) && !key.startsWith('./unstable-'))
+        .map(async (subpath) => {
+          const importSpecifier = `@base-ui-components/react/${subpath.replace('./', '')}`;
+          const module = await import(importSpecifier);
+
+          Object.keys(module).forEach((exportKey) => {
+            expect((BaseUI as Record<string, unknown>)[exportKey]).not.to.equal(
+              undefined,
+              `${exportKey} (from ${importSpecifier}) was not found in root exports`,
+            );
+          });
+        }),
+    );
+
+    // Ensure the utils are also exported
+    expect(BaseUI.utils).not.to.equal(undefined);
+  });
+});
diff --git a/packages/react/src/index.ts b/packages/react/src/index.ts
index 18877eb69f..1edf08b8da 100644
--- a/packages/react/src/index.ts
+++ b/packages/react/src/index.ts
@@ -26,3 +26,4 @@ export * from './tabs';
 export * from './toggle';
 export * from './toggle-group';
 export * from './tooltip';
+export * as utils from './utils';
diff --git a/packages/react/src/menu/arrow/MenuArrow.tsx b/packages/react/src/menu/arrow/MenuArrow.tsx
index e75cd61a03..e920c1c6a4 100644
--- a/packages/react/src/menu/arrow/MenuArrow.tsx
+++ b/packages/react/src/menu/arrow/MenuArrow.tsx
@@ -8,7 +8,6 @@ import { useForkRef } from '../../utils/useForkRef';
 import type { Side, Align } from '../../utils/useAnchorPositioning';
 import type { BaseUIComponentProps } from '../../utils/types';
 import { popupStateMapping } from '../../utils/popupStateMapping';
-import { mergeReactProps } from '../../utils/mergeReactProps';
 
 /**
  * Displays an element positioned against the menu anchor.
@@ -25,16 +24,6 @@ const MenuArrow = React.forwardRef(function MenuArrow(
   const { open } = useMenuRootContext();
   const { arrowRef, side, align, arrowUncentered, arrowStyles } = useMenuPositionerContext();
 
-  const getArrowProps = React.useCallback(
-    (externalProps = {}) => {
-      return mergeReactProps<'div'>(externalProps, {
-        style: arrowStyles,
-        'aria-hidden': true,
-      });
-    },
-    [arrowStyles],
-  );
-
   const state: MenuArrow.State = React.useMemo(
     () => ({
       open,
@@ -48,12 +37,15 @@ const MenuArrow = React.forwardRef(function MenuArrow(
   const mergedRef = useForkRef(arrowRef, forwardedRef);
 
   const { renderElement } = useComponentRenderer({
-    propGetter: getArrowProps,
     render: render ?? 'div',
     className,
     state,
     ref: mergedRef,
-    extraProps: otherProps,
+    extraProps: {
+      style: arrowStyles,
+      'aria-hidden': true,
+      ...otherProps,
+    },
     customStyleHookMapping: popupStateMapping,
   });
 
diff --git a/packages/react/src/menu/checkbox-item-indicator/MenuCheckboxItemIndicator.tsx b/packages/react/src/menu/checkbox-item-indicator/MenuCheckboxItemIndicator.tsx
index 1cbb378d0f..06cb2d422c 100644
--- a/packages/react/src/menu/checkbox-item-indicator/MenuCheckboxItemIndicator.tsx
+++ b/packages/react/src/menu/checkbox-item-indicator/MenuCheckboxItemIndicator.tsx
@@ -5,7 +5,6 @@ import { useMenuCheckboxItemContext } from '../checkbox-item/MenuCheckboxItemCon
 import { useComponentRenderer } from '../../utils/useComponentRenderer';
 import { BaseUIComponentProps } from '../../utils/types';
 import { itemMapping } from '../utils/styleHookMapping';
-import { mergeReactProps } from '../../utils/mergeReactProps';
 import { TransitionStatus, useTransitionStatus } from '../../utils/useTransitionStatus';
 import { useOpenChangeComplete } from '../../utils/useOpenChangeComplete';
 import { useForkRef } from '../../utils/useForkRef';
@@ -29,14 +28,6 @@ const MenuCheckboxItemIndicator = React.forwardRef(function MenuCheckboxItemIndi
 
   const { transitionStatus, setMounted } = useTransitionStatus(item.checked);
 
-  const getItemProps = React.useCallback(
-    (externalProps = {}) =>
-      mergeReactProps(externalProps, {
-        'aria-hidden': true,
-      }),
-    [],
-  );
-
   useOpenChangeComplete({
     open: item.checked,
     ref: indicatorRef,
@@ -58,12 +49,14 @@ const MenuCheckboxItemIndicator = React.forwardRef(function MenuCheckboxItemIndi
   );
 
   const { renderElement } = useComponentRenderer({
-    propGetter: getItemProps,
     render: render || 'span',
     className,
     state,
     customStyleHookMapping: itemMapping,
-    extraProps: other,
+    extraProps: {
+      'aria-hidden': true,
+      ...other,
+    },
     ref: mergedRef,
   });
 
diff --git a/packages/react/src/menu/checkbox-item/MenuCheckboxItem.test.tsx b/packages/react/src/menu/checkbox-item/MenuCheckboxItem.test.tsx
index 4c9811122a..dba00aec47 100644
--- a/packages/react/src/menu/checkbox-item/MenuCheckboxItem.test.tsx
+++ b/packages/react/src/menu/checkbox-item/MenuCheckboxItem.test.tsx
@@ -364,18 +364,18 @@ describe('<Menu.CheckboxItem />', () => {
       expect(item).toHaveFocus();
 
       fireEvent.keyDown(item, { key: 'Enter' });
-      expect(handleKeyDown.callCount).to.equal(1);
+      expect(handleKeyDown.callCount).to.equal(0);
       expect(handleClick.callCount).to.equal(0);
       expect(handleCheckedChange.callCount).to.equal(0);
 
       fireEvent.keyUp(item, { key: 'Space' });
-      expect(handleKeyUp.callCount).to.equal(1);
+      expect(handleKeyUp.callCount).to.equal(0);
       expect(handleClick.callCount).to.equal(0);
       expect(handleCheckedChange.callCount).to.equal(0);
 
       fireEvent.click(item);
-      expect(handleKeyDown.callCount).to.equal(1);
-      expect(handleKeyUp.callCount).to.equal(1);
+      expect(handleKeyDown.callCount).to.equal(0);
+      expect(handleKeyUp.callCount).to.equal(0);
       expect(handleClick.callCount).to.equal(0);
       expect(handleCheckedChange.callCount).to.equal(0);
     });
diff --git a/packages/react/src/menu/checkbox-item/MenuCheckboxItem.tsx b/packages/react/src/menu/checkbox-item/MenuCheckboxItem.tsx
index 4daa70f132..11b5c9c6b3 100644
--- a/packages/react/src/menu/checkbox-item/MenuCheckboxItem.tsx
+++ b/packages/react/src/menu/checkbox-item/MenuCheckboxItem.tsx
@@ -11,6 +11,7 @@ import type { BaseUIComponentProps, GenericHTMLProps } from '../../utils/types';
 import { useForkRef } from '../../utils/useForkRef';
 import { itemMapping } from '../utils/styleHookMapping';
 import { useCompositeListItem } from '../../composite/list/useCompositeListItem';
+import { mergeReactProps } from '../../utils/mergeReactProps';
 
 const InnerMenuCheckboxItem = React.forwardRef(function InnerMenuItem(
   props: InnerMenuCheckboxItemProps,
@@ -26,14 +27,14 @@ const InnerMenuCheckboxItem = React.forwardRef(function InnerMenuItem(
     highlighted,
     id,
     menuEvents,
-    propGetter,
+    itemProps,
     render,
     allowMouseUpTriggerRef,
     typingRef,
     ...other
   } = props;
 
-  const { getRootProps, checked } = useMenuCheckboxItem({
+  const { getItemProps, checked } = useMenuCheckboxItem({
     closeOnClick,
     disabled,
     highlighted,
@@ -56,7 +57,7 @@ const InnerMenuCheckboxItem = React.forwardRef(function InnerMenuItem(
     render: render || 'div',
     className,
     state,
-    propGetter: (externalProps) => propGetter(getRootProps(externalProps)),
+    propGetter: (externalProps) => mergeReactProps(getItemProps, externalProps, itemProps),
     customStyleHookMapping: itemMapping,
     extraProps: other,
   });
@@ -118,6 +119,10 @@ InnerMenuCheckboxItem.propTypes /* remove-proptypes */ = {
    * @ignore
    */
   id: PropTypes.string,
+  /**
+   * @ignore
+   */
+  itemProps: PropTypes.object.isRequired,
   /**
    * Overrides the text label to use when the item is matched during keyboard text navigation.
    */
@@ -138,10 +143,6 @@ InnerMenuCheckboxItem.propTypes /* remove-proptypes */ = {
    * The click handler for the menu item.
    */
   onClick: PropTypes.func,
-  /**
-   * @ignore
-   */
-  propGetter: PropTypes.func.isRequired,
   /**
    * Allows you to replace the component’s HTML element
    * with a different tag, or compose it with another component.
@@ -175,7 +176,7 @@ const MenuCheckboxItem = React.forwardRef(function MenuCheckboxItem(
   const listItem = useCompositeListItem({ label });
   const mergedRef = useForkRef(forwardedRef, listItem.ref, itemRef);
 
-  const { getItemProps, activeIndex, allowMouseUpTriggerRef, typingRef } = useMenuRootContext();
+  const { itemProps, activeIndex, allowMouseUpTriggerRef, typingRef } = useMenuRootContext();
   const id = useBaseUiId(idProp);
 
   const highlighted = listItem.index === activeIndex;
@@ -192,7 +193,7 @@ const MenuCheckboxItem = React.forwardRef(function MenuCheckboxItem(
       ref={mergedRef}
       highlighted={highlighted}
       menuEvents={menuEvents}
-      propGetter={getItemProps}
+      itemProps={itemProps}
       allowMouseUpTriggerRef={allowMouseUpTriggerRef}
       typingRef={typingRef}
       closeOnClick={closeOnClick}
@@ -202,7 +203,7 @@ const MenuCheckboxItem = React.forwardRef(function MenuCheckboxItem(
 
 interface InnerMenuCheckboxItemProps extends MenuCheckboxItem.Props {
   highlighted: boolean;
-  propGetter: (externalProps?: GenericHTMLProps) => GenericHTMLProps;
+  itemProps: GenericHTMLProps;
   menuEvents: FloatingEvents;
   allowMouseUpTriggerRef: React.RefObject<boolean>;
   typingRef: React.RefObject<boolean>;
diff --git a/packages/react/src/menu/checkbox-item/useMenuCheckboxItem.ts b/packages/react/src/menu/checkbox-item/useMenuCheckboxItem.ts
index 34abf43bf9..c6065c080d 100644
--- a/packages/react/src/menu/checkbox-item/useMenuCheckboxItem.ts
+++ b/packages/react/src/menu/checkbox-item/useMenuCheckboxItem.ts
@@ -16,31 +16,29 @@ export function useMenuCheckboxItem(
     state: 'checked',
   });
 
-  const { getRootProps: getMenuItemRootProps, ...menuItem } = useMenuItem(other);
+  const { getItemProps: getMenuItemProps, ...menuItem } = useMenuItem(other);
 
-  const getRootProps = React.useCallback(
+  const getItemProps = React.useCallback(
     (externalProps?: GenericHTMLProps): GenericHTMLProps => {
-      return getMenuItemRootProps(
-        mergeReactProps(externalProps, {
-          role: 'menuitemcheckbox',
-          'aria-checked': checked,
-          onClick: (event: React.MouseEvent) => {
-            setChecked((currentlyChecked) => !currentlyChecked);
-            onCheckedChange?.(!checked, event.nativeEvent);
-          },
-        }),
-      );
+      return mergeReactProps(getMenuItemProps, externalProps, {
+        role: 'menuitemcheckbox',
+        'aria-checked': checked,
+        onClick: (event: React.MouseEvent) => {
+          setChecked((currentlyChecked) => !currentlyChecked);
+          onCheckedChange?.(!checked, event.nativeEvent);
+        },
+      });
     },
-    [checked, getMenuItemRootProps, onCheckedChange, setChecked],
+    [checked, getMenuItemProps, onCheckedChange, setChecked],
   );
 
   return React.useMemo(
     () => ({
       ...menuItem,
-      getRootProps,
+      getItemProps,
       checked,
     }),
-    [checked, getRootProps, menuItem],
+    [checked, getItemProps, menuItem],
   );
 }
 
diff --git a/packages/react/src/menu/item/MenuItem.test.tsx b/packages/react/src/menu/item/MenuItem.test.tsx
index 75b8f0ffa2..36fe0c05f6 100644
--- a/packages/react/src/menu/item/MenuItem.test.tsx
+++ b/packages/react/src/menu/item/MenuItem.test.tsx
@@ -268,16 +268,16 @@ describe('<Menu.Item />', () => {
       expect(item).toHaveFocus();
 
       fireEvent.keyDown(item, { key: 'Enter' });
-      expect(handleKeyDown.callCount).to.equal(1);
+      expect(handleKeyDown.callCount).to.equal(0);
       expect(handleClick.callCount).to.equal(0);
 
       fireEvent.keyUp(item, { key: 'Space' });
-      expect(handleKeyUp.callCount).to.equal(1);
+      expect(handleKeyUp.callCount).to.equal(0);
       expect(handleClick.callCount).to.equal(0);
 
       fireEvent.click(item);
-      expect(handleKeyDown.callCount).to.equal(1);
-      expect(handleKeyUp.callCount).to.equal(1);
+      expect(handleKeyDown.callCount).to.equal(0);
+      expect(handleKeyUp.callCount).to.equal(0);
       expect(handleClick.callCount).to.equal(0);
     });
   });
diff --git a/packages/react/src/menu/item/MenuItem.tsx b/packages/react/src/menu/item/MenuItem.tsx
index 001c9994e4..3f3da35737 100644
--- a/packages/react/src/menu/item/MenuItem.tsx
+++ b/packages/react/src/menu/item/MenuItem.tsx
@@ -9,6 +9,7 @@ import { useBaseUiId } from '../../utils/useBaseUiId';
 import type { BaseUIComponentProps, GenericHTMLProps } from '../../utils/types';
 import { useForkRef } from '../../utils/useForkRef';
 import { useCompositeListItem } from '../../composite/list/useCompositeListItem';
+import { mergeReactProps } from '../../utils/mergeReactProps';
 
 const InnerMenuItem = React.forwardRef(function InnerMenuItem(
   props: InnerMenuItemProps,
@@ -21,14 +22,14 @@ const InnerMenuItem = React.forwardRef(function InnerMenuItem(
     highlighted,
     id,
     menuEvents,
-    propGetter,
+    itemProps,
     render,
     allowMouseUpTriggerRef,
     typingRef,
     ...other
   } = props;
 
-  const { getRootProps } = useMenuItem({
+  const { getItemProps } = useMenuItem({
     closeOnClick,
     disabled,
     highlighted,
@@ -48,7 +49,7 @@ const InnerMenuItem = React.forwardRef(function InnerMenuItem(
     render: render || 'div',
     className,
     state,
-    propGetter: (externalProps) => propGetter(getRootProps(externalProps)),
+    propGetter: (externalProps) => mergeReactProps(getItemProps, externalProps, itemProps),
     extraProps: other,
   });
 
@@ -103,6 +104,10 @@ InnerMenuItem.propTypes /* remove-proptypes */ = {
    * @ignore
    */
   id: PropTypes.string,
+  /**
+   * @ignore
+   */
+  itemProps: PropTypes.object.isRequired,
   /**
    * Overrides the text label to use when the item is matched during keyboard text navigation.
    */
@@ -119,10 +124,6 @@ InnerMenuItem.propTypes /* remove-proptypes */ = {
    * The click handler for the menu item.
    */
   onClick: PropTypes.func,
-  /**
-   * @ignore
-   */
-  propGetter: PropTypes.func.isRequired,
   /**
    * Allows you to replace the component’s HTML element
    * with a different tag, or compose it with another component.
@@ -154,7 +155,7 @@ const MenuItem = React.forwardRef(function MenuItem(
   const listItem = useCompositeListItem({ label });
   const mergedRef = useForkRef(forwardedRef, listItem.ref, itemRef);
 
-  const { getItemProps, activeIndex, allowMouseUpTriggerRef, typingRef } = useMenuRootContext();
+  const { itemProps, activeIndex, allowMouseUpTriggerRef, typingRef } = useMenuRootContext();
   const id = useBaseUiId(idProp);
 
   const highlighted = listItem.index === activeIndex;
@@ -171,7 +172,7 @@ const MenuItem = React.forwardRef(function MenuItem(
       ref={mergedRef}
       highlighted={highlighted}
       menuEvents={menuEvents}
-      propGetter={getItemProps}
+      itemProps={itemProps}
       allowMouseUpTriggerRef={allowMouseUpTriggerRef}
       typingRef={typingRef}
     />
@@ -180,7 +181,7 @@ const MenuItem = React.forwardRef(function MenuItem(
 
 interface InnerMenuItemProps extends MenuItem.Props {
   highlighted: boolean;
-  propGetter: (externalProps?: GenericHTMLProps) => GenericHTMLProps;
+  itemProps: GenericHTMLProps;
   menuEvents: FloatingEvents;
   allowMouseUpTriggerRef: React.RefObject<boolean>;
   typingRef: React.RefObject<boolean>;
diff --git a/packages/react/src/menu/item/useMenuItem.ts b/packages/react/src/menu/item/useMenuItem.ts
index 43ea05b2f2..c9b5d2b430 100644
--- a/packages/react/src/menu/item/useMenuItem.ts
+++ b/packages/react/src/menu/item/useMenuItem.ts
@@ -26,43 +26,41 @@ export function useMenuItem(params: useMenuItem.Parameters): useMenuItem.ReturnV
     buttonRef: useForkRef(externalRef, itemRef),
   });
 
-  const getRootProps = React.useCallback(
+  const getItemProps = React.useCallback(
     (externalProps?: GenericHTMLProps): GenericHTMLProps => {
-      return getButtonProps(
-        mergeReactProps(externalProps, {
-          id,
-          role: 'menuitem',
-          tabIndex: highlighted ? 0 : -1,
-          onKeyUp: (event: BaseUIEvent<React.KeyboardEvent>) => {
-            if (event.key === ' ' && typingRef.current) {
-              event.preventBaseUIHandler();
-            }
-          },
-          onClick: (event: React.MouseEvent | React.KeyboardEvent) => {
-            if (closeOnClick) {
-              menuEvents.emit('close', event);
-            }
-          },
-          onMouseUp: (event: React.MouseEvent) => {
-            if (itemRef.current && allowMouseUpTriggerRef.current) {
-              // This fires whenever the user clicks on the trigger, moves the cursor, and releases it over the item.
-              // We trigger the click and override the `closeOnClick` preference to always close the menu.
-              itemRef.current.click();
-              menuEvents.emit('close', event);
-            }
-          },
-        }),
-      );
+      return mergeReactProps(getButtonProps, externalProps, {
+        id,
+        role: 'menuitem',
+        tabIndex: highlighted ? 0 : -1,
+        onKeyUp: (event: BaseUIEvent<React.KeyboardEvent>) => {
+          if (event.key === ' ' && typingRef.current) {
+            event.preventBaseUIHandler();
+          }
+        },
+        onClick: (event: React.MouseEvent | React.KeyboardEvent) => {
+          if (closeOnClick) {
+            menuEvents.emit('close', event);
+          }
+        },
+        onMouseUp: (event: React.MouseEvent) => {
+          if (itemRef.current && allowMouseUpTriggerRef.current) {
+            // This fires whenever the user clicks on the trigger, moves the cursor, and releases it over the item.
+            // We trigger the click and override the `closeOnClick` preference to always close the menu.
+            itemRef.current.click();
+            menuEvents.emit('close', event);
+          }
+        },
+      });
     },
     [getButtonProps, id, highlighted, typingRef, closeOnClick, menuEvents, allowMouseUpTriggerRef],
   );
 
   return React.useMemo(
     () => ({
-      getRootProps,
+      getItemProps,
       rootRef: mergedRef,
     }),
-    [getRootProps, mergedRef],
+    [getItemProps, mergedRef],
   );
 }
 
@@ -108,7 +106,7 @@ export namespace useMenuItem {
      * @param externalProps event handlers for the root slot
      * @returns props that should be spread on the root slot
      */
-    getRootProps: (externalProps?: GenericHTMLProps) => GenericHTMLProps;
+    getItemProps: (externalProps?: GenericHTMLProps) => GenericHTMLProps;
     /**
      * The ref to the component's root DOM element.
      */
diff --git a/packages/react/src/menu/popup/MenuPopup.tsx b/packages/react/src/menu/popup/MenuPopup.tsx
index e27f342575..1dd34915e8 100644
--- a/packages/react/src/menu/popup/MenuPopup.tsx
+++ b/packages/react/src/menu/popup/MenuPopup.tsx
@@ -21,6 +21,9 @@ const customStyleHookMapping: CustomStyleHookMapping<MenuPopup.State> = {
   ...transitionStatusMapping,
 };
 
+const DISABLED_TRANSITIONS_STYLE = { style: { transition: 'none' } };
+const EMPTY_OBJ = {};
+
 /**
  * A container for the menu items.
  * Renders a `<div>` element.
@@ -39,7 +42,7 @@ const MenuPopup = React.forwardRef(function MenuPopup(
     popupRef,
     transitionStatus,
     nested,
-    getPopupProps,
+    popupProps,
     modal,
     mounted,
     instantType,
@@ -79,16 +82,14 @@ const MenuPopup = React.forwardRef(function MenuPopup(
   );
 
   const { renderElement } = useComponentRenderer({
-    propGetter: getPopupProps,
     render: render || 'div',
     className,
     state,
-    extraProps:
-      transitionStatus === 'starting'
-        ? mergeReactProps(other, {
-            style: { transition: 'none' },
-          })
-        : other,
+    extraProps: mergeReactProps(
+      other,
+      popupProps,
+      transitionStatus === 'starting' ? DISABLED_TRANSITIONS_STYLE : EMPTY_OBJ,
+    ),
     customStyleHookMapping,
     ref: mergedRef,
   });
diff --git a/packages/react/src/menu/positioner/MenuPositioner.tsx b/packages/react/src/menu/positioner/MenuPositioner.tsx
index f014621915..b62639633c 100644
--- a/packages/react/src/menu/positioner/MenuPositioner.tsx
+++ b/packages/react/src/menu/positioner/MenuPositioner.tsx
@@ -119,13 +119,15 @@ const MenuPositioner = React.forwardRef(function MenuPositioner(
   const mergedRef = useForkRef(forwardedRef, setPositionerElement);
 
   const { renderElement } = useComponentRenderer({
-    propGetter: positioner.getPositionerProps,
     render: render ?? 'div',
     className,
     state,
     customStyleHookMapping: popupStateMapping,
     ref: mergedRef,
-    extraProps: otherProps,
+    extraProps: {
+      ...positioner.positionerProps,
+      ...otherProps,
+    },
   });
 
   return (
@@ -140,7 +142,7 @@ const MenuPositioner = React.forwardRef(function MenuPositioner(
   );
 });
 
-export namespace MenuPositioner {
+namespace MenuPositioner {
   export interface State {
     /**
      * Whether the menu is currently open.
diff --git a/packages/react/src/menu/positioner/useMenuPositioner.ts b/packages/react/src/menu/positioner/useMenuPositioner.ts
index e440a77f3a..7a46ebb9b0 100644
--- a/packages/react/src/menu/positioner/useMenuPositioner.ts
+++ b/packages/react/src/menu/positioner/useMenuPositioner.ts
@@ -1,7 +1,6 @@
 'use client';
 import * as React from 'react';
 import { useFloatingTree, type FloatingRootContext } from '@floating-ui/react';
-import { mergeReactProps } from '../../utils/mergeReactProps';
 import { useAnchorPositioning } from '../../utils/useAnchorPositioning';
 import type { GenericHTMLProps } from '../../utils/types';
 import { useMenuRootContext } from '../root/MenuRootContext';
@@ -17,25 +16,22 @@ export function useMenuPositioner(
 
   const { events: menuEvents } = useFloatingTree()!;
 
-  const getPositionerProps: useMenuPositioner.ReturnValue['getPositionerProps'] = React.useCallback(
-    (externalProps = {}) => {
-      const hiddenStyles: React.CSSProperties = {};
+  const positionerProps = React.useMemo(() => {
+    const hiddenStyles: React.CSSProperties = {};
 
-      if (!open) {
-        hiddenStyles.pointerEvents = 'none';
-      }
+    if (!open) {
+      hiddenStyles.pointerEvents = 'none';
+    }
 
-      return mergeReactProps<'div'>(externalProps, {
-        role: 'presentation',
-        hidden: !mounted,
-        style: {
-          ...positioning.positionerStyles,
-          ...hiddenStyles,
-        },
-      });
-    },
-    [open, mounted, positioning.positionerStyles],
-  );
+    return {
+      role: 'presentation',
+      hidden: !mounted,
+      style: {
+        ...positioning.positionerStyles,
+        ...hiddenStyles,
+      },
+    };
+  }, [open, mounted, positioning.positionerStyles]);
 
   React.useEffect(() => {
     function onMenuOpenChange(event: { open: boolean; nodeId: string; parentNodeId: string }) {
@@ -65,9 +61,9 @@ export function useMenuPositioner(
   return React.useMemo(
     () => ({
       ...positioning,
-      getPositionerProps,
+      positionerProps,
     }),
-    [positioning, getPositionerProps],
+    [positioning, positionerProps],
   );
 }
 
@@ -90,6 +86,6 @@ export namespace useMenuPositioner {
   export interface SharedParameters extends useAnchorPositioning.SharedParameters {}
 
   export interface ReturnValue extends useAnchorPositioning.ReturnValue {
-    getPositionerProps: (externalProps?: GenericHTMLProps) => GenericHTMLProps;
+    positionerProps: GenericHTMLProps;
   }
 }
diff --git a/packages/react/src/menu/radio-item-indicator/MenuRadioItemIndicator.tsx b/packages/react/src/menu/radio-item-indicator/MenuRadioItemIndicator.tsx
index d9a5967775..4cde3ad3e0 100644
--- a/packages/react/src/menu/radio-item-indicator/MenuRadioItemIndicator.tsx
+++ b/packages/react/src/menu/radio-item-indicator/MenuRadioItemIndicator.tsx
@@ -5,7 +5,6 @@ import { useMenuRadioItemContext } from '../radio-item/MenuRadioItemContext';
 import { useComponentRenderer } from '../../utils/useComponentRenderer';
 import { BaseUIComponentProps } from '../../utils/types';
 import { itemMapping } from '../utils/styleHookMapping';
-import { mergeReactProps } from '../../utils/mergeReactProps';
 import { TransitionStatus, useTransitionStatus } from '../../utils/useTransitionStatus';
 import { useOpenChangeComplete } from '../../utils/useOpenChangeComplete';
 import { useForkRef } from '../../utils/useForkRef';
@@ -29,14 +28,6 @@ const MenuRadioItemIndicator = React.forwardRef(function MenuRadioItemIndicator(
 
   const { transitionStatus, setMounted } = useTransitionStatus(item.checked);
 
-  const getItemProps = React.useCallback(
-    (externalProps = {}) =>
-      mergeReactProps(externalProps, {
-        'aria-hidden': true,
-      }),
-    [],
-  );
-
   useOpenChangeComplete({
     open: item.checked,
     ref: indicatorRef,
@@ -58,12 +49,14 @@ const MenuRadioItemIndicator = React.forwardRef(function MenuRadioItemIndicator(
   );
 
   const { renderElement } = useComponentRenderer({
-    propGetter: getItemProps,
     render: render || 'span',
     className,
     state,
     customStyleHookMapping: itemMapping,
-    extraProps: other,
+    extraProps: {
+      'aria-hidden': true,
+      ...other,
+    },
     ref: mergedRef,
   });
 
diff --git a/packages/react/src/menu/radio-item/MenuRadioItem.test.tsx b/packages/react/src/menu/radio-item/MenuRadioItem.test.tsx
index 179ea23ae1..3e791923bc 100644
--- a/packages/react/src/menu/radio-item/MenuRadioItem.test.tsx
+++ b/packages/react/src/menu/radio-item/MenuRadioItem.test.tsx
@@ -346,12 +346,12 @@ describe('<Menu.RadioItem />', () => {
       expect(item1).toHaveFocus();
 
       fireEvent.keyDown(item1, { key: 'Enter' });
-      expect(handleKeyDown.callCount).to.equal(1);
+      expect(handleKeyDown.callCount).to.equal(0);
       expect(handleClick.callCount).to.equal(0);
       expect(handleValueChange.callCount).to.equal(0);
 
       fireEvent.keyUp(item1, { key: 'Space' });
-      expect(handleKeyDown.callCount).to.equal(1);
+      expect(handleKeyDown.callCount).to.equal(0);
       expect(handleClick.callCount).to.equal(0);
       expect(handleValueChange.callCount).to.equal(0);
 
@@ -360,16 +360,16 @@ describe('<Menu.RadioItem />', () => {
       expect(handleValueChange.callCount).to.equal(0);
 
       fireEvent.keyDown(item1, { key: 'ArrowDown' });
-      expect(handleKeyDown.callCount).to.equal(2);
+      expect(handleKeyDown.callCount).to.equal(0);
       expect(item2).toHaveFocus();
 
       fireEvent.keyDown(item2, { key: 'Enter' });
-      expect(handleKeyDown.callCount).to.equal(3);
+      expect(handleKeyDown.callCount).to.equal(0);
       expect(handleClick.callCount).to.equal(0);
       expect(handleValueChange.callCount).to.equal(0);
 
       fireEvent.keyUp(item2, { key: 'Space' });
-      expect(handleKeyDown.callCount).to.equal(3);
+      expect(handleKeyDown.callCount).to.equal(0);
       expect(handleClick.callCount).to.equal(0);
       expect(handleValueChange.callCount).to.equal(0);
 
@@ -424,12 +424,12 @@ describe('<Menu.RadioItem />', () => {
     expect(item1).toHaveFocus();
 
     fireEvent.keyDown(item1, { key: 'Enter' });
-    expect(handleKeyDown.callCount).to.equal(1);
+    expect(handleKeyDown.callCount).to.equal(0);
     expect(handleClick.callCount).to.equal(0);
     expect(handleValueChange.callCount).to.equal(0);
 
     fireEvent.keyUp(item1, { key: 'Space' });
-    expect(handleKeyDown.callCount).to.equal(1);
+    expect(handleKeyDown.callCount).to.equal(0);
     expect(handleClick.callCount).to.equal(0);
     expect(handleValueChange.callCount).to.equal(0);
 
@@ -438,11 +438,11 @@ describe('<Menu.RadioItem />', () => {
     expect(handleValueChange.callCount).to.equal(0);
 
     fireEvent.keyDown(item1, { key: 'ArrowDown' });
-    expect(handleKeyDown.callCount).to.equal(2);
+    expect(handleKeyDown.callCount).to.equal(0);
     expect(item2).toHaveFocus();
 
     fireEvent.keyDown(item2, { key: 'Enter' });
-    expect(handleKeyDown.callCount).to.equal(3);
+    expect(handleKeyDown.callCount).to.equal(1);
     expect(handleClick.callCount).to.equal(1);
     expect(handleValueChange.callCount).to.equal(1);
     expect(handleValueChange.args[0][0]).to.equal('two');
diff --git a/packages/react/src/menu/radio-item/MenuRadioItem.tsx b/packages/react/src/menu/radio-item/MenuRadioItem.tsx
index fbdfe80221..2e5e7bdc46 100644
--- a/packages/react/src/menu/radio-item/MenuRadioItem.tsx
+++ b/packages/react/src/menu/radio-item/MenuRadioItem.tsx
@@ -12,6 +12,7 @@ import { useMenuRadioGroupContext } from '../radio-group/MenuRadioGroupContext';
 import { MenuRadioItemContext } from './MenuRadioItemContext';
 import { itemMapping } from '../utils/styleHookMapping';
 import { useCompositeListItem } from '../../composite/list/useCompositeListItem';
+import { mergeReactProps } from '../../utils/mergeReactProps';
 
 const InnerMenuRadioItem = React.forwardRef(function InnerMenuItem(
   props: InnerMenuRadioItemProps,
@@ -26,14 +27,14 @@ const InnerMenuRadioItem = React.forwardRef(function InnerMenuItem(
     highlighted,
     id,
     menuEvents,
-    propGetter,
+    itemProps,
     render,
     allowMouseUpTriggerRef,
     typingRef,
     ...other
   } = props;
 
-  const { getRootProps } = useMenuRadioItem({
+  const { getItemProps } = useMenuRadioItem({
     checked,
     setChecked,
     closeOnClick,
@@ -52,7 +53,7 @@ const InnerMenuRadioItem = React.forwardRef(function InnerMenuItem(
     render: render || 'div',
     className,
     state,
-    propGetter: (externalProps) => propGetter(getRootProps(externalProps)),
+    propGetter: (externalProps) => mergeReactProps(getItemProps, externalProps, itemProps),
     customStyleHookMapping: itemMapping,
     extraProps: other,
   });
@@ -108,6 +109,10 @@ InnerMenuRadioItem.propTypes /* remove-proptypes */ = {
    * @ignore
    */
   id: PropTypes.string,
+  /**
+   * @ignore
+   */
+  itemProps: PropTypes.object.isRequired,
   /**
    * Overrides the text label to use when the item is matched during keyboard text navigation.
    */
@@ -124,10 +129,6 @@ InnerMenuRadioItem.propTypes /* remove-proptypes */ = {
    * The click handler for the menu item.
    */
   onClick: PropTypes.func,
-  /**
-   * @ignore
-   */
-  propGetter: PropTypes.func.isRequired,
   /**
    * Allows you to replace the component’s HTML element
    * with a different tag, or compose it with another component.
@@ -172,7 +173,7 @@ const MenuRadioItem = React.forwardRef(function MenuRadioItem(
   const listItem = useCompositeListItem({ label });
   const mergedRef = useForkRef(forwardedRef, listItem.ref, itemRef);
 
-  const { getItemProps, activeIndex, allowMouseUpTriggerRef, typingRef } = useMenuRootContext();
+  const { itemProps, activeIndex, allowMouseUpTriggerRef, typingRef } = useMenuRootContext();
   const id = useBaseUiId(idProp);
 
   const highlighted = listItem.index === activeIndex;
@@ -213,7 +214,7 @@ const MenuRadioItem = React.forwardRef(function MenuRadioItem(
         disabled={disabled}
         highlighted={highlighted}
         menuEvents={menuEvents}
-        propGetter={getItemProps}
+        itemProps={itemProps}
         allowMouseUpTriggerRef={allowMouseUpTriggerRef}
         checked={selectedValue === value}
         setChecked={setChecked}
@@ -226,7 +227,7 @@ const MenuRadioItem = React.forwardRef(function MenuRadioItem(
 
 interface InnerMenuRadioItemProps extends Omit<MenuRadioItem.Props, 'value'> {
   highlighted: boolean;
-  propGetter: (externalProps?: GenericHTMLProps) => GenericHTMLProps;
+  itemProps: GenericHTMLProps;
   menuEvents: FloatingEvents;
   allowMouseUpTriggerRef: React.RefObject<boolean>;
   checked: boolean;
diff --git a/packages/react/src/menu/radio-item/useMenuRadioItem.ts b/packages/react/src/menu/radio-item/useMenuRadioItem.ts
index 4f9b28c8dd..3bc83db28e 100644
--- a/packages/react/src/menu/radio-item/useMenuRadioItem.ts
+++ b/packages/react/src/menu/radio-item/useMenuRadioItem.ts
@@ -8,26 +8,24 @@ export function useMenuRadioItem(
 ): useMenuRadioItem.ReturnValue {
   const { checked, setChecked, ...other } = params;
 
-  const { getRootProps: getMenuItemRootProps, ...menuItem } = useMenuItem(other);
+  const { getItemProps: getMenuItemProps, ...menuItem } = useMenuItem(other);
 
-  const getRootProps = React.useCallback(
+  const getItemProps = React.useCallback(
     (externalProps?: GenericHTMLProps): GenericHTMLProps => {
-      return getMenuItemRootProps(
-        mergeReactProps(externalProps, {
-          role: 'menuitemradio',
-          'aria-checked': checked,
-          onClick: (event: React.MouseEvent) => {
-            setChecked(event.nativeEvent);
-          },
-        }),
-      );
+      return mergeReactProps(getMenuItemProps, externalProps, {
+        role: 'menuitemradio',
+        'aria-checked': checked,
+        onClick: (event: React.MouseEvent) => {
+          setChecked(event.nativeEvent);
+        },
+      });
     },
-    [checked, getMenuItemRootProps, setChecked],
+    [checked, getMenuItemProps, setChecked],
   );
 
   return {
     ...menuItem,
-    getRootProps,
+    getItemProps,
     checked,
   };
 }
diff --git a/packages/react/src/menu/root/MenuRoot.test.tsx b/packages/react/src/menu/root/MenuRoot.test.tsx
index ed74942145..27714c7c5a 100644
--- a/packages/react/src/menu/root/MenuRoot.test.tsx
+++ b/packages/react/src/menu/root/MenuRoot.test.tsx
@@ -5,7 +5,7 @@ import { DirectionProvider } from '@base-ui-components/react/direction-provider'
 import { Menu } from '@base-ui-components/react/menu';
 import userEvent from '@testing-library/user-event';
 import { spy } from 'sinon';
-import { createRenderer, isJSDOM } from '#test-utils';
+import { createRenderer, isJSDOM, popupConformanceTests } from '#test-utils';
 
 describe('<Menu.Root />', () => {
   beforeEach(() => {
@@ -15,6 +15,24 @@ describe('<Menu.Root />', () => {
   const { render } = createRenderer();
   const user = userEvent.setup();
 
+  popupConformanceTests({
+    createComponent: (props) => (
+      <Menu.Root {...props.root}>
+        <Menu.Trigger {...props.trigger}>Open menu</Menu.Trigger>
+        <Menu.Portal {...props.portal}>
+          <Menu.Positioner>
+            <Menu.Popup {...props.popup}>
+              <Menu.Item>Item</Menu.Item>
+            </Menu.Popup>
+          </Menu.Positioner>
+        </Menu.Portal>
+      </Menu.Root>
+    ),
+    render,
+    triggerMouseAction: 'click',
+    expectedPopupRole: 'menu',
+  });
+
   describe('keyboard navigation', () => {
     it('changes the highlighted item using the arrow keys', async () => {
       const { getByRole, getByTestId } = await render(
@@ -717,102 +735,6 @@ describe('<Menu.Root />', () => {
     });
   });
 
-  describe('controlled mode', () => {
-    it('should remove the popup when and there is no exit animation defined', async ({ skip }) => {
-      if (isJSDOM) {
-        skip();
-      }
-
-      function Test() {
-        const [open, setOpen] = React.useState(true);
-
-        return (
-          <div>
-            <button onClick={() => setOpen(false)}>Close</button>
-            <Menu.Root open={open} modal={false}>
-              <Menu.Portal>
-                <Menu.Positioner>
-                  <Menu.Popup />
-                </Menu.Positioner>
-              </Menu.Portal>
-            </Menu.Root>
-          </div>
-        );
-      }
-
-      await render(<Test />);
-
-      const closeButton = screen.getByText('Close');
-      await user.click(closeButton);
-
-      await waitFor(() => {
-        expect(screen.queryByRole('menu')).to.equal(null);
-      });
-    });
-
-    it('should remove the popup when the animation finishes', async ({ skip }) => {
-      if (isJSDOM) {
-        skip();
-      }
-
-      globalThis.BASE_UI_ANIMATIONS_DISABLED = false;
-
-      let animationFinished = false;
-      const notifyAnimationFinished = () => {
-        animationFinished = true;
-      };
-
-      function Test() {
-        const style = `
-          @keyframes test-anim {
-            to {
-              opacity: 0;
-            }
-          }
-
-          .animation-test-popup[data-open] {
-            opacity: 1;
-          }
-
-          .animation-test-popup[data-ending-style] {
-            animation: test-anim 1ms;
-          }
-        `;
-
-        const [open, setOpen] = React.useState(true);
-
-        return (
-          <div>
-            {/* eslint-disable-next-line react/no-danger */}
-            <style dangerouslySetInnerHTML={{ __html: style }} />
-            <button onClick={() => setOpen(false)}>Close</button>
-            <Menu.Root open={open} modal={false}>
-              <Menu.Portal keepMounted>
-                <Menu.Positioner>
-                  <Menu.Popup
-                    className="animation-test-popup"
-                    onAnimationEnd={notifyAnimationFinished}
-                  />
-                </Menu.Positioner>
-              </Menu.Portal>
-            </Menu.Root>
-          </div>
-        );
-      }
-
-      await render(<Test />);
-
-      const closeButton = screen.getByText('Close');
-      await user.click(closeButton);
-
-      await waitFor(() => {
-        expect(screen.queryByRole('menu')).to.equal(null);
-      });
-
-      expect(animationFinished).to.equal(true);
-    });
-  });
-
   describe('prop: modal', () => {
     it('should render an internal backdrop when `true`', async () => {
       await render(
diff --git a/packages/react/src/menu/root/MenuRoot.tsx b/packages/react/src/menu/root/MenuRoot.tsx
index 1201ed2376..4b9b9b2403 100644
--- a/packages/react/src/menu/root/MenuRoot.tsx
+++ b/packages/react/src/menu/root/MenuRoot.tsx
@@ -168,7 +168,7 @@ MenuRoot.propTypes /* remove-proptypes */ = {
   /**
    * A ref to imperative actions.
    */
-  action: PropTypes.shape({
+  actionsRef: PropTypes.shape({
     current: PropTypes.shape({
       unmount: PropTypes.func.isRequired,
     }).isRequired,
diff --git a/packages/react/src/menu/root/useMenuRoot.ts b/packages/react/src/menu/root/useMenuRoot.ts
index ec226e9ebe..2b0381c4b7 100644
--- a/packages/react/src/menu/root/useMenuRoot.ts
+++ b/packages/react/src/menu/root/useMenuRoot.ts
@@ -13,7 +13,6 @@ import {
   useTypeahead,
   type FloatingRootContext,
 } from '@floating-ui/react';
-import { mergeReactProps } from '../../utils/mergeReactProps';
 import { GenericHTMLProps } from '../../utils/types';
 import { useTransitionStatus, type TransitionStatus } from '../../utils/useTransitionStatus';
 import { useEventCallback } from '../../utils/useEventCallback';
@@ -90,10 +89,13 @@ export function useMenuRoot(parameters: useMenuRoot.Parameters): useMenuRoot.Ret
     },
   );
 
+  if (!open && !hoverEnabled) {
+    setHoverEnabled(true);
+  }
+
   const handleUnmount = useEventCallback(() => {
     setMounted(false);
     setOpenReason(null);
-    setHoverEnabled(true);
     setStickIfOpen(true);
     onOpenChangeComplete?.(false);
   });
@@ -228,45 +230,43 @@ export function useMenuRoot(parameters: useMenuRoot.Parameters): useMenuRoot.Ret
     typeahead,
   ]);
 
-  const getTriggerProps = React.useCallback(
-    (externalProps?: GenericHTMLProps) =>
-      getReferenceProps(
-        mergeReactProps(externalProps, {
-          onMouseEnter() {
-            setHoverEnabled(true);
-          },
-        }),
-      ),
+  const triggerProps = React.useMemo(
+    () =>
+      getReferenceProps({
+        onMouseEnter() {
+          setHoverEnabled(true);
+        },
+      }),
     [getReferenceProps],
   );
 
-  const getPopupProps = React.useCallback(
-    (externalProps?: GenericHTMLProps) =>
-      getFloatingProps(
-        mergeReactProps(externalProps, {
-          onMouseEnter() {
-            if (!openOnHover || nested) {
-              setHoverEnabled(false);
-            }
-          },
-          onClick() {
-            if (openOnHover) {
-              setHoverEnabled(false);
-            }
-          },
-        }),
-      ),
+  const popupProps = React.useMemo(
+    () =>
+      getFloatingProps({
+        onMouseEnter() {
+          if (!openOnHover || nested) {
+            setHoverEnabled(false);
+          }
+        },
+        onClick() {
+          if (openOnHover) {
+            setHoverEnabled(false);
+          }
+        },
+      }),
     [getFloatingProps, openOnHover, nested],
   );
 
+  const itemProps = React.useMemo(() => getItemProps(), [getItemProps]);
+
   return React.useMemo(
     () => ({
       activeIndex,
       allowMouseUpTriggerRef,
       floatingRootContext,
-      getItemProps,
-      getPopupProps,
-      getTriggerProps,
+      itemProps,
+      popupProps,
+      triggerProps,
       itemDomElements,
       itemLabels,
       mounted,
@@ -285,9 +285,9 @@ export function useMenuRoot(parameters: useMenuRoot.Parameters): useMenuRoot.Ret
     [
       activeIndex,
       floatingRootContext,
-      getItemProps,
-      getPopupProps,
-      getTriggerProps,
+      itemProps,
+      popupProps,
+      triggerProps,
       itemDomElements,
       itemLabels,
       mounted,
@@ -376,9 +376,9 @@ export namespace useMenuRoot {
   export interface ReturnValue {
     activeIndex: number | null;
     floatingRootContext: FloatingRootContext;
-    getItemProps: (externalProps?: GenericHTMLProps) => GenericHTMLProps;
-    getPopupProps: (externalProps?: GenericHTMLProps) => GenericHTMLProps;
-    getTriggerProps: (externalProps?: GenericHTMLProps) => GenericHTMLProps;
+    itemProps: GenericHTMLProps;
+    popupProps: GenericHTMLProps;
+    triggerProps: GenericHTMLProps;
     itemDomElements: React.MutableRefObject<(HTMLElement | null)[]>;
     itemLabels: React.MutableRefObject<(string | null)[]>;
     mounted: boolean;
diff --git a/packages/react/src/menu/submenu-trigger/MenuSubmenuTrigger.tsx b/packages/react/src/menu/submenu-trigger/MenuSubmenuTrigger.tsx
index 8eabcd8538..4556741737 100644
--- a/packages/react/src/menu/submenu-trigger/MenuSubmenuTrigger.tsx
+++ b/packages/react/src/menu/submenu-trigger/MenuSubmenuTrigger.tsx
@@ -10,6 +10,7 @@ import { useMenuSubmenuTrigger } from './useMenuSubmenuTrigger';
 import { useForkRef } from '../../utils/useForkRef';
 import { triggerOpenStateMapping } from '../../utils/popupStateMapping';
 import { useCompositeListItem } from '../../composite/list/useCompositeListItem';
+import { mergeReactProps } from '../../utils/mergeReactProps';
 
 /**
  * A menu item that opens a submenu.
@@ -21,23 +22,24 @@ const MenuSubmenuTrigger = React.forwardRef(function SubmenuTriggerComponent(
   props: MenuSubmenuTrigger.Props,
   forwardedRef: React.ForwardedRef<Element>,
 ) {
-  const { render, className, disabled = false, label, id: idProp, ...other } = props;
+  const { render, className, label, id: idProp, ...other } = props;
   const id = useBaseUiId(idProp);
 
   const {
-    getTriggerProps,
+    triggerProps: rootTriggerProps,
     parentContext,
     setTriggerElement,
     allowMouseUpTriggerRef,
     open,
     typingRef,
+    disabled,
   } = useMenuRootContext();
 
   if (parentContext === undefined) {
     throw new Error('Base UI: ItemTrigger must be placed in a nested Menu.');
   }
 
-  const { activeIndex, getItemProps } = parentContext;
+  const { activeIndex, itemProps } = parentContext;
   const item = useCompositeListItem();
 
   const highlighted = activeIndex === item.index;
@@ -46,7 +48,7 @@ const MenuSubmenuTrigger = React.forwardRef(function SubmenuTriggerComponent(
 
   const { events: menuEvents } = useFloatingTree()!;
 
-  const { getRootProps } = useMenuSubmenuTrigger({
+  const { getTriggerProps } = useMenuSubmenuTrigger({
     id,
     highlighted,
     ref: mergedRef,
@@ -67,7 +69,7 @@ const MenuSubmenuTrigger = React.forwardRef(function SubmenuTriggerComponent(
     className,
     state,
     propGetter: (externalProps: GenericHTMLProps) =>
-      getTriggerProps(getItemProps(getRootProps(externalProps))),
+      mergeReactProps(getTriggerProps, externalProps, itemProps, rootTriggerProps),
     customStyleHookMapping: triggerOpenStateMapping,
     extraProps: other,
   });
@@ -79,11 +81,6 @@ namespace MenuSubmenuTrigger {
   export interface Props extends BaseUIComponentProps<'div', State> {
     children?: React.ReactNode;
     onClick?: React.MouseEventHandler<HTMLElement>;
-    /**
-     * Whether the component should ignore user interaction.
-     * @default false
-     */
-    disabled?: boolean;
     /**
      * Overrides the text label to use when the item is matched during keyboard text navigation.
      */
@@ -121,11 +118,6 @@ MenuSubmenuTrigger.propTypes /* remove-proptypes */ = {
    * returns a class based on the component’s state.
    */
   className: PropTypes.oneOfType([PropTypes.func, PropTypes.string]),
-  /**
-   * Whether the component should ignore user interaction.
-   * @default false
-   */
-  disabled: PropTypes.bool,
   /**
    * @ignore
    */
diff --git a/packages/react/src/menu/submenu-trigger/useMenuSubmenuTrigger.ts b/packages/react/src/menu/submenu-trigger/useMenuSubmenuTrigger.ts
index 3935162902..912d728121 100644
--- a/packages/react/src/menu/submenu-trigger/useMenuSubmenuTrigger.ts
+++ b/packages/react/src/menu/submenu-trigger/useMenuSubmenuTrigger.ts
@@ -6,8 +6,8 @@ import { useForkRef } from '../../utils/useForkRef';
 import { GenericHTMLProps } from '../../utils/types';
 
 export function useMenuSubmenuTrigger(
-  parameters: useSubmenuTrigger.Parameters,
-): useSubmenuTrigger.ReturnValue {
+  parameters: useMenuSubmenuTrigger.Parameters,
+): useMenuSubmenuTrigger.ReturnValue {
   const {
     id,
     highlighted,
@@ -19,7 +19,7 @@ export function useMenuSubmenuTrigger(
     typingRef,
   } = parameters;
 
-  const { getRootProps: getMenuItemProps, rootRef: menuItemRef } = useMenuItem({
+  const { getItemProps, rootRef: menuItemRef } = useMenuItem({
     closeOnClick: false,
     disabled,
     highlighted,
@@ -32,29 +32,27 @@ export function useMenuSubmenuTrigger(
 
   const menuTriggerRef = useForkRef(menuItemRef, setTriggerElement);
 
-  const getRootProps = React.useCallback(
+  const getTriggerProps = React.useCallback(
     (externalProps?: GenericHTMLProps) => {
       return {
-        ...getMenuItemProps({
-          'aria-haspopup': 'menu' as const,
-          ...externalProps,
-        }),
+        ...getItemProps(externalProps),
+        'aria-haspopup': 'menu' as const,
         ref: menuTriggerRef,
       };
     },
-    [getMenuItemProps, menuTriggerRef],
+    [getItemProps, menuTriggerRef],
   );
 
   return React.useMemo(
     () => ({
-      getRootProps,
+      getTriggerProps,
       rootRef: menuTriggerRef,
     }),
-    [getRootProps, menuTriggerRef],
+    [getTriggerProps, menuTriggerRef],
   );
 }
 
-export namespace useSubmenuTrigger {
+export namespace useMenuSubmenuTrigger {
   export interface Parameters {
     id: string | undefined;
     highlighted: boolean;
@@ -85,6 +83,6 @@ export namespace useSubmenuTrigger {
   }
 
   export interface ReturnValue {
-    getRootProps: (externalProps?: GenericHTMLProps) => GenericHTMLProps;
+    getTriggerProps: (externalProps?: GenericHTMLProps) => GenericHTMLProps;
   }
 }
diff --git a/packages/react/src/menu/trigger/MenuTrigger.test.tsx b/packages/react/src/menu/trigger/MenuTrigger.test.tsx
index 68040f68b7..558d0e0812 100644
--- a/packages/react/src/menu/trigger/MenuTrigger.test.tsx
+++ b/packages/react/src/menu/trigger/MenuTrigger.test.tsx
@@ -245,4 +245,46 @@ describe('<Menu.Trigger />', () => {
       expect(trigger).not.to.have.attribute('data-popup-open');
     });
   });
+
+  describe('preventBaseUIHandler', () => {
+    it('prevents opening the menu with a mouse when `preventBaseUIHandler` is called in onMouseDown', async () => {
+      const { getByRole, queryByRole } = await render(
+        <Menu.Root>
+          <Menu.Trigger onMouseDown={(event) => event.preventBaseUIHandler()} />
+          <Menu.Portal>
+            <Menu.Positioner>
+              <Menu.Popup />
+            </Menu.Positioner>
+          </Menu.Portal>
+        </Menu.Root>,
+      );
+
+      const button = getByRole('button');
+      await user.click(button);
+
+      expect(queryByRole('menu', { hidden: false })).to.equal(null);
+    });
+
+    it('prevents opening the menu with keyboard when `preventBaseUIHandler` is called in onClick', async () => {
+      const { getByRole, queryByRole } = await render(
+        <Menu.Root>
+          <Menu.Trigger onClick={(event) => event.preventBaseUIHandler()} />
+          <Menu.Portal>
+            <Menu.Positioner>
+              <Menu.Popup />
+            </Menu.Positioner>
+          </Menu.Portal>
+        </Menu.Root>,
+      );
+
+      const button = getByRole('button');
+      await act(async () => {
+        button.focus();
+      });
+
+      await user.keyboard('[Enter]');
+
+      expect(queryByRole('menu', { hidden: false })).to.equal(null);
+    });
+  });
 });
diff --git a/packages/react/src/menu/trigger/MenuTrigger.tsx b/packages/react/src/menu/trigger/MenuTrigger.tsx
index e69461e361..6eba1f3f31 100644
--- a/packages/react/src/menu/trigger/MenuTrigger.tsx
+++ b/packages/react/src/menu/trigger/MenuTrigger.tsx
@@ -5,7 +5,8 @@ import { useMenuTrigger } from './useMenuTrigger';
 import { useMenuRootContext } from '../root/MenuRootContext';
 import { pressableTriggerOpenStateMapping } from '../../utils/popupStateMapping';
 import { useComponentRenderer } from '../../utils/useComponentRenderer';
-import { BaseUIComponentProps } from '../../utils/types';
+import { BaseUIComponentProps, GenericHTMLProps } from '../../utils/types';
+import { mergeReactProps } from '../../utils/mergeReactProps';
 
 /**
  * A button that opens the menu.
@@ -20,7 +21,7 @@ const MenuTrigger = React.forwardRef(function MenuTrigger(
   const { render, className, disabled = false, ...other } = props;
 
   const {
-    getTriggerProps: getRootTriggerProps,
+    triggerProps: rootTriggerProps,
     disabled: menuDisabled,
     setTriggerElement,
     open,
@@ -41,11 +42,17 @@ const MenuTrigger = React.forwardRef(function MenuTrigger(
 
   const state: MenuTrigger.State = React.useMemo(() => ({ open }), [open]);
 
+  const propGetter = React.useCallback(
+    (externalProps: GenericHTMLProps) =>
+      mergeReactProps(getTriggerProps, externalProps, rootTriggerProps),
+    [getTriggerProps, rootTriggerProps],
+  );
+
   const { renderElement } = useComponentRenderer({
     render: render || 'button',
     className,
     state,
-    propGetter: (externalProps) => getRootTriggerProps(getTriggerProps(externalProps)),
+    propGetter,
     customStyleHookMapping: pressableTriggerOpenStateMapping,
     extraProps: other,
   });
diff --git a/packages/react/src/menu/trigger/useMenuTrigger.ts b/packages/react/src/menu/trigger/useMenuTrigger.ts
index b9576884ba..aedd4b83ed 100644
--- a/packages/react/src/menu/trigger/useMenuTrigger.ts
+++ b/packages/react/src/menu/trigger/useMenuTrigger.ts
@@ -40,62 +40,60 @@ export function useMenuTrigger(parameters: useMenuTrigger.Parameters): useMenuTr
 
   const getTriggerProps = React.useCallback(
     (externalProps?: GenericHTMLProps): GenericHTMLProps => {
-      return getButtonProps(
-        mergeReactProps(externalProps, {
-          'aria-haspopup': 'menu' as const,
-          tabIndex: 0, // this is needed to make the button focused after click in Safari
-          ref: handleRef,
-          onMouseDown: (event: React.MouseEvent) => {
-            if (open) {
+      return mergeReactProps(getButtonProps, externalProps, {
+        'aria-haspopup': 'menu' as const,
+        tabIndex: 0, // this is needed to make the button focused after click in Safari
+        ref: handleRef,
+        onMouseDown: (event: React.MouseEvent) => {
+          if (open) {
+            return;
+          }
+
+          // mousedown -> mouseup on menu item should not trigger it within 200ms.
+          allowMouseUpTriggerTimeoutRef.current = window.setTimeout(() => {
+            allowMouseUpTriggerRef.current = true;
+          }, 200);
+
+          const doc = ownerDocument(event.currentTarget);
+
+          function handleMouseUp(mouseEvent: MouseEvent) {
+            if (!triggerRef.current) {
               return;
             }
 
-            // mousedown -> mouseup on menu item should not trigger it within 200ms.
-            allowMouseUpTriggerTimeoutRef.current = window.setTimeout(() => {
-              allowMouseUpTriggerRef.current = true;
-            }, 200);
-
-            const doc = ownerDocument(event.currentTarget);
-
-            function handleMouseUp(mouseEvent: MouseEvent) {
-              if (!triggerRef.current) {
-                return;
-              }
-
-              if (allowMouseUpTriggerTimeoutRef.current !== -1) {
-                clearTimeout(allowMouseUpTriggerTimeoutRef.current);
-                allowMouseUpTriggerTimeoutRef.current = -1;
-              }
-              allowMouseUpTriggerRef.current = false;
-
-              const mouseUpTarget = mouseEvent.target as Element | null;
-
-              if (
-                contains(triggerRef.current, mouseUpTarget) ||
-                contains(positionerRef.current, mouseUpTarget) ||
-                mouseUpTarget === triggerRef.current
-              ) {
-                return;
-              }
-
-              const bounds = getPseudoElementBounds(triggerRef.current);
-
-              if (
-                mouseEvent.clientX >= bounds.left - BOUNDARY_OFFSET &&
-                mouseEvent.clientX <= bounds.right + BOUNDARY_OFFSET &&
-                mouseEvent.clientY >= bounds.top - BOUNDARY_OFFSET &&
-                mouseEvent.clientY <= bounds.bottom + BOUNDARY_OFFSET
-              ) {
-                return;
-              }
-
-              setOpen(false, mouseEvent);
+            if (allowMouseUpTriggerTimeoutRef.current !== -1) {
+              clearTimeout(allowMouseUpTriggerTimeoutRef.current);
+              allowMouseUpTriggerTimeoutRef.current = -1;
             }
+            allowMouseUpTriggerRef.current = false;
 
-            doc.addEventListener('mouseup', handleMouseUp, { once: true });
-          },
-        }),
-      );
+            const mouseUpTarget = mouseEvent.target as Element | null;
+
+            if (
+              contains(triggerRef.current, mouseUpTarget) ||
+              contains(positionerRef.current, mouseUpTarget) ||
+              mouseUpTarget === triggerRef.current
+            ) {
+              return;
+            }
+
+            const bounds = getPseudoElementBounds(triggerRef.current);
+
+            if (
+              mouseEvent.clientX >= bounds.left - BOUNDARY_OFFSET &&
+              mouseEvent.clientX <= bounds.right + BOUNDARY_OFFSET &&
+              mouseEvent.clientY >= bounds.top - BOUNDARY_OFFSET &&
+              mouseEvent.clientY <= bounds.bottom + BOUNDARY_OFFSET
+            ) {
+              return;
+            }
+
+            setOpen(false, mouseEvent);
+          }
+
+          doc.addEventListener('mouseup', handleMouseUp, { once: true });
+        },
+      });
     },
     [getButtonProps, handleRef, open, setOpen, positionerRef, allowMouseUpTriggerRef],
   );
diff --git a/packages/react/src/number-field/root/NumberFieldRoot.test.tsx b/packages/react/src/number-field/root/NumberFieldRoot.test.tsx
index 4e0f31ed8d..79e4f65de2 100644
--- a/packages/react/src/number-field/root/NumberFieldRoot.test.tsx
+++ b/packages/react/src/number-field/root/NumberFieldRoot.test.tsx
@@ -45,7 +45,7 @@ describe('<NumberField />', () => {
       const { rerender } = await render(<NumberField value={1} />);
       const input = screen.getByRole('textbox');
       expect(input).to.have.value('1');
-      rerender(<NumberField value={2} />);
+      await rerender(<NumberField value={2} />);
       expect(input).to.have.value('2');
     });
 
diff --git a/packages/react/src/popover/root/PopoverRoot.test.tsx b/packages/react/src/popover/root/PopoverRoot.test.tsx
index b670e53df3..7b7d8cbae1 100644
--- a/packages/react/src/popover/root/PopoverRoot.test.tsx
+++ b/packages/react/src/popover/root/PopoverRoot.test.tsx
@@ -3,7 +3,7 @@ import { Popover } from '@base-ui-components/react/popover';
 import { act, fireEvent, flushMicrotasks, screen, waitFor } from '@mui/internal-test-utils';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { createRenderer, isJSDOM } from '#test-utils';
+import { createRenderer, isJSDOM, popupConformanceTests } from '#test-utils';
 import { OPEN_DELAY } from '../utils/constants';
 
 function Root(props: Popover.Root.Props) {
@@ -17,6 +17,22 @@ describe('<Popover.Root />', () => {
 
   const { render, clock } = createRenderer();
 
+  popupConformanceTests({
+    createComponent: (props) => (
+      <Popover.Root {...props.root}>
+        <Popover.Trigger {...props.trigger}>Open menu</Popover.Trigger>
+        <Popover.Portal {...props.portal}>
+          <Popover.Positioner>
+            <Popover.Popup {...props.popup}>Content</Popover.Popup>
+          </Popover.Positioner>
+        </Popover.Portal>
+      </Popover.Root>
+    ),
+    render,
+    triggerMouseAction: 'click',
+    expectedPopupRole: 'dialog',
+  });
+
   it('should render the children', async () => {
     await render(
       <Root>
@@ -28,27 +44,6 @@ describe('<Popover.Root />', () => {
   });
 
   describe('uncontrolled open', () => {
-    it('should open when the anchor is clicked', async () => {
-      await render(
-        <Root>
-          <Popover.Trigger />
-          <Popover.Portal>
-            <Popover.Positioner>
-              <Popover.Popup>Content</Popover.Popup>
-            </Popover.Positioner>
-          </Popover.Portal>
-        </Root>,
-      );
-
-      const anchor = screen.getByRole('button');
-
-      fireEvent.click(anchor);
-
-      await flushMicrotasks();
-
-      expect(screen.getByText('Content')).not.to.equal(null);
-    });
-
     it('should close when the anchor is clicked twice', async () => {
       await render(
         <Root>
@@ -76,34 +71,6 @@ describe('<Popover.Root />', () => {
   });
 
   describe('controlled open', () => {
-    it('should open when controlled open is true', async () => {
-      await render(
-        <Root open>
-          <Popover.Portal>
-            <Popover.Positioner>
-              <Popover.Popup>Content</Popover.Popup>
-            </Popover.Positioner>
-          </Popover.Portal>
-        </Root>,
-      );
-
-      expect(screen.getByText('Content')).not.to.equal(null);
-    });
-
-    it('should close when controlled open is false', async () => {
-      await render(
-        <Root open={false}>
-          <Popover.Portal>
-            <Popover.Positioner>
-              <Popover.Popup>Content</Popover.Popup>
-            </Popover.Positioner>
-          </Popover.Portal>
-        </Root>,
-      );
-
-      expect(screen.queryByText('Content')).to.equal(null);
-    });
-
     it('should call onChange when the open state changes', async () => {
       const handleChange = spy();
 
@@ -186,101 +153,6 @@ describe('<Popover.Root />', () => {
       expect(handleChange.callCount).to.equal(1);
       expect(handleChange.firstCall.args[0]).to.equal(false);
     });
-
-    it('should remove the popup when there is no exit animation defined', async ({ skip }) => {
-      if (isJSDOM) {
-        skip();
-      }
-
-      function Test() {
-        const [open, setOpen] = React.useState(true);
-
-        return (
-          <div>
-            <button onClick={() => setOpen(false)}>Close</button>
-            <Popover.Root open={open}>
-              <Popover.Portal keepMounted>
-                <Popover.Positioner>
-                  <Popover.Popup />
-                </Popover.Positioner>
-              </Popover.Portal>
-            </Popover.Root>
-          </div>
-        );
-      }
-
-      const { user } = await render(<Test />);
-
-      const closeButton = screen.getByText('Close');
-
-      await user.click(closeButton);
-
-      await waitFor(() => {
-        expect(screen.queryByRole('dialog')).to.equal(null);
-      });
-    });
-
-    it('should remove the popup when the animation finishes', async ({ skip }) => {
-      if (isJSDOM) {
-        skip();
-      }
-
-      globalThis.BASE_UI_ANIMATIONS_DISABLED = false;
-
-      let animationFinished = false;
-      const notifyAnimationFinished = () => {
-        animationFinished = true;
-      };
-
-      function Test() {
-        const style = `
-          @keyframes test-anim {
-            to {
-              opacity: 0;
-            }
-          }
-
-          .animation-test-popup[data-open] {
-            opacity: 1;
-          }
-
-          .animation-test-popup[data-ending-style] {
-            animation: test-anim 1ms;
-          }
-        `;
-
-        const [open, setOpen] = React.useState(true);
-
-        return (
-          <div>
-            {/* eslint-disable-next-line react/no-danger */}
-            <style dangerouslySetInnerHTML={{ __html: style }} />
-            <button onClick={() => setOpen(false)}>Close</button>
-            <Popover.Root open={open}>
-              <Popover.Portal keepMounted>
-                <Popover.Positioner data-testid="positioner">
-                  <Popover.Popup
-                    className="animation-test-popup"
-                    onAnimationEnd={notifyAnimationFinished}
-                  />
-                </Popover.Positioner>
-              </Popover.Portal>
-            </Popover.Root>
-          </div>
-        );
-      }
-
-      const { user } = await render(<Test />);
-
-      const closeButton = screen.getByText('Close');
-      await user.click(closeButton);
-
-      await waitFor(() => {
-        expect(screen.getByTestId('positioner')).to.have.attribute('hidden');
-      });
-
-      expect(animationFinished).to.equal(true);
-    });
   });
 
   describe('prop: defaultOpen', () => {
diff --git a/packages/react/src/popover/root/PopoverRoot.tsx b/packages/react/src/popover/root/PopoverRoot.tsx
index 1f49a613ef..2cf67a2c5a 100644
--- a/packages/react/src/popover/root/PopoverRoot.tsx
+++ b/packages/react/src/popover/root/PopoverRoot.tsx
@@ -70,7 +70,7 @@ PopoverRoot.propTypes /* remove-proptypes */ = {
   /**
    * A ref to imperative actions.
    */
-  action: PropTypes.shape({
+  actionsRef: PropTypes.shape({
     current: PropTypes.shape({
       unmount: PropTypes.func.isRequired,
     }).isRequired,
diff --git a/packages/react/src/preview-card/positioner/usePreviewCardPositioner.ts b/packages/react/src/preview-card/positioner/usePreviewCardPositioner.ts
index f9aa8506a3..cc9e861978 100644
--- a/packages/react/src/preview-card/positioner/usePreviewCardPositioner.ts
+++ b/packages/react/src/preview-card/positioner/usePreviewCardPositioner.ts
@@ -22,6 +22,7 @@ export function usePreviewCardPositioner(
 
         return mergeReactProps<'div'>(externalProps, {
           role: 'presentation',
+
           hidden: !mounted,
           style: {
             ...positioning.positionerStyles,
diff --git a/packages/react/src/preview-card/root/PreviewCardRoot.test.tsx b/packages/react/src/preview-card/root/PreviewCardRoot.test.tsx
index 7f4062a5aa..cebc5b025c 100644
--- a/packages/react/src/preview-card/root/PreviewCardRoot.test.tsx
+++ b/packages/react/src/preview-card/root/PreviewCardRoot.test.tsx
@@ -3,7 +3,7 @@ import { PreviewCard } from '@base-ui-components/react/preview-card';
 import { act, fireEvent, screen, flushMicrotasks, waitFor } from '@mui/internal-test-utils';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { createRenderer, isJSDOM } from '#test-utils';
+import { createRenderer, isJSDOM, popupConformanceTests } from '#test-utils';
 import { CLOSE_DELAY, OPEN_DELAY } from '../utils/constants';
 
 function Root(props: PreviewCard.Root.Props) {
@@ -25,6 +25,21 @@ describe('<PreviewCard.Root />', () => {
 
   const { render, clock } = createRenderer();
 
+  popupConformanceTests({
+    createComponent: (props) => (
+      <PreviewCard.Root {...props.root}>
+        <PreviewCard.Trigger {...props.trigger}>Link</PreviewCard.Trigger>
+        <PreviewCard.Portal {...props.portal}>
+          <PreviewCard.Positioner>
+            <PreviewCard.Popup {...props.popup}>Content</PreviewCard.Popup>
+          </PreviewCard.Positioner>
+        </PreviewCard.Portal>
+      </PreviewCard.Root>
+    ),
+    render,
+    triggerMouseAction: 'hover',
+  });
+
   describe('uncontrolled open', () => {
     clock.withFakeTimers();
 
@@ -135,132 +150,6 @@ describe('<PreviewCard.Root />', () => {
     });
   });
 
-  describe('controlled open', () => {
-    it('should open when controlled open is true', async () => {
-      await render(
-        <Root open>
-          <PreviewCard.Portal>
-            <PreviewCard.Positioner>
-              <PreviewCard.Popup>Content</PreviewCard.Popup>
-            </PreviewCard.Positioner>
-          </PreviewCard.Portal>
-        </Root>,
-      );
-
-      expect(screen.getByText('Content')).not.to.equal(null);
-    });
-
-    it('should close when controlled open is false', async () => {
-      await render(
-        <Root open={false}>
-          <PreviewCard.Portal>
-            <PreviewCard.Positioner>
-              <PreviewCard.Popup>Content</PreviewCard.Popup>
-            </PreviewCard.Positioner>
-          </PreviewCard.Portal>
-        </Root>,
-      );
-
-      expect(screen.queryByText('Content')).to.equal(null);
-    });
-
-    it('should remove the popup when there is no exit animation defined', async ({ skip }) => {
-      if (isJSDOM) {
-        skip();
-      }
-
-      function Test() {
-        const [open, setOpen] = React.useState(true);
-
-        return (
-          <div>
-            <button onClick={() => setOpen(false)}>Close</button>
-            <PreviewCard.Root open={open}>
-              <PreviewCard.Portal>
-                <PreviewCard.Positioner>
-                  <PreviewCard.Popup>Content</PreviewCard.Popup>
-                </PreviewCard.Positioner>
-              </PreviewCard.Portal>
-            </PreviewCard.Root>
-          </div>
-        );
-      }
-
-      const { user } = await render(<Test />);
-
-      const closeButton = screen.getByText('Close');
-      await user.click(closeButton);
-
-      await waitFor(() => {
-        expect(screen.queryByText('Content')).to.equal(null);
-      });
-    });
-
-    it('should remove the popup when the animation finishes', async ({ skip }) => {
-      if (isJSDOM) {
-        skip();
-      }
-
-      let animationFinished = false;
-      const notifyAnimationFinished = () => {
-        animationFinished = true;
-      };
-
-      globalThis.BASE_UI_ANIMATIONS_DISABLED = false;
-
-      function Test() {
-        const style = `
-          @keyframes test-anim {
-            to {
-              opacity: 0;
-            }
-          }
-
-          .animation-test-popup[data-open] {
-            opacity: 1;
-          }
-
-          .animation-test-popup[data-ending-style] {
-            animation: test-anim 1ms;
-          }
-        `;
-
-        const [open, setOpen] = React.useState(true);
-
-        return (
-          <div>
-            {/* eslint-disable-next-line react/no-danger */}
-            <style dangerouslySetInnerHTML={{ __html: style }} />
-            <button onClick={() => setOpen(false)}>Close</button>
-            <PreviewCard.Root open={open}>
-              <PreviewCard.Portal keepMounted>
-                <PreviewCard.Positioner data-testid="positioner">
-                  <PreviewCard.Popup
-                    className="animation-test-popup"
-                    onAnimationEnd={notifyAnimationFinished}
-                  >
-                    Content
-                  </PreviewCard.Popup>
-                </PreviewCard.Positioner>
-              </PreviewCard.Portal>
-            </PreviewCard.Root>
-          </div>
-        );
-      }
-
-      const { user } = await render(<Test />);
-
-      const closeButton = screen.getByText('Close');
-      await user.click(closeButton);
-
-      await waitFor(() => {
-        expect(screen.getByTestId('positioner')).to.have.attribute('hidden');
-      });
-
-      expect(animationFinished).to.equal(true);
-    });
-  });
-
   describe('prop: onOpenChange', () => {
     clock.withFakeTimers();
 
diff --git a/packages/react/src/preview-card/root/PreviewCardRoot.tsx b/packages/react/src/preview-card/root/PreviewCardRoot.tsx
index d89cde19e6..78cc104ccc 100644
--- a/packages/react/src/preview-card/root/PreviewCardRoot.tsx
+++ b/packages/react/src/preview-card/root/PreviewCardRoot.tsx
@@ -61,7 +61,7 @@ PreviewCardRoot.propTypes /* remove-proptypes */ = {
   /**
    * A ref to imperative actions.
    */
-  action: PropTypes.shape({
+  actionsRef: PropTypes.shape({
     current: PropTypes.shape({
       unmount: PropTypes.func.isRequired,
     }).isRequired,
diff --git a/packages/react/src/progress/root/ProgressRoot.test.tsx b/packages/react/src/progress/root/ProgressRoot.test.tsx
index 0adc3fa984..13e11ea639 100644
--- a/packages/react/src/progress/root/ProgressRoot.test.tsx
+++ b/packages/react/src/progress/root/ProgressRoot.test.tsx
@@ -57,7 +57,7 @@ describe('<Progress.Root />', () => {
     it('should update aria-valuenow when value changes', async () => {
       const { getByRole, setProps } = await render(<TestProgress value={50} />);
       const progressbar = getByRole('progressbar');
-      setProps({ value: 77 });
+      await setProps({ value: 77 });
       expect(progressbar).to.have.attribute('aria-valuenow', '77');
     });
   });
diff --git a/packages/react/src/radio-group/RadioGroup.test.tsx b/packages/react/src/radio-group/RadioGroup.test.tsx
index ae2f76cb5f..19843f2774 100644
--- a/packages/react/src/radio-group/RadioGroup.test.tsx
+++ b/packages/react/src/radio-group/RadioGroup.test.tsx
@@ -1,6 +1,8 @@
 import * as React from 'react';
 import { RadioGroup } from '@base-ui-components/react/radio-group';
 import { Radio } from '@base-ui-components/react/radio';
+import { Field } from '@base-ui-components/react/field';
+import { Form } from '@base-ui-components/react/form';
 import {
   DirectionProvider,
   type TextDirection,
@@ -358,4 +360,46 @@ describe('<RadioGroup />', () => {
       expect(indicatorB).to.have.attribute('data-unchecked', '');
     });
   });
+
+  describe('Field', () => {
+    it('passes the `name` prop to the hidden input', () => {
+      render(
+        <Field.Root name="test" data-testid="field">
+          <RadioGroup name="group">
+            <Radio.Root value="a" data-testid="item" />
+          </RadioGroup>
+        </Field.Root>,
+      );
+
+      const input = screen.getByTestId('field').querySelector('input[name="test"]');
+      expect(input).not.to.equal(null);
+    });
+  });
+
+  describe('Form', () => {
+    it('triggers native HTML validation on submit', async () => {
+      const { user } = render(
+        <Form>
+          <Field.Root name="test" data-testid="field">
+            <RadioGroup name="group" required>
+              <Radio.Root value="a" data-testid="item" />
+            </RadioGroup>
+            <Field.Error match="valueMissing" data-testid="error">
+              required
+            </Field.Error>
+          </Field.Root>
+          <button type="submit">Submit</button>
+        </Form>,
+      );
+
+      const submit = screen.getByText('Submit');
+
+      expect(screen.queryByTestId('error')).to.equal(null);
+
+      await user.click(submit);
+
+      const error = screen.getByTestId('error');
+      expect(error).to.have.text('required');
+    });
+  });
 });
diff --git a/packages/react/src/radio-group/useRadioGroup.ts b/packages/react/src/radio-group/useRadioGroup.ts
index 325370de5b..b01f442d7f 100644
--- a/packages/react/src/radio-group/useRadioGroup.ts
+++ b/packages/react/src/radio-group/useRadioGroup.ts
@@ -7,17 +7,28 @@ import { useFieldRootContext } from '../field/root/FieldRootContext';
 import { useBaseUiId } from '../utils/useBaseUiId';
 import { useFieldControlValidation } from '../field/control/useFieldControlValidation';
 import { useField } from '../field/useField';
+import { visuallyHidden } from '../utils';
 
 export function useRadioGroup(params: useRadioGroup.Parameters) {
-  const { disabled = false, name, defaultValue, readOnly, value: externalValue } = params;
+  const {
+    disabled = false,
+    required,
+    name: nameProp,
+    defaultValue,
+    readOnly,
+    value: externalValue,
+  } = params;
 
   const {
     labelId,
     setTouched: setFieldTouched,
     setFocused,
     validationMode,
+    name: fieldName,
   } = useFieldRootContext();
 
+  const name = fieldName ?? nameProp;
+
   const fieldControlValidation = useFieldControlValidation();
 
   const id = useBaseUiId();
@@ -91,15 +102,18 @@ export function useRadioGroup(params: useRadioGroup.Parameters) {
   const getInputProps = React.useCallback(
     (externalProps = {}) =>
       mergeReactProps<'input'>(fieldControlValidation.getInputValidationProps(externalProps), {
-        type: 'hidden',
         value: serializedCheckedValue,
         ref: fieldControlValidation.inputRef,
         id,
         name,
         disabled,
         readOnly,
+        required,
+        'aria-hidden': true,
+        tabIndex: -1,
+        style: visuallyHidden,
       }),
-    [fieldControlValidation, serializedCheckedValue, id, name, disabled, readOnly],
+    [fieldControlValidation, serializedCheckedValue, id, name, disabled, readOnly, required],
   );
 
   return React.useMemo(
@@ -120,6 +134,7 @@ namespace useRadioGroup {
   export interface Parameters {
     name?: string;
     disabled?: boolean;
+    required?: boolean;
     readOnly?: boolean;
     defaultValue?: unknown;
     value?: unknown;
diff --git a/packages/react/src/select/root/SelectRoot.test.tsx b/packages/react/src/select/root/SelectRoot.test.tsx
index d183735388..6c73a361e2 100644
--- a/packages/react/src/select/root/SelectRoot.test.tsx
+++ b/packages/react/src/select/root/SelectRoot.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Select } from '@base-ui-components/react/select';
 import { act, fireEvent, flushMicrotasks, screen, waitFor } from '@mui/internal-test-utils';
-import { createRenderer, isJSDOM } from '#test-utils';
+import { createRenderer, isJSDOM, popupConformanceTests } from '#test-utils';
 import { expect } from 'chai';
 import { spy } from 'sinon';
 
@@ -12,6 +12,27 @@ describe('<Select.Root />', () => {
 
   const { render } = createRenderer();
 
+  popupConformanceTests({
+    createComponent: (props) => (
+      <Select.Root {...props.root}>
+        <Select.Trigger {...props.trigger}>
+          <Select.Value />
+        </Select.Trigger>
+        <Select.Portal {...props.portal}>
+          <Select.Positioner>
+            <Select.Popup {...props.popup}>
+              <Select.Item>Item</Select.Item>
+            </Select.Popup>
+          </Select.Positioner>
+        </Select.Portal>
+      </Select.Root>
+    ),
+    render,
+    triggerMouseAction: 'click',
+    expectedPopupRole: 'listbox',
+    alwaysMounted: true,
+  });
+
   describe('prop: defaultValue', () => {
     it('should select the item by default', async () => {
       await render(
@@ -101,9 +122,7 @@ describe('<Select.Root />', () => {
         '',
       );
 
-      setProps({ value: 'b' });
-
-      await flushMicrotasks();
+      await setProps({ value: 'b' });
 
       expect(screen.getByRole('option', { name: 'b', hidden: false })).to.have.attribute(
         'data-selected',
@@ -180,134 +199,6 @@ describe('<Select.Root />', () => {
     });
   });
 
-  describe('prop: open', () => {
-    it('should control the open state of the select', async () => {
-      function ControlledSelect({ open }: { open: boolean }) {
-        return (
-          <Select.Root open={open}>
-            <Select.Trigger data-testid="trigger">
-              <Select.Value />
-            </Select.Trigger>
-            <Select.Portal>
-              <Select.Positioner>
-                <Select.Popup>
-                  <Select.Item value="a">a</Select.Item>
-                  <Select.Item value="b">b</Select.Item>
-                </Select.Popup>
-              </Select.Positioner>
-            </Select.Portal>
-          </Select.Root>
-        );
-      }
-
-      const { rerender } = await render(<ControlledSelect open={false} />);
-
-      expect(screen.queryByRole('listbox', { hidden: false })).to.equal(null);
-
-      rerender(<ControlledSelect open />);
-
-      await flushMicrotasks();
-
-      expect(screen.queryByRole('listbox')).not.to.equal(null);
-    });
-
-    it('when `false`, should remove the popup when there is no exit animation defined', async ({
-      skip,
-    }) => {
-      if (isJSDOM) {
-        skip();
-      }
-
-      function Test() {
-        const [open, setOpen] = React.useState(true);
-
-        return (
-          <div>
-            <button onClick={() => setOpen(false)}>Close</button>
-            <Select.Root open={open} modal={false}>
-              <Select.Portal>
-                <Select.Positioner>
-                  <Select.Popup />
-                </Select.Positioner>
-              </Select.Portal>
-            </Select.Root>
-          </div>
-        );
-      }
-
-      const { user } = await render(<Test />);
-
-      const closeButton = screen.getByText('Close');
-      await user.click(closeButton);
-
-      await waitFor(() => {
-        expect(screen.queryByRole('listbox')).to.equal(null);
-      });
-    });
-
-    it('when `false`, should remove the popup when the animation finishes', async ({ skip }) => {
-      if (isJSDOM) {
-        skip();
-      }
-
-      globalThis.BASE_UI_ANIMATIONS_DISABLED = false;
-
-      let animationFinished = false;
-      const notifyAnimationFinished = () => {
-        animationFinished = true;
-      };
-
-      function Test() {
-        const style = `
-          @keyframes test-anim {
-            to {
-              opacity: 0;
-            }
-          }
-
-          .animation-test-popup[data-open] {
-            opacity: 1;
-          }
-
-          .animation-test-popup[data-ending-style] {
-            animation: test-anim 1ms;
-          }
-        `;
-
-        const [open, setOpen] = React.useState(true);
-
-        return (
-          <div>
-            {/* eslint-disable-next-line react/no-danger */}
-            <style dangerouslySetInnerHTML={{ __html: style }} />
-            <button onClick={() => setOpen(false)}>Close</button>
-            <Select.Root open={open} modal={false}>
-              <Select.Portal>
-                <Select.Positioner>
-                  <Select.Popup
-                    className="animation-test-popup"
-                    onAnimationEnd={notifyAnimationFinished}
-                  />
-                </Select.Positioner>
-              </Select.Portal>
-            </Select.Root>
-          </div>
-        );
-      }
-
-      const { user } = await render(<Test />);
-
-      const closeButton = screen.getByText('Close');
-      await user.click(closeButton);
-
-      await waitFor(() => {
-        expect(screen.queryByRole('listbox')).to.equal(null);
-      });
-
-      expect(animationFinished).to.equal(true);
-    });
-  });
-
   describe('prop: onOpenChange', () => {
     it('should call onOpenChange when the select is opened or closed', async () => {
       const handleOpenChange = spy();
diff --git a/packages/react/src/slider/root/SliderRoot.test.tsx b/packages/react/src/slider/root/SliderRoot.test.tsx
index 49dcf02ffb..89ae72052d 100644
--- a/packages/react/src/slider/root/SliderRoot.test.tsx
+++ b/packages/react/src/slider/root/SliderRoot.test.tsx
@@ -349,7 +349,7 @@ describe.skipIf(typeof Touch === 'undefined')('<Slider.Root />', () => {
       expect(thumb).to.have.attribute('aria-valuenow', '21');
       expect(thumb).toHaveFocus();
 
-      setProps({ disabled: true });
+      await setProps({ disabled: true });
       expect(thumb).not.toHaveFocus();
       // expect(thumb).not.to.have.class(classes.active);
 
diff --git a/packages/react/src/switch/root/SwitchRoot.test.tsx b/packages/react/src/switch/root/SwitchRoot.test.tsx
index dc759610da..582de17be7 100644
--- a/packages/react/src/switch/root/SwitchRoot.test.tsx
+++ b/packages/react/src/switch/root/SwitchRoot.test.tsx
@@ -265,7 +265,7 @@ describe('<Switch.Root />', () => {
     expect(thumb).to.have.attribute('data-readonly', '');
     expect(thumb).to.have.attribute('data-required', '');
 
-    setProps({ disabled: false, readOnly: false });
+    await setProps({ disabled: false, readOnly: false });
     fireEvent.click(switchElement);
 
     expect(switchElement).to.have.attribute('data-unchecked', '');
diff --git a/packages/react/src/tabs/indicator/TabsIndicator.test.tsx b/packages/react/src/tabs/indicator/TabsIndicator.test.tsx
index 7a0dd89055..e78b09b916 100644
--- a/packages/react/src/tabs/indicator/TabsIndicator.test.tsx
+++ b/packages/react/src/tabs/indicator/TabsIndicator.test.tsx
@@ -116,7 +116,7 @@ describe('<Tabs.Indicator />', () => {
         </Tabs.Root>,
       );
 
-      setProps({ value: 3 });
+      await setProps({ value: 3 });
 
       const bubble = getByTestId('bubble');
       const tabs = getAllByRole('tab');
@@ -125,7 +125,7 @@ describe('<Tabs.Indicator />', () => {
 
       assertBubblePositionVariables(bubble, tabList, activeTab);
 
-      setProps({ value: 1 });
+      await setProps({ value: 1 });
       activeTab = tabs[0];
       await waitFor(() => {
         assertBubblePositionVariables(bubble, tabList, activeTab);
@@ -154,7 +154,7 @@ describe('<Tabs.Indicator />', () => {
 
       assertBubblePositionVariables(bubble, tabList, activeTab);
 
-      setProps({
+      await setProps({
         style: { width: '800px' },
       });
 
diff --git a/packages/react/src/tabs/root/TabsRoot.test.tsx b/packages/react/src/tabs/root/TabsRoot.test.tsx
index 2e81efd15b..1685fb928c 100644
--- a/packages/react/src/tabs/root/TabsRoot.test.tsx
+++ b/packages/react/src/tabs/root/TabsRoot.test.tsx
@@ -58,7 +58,7 @@ describe('<Tabs.Root />', () => {
 
       expect(getAllByRole('tab').map((tab) => tab.tabIndex)).to.have.ordered.members([-1, 0]);
 
-      setProps({ value: 0 });
+      await setProps({ value: 0 });
 
       expect(getAllByRole('tab').map((tab) => tab.tabIndex)).to.have.ordered.members([0, -1]);
     });
diff --git a/packages/react/src/toggle-group/ToggleGroup.test.tsx b/packages/react/src/toggle-group/ToggleGroup.test.tsx
index c098c973da..dd2501863b 100644
--- a/packages/react/src/toggle-group/ToggleGroup.test.tsx
+++ b/packages/react/src/toggle-group/ToggleGroup.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { act, flushMicrotasks } from '@mui/internal-test-utils';
+import { act } from '@mui/internal-test-utils';
 import {
   DirectionProvider,
   type TextDirection,
@@ -92,15 +92,13 @@ describe('<ToggleGroup />', () => {
       expect(button2).to.have.attribute('aria-pressed', 'true');
       expect(button2).to.have.attribute('data-pressed');
 
-      setProps({ value: ['one'] });
-      await flushMicrotasks();
+      await setProps({ value: ['one'] });
 
       expect(button1).to.have.attribute('aria-pressed', 'true');
       expect(button1).to.have.attribute('data-pressed');
       expect(button2).to.have.attribute('aria-pressed', 'false');
 
-      setProps({ value: ['two'] });
-      await flushMicrotasks();
+      await setProps({ value: ['two'] });
 
       expect(button2).to.have.attribute('aria-pressed', 'true');
       expect(button2).to.have.attribute('data-pressed');
@@ -121,8 +119,7 @@ describe('<ToggleGroup />', () => {
       expect(button2).to.have.attribute('data-pressed');
       expect(button1).to.have.attribute('aria-pressed', 'false');
 
-      setProps({ value: ['one'] });
-      await flushMicrotasks();
+      await setProps({ value: ['one'] });
 
       expect(button1).to.have.attribute('aria-pressed', 'true');
       expect(button1).to.have.attribute('data-pressed');
diff --git a/packages/react/src/tooltip/root/TooltipRoot.test.tsx b/packages/react/src/tooltip/root/TooltipRoot.test.tsx
index 631842c864..81add72f66 100644
--- a/packages/react/src/tooltip/root/TooltipRoot.test.tsx
+++ b/packages/react/src/tooltip/root/TooltipRoot.test.tsx
@@ -3,7 +3,7 @@ import { Tooltip } from '@base-ui-components/react/tooltip';
 import { act, fireEvent, flushMicrotasks, screen, waitFor } from '@mui/internal-test-utils';
 import { expect } from 'chai';
 import { spy } from 'sinon';
-import { createRenderer, isJSDOM } from '#test-utils';
+import { createRenderer, isJSDOM, popupConformanceTests } from '#test-utils';
 import { OPEN_DELAY } from '../utils/constants';
 
 function Root(props: Tooltip.Root.Props) {
@@ -17,6 +17,21 @@ describe('<Tooltip.Root />', () => {
 
   const { render, clock } = createRenderer();
 
+  popupConformanceTests({
+    createComponent: (props) => (
+      <Tooltip.Root {...props.root}>
+        <Tooltip.Trigger {...props.trigger}>Open menu</Tooltip.Trigger>
+        <Tooltip.Portal {...props.portal}>
+          <Tooltip.Positioner>
+            <Tooltip.Popup {...props.popup}>Content</Tooltip.Popup>
+          </Tooltip.Positioner>
+        </Tooltip.Portal>
+      </Tooltip.Root>
+    ),
+    render,
+    triggerMouseAction: 'hover',
+  });
+
   describe('uncontrolled open', () => {
     clock.withFakeTimers();
 
@@ -130,35 +145,6 @@ describe('<Tooltip.Root />', () => {
 
   describe('controlled open', () => {
     clock.withFakeTimers();
-
-    it('should open when controlled open is true', async () => {
-      await render(
-        <Root open>
-          <Tooltip.Portal>
-            <Tooltip.Positioner>
-              <Tooltip.Popup>Content</Tooltip.Popup>
-            </Tooltip.Positioner>
-          </Tooltip.Portal>
-        </Root>,
-      );
-
-      expect(screen.getByText('Content')).not.to.equal(null);
-    });
-
-    it('should close when controlled open is false', async () => {
-      await render(
-        <Root open={false}>
-          <Tooltip.Portal>
-            <Tooltip.Positioner>
-              <Tooltip.Popup>Content</Tooltip.Popup>
-            </Tooltip.Positioner>
-          </Tooltip.Portal>
-        </Root>,
-      );
-
-      expect(screen.queryByText('Content')).to.equal(null);
-    });
-
     it('should call onOpenChange when the open state changes', async () => {
       const handleChange = spy();
 
diff --git a/packages/react/src/tooltip/root/TooltipRoot.tsx b/packages/react/src/tooltip/root/TooltipRoot.tsx
index 0cc48704b2..1f8d26683a 100644
--- a/packages/react/src/tooltip/root/TooltipRoot.tsx
+++ b/packages/react/src/tooltip/root/TooltipRoot.tsx
@@ -73,7 +73,7 @@ TooltipRoot.propTypes /* remove-proptypes */ = {
   /**
    * A ref to imperative actions.
    */
-  action: PropTypes.shape({
+  actionsRef: PropTypes.shape({
     current: PropTypes.shape({
       unmount: PropTypes.func.isRequired,
     }).isRequired,
diff --git a/packages/react/src/use-button/useButton.test.tsx b/packages/react/src/use-button/useButton.test.tsx
index aede0952bc..7a86631574 100644
--- a/packages/react/src/use-button/useButton.test.tsx
+++ b/packages/react/src/use-button/useButton.test.tsx
@@ -48,16 +48,16 @@ describe('useButton', () => {
       expect(button).toHaveFocus();
 
       fireEvent.keyDown(button, { key: 'Enter' });
-      expect(handleKeyDown.callCount).to.equal(1);
+      expect(handleKeyDown.callCount).to.equal(0);
       expect(handleClick.callCount).to.equal(0);
 
       fireEvent.keyUp(button, { key: 'Space' });
-      expect(handleKeyUp.callCount).to.equal(1);
+      expect(handleKeyUp.callCount).to.equal(0);
       expect(handleClick.callCount).to.equal(0);
 
       fireEvent.click(button);
-      expect(handleKeyDown.callCount).to.equal(1);
-      expect(handleKeyUp.callCount).to.equal(1);
+      expect(handleKeyDown.callCount).to.equal(0);
+      expect(handleKeyUp.callCount).to.equal(0);
       expect(handleClick.callCount).to.equal(0);
     });
   });
diff --git a/packages/react/src/use-button/useButton.ts b/packages/react/src/use-button/useButton.ts
index c2fa8bd820..ba443905c6 100644
--- a/packages/react/src/use-button/useButton.ts
+++ b/packages/react/src/use-button/useButton.ts
@@ -1,11 +1,10 @@
 'use client';
 import * as React from 'react';
-import { NOOP } from '../utils/noop';
 import { useForkRef } from '../utils/useForkRef';
-import { mergeReactProps } from '../utils/mergeReactProps';
+import { makeEventPreventable, mergeReactProps } from '../utils/mergeReactProps';
 import { useEventCallback } from '../utils/useEventCallback';
 import { useRootElementName } from '../utils/useRootElementName';
-import { GenericHTMLProps } from '../utils/types';
+import { BaseUIEvent, GenericHTMLProps } from '../utils/types';
 
 export function useButton(parameters: useButton.Parameters = {}): useButton.ReturnValue {
   const {
@@ -67,22 +66,40 @@ export function useButton(parameters: useButton.Parameters = {}): useButton.Retu
 
   const getButtonProps = React.useCallback(
     (externalProps: GenericButtonProps = {}): GenericButtonProps => {
-      const onClickProp = externalProps?.onClick ?? NOOP;
+      const {
+        onClick: externalOnClick,
+        onMouseDown: externalOnMouseDown,
+        onKeyUp: externalOnKeyUp,
+        onKeyDown: externalOnKeyDown,
+        ...otherExternalProps
+      } = externalProps;
 
-      const otherExternalProps = { ...externalProps };
-      delete otherExternalProps.onClick;
       return mergeReactProps(otherExternalProps, buttonProps, {
         type,
         onClick(event: React.MouseEvent) {
           if (!disabled) {
-            onClickProp(event);
+            externalOnClick?.(event);
           }
         },
-        onKeyDown(event: React.KeyboardEvent) {
+        onMouseDown(event: React.MouseEvent) {
+          if (!disabled) {
+            externalOnMouseDown?.(event);
+          }
+        },
+        onKeyDown(event: BaseUIEvent<React.KeyboardEvent>) {
           if (event.target === event.currentTarget && !isNativeButton() && event.key === ' ') {
             event.preventDefault();
           }
 
+          if (!disabled) {
+            makeEventPreventable(event);
+            externalOnKeyDown?.(event);
+          }
+
+          if (event.baseUIHandlerPrevented) {
+            return;
+          }
+
           // Keyboard accessibility for non interactive elements
           if (
             event.target === event.currentTarget &&
@@ -91,21 +108,30 @@ export function useButton(parameters: useButton.Parameters = {}): useButton.Retu
             event.key === 'Enter' &&
             !disabled
           ) {
-            onClickProp(event);
+            externalOnClick?.(event);
             event.preventDefault();
           }
         },
-        onKeyUp(event: React.KeyboardEvent) {
+        onKeyUp(event: BaseUIEvent<React.KeyboardEvent>) {
           // calling preventDefault in keyUp on a <button> will not dispatch a click event if Space is pressed
           // https://codesandbox.io/p/sandbox/button-keyup-preventdefault-dn7f0
           // Keyboard accessibility for non interactive elements
+          if (!disabled) {
+            makeEventPreventable(event);
+            externalOnKeyUp?.(event);
+          }
+
+          if (event.baseUIHandlerPrevented) {
+            return;
+          }
+
           if (
             event.target === event.currentTarget &&
             !isNativeButton() &&
             !disabled &&
             event.key === ' '
           ) {
-            onClickProp(event);
+            externalOnClick?.(event);
           }
         },
         ref: mergedRef,
diff --git a/packages/react/src/utils/mergeReactProps.test.ts b/packages/react/src/utils/mergeReactProps.test.ts
index 1cc55f159e..46978f7b32 100644
--- a/packages/react/src/utils/mergeReactProps.test.ts
+++ b/packages/react/src/utils/mergeReactProps.test.ts
@@ -196,4 +196,73 @@ describe('mergeReactProps', () => {
 
     expect(mergedProps.title).to.equal('internal title 1');
   });
+
+  describe('props getters', () => {
+    it('calls the props getter with the props defined after it', () => {
+      const propsGetter = spy((props) => props);
+      mergeReactProps(
+        {
+          id: '1',
+          role: 'button',
+        },
+        propsGetter,
+        {
+          id: '2',
+          className: 'test-class',
+        },
+      );
+
+      expect(propsGetter.calledOnce).to.equal(true);
+      expect(propsGetter.firstCall.args[0]).to.deep.equal({ id: '2', className: 'test-class' });
+    });
+
+    it('calls the props getter with merged props defined after it', () => {
+      const propsGetter = spy((props) => props);
+      mergeReactProps(
+        {
+          id: 'one',
+        },
+        propsGetter,
+        {
+          role: 'tab',
+        },
+        {
+          role: 'button',
+          className: 'test-class',
+        },
+      );
+
+      expect(propsGetter.calledOnce).to.equal(true);
+      expect(propsGetter.firstCall.args[0]).to.deep.equal({
+        role: 'tab',
+        className: 'test-class',
+      });
+    });
+
+    it('calls the props getter with an empty object if no props are defined after it', () => {
+      const propsGetter = spy((props) => props);
+      mergeReactProps({ id: '1' }, propsGetter);
+
+      expect(propsGetter.calledOnce).to.equal(true);
+      expect(propsGetter.firstCall.args[0]).to.deep.equal({});
+    });
+
+    it('accepts the result of the props getter', () => {
+      const propsGetter = () => ({ className: 'test-class' });
+      const result = mergeReactProps(
+        propsGetter,
+        {
+          id: 'one',
+        },
+        {
+          id: 'two',
+          role: 'tab',
+        },
+      );
+
+      expect(result).to.deep.equal({
+        className: 'test-class',
+      });
+    });
+  });
 });
diff --git a/packages/react/src/utils/mergeReactProps.ts b/packages/react/src/utils/mergeReactProps.ts
index 4633f3a7b0..6eb554277b 100644
--- a/packages/react/src/utils/mergeReactProps.ts
+++ b/packages/react/src/utils/mergeReactProps.ts
@@ -1,36 +1,74 @@
 import * as React from 'react';
 import type { BaseUIEvent, WithBaseUIEvent } from './types';
 
+type MergableProps<T extends React.ElementType> =
+  | WithBaseUIEvent<React.ComponentPropsWithRef<T>>
+  | ((
+      otherProps: WithBaseUIEvent<React.ComponentPropsWithRef<T>>,
+    ) => WithBaseUIEvent<React.ComponentPropsWithRef<T>>)
+  | undefined;
+
 /**
- * Merges multiple sets of React props such that their event handlers are called in sequence
- * (the leftmost one being called first), and allows the user to prevent the subsequent event handlers from being
+ * Merges multiple sets of React props. It follows the Object.assign pattern where the leftmost object's fields overwrite
+ * the conflicting ones from others. This doesn't apply to event handlers, `className` and `style` props.
+ * Event handlers are merged such that they are called in sequence (the leftmost one being called first),
+ * and allows the user to prevent the subsequent event handlers from being
  * executed by attaching a `preventBaseUIHandler` method.
  * It also merges the `className` and `style` props, whereby the classes are concatenated
  * and the leftmost styles overwrite the subsequent ones.
+ *
+ * Props can either be provided as objects or as functions that take the previous props as an argument.
+ * The function will receive the merged props up to that point (going from right to left):
+ * so in the case of `(obj1, fn, obj2, obj3)`, `fn` will receive the merged props of `obj2` and `obj3`.
+ * The function is responsible for chaining event handlers if needed (i.e. we don't run the merge logic).
+ *
+ * Event handlers returned by the functions are not automatically prevented when `preventBaseUIHandler` is called.
+ * They must check `event.baseUIHandlerPrevented` themselves and bail out if it's true.
+ *
  * @important **`ref` is not merged.**
  * @param props props to merge.
  * @returns the merged props.
  */
 export function mergeReactProps<T extends React.ElementType>(
-  ...props: (WithBaseUIEvent<React.ComponentPropsWithRef<T>> | undefined)[]
+  ...props: MergableProps<T>[]
 ): WithBaseUIEvent<React.ComponentPropsWithRef<T>> {
   if (props.length === 0) {
     return {} as WithBaseUIEvent<React.ComponentPropsWithRef<T>>;
   }
 
   if (props.length === 1) {
-    return props[0] ?? ({} as WithBaseUIEvent<React.ComponentPropsWithRef<T>>);
+    return resolvePropsGetter(props[0], {});
   }
 
-  let merged = merge(props[props.length - 2], props[props.length - 1]);
+  let merged = resolvePropsGetter(props[props.length - 1], {});
+
+  for (let i = props.length - 2; i >= 0; i -= 1) {
+    const propsOrPropsGetter = props[i];
+    if (!propsOrPropsGetter) {
+      continue;
+    }
 
-  for (let i = props.length - 3; i >= 0; i -= 1) {
-    merged = merge(props[i], merged);
+    if (isPropsGetter(propsOrPropsGetter)) {
+      merged = propsOrPropsGetter(merged);
+    } else {
+      merged = merge(propsOrPropsGetter as WithBaseUIEvent<React.ComponentPropsWithRef<T>>, merged);
+    }
   }
 
   return merged ?? ({} as WithBaseUIEvent<React.ComponentPropsWithRef<T>>);
 }
 
+function resolvePropsGetter<T extends React.ElementType>(
+  propsOrPropsGetter: MergableProps<React.ElementType>,
+  previousProps: WithBaseUIEvent<React.ComponentPropsWithRef<T>>,
+) {
+  if (isPropsGetter(propsOrPropsGetter)) {
+    return propsOrPropsGetter(previousProps);
+  }
+
+  return propsOrPropsGetter ?? ({} as WithBaseUIEvent<React.ComponentPropsWithRef<T>>);
+}
+
 /**
  * Merges two sets of props. In case of conflicts, the external props take precedence.
  */
@@ -86,19 +124,24 @@ function isEventHandler(key: string, value: unknown) {
   );
 }
 
+function isPropsGetter<T extends React.ComponentType>(
+  propsOrPropsGetter: MergableProps<T>,
+): propsOrPropsGetter is (
+  props: WithBaseUIEvent<React.ComponentPropsWithRef<T>>,
+) => WithBaseUIEvent<React.ComponentPropsWithRef<T>> {
+  return typeof propsOrPropsGetter === 'function';
+}
+
 function mergeEventHandlers(theirHandler: Function, ourHandler: Function) {
   return (event: unknown) => {
     if (isSyntheticEvent(event)) {
-      let isPrevented = false;
       const baseUIEvent = event as BaseUIEvent<typeof event>;
 
-      baseUIEvent.preventBaseUIHandler = () => {
-        isPrevented = true;
-      };
+      makeEventPreventable(baseUIEvent);
 
       const result = theirHandler(baseUIEvent);
 
-      if (!isPrevented) {
+      if (!baseUIEvent.baseUIHandlerPrevented) {
         ourHandler?.(baseUIEvent);
       }
 
@@ -111,6 +154,14 @@ function mergeEventHandlers(theirHandler: Function, ourHandler: Function) {
   };
 }
 
+export function makeEventPreventable<T extends React.SyntheticEvent>(event: BaseUIEvent<T>) {
+  event.preventBaseUIHandler = () => {
+    (event.baseUIHandlerPrevented as boolean) = true;
+  };
+
+  return event;
+}
+
 function mergeStyles(
   theirStyle: React.CSSProperties | undefined,
   ourStyle: React.CSSProperties | undefined,
diff --git a/packages/react/src/utils/types.ts b/packages/react/src/utils/types.ts
index c51f81d698..aa2e674502 100644
--- a/packages/react/src/utils/types.ts
+++ b/packages/react/src/utils/types.ts
@@ -4,6 +4,7 @@ export type GenericHTMLProps = React.HTMLAttributes<any> & { ref?: React.Ref<any
 
 export type BaseUIEvent<E extends React.SyntheticEvent<Element, Event>> = E & {
   preventBaseUIHandler: () => void;
+  readonly baseUIHandlerPrevented?: boolean;
 };
 
 type WithPreventBaseUIHandler<T> = T extends (event: infer E) => any
diff --git a/packages/react/test/createRenderer.ts b/packages/react/test/createRenderer.ts
index d0e237f2c8..175a7276c6 100644
--- a/packages/react/test/createRenderer.ts
+++ b/packages/react/test/createRenderer.ts
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import {
   CreateRendererOptions,
   RenderOptions,
@@ -8,11 +9,16 @@ import {
   act,
 } from '@mui/internal-test-utils';
 
+export type BaseUIRenderResult = Omit<MuiRenderResult, 'rerender' | 'setProps'> & {
+  rerender: (newElement: React.ReactElement<DataAttributes>) => Promise<void>;
+  setProps: (newProps: object) => Promise<void>;
+};
+
 type BaseUITestRenderer = Omit<Renderer, 'render'> & {
   render: (
     element: React.ReactElement<DataAttributes>,
     options?: RenderOptions,
-  ) => Promise<MuiRenderResult>;
+  ) => Promise<BaseUIRenderResult>;
 };
 
 interface DataAttributes {
@@ -27,7 +33,22 @@ export function createRenderer(globalOptions?: CreateRendererOptions): BaseUITes
     act(async () => {
       const result = await originalRender(element, options);
       await flushMicrotasks();
-      return result;
+
+      async function rerender(newElement: React.ReactElement<DataAttributes>) {
+        await act(async () => result.rerender(newElement));
+        await flushMicrotasks();
+      }
+
+      async function setProps(newProps: object) {
+        await rerender(React.cloneElement(element, newProps));
+        await flushMicrotasks();
+      }
+
+      return {
+        ...result,
+        rerender,
+        setProps,
+      };
     });
 
   return {
diff --git a/packages/react/test/describeConformance.tsx b/packages/react/test/describeConformance.tsx
index 2cc5b51095..43c53263c9 100644
--- a/packages/react/test/describeConformance.tsx
+++ b/packages/react/test/describeConformance.tsx
@@ -9,6 +9,7 @@ import { testPropForwarding } from './conformanceTests/propForwarding';
 import { testRefForwarding } from './conformanceTests/refForwarding';
 import { testRenderProp } from './conformanceTests/renderProp';
 import { testClassName } from './conformanceTests/className';
+import { BaseUIRenderResult } from './createRenderer';
 
 export type ConformantComponentProps = {
   render?: React.ReactElement<unknown> | ((props: Record<string, unknown>) => React.ReactNode);
@@ -26,7 +27,7 @@ export interface BaseUiConformanceTestsOptions
       string | React.JSXElementConstructor<any>
     >,
     options?: RenderOptions | undefined,
-  ) => Promise<MuiRenderResult> | MuiRenderResult;
+  ) => Promise<BaseUIRenderResult> | MuiRenderResult;
   skip?: (keyof typeof fullSuite)[];
   testRenderPropWith?: keyof React.JSX.IntrinsicElements;
 }
diff --git a/packages/react/test/index.ts b/packages/react/test/index.ts
index 6d1fb59a60..a4798274ab 100644
--- a/packages/react/test/index.ts
+++ b/packages/react/test/index.ts
@@ -1,3 +1,4 @@
 export { createRenderer } from './createRenderer';
 export { describeConformance } from './describeConformance';
+export { popupConformanceTests } from './popupConformanceTests';
 export * from './utils';
diff --git a/packages/react/test/popupConformanceTests.tsx b/packages/react/test/popupConformanceTests.tsx
new file mode 100644
index 0000000000..2fc5b82539
--- /dev/null
+++ b/packages/react/test/popupConformanceTests.tsx
@@ -0,0 +1,230 @@
+import * as React from 'react';
+import { spy } from 'sinon';
+import { expect } from 'chai';
+import { randomStringValue, screen, waitFor } from '@mui/internal-test-utils';
+import { createRenderer, isJSDOM } from '#test-utils';
+
+export function popupConformanceTests(config: PopupTestConfig) {
+  const {
+    createComponent,
+    triggerMouseAction,
+    render,
+    expectedPopupRole,
+    alwaysMounted = false,
+  } = config;
+
+  const prepareComponent = (props: TestedComponentProps) => {
+    return createComponent({
+      ...props,
+      trigger: {
+        'data-testid': 'trigger',
+        ...props.trigger,
+      },
+      popup: {
+        'data-testid': 'popup',
+        ...props.popup,
+      },
+    });
+  };
+
+  describe('Popup conformance', () => {
+    describe('controlled mode', () => {
+      it('opens the popup with the `open` prop', async () => {
+        const { rerender } = await render(prepareComponent({ root: { open: false } }));
+        if (!alwaysMounted) {
+          expect(getPopup()).to.equal(null);
+        } else {
+          expect(getPopup()).toBeInaccessible();
+        }
+
+        await rerender(prepareComponent({ root: { open: true } }));
+        expect(getPopup()).not.to.equal(null);
+      });
+    });
+
+    if (triggerMouseAction === 'click') {
+      describe('uncontrolled mode', () => {
+        it('opens the popup when clicking on the trigger', async () => {
+          const { user } = await render(prepareComponent({}));
+
+          const trigger = getTrigger();
+          if (!alwaysMounted) {
+            expect(getPopup()).to.equal(null);
+          } else {
+            expect(getPopup()).toBeInaccessible();
+          }
+
+          await user.click(trigger);
+
+          expect(getPopup()).not.to.equal(null);
+        });
+      });
+    }
+
+    if (expectedPopupRole || triggerMouseAction === 'click') {
+      describe('ARIA attributes', () => {
+        if (expectedPopupRole) {
+          it(`has the ${expectedPopupRole} role on the popup`, async () => {
+            await render(prepareComponent({ root: { open: true } }));
+            const popup = getPopup();
+            expect(popup).not.to.equal(null);
+            expect(popup).to.have.attribute('role', expectedPopupRole);
+          });
+        }
+
+        if (triggerMouseAction === 'click') {
+          it('has the `aria-controls` attribute on the trigger', async () => {
+            await render(prepareComponent({ root: { open: true } }));
+            const trigger = getTrigger();
+            const popup = getPopup();
+            expect(trigger).to.have.attribute('aria-controls', popup?.id);
+          });
+        }
+      });
+    }
+
+    describe('animations', () => {
+      beforeEach(() => {
+        globalThis.BASE_UI_ANIMATIONS_DISABLED = false;
+      });
+
+      afterEach(() => {
+        globalThis.BASE_UI_ANIMATIONS_DISABLED = true;
+      });
+
+      it('removes the popup when there is no exit animation defined', async ({ skip }) => {
+        if (isJSDOM) {
+          skip();
+        }
+
+        const { rerender } = await render(prepareComponent({ root: { open: true } }));
+
+        await waitFor(() => {
+          expect(getPopup()).not.to.equal(null);
+        });
+
+        await rerender(prepareComponent({ root: { open: false } }));
+        await waitFor(() => {
+          if (!alwaysMounted) {
+            expect(getPopup()).to.equal(null);
+          } else {
+            expect(getPopup()).toBeInaccessible();
+          }
+        });
+      });
+
+      it('removes the popup when the animation finishes', async ({ skip }) => {
+        if (isJSDOM) {
+          skip();
+        }
+
+        const handleAnimationEnd = spy();
+        const animationName = `anim-${randomStringValue()}`;
+
+        function Test(props: { open: boolean }) {
+          const style = `
+            @keyframes ${animationName} {
+              to {
+                opacity: 0;
+              }
+            }
+
+            .animation-test-popup-${animationName}[data-open] {
+              opacity: 1;
+            }
+
+            .animation-test-popup-${animationName}[data-ending-style] {
+              animation: ${animationName} 150ms;
+            }
+          `;
+
+          return (
+            <div>
+              {/* eslint-disable-next-line react/no-danger */}
+              <style dangerouslySetInnerHTML={{ __html: style }} />
+              {prepareComponent({
+                root: { open: props.open },
+                portal: { keepMounted: true },
+                popup: {
+                  className: `animation-test-popup-${animationName}`,
+                  onAnimationEnd: handleAnimationEnd,
+                },
+              })}
+            </div>
+          );
+        }
+
+        const { setProps } = await render(<Test open />);
+        await setProps({ open: false });
+
+        await waitFor(() => {
+          const popup = getPopup();
+          expect(popup).not.to.equal(null);
+          expect(popup).toBeInaccessible();
+        });
+
+        await waitFor(() => {
+          expect(handleAnimationEnd.callCount).to.equal(1);
+        });
+      });
+    });
+  });
+}
+
+function getTrigger() {
+  return screen.getByTestId('trigger');
+}
+
+function getPopup() {
+  return screen.queryByTestId('popup');
+}
+
+export interface PopupTestConfig {
+  /**
+   * A function that returns a JSX tree with a component to test.
+   * Its parameters contain props to be spread on the component's parts.
+   */
+  createComponent: (props: TestedComponentProps) => React.JSX.Element;
+  /**
+   * How the popup is triggered.
+   */
+  triggerMouseAction: 'click' | 'hover';
+  /**
+   * Render function returned from `createRenderer`.
+   */
+  render: ReturnType<typeof createRenderer>['render'];
+  /**
+   * Expected `role` attribute of the popup element.
+   */
+  expectedPopupRole?: string;
+  /**
+   * Whether the popup contents are always present in the DOM.
+   */
+  alwaysMounted?: boolean;
+}
+
+interface RootProps {
+  open?: boolean;
+  onOpenChange?: (open: boolean) => void;
+}
+
+interface TriggerProps {
+  'data-testid'?: string;
+}
+
+interface PopupProps {
+  className?: string;
+  'data-testid'?: string;
+  onAnimationEnd?: () => void;
+}
+
+interface PortalProps {
+  keepMounted?: boolean;
+}
+
+interface TestedComponentProps {
+  root?: RootProps;
+  popup?: PopupProps;
+  trigger?: TriggerProps;
+  portal?: PortalProps;
+}
diff --git a/packages/react/tsconfig.test.json b/packages/react/tsconfig.test.json
index 02a8ee1245..207e245d33 100644
--- a/packages/react/tsconfig.test.json
+++ b/packages/react/tsconfig.test.json
@@ -14,9 +14,10 @@
   "include": [
     "src/**/*.spec.ts*",
     "src/**/*.test.ts*",
-    "src/index.test.js",
+    "src/index.test.ts",
     "test",
-    "src/global.d.ts"
+    "src/global.d.ts",
+    "package.json"
   ],
   "references": [{ "path": "./tsconfig.build.json" }]
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0d37a876aa..fcb281f52a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -445,7 +445,7 @@ importers:
         version: 19.0.0
       react-router-dom:
         specifier: ^7.1.5
-        version: 7.1.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+        version: 7.2.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       react-runner:
         specifier: ^1.0.5
         version: 1.0.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
@@ -580,8 +580,8 @@ importers:
         specifier: ^5.62.0
         version: 5.62.0(eslint@9.8.0)(typescript@5.7.3)
       '@typescript-eslint/parser':
-        specifier: ^8.24.0
-        version: 8.24.0(eslint@9.8.0)(typescript@5.7.3)
+        specifier: ^8.24.1
+        version: 8.24.1(eslint@9.8.0)(typescript@5.7.3)
 
   packages/react:
     dependencies:
@@ -647,8 +647,8 @@ importers:
         specifier: ^4.17.21
         version: 4.17.21
       publint:
-        specifier: ^0.3.4
-        version: 0.3.4
+        specifier: ^0.3.5
+        version: 0.3.5
       react:
         specifier: ^19.0.0
         version: 19.0.0
@@ -656,8 +656,8 @@ importers:
         specifier: ^19.0.0
         version: 19.0.0(react@19.0.0)
       react-router-dom:
-        specifier: ^7.1.5
-        version: 7.1.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+        specifier: ^7.2.0
+        version: 7.2.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       sinon:
         specifier: ^19.0.2
         version: 19.0.2
@@ -727,7 +727,7 @@ importers:
         version: 19.0.0(react@19.0.0)
       react-router-dom:
         specifier: ^7.1.5
-        version: 7.1.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+        version: 7.2.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       sinon:
         specifier: ^17.0.1
         version: 17.0.1
@@ -3211,8 +3211,8 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/parser@8.24.0':
-    resolution: {integrity: sha512-MFDaO9CYiard9j9VepMNa9MTcqVvSny2N4hkY6roquzj8pdCBRENhErrteaQuu7Yjn1ppk0v1/ZF9CG3KIlrTA==}
+  '@typescript-eslint/parser@8.24.1':
+    resolution: {integrity: sha512-Tqoa05bu+t5s8CTZFaGpCH2ub3QeT9YDkXbPd3uQ4SfsLoh1/vv2GEYAioPoxCWJJNsenXlC88tRjwoHNts1oQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
@@ -3226,8 +3226,8 @@ packages:
     resolution: {integrity: sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==}
     engines: {node: ^18.18.0 || >=20.0.0}
 
-  '@typescript-eslint/scope-manager@8.24.0':
-    resolution: {integrity: sha512-HZIX0UByphEtdVBKaQBgTDdn9z16l4aTUz8e8zPQnyxwHBtf5vtl1L+OhH+m1FGV9DrRmoDuYKqzVrvWDcDozw==}
+  '@typescript-eslint/scope-manager@8.24.1':
+    resolution: {integrity: sha512-OdQr6BNBzwRjNEXMQyaGyZzgg7wzjYKfX2ZBV3E04hUCBDv3GQCHiz9RpqdUIiVrMgJGkXm3tcEh4vFSHreS2Q==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@typescript-eslint/type-utils@7.18.0':
@@ -3248,8 +3248,8 @@ packages:
     resolution: {integrity: sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==}
     engines: {node: ^18.18.0 || >=20.0.0}
 
-  '@typescript-eslint/types@8.24.0':
-    resolution: {integrity: sha512-VacJCBTyje7HGAw7xp11q439A+zeGG0p0/p2zsZwpnMzjPB5WteaWqt4g2iysgGFafrqvyLWqq6ZPZAOCoefCw==}
+  '@typescript-eslint/types@8.24.1':
+    resolution: {integrity: sha512-9kqJ+2DkUXiuhoiYIUvIYjGcwle8pcPpdlfkemGvTObzgmYfJ5d0Qm6jwb4NBXP9W1I5tss0VIAnWFumz3mC5A==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@typescript-eslint/typescript-estree@5.62.0':
@@ -3270,8 +3270,8 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/typescript-estree@8.24.0':
-    resolution: {integrity: sha512-ITjYcP0+8kbsvT9bysygfIfb+hBj6koDsu37JZG7xrCiy3fPJyNmfVtaGsgTUSEuTzcvME5YI5uyL5LD1EV5ZQ==}
+  '@typescript-eslint/typescript-estree@8.24.1':
+    resolution: {integrity: sha512-UPyy4MJ/0RE648DSKQe9g0VDSehPINiejjA6ElqnFaFIhI6ZEiZAkUI0D5MCk0bQcTf/LVqZStvQ6K4lPn/BRg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <5.8.0'
@@ -3296,8 +3296,8 @@ packages:
     resolution: {integrity: sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==}
     engines: {node: ^18.18.0 || >=20.0.0}
 
-  '@typescript-eslint/visitor-keys@8.24.0':
-    resolution: {integrity: sha512-kArLq83QxGLbuHrTMoOEWO+l2MwsNS2TGISEdx8xgqpkbytB07XmlQyQdNDrCc1ecSqx0cnmhGvpX+VBwqqSkg==}
+  '@typescript-eslint/visitor-keys@8.24.1':
+    resolution: {integrity: sha512-EwVHlp5l+2vp8CoqJm9KikPZgi3gbdZAtabKT9KPShGeOcJhsv4Zdo3oc8T8I0uKEmYoU4ItyxbptjF08enaxg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@ungap/structured-clone@1.2.0':
@@ -7475,8 +7475,8 @@ packages:
   psl@1.9.0:
     resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
 
-  publint@0.3.4:
-    resolution: {integrity: sha512-szQCgQXxLgrI2P+3Znv/KUiglp3YA+A2MeI+9Izjs01Ol5KXKCkdbmz69bM/ivPKMYKHhtKOKkib9VJ6JL3H/w==}
+  publint@0.3.5:
+    resolution: {integrity: sha512-/84pl/T/emCA5hHmNYqsE/x0Voikg278QmFwNiORYqnZgqeII2HSZ+aAGs4frfDpOCQlU1SAgYloz8ayJGMbIg==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -7556,15 +7556,15 @@ packages:
     resolution: {integrity: sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==}
     engines: {node: '>=0.10.0'}
 
-  react-router-dom@7.1.5:
-    resolution: {integrity: sha512-/4f9+up0Qv92D3bB8iN5P1s3oHAepSGa9h5k6tpTFlixTTskJZwKGhJ6vRJ277tLD1zuaZTt95hyGWV1Z37csQ==}
+  react-router-dom@7.2.0:
+    resolution: {integrity: sha512-cU7lTxETGtQRQbafJubvZKHEn5izNABxZhBY0Jlzdv0gqQhCPQt2J8aN5ZPjS6mQOXn5NnirWNh+FpE8TTYN0Q==}
     engines: {node: '>=20.0.0'}
     peerDependencies:
       react: '>=18'
       react-dom: '>=18'
 
-  react-router@7.1.5:
-    resolution: {integrity: sha512-8BUF+hZEU4/z/JD201yK6S+UYhsf58bzYIDq2NS1iGpwxSXDu7F+DeGSkIXMFBuHZB21FSiCzEcUb18cQNdRkA==}
+  react-router@7.2.0:
+    resolution: {integrity: sha512-fXyqzPgCPZbqhrk7k3hPcCpYIlQ2ugIXDboHUzhJISFVy2DEPsmHgN588MyGmkIOv3jDgNfUE3kJi83L28s/LQ==}
     engines: {node: '>=20.0.0'}
     peerDependencies:
       react: '>=18'
@@ -11900,12 +11900,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.24.0(eslint@9.8.0)(typescript@5.7.3)':
+  '@typescript-eslint/parser@8.24.1(eslint@9.8.0)(typescript@5.7.3)':
     dependencies:
-      '@typescript-eslint/scope-manager': 8.24.0
-      '@typescript-eslint/types': 8.24.0
-      '@typescript-eslint/typescript-estree': 8.24.0(typescript@5.7.3)
-      '@typescript-eslint/visitor-keys': 8.24.0
+      '@typescript-eslint/scope-manager': 8.24.1
+      '@typescript-eslint/types': 8.24.1
+      '@typescript-eslint/typescript-estree': 8.24.1(typescript@5.7.3)
+      '@typescript-eslint/visitor-keys': 8.24.1
       debug: 4.4.0(supports-color@8.1.1)
       eslint: 9.8.0
       typescript: 5.7.3
@@ -11922,10 +11922,10 @@ snapshots:
       '@typescript-eslint/types': 7.18.0
       '@typescript-eslint/visitor-keys': 7.18.0
 
-  '@typescript-eslint/scope-manager@8.24.0':
+  '@typescript-eslint/scope-manager@8.24.1':
     dependencies:
-      '@typescript-eslint/types': 8.24.0
-      '@typescript-eslint/visitor-keys': 8.24.0
+      '@typescript-eslint/types': 8.24.1
+      '@typescript-eslint/visitor-keys': 8.24.1
 
   '@typescript-eslint/type-utils@7.18.0(eslint@8.57.1)(typescript@5.7.3)':
     dependencies:
@@ -11943,7 +11943,7 @@ snapshots:
 
   '@typescript-eslint/types@7.18.0': {}
 
-  '@typescript-eslint/types@8.24.0': {}
+  '@typescript-eslint/types@8.24.1': {}
 
   '@typescript-eslint/typescript-estree@5.62.0(typescript@5.7.3)':
     dependencies:
@@ -11974,10 +11974,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@8.24.0(typescript@5.7.3)':
+  '@typescript-eslint/typescript-estree@8.24.1(typescript@5.7.3)':
     dependencies:
-      '@typescript-eslint/types': 8.24.0
-      '@typescript-eslint/visitor-keys': 8.24.0
+      '@typescript-eslint/types': 8.24.1
+      '@typescript-eslint/visitor-keys': 8.24.1
       debug: 4.4.0(supports-color@8.1.1)
       fast-glob: 3.3.3
       is-glob: 4.0.3
@@ -12039,9 +12039,9 @@ snapshots:
       '@typescript-eslint/types': 7.18.0
       eslint-visitor-keys: 3.4.3
 
-  '@typescript-eslint/visitor-keys@8.24.0':
+  '@typescript-eslint/visitor-keys@8.24.1':
     dependencies:
-      '@typescript-eslint/types': 8.24.0
+      '@typescript-eslint/types': 8.24.1
       eslint-visitor-keys: 4.2.0
 
   '@ungap/structured-clone@1.2.0': {}
@@ -17088,7 +17088,7 @@ snapshots:
 
   psl@1.9.0: {}
 
-  publint@0.3.4:
+  publint@0.3.5:
     dependencies:
       '@publint/pack': 0.1.1
       package-manager-detector: 0.2.9
@@ -17168,13 +17168,13 @@ snapshots:
 
   react-refresh@0.14.2: {}
 
-  react-router-dom@7.1.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0):
+  react-router-dom@7.2.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0):
     dependencies:
       react: 19.0.0
       react-dom: 19.0.0(react@19.0.0)
-      react-router: 7.1.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+      react-router: 7.2.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
 
-  react-router@7.1.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0):
+  react-router@7.2.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0):
     dependencies:
       '@types/cookie': 0.6.0
       cookie: 1.0.2