fixup! Fix(web-react): Use aria-label on buttons instead ariaLabel prop #DS-1879

Author: katerinarehorkova

packages/web-react/src/components/Button/Button.tsx

@@ -6,7 +6,7 @@ import { useStyleProps } from '../../hooks';
 import { SpiritButtonProps } from '../../types';
 import { mergeStyleProps } from '../../utils';
 import { Spinner } from '../Spinner';
-import { useButtonAriaProps } from './useButtonAriaProps';
+import { useButtonProps } from './useButtonProps';
 import { useButtonStyleProps } from './useButtonStyleProps';
 
 const defaultProps: Partial<SpiritButtonProps> = {
@@ -34,7 +34,7 @@ const _Button = <T extends ElementType = 'button', C = void, S = void>(
     ...restProps
   } = propsWithDefaults;
 
-  const { buttonProps } = useButtonAriaProps(restProps);
+  const { buttonProps } = useButtonProps(restProps);
   const { classProps, props: modifiedProps } = useButtonStyleProps(restProps);
   const { styleProps, props: otherProps } = useStyleProps(modifiedProps);
   const mergedStyleProps = mergeStyleProps(ElementTag, { classProps, styleProps, otherProps });

packages/web-react/src/components/Button/index.ts

@@ -1,13 +1,13 @@
 'use client';
 
-export * from './useButtonAriaProps';
+export * from './useButtonProps';
 export * from './useButtonStyleProps';
 export { default as Button } from './Button';
 
 // Export ButtonLink here for backwards compatibility
 // ButtonLink is NOT exported from packages/web-react/src/components/index.ts
 // ButtonLink will be removed in a future release and Button should be used instead
 // [web-react: Polymorfní Button](https://jira.lmc.cz/browse/DS-978)
-export * from '../ButtonLink/useButtonLinkAriaProps';
+export * from '../ButtonLink/useButtonLinkProps';
 export * from '../ButtonLink/useButtonLinkStyleProps';
 export { default as ButtonLink } from '../ButtonLink/ButtonLink';

packages/web-react/src/components/Button/useButtonAriaProps.ts renamed to packages/web-react/src/components/Button/useButtonProps.ts

@@ -12,12 +12,12 @@ const handleClick = (event: ClickEvent, isDisabled?: boolean, onClick?: (event:
   }
 };
 
-export type UseButtonAriaProps = Partial<SpiritButtonProps>;
-export type UseButtonAriaReturn = {
-  buttonProps: UseButtonAriaProps;
+export type UseButtonProps = Partial<SpiritButtonProps>;
+export type UseButtonReturn = {
+  buttonProps: UseButtonProps;
 };
 
-export const useButtonAriaProps = (props: UseButtonAriaProps): UseButtonAriaReturn => {
+export const useButtonProps = (props: UseButtonProps): UseButtonReturn => {
   const { isDisabled, isLoading, onClick, type = 'button' } = props;
 
   const additionalProps = {

packages/web-react/src/components/ButtonLink/ButtonLink.tsx

@@ -5,7 +5,7 @@ import { useStyleProps } from '../../hooks';
 import { SpiritButtonLinkProps } from '../../types';
 import { mergeStyleProps } from '../../utils';
 import { Spinner } from '../Spinner';
-import { useButtonLinkAriaProps } from './useButtonLinkAriaProps';
+import { useButtonLinkProps } from './useButtonLinkProps';
 import { useButtonLinkStyleProps } from './useButtonLinkStyleProps';
 
 const defaultProps: Partial<SpiritButtonLinkProps> = {
@@ -31,7 +31,7 @@ const _ButtonLink = <T extends ElementType = 'a', C = void, S = void>(
     ...restProps
   } = propsWithDefaults;
 
-  const { buttonLinkProps } = useButtonLinkAriaProps(propsWithDefaults);
+  const { buttonLinkProps } = useButtonLinkProps(propsWithDefaults);
   const { classProps, props: modifiedProps } = useButtonLinkStyleProps(restProps);
   const { styleProps, props: otherProps } = useStyleProps(modifiedProps);
   const mergedStyleProps = mergeStyleProps(ElementTag, { classProps, styleProps, otherProps });

packages/web-react/src/components/ButtonLink/__tests__/useButtonLinkAriaProps.test.ts renamed to packages/web-react/src/components/ButtonLink/__tests__/useButtonLinkProps.test.ts

@@ -1,5 +1,5 @@
 import { renderHook } from '@testing-library/react';
-import { UseButtonLinkAriaProps, useButtonLinkAriaProps } from '../useButtonLinkAriaProps';
+import { UseButtonLinkProps, useButtonLinkProps } from '../useButtonLinkProps';
 
 describe('useButtonAriaProps', () => {
   it('should return aria props for anchor tag', () => {
@@ -9,8 +9,8 @@ describe('useButtonAriaProps', () => {
       isDisabled: false,
       target: '_blank',
       rel: 'noopener',
-    } as UseButtonLinkAriaProps;
-    const { result } = renderHook(() => useButtonLinkAriaProps(props));
+    } as UseButtonLinkProps;
+    const { result } = renderHook(() => useButtonLinkProps(props));
 
     expect(result.current.buttonLinkProps).toEqual({
       'aria-label': undefined,
@@ -30,8 +30,8 @@ describe('useButtonAriaProps', () => {
       isDisabled: true,
       target: '_blank',
       rel: 'noopener',
-    } as UseButtonLinkAriaProps;
-    const { result } = renderHook(() => useButtonLinkAriaProps(props));
+    } as UseButtonLinkProps;
+    const { result } = renderHook(() => useButtonLinkProps(props));
 
     expect(result.current.buttonLinkProps).toEqual({
       'aria-label': undefined,
@@ -48,8 +48,8 @@ describe('useButtonAriaProps', () => {
     const props = {
       elementType: 'button',
       isDisabled: false,
-    } as unknown as UseButtonLinkAriaProps;
-    const { result } = renderHook(() => useButtonLinkAriaProps(props));
+    } as unknown as UseButtonLinkProps;
+    const { result } = renderHook(() => useButtonLinkProps(props));
 
     expect(result.current.buttonLinkProps).toEqual({
       'aria-label': undefined,
@@ -65,8 +65,8 @@ describe('useButtonAriaProps', () => {
     const props = {
       elementType: 'button',
       isDisabled: true,
-    } as unknown as UseButtonLinkAriaProps;
-    const { result } = renderHook(() => useButtonLinkAriaProps(props));
+    } as unknown as UseButtonLinkProps;
+    const { result } = renderHook(() => useButtonLinkProps(props));
 
     expect(result.current.buttonLinkProps).toEqual({
       'aria-label': undefined,

packages/web-react/src/components/ButtonLink/index.ts

@@ -1,5 +1,5 @@
 'use client';
 
-export * from './useButtonLinkAriaProps';
+export * from './useButtonLinkProps';
 export * from './useButtonLinkStyleProps';
 export { default as ButtonLink } from './ButtonLink';

packages/web-react/src/components/ButtonLink/useButtonLinkAriaProps.ts renamed to packages/web-react/src/components/ButtonLink/useButtonLinkProps.ts

@@ -12,12 +12,12 @@ const handleClick = (event: ClickEvent, isDisabled?: boolean, onClick?: (event:
   }
 };
 
-export type UseButtonLinkAriaProps = Partial<SpiritButtonLinkProps>;
-export type UseButtonLinkAriaReturn = {
-  buttonLinkProps: UseButtonLinkAriaProps;
+export type UseButtonLinkProps = Partial<SpiritButtonLinkProps>;
+export type UseButtonLinkReturn = {
+  buttonLinkProps: UseButtonLinkProps;
 };
 
-export const useButtonLinkAriaProps = (props: UseButtonLinkAriaProps): UseButtonLinkAriaReturn => {
+export const useButtonLinkProps = (props: UseButtonLinkProps): UseButtonLinkReturn => {
   const { elementType, isDisabled, isLoading, onClick, href, target, rel } = props;
 
   const additionalProps = {