diff --git a/packages/mui-base/src/Menu/Item/useMenuItem.ts b/packages/mui-base/src/Menu/Item/useMenuItem.ts index 5fbd8b5982..cfa228f0a5 100644 --- a/packages/mui-base/src/Menu/Item/useMenuItem.ts +++ b/packages/mui-base/src/Menu/Item/useMenuItem.ts @@ -18,7 +18,7 @@ export function useMenuItem(params: useMenuItem.Parameters): useMenuItem.ReturnV typingRef, } = params; - const { getRootProps: getButtonProps, buttonRef: mergedRef } = useButton({ + const { getButtonProps, buttonRef: mergedRef } = useButton({ disabled, focusableWhenDisabled: true, buttonRef: externalRef, diff --git a/packages/mui-base/src/Menu/Trigger/useMenuTrigger.ts b/packages/mui-base/src/Menu/Trigger/useMenuTrigger.ts index ca53161617..4a69d607f4 100644 --- a/packages/mui-base/src/Menu/Trigger/useMenuTrigger.ts +++ b/packages/mui-base/src/Menu/Trigger/useMenuTrigger.ts @@ -21,13 +21,13 @@ export function useMenuTrigger(parameters: useMenuTrigger.Parameters): useMenuTr const mergedRef = useForkRef(externalRef, triggerRef); - const { getRootProps: getButtonRootProps, buttonRef: buttonRootRef } = useButton({ + const { getButtonProps, buttonRef } = useButton({ disabled, focusableWhenDisabled: false, buttonRef: mergedRef, }); - const handleRef = useForkRef(buttonRootRef, setTriggerElement); + const handleRef = useForkRef(buttonRef, setTriggerElement); const ignoreNextClick = React.useRef(false); const getRootProps = React.useCallback( @@ -73,10 +73,10 @@ export function useMenuTrigger(parameters: useMenuTrigger.Parameters): useMenuTr } }, }, - getButtonRootProps(), + getButtonProps(), ); }, - [getButtonRootProps, handleRef, open, setOpen, setClickAndDragEnabled], + [getButtonProps, handleRef, open, setOpen, setClickAndDragEnabled], ); return React.useMemo( diff --git a/packages/mui-base/src/Tabs/Tab/useTab.ts b/packages/mui-base/src/Tabs/Tab/useTab.ts index 91d9d73c44..f04b4d7cf5 100644 --- a/packages/mui-base/src/Tabs/Tab/useTab.ts +++ b/packages/mui-base/src/Tabs/Tab/useTab.ts @@ -34,7 +34,7 @@ function useTab(parameters: UseTabParameters): UseTabReturnValue { item: value, }); - const { getRootProps: getButtonProps, buttonRef: buttonRefHandler } = useButton({ + const { getButtonProps, buttonRef: buttonRefHandler } = useButton({ disabled, focusableWhenDisabled: true, type: 'button', diff --git a/packages/mui-base/src/useButton/useButton.test.tsx b/packages/mui-base/src/useButton/useButton.test.tsx index 9ca1bef7fe..26e4554a4a 100644 --- a/packages/mui-base/src/useButton/useButton.test.tsx +++ b/packages/mui-base/src/useButton/useButton.test.tsx @@ -7,40 +7,40 @@ describe('useButton', () => { const { render } = createRenderer(); describe('tabIndex', () => { - it('does not return tabIndex in getRootProps when host component is BUTTON', () => { + it('does not return tabIndex in getButtonProps when host component is BUTTON', () => { function TestComponent() { const buttonRef = React.useRef(null); - const { getRootProps } = useButton({ buttonRef }); + const { getButtonProps } = useButton({ buttonRef }); - expect(getRootProps().tabIndex).to.equal(undefined); + expect(getButtonProps().tabIndex).to.equal(undefined); - return