@lumx/react 3.19.1-alpha.7 → 3.19.1-alpha.9

package/src/components/select/Select.test.tsx

@@ -1,3 +1,4 @@
+import { Mock } from 'vitest';
 import React from 'react';
 
 import { Theme } from '@lumx/core/js/constants';
@@ -13,8 +14,8 @@ import { Select, SelectProps, SelectVariant } from './Select';
 
 const CLASSNAME = Select.className as string;
 
-jest.mock('@lumx/react/utils/browser/isFocusVisible');
-jest.mock('@lumx/react/hooks/useId', () => ({ useId: () => ':r1:' }));
+vi.mock('@lumx/react/utils/browser/isFocusVisible');
+vi.mock('@lumx/react/hooks/useId', () => ({ useId: () => ':r1:' }));
 
 /**
  * Mounts the component and returns common DOM elements / data needed in multiple tests further down.
@@ -35,7 +36,7 @@ const setup = (propsOverride: Partial<SelectProps> = {}, { wrapper }: SetupRende
 };
 
 describe(`<${Select.displayName}>`, () => {
-    (isFocusVisible as jest.Mock).mockReturnValue(false);
+    (isFocusVisible as Mock).mockReturnValue(false);
 
     describe('Props', () => {
         it('should have default classNames', () => {
@@ -144,7 +145,7 @@ describe(`<${Select.displayName}>`, () => {
 
     describe('Events', () => {
         it('should trigger `onDropdownClose` on escape', async () => {
-            const onDropdownClose = jest.fn();
+            const onDropdownClose = vi.fn();
             const { getDropdown } = setup({ isOpen: true, onDropdownClose });
 
             const dropdown = getDropdown();
@@ -156,7 +157,7 @@ describe(`<${Select.displayName}>`, () => {
 
         describe('should trigger `onInputClick` when the select button is clicked', () => {
             it('with input variant', async () => {
-                const onClick = jest.fn();
+                const onClick = vi.fn();
                 const { inputWrapper } = setup({ onInputClick: onClick, variant: SelectVariant.input });
 
                 await userEvent.click(inputWrapper as any);
@@ -164,7 +165,7 @@ describe(`<${Select.displayName}>`, () => {
             });
 
             it('with chip variant', async () => {
-                const onClick = jest.fn();
+                const onClick = vi.fn();
                 const { chip } = setup({ onInputClick: onClick, variant: SelectVariant.chip });
 
                 await userEvent.click(chip as any);
@@ -174,7 +175,7 @@ describe(`<${Select.displayName}>`, () => {
 
         it('should call onClear when clear icon is clicked in select input', async () => {
             const value = 'Value';
-            const onClear = jest.fn();
+            const onClear = vi.fn();
             const { select, props } = setup({ value, onClear, clearButtonProps: { label: 'Clear' } });
 
             const clearButton = within(select).getByRole('button', { name: props.clearButtonProps?.label });

package/src/components/select/SelectMultiple.test.tsx

@@ -18,7 +18,7 @@ import { SelectVariant } from './constants';
 
 const CLASSNAME = SelectMultiple.className as string;
 
-jest.mock('@lumx/react/hooks/useId', () => ({ useId: () => ':r1:' }));
+vi.mock('@lumx/react/hooks/useId', () => ({ useId: () => ':r1:' }));
 
 /**
  * Mounts the component and returns common DOM elements / data needed in multiple tests further down.
@@ -144,7 +144,7 @@ describe('<SelectMultiple>', () => {
     describe('Events', () => {
         describe('should trigger `onInputClick` when the select button is clicked', () => {
             it('with input variant', async () => {
-                const onClick = jest.fn();
+                const onClick = vi.fn();
                 const { inputWrapper } = setup({ onInputClick: onClick, variant: SelectVariant.input });
 
                 await userEvent.click(inputWrapper as any);
@@ -152,7 +152,7 @@ describe('<SelectMultiple>', () => {
             });
 
             it('with chip variant', async () => {
-                const onClick = jest.fn();
+                const onClick = vi.fn();
                 const { chip } = setup({ onInputClick: onClick, variant: SelectVariant.chip });
 
                 await userEvent.click(chip as any);
@@ -161,7 +161,7 @@ describe('<SelectMultiple>', () => {
         });
 
         it('should call onClear when an item is clicked with the correct value', async () => {
-            const onClear = jest.fn();
+            const onClear = vi.fn();
             const { valueChips } = setup({
                 onClear,
                 value: ['val 1', 'val 2'],
@@ -184,7 +184,7 @@ describe('<SelectMultiple>', () => {
             const value1 = 'Value 1';
             const value2 = 'Value 2';
 
-            const onClear = jest.fn();
+            const onClear = vi.fn();
             const { chip } = setup({
                 onClear,
                 value: [value1, value2],

package/src/components/side-navigation/SideNavigationItem.test.tsx

@@ -10,7 +10,7 @@ const CLASSNAME = SideNavigationItem.className as string;
 
 const toggleButtonProps = { label: 'Toggle' };
 
-jest.mock('@lumx/react/hooks/useId', () => ({ useId: () => ':r1:' }));
+vi.mock('@lumx/react/hooks/useId', () => ({ useId: () => ':r1:' }));
 
 /**
  * Mounts the component and returns common DOM elements / data needed in multiple tests further down.
@@ -106,7 +106,7 @@ describe(`<${SideNavigationItem.displayName}>`, () => {
 
     describe('children and link', () => {
         it('should render with children and link', () => {
-            const onActionClick = jest.fn();
+            const onActionClick = vi.fn();
             const label = 'Side navigation item';
             const { props, toggle, link } = setup({
                 label,

package/src/components/side-navigation/SideNavigationItem.tsx

@@ -7,10 +7,9 @@ import { mdiChevronDown, mdiChevronUp } from '@lumx/icons';
 import { Emphasis, Icon, Size, IconButton, IconButtonProps } from '@lumx/react';
 import { GenericProps, HasCloseMode, isComponent } from '@lumx/react/utils/type';
 import { getRootClassName, handleBasicClasses } from '@lumx/core/js/utils/className';
-import { renderLink } from '@lumx/react/utils/react/renderLink';
-import { renderButtonOrLink } from '@lumx/react/utils/react/renderButtonOrLink';
 import { useId } from '@lumx/react/hooks/useId';
 import { forwardRef } from '@lumx/react/utils/react/forwardRef';
+import { RawClickable } from '@lumx/react/utils/react/RawClickable';
 
 /**
  * Defines the props of the component.
@@ -113,17 +112,15 @@ export const SideNavigationItem = forwardRef<SideNavigationItemProps, HTMLLIElem
         >
             {shouldSplitActions ? (
                 <div className={`${CLASSNAME}__wrapper`}>
-                    {renderLink(
-                        {
-                            linkAs,
-                            ...linkProps,
-                            className: `${CLASSNAME}__link`,
-                            onClick,
-                            tabIndex: 0,
-                        },
-                        icon && <Icon className={`${CLASSNAME}__icon`} icon={icon} size={Size.xs} />,
-                        <span>{label}</span>,
-                    )}
+                    <RawClickable
+                        as={linkAs || (linkProps?.href ? 'a' : 'button')}
+                        {...(linkProps as any)}
+                        className={`${CLASSNAME}__link`}
+                        onClick={onClick}
+                    >
+                        {icon && <Icon className={`${CLASSNAME}__icon`} icon={icon} size={Size.xs} />}
+                        <span>{label}</span>
+                    </RawClickable>
 
                     <IconButton
                         {...toggleButtonProps}
@@ -136,25 +133,23 @@ export const SideNavigationItem = forwardRef<SideNavigationItemProps, HTMLLIElem
                     />
                 </div>
             ) : (
-                renderButtonOrLink(
-                    {
-                        linkAs,
-                        ...linkProps,
-                        className: `${CLASSNAME}__link`,
-                        tabIndex: 0,
-                        onClick,
-                        ...ariaProps,
-                    },
-                    icon && <Icon className={`${CLASSNAME}__icon`} icon={icon} size={Size.xs} />,
-                    <span>{label}</span>,
-                    hasContent && (
+                <RawClickable
+                    as={linkAs || (linkProps?.href ? 'a' : 'button')}
+                    {...linkProps}
+                    className={`${CLASSNAME}__link`}
+                    onClick={onClick}
+                    {...ariaProps}
+                >
+                    {icon && <Icon className={`${CLASSNAME}__icon`} icon={icon} size={Size.xs} />}
+                    <span>{label}</span>
+                    {hasContent && (
                         <Icon
                             className={`${CLASSNAME}__chevron`}
                             icon={isOpen ? mdiChevronUp : mdiChevronDown}
                             size={Size.xs}
                         />
-                    ),
-                )
+                    )}
+                </RawClickable>
             )}
 
             {(closeMode === 'hide' || showChildren) && (

package/src/components/slider/Slider.test.tsx

@@ -7,7 +7,7 @@ import { Slider, SliderProps } from './Slider';
 
 const CLASSNAME = Slider.className as string;
 
-jest.mock('@lumx/react/hooks/useId', () => ({ useId: () => ':r1:' }));
+vi.mock('@lumx/react/hooks/useId', () => ({ useId: () => ':r1:' }));
 
 const setup = (props: Partial<SliderProps> = {}, { wrapper }: SetupRenderOptions = {}) => {
     render(<Slider {...(props as any)} />, { wrapper });

package/src/components/switch/Switch.test.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import { commonTestsSuiteRTL, SetupRenderOptions } from '@lumx/react/testing/utils';
 import { render } from '@testing-library/react';
 import { getByClassName, getByTagName, queryByClassName } from '@lumx/react/testing/utils/queries';
-import userEvent from '@testing-library/user-event/';
+import userEvent from '@testing-library/user-event';
 
 import { Switch, SwitchProps } from './Switch';
 
@@ -24,7 +24,7 @@ const setup = (propsOverride: SetupProps = {}, { wrapper }: SetupRenderOptions =
     return { switchWrapper, input, helper, label, props };
 };
 
-jest.mock('@lumx/react/hooks/useId', () => ({ useId: () => ':r1:' }));
+vi.mock('@lumx/react/hooks/useId', () => ({ useId: () => ':r1:' }));
 
 describe(`<${Switch.displayName}>`, () => {
     describe('Props', () => {
@@ -86,7 +86,7 @@ describe(`<${Switch.displayName}>`, () => {
     });
 
     describe('Events', () => {
-        const onChange = jest.fn();
+        const onChange = vi.fn();
 
         it('should trigger `onChange` when switchWrapper is clicked', async () => {
             const value = 'value';
@@ -102,7 +102,7 @@ describe(`<${Switch.displayName}>`, () => {
 
     describe('Disabled state', () => {
         it('should be disabled with isDisabled', async () => {
-            const onChange = jest.fn();
+            const onChange = vi.fn();
             const { switchWrapper, input } = setup({ isDisabled: true, onChange });
 
             expect(switchWrapper).toHaveClass('lumx-switch--is-disabled');
@@ -115,7 +115,7 @@ describe(`<${Switch.displayName}>`, () => {
         });
 
         it('should be disabled with aria-disabled', async () => {
-            const onChange = jest.fn();
+            const onChange = vi.fn();
             const { switchWrapper, input } = setup({ 'aria-disabled': true, onChange });
 
             expect(switchWrapper).toHaveClass('lumx-switch--is-disabled');

package/src/components/table/TableCell.test.tsx

@@ -42,7 +42,7 @@ describe(`<${TableCell.displayName}>`, () => {
 
     it('should render header variant clickable', async () => {
         const content = 'Content';
-        const onHeaderClick = jest.fn();
+        const onHeaderClick = vi.fn();
         const { tableCell } = setup({ children: content, variant: 'head', onHeaderClick });
 
         const headerButton = within(tableCell).getByRole('button', { name: content });

package/src/components/text-field/TextField.test.tsx

@@ -1,3 +1,4 @@
+import { Mock } from 'vitest';
 import React from 'react';
 
 import camelCase from 'lodash/camelCase';
@@ -20,7 +21,7 @@ import { TextField, TextFieldProps } from './TextField';
 
 const CLASSNAME = TextField.className as string;
 
-jest.mock('@lumx/react/utils/browser/isFocusVisible');
+vi.mock('@lumx/react/utils/browser/isFocusVisible');
 
 /**
  * Mounts the component and returns common DOM elements / data needed in multiple tests further down.
@@ -49,7 +50,7 @@ const setup = (propsOverride: Partial<TextFieldProps> = {}, { wrapper }: SetupRe
 };
 
 describe(`<${TextField.displayName}>`, () => {
-    (isFocusVisible as jest.Mock).mockReturnValue(false);
+    (isFocusVisible as Mock).mockReturnValue(false);
 
     describe('Render', () => {
         it('should render defaults', () => {
@@ -180,7 +181,7 @@ describe(`<${TextField.displayName}>`, () => {
 
     describe('Events', () => {
         it('should trigger `onChange` when text field is changed', async () => {
-            const onChange = jest.fn();
+            const onChange = vi.fn();
             const { inputNative } = setup({ value: '', name: 'name', onChange });
 
             await userEvent.tab();
@@ -192,7 +193,7 @@ describe(`<${TextField.displayName}>`, () => {
         });
 
         it('should trigger `onChange` with empty value when text field is cleared', async () => {
-            const onChange = jest.fn();
+            const onChange = vi.fn();
             const { clearButton } = setup({
                 value: 'initial value',
                 name: 'name',
@@ -208,8 +209,8 @@ describe(`<${TextField.displayName}>`, () => {
         });
 
         it('should trigger `onChange` with empty value and `onClear` when text field is cleared', async () => {
-            const onChange = jest.fn();
-            const onClear = jest.fn();
+            const onChange = vi.fn();
+            const onClear = vi.fn();
             const { clearButton } = setup({
                 value: 'initial value',
                 name: 'name',
@@ -229,7 +230,7 @@ describe(`<${TextField.displayName}>`, () => {
 
     describe('Disabled state', () => {
         it('should render with "isDisabled"', async () => {
-            const onChange = jest.fn();
+            const onChange = vi.fn();
             const { element, inputNative } = setup({
                 label: 'Label',
                 isDisabled: true,
@@ -255,7 +256,7 @@ describe(`<${TextField.displayName}>`, () => {
         });
 
         it('should render with "aria-disabled"', async () => {
-            const onChange = jest.fn();
+            const onChange = vi.fn();
             const { element, inputNative } = setup({
                 label: 'Label',
                 'aria-disabled': true,

package/src/components/thumbnail/Thumbnail.test.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import { DisabledStateProvider } from '@lumx/react/utils';
 import { commonTestsSuiteRTL, SetupRenderOptions } from '@lumx/react/testing/utils';
 import { queryByClassName } from '@lumx/react/testing/utils/queries';
-import { fireEvent, render } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
 import { Thumbnail, ThumbnailProps } from './Thumbnail';
 
 const CLASSNAME = Thumbnail.className as string;
@@ -28,9 +28,20 @@ describe(`<${Thumbnail.displayName}>`, () => {
         },
     });
 
-    describe('disabled state', () => {
-        it('should not be clickable when disabled from context', () => {
-            const onClick = jest.fn();
+    describe('clickable button', () => {
+        it('should render clickable button', async () => {
+            const onClick = vi.fn();
+            const { thumbnail } = setup({ onClick, alt: 'Name' });
+            const button = screen.getByRole('button', { name: 'Name' });
+            expect(button).toBe(thumbnail);
+            expect(button).toHaveAttribute('type', 'button');
+
+            fireEvent.click(thumbnail as HTMLElement);
+            expect(onClick).toHaveBeenCalled();
+        });
+
+        it('should not render button in disabled context', () => {
+            const onClick = vi.fn();
             const { thumbnail, container } = setup(
                 { onClick, 'aria-label': 'thumbnail' },
                 {
@@ -47,8 +58,21 @@ describe(`<${Thumbnail.displayName}>`, () => {
             fireEvent.click(thumbnail as HTMLElement);
             expect(onClick).not.toHaveBeenCalled();
         });
+    });
+
+    describe('clickable link', () => {
+        it('should render clickable link', async () => {
+            const onClick = vi.fn((evt: any) => evt.preventDefault());
+            const { thumbnail } = setup({ linkProps: { href: '#' }, onClick, alt: 'Name' });
+            const link = screen.getByRole('link');
+            expect(link).toBe(thumbnail);
+            expect(link).toHaveAttribute('href', '#');
+
+            fireEvent.click(thumbnail as HTMLElement);
+            expect(onClick).toHaveBeenCalled();
+        });
 
-        it('should have no href when disabled from context', () => {
+        it('should not render link in disabled context', () => {
             const { container, thumbnail } = setup(
                 { linkAs: 'a', linkProps: { href: '#' }, 'aria-label': 'thumbnail' },
                 {

package/src/components/thumbnail/Thumbnail.tsx

@@ -22,6 +22,7 @@ import { useTheme } from '@lumx/react/utils/theme/ThemeContext';
 import { forwardRef } from '@lumx/react/utils/react/forwardRef';
 
 import { useDisableStateProps } from '@lumx/react/utils/disabled';
+import { RawClickable } from '@lumx/react/utils/react/RawClickable';
 import { FocusPoint, ThumbnailSize, ThumbnailVariant } from './types';
 
 type ImgHTMLProps = ImgHTMLAttributes<HTMLImageElement>;
@@ -100,7 +101,7 @@ const DEFAULT_PROPS: Partial<ThumbnailProps> = {
  * @return React element.
  */
 export const Thumbnail = forwardRef<ThumbnailProps>((props, ref) => {
-    const { isAnyDisabled, otherProps } = useDisableStateProps(props);
+    const { isAnyDisabled, otherProps, disabledStateProps } = useDisableStateProps(props);
     const defaultTheme = useTheme() || Theme.light;
     const {
         align,
@@ -151,18 +152,17 @@ export const Thumbnail = forwardRef<ThumbnailProps>((props, ref) => {
     }
 
     const isLink = Boolean(linkProps?.href || linkAs);
-    const isButton = !!forwardedProps.onClick;
-    const isClickable = !isAnyDisabled && (isButton || isLink);
+    const isClickable = !isAnyDisabled && Boolean(isLink || !!forwardedProps.onClick);
 
-    let Wrapper: any = 'div';
+    const Wrapper: any = isClickable ? RawClickable : 'div';
     const wrapperProps = { ...forwardedProps };
-    if (!isAnyDisabled && isLink) {
-        Wrapper = linkAs || 'a';
-        Object.assign(wrapperProps, linkProps);
-    } else if (!isAnyDisabled && isButton) {
-        Wrapper = 'button';
-        wrapperProps.type = forwardedProps.type || 'button';
-        wrapperProps['aria-label'] = forwardedProps['aria-label'] || alt;
+    if (isClickable) {
+        Object.assign(wrapperProps, { as: linkAs || (linkProps?.href ? 'a' : 'button') }, disabledStateProps);
+        if (isLink) {
+            Object.assign(wrapperProps, linkProps);
+        } else {
+            wrapperProps['aria-label'] = forwardedProps['aria-label'] || alt;
+        }
     }
 
     // If we have a loading placeholder image that is really loaded (complete)

package/src/components/tooltip/Tooltip.test.tsx

@@ -1,3 +1,4 @@
+import { MockInstance } from 'vitest';
 import React from 'react';
 
 import { Button } from '@lumx/react';
@@ -12,13 +13,18 @@ import { Tooltip, TooltipProps } from './Tooltip';
 
 const CLASSNAME = Tooltip.className as string;
 
-jest.mock('@lumx/react/utils/browser/isFocusVisible');
-jest.mock('@lumx/react/hooks/useId', () => ({ useId: () => ':r1:' }));
+vi.mock('@lumx/react/utils/browser/isFocusVisible');
+vi.mock('@lumx/react/hooks/useId', () => ({ useId: () => ':r1:' }));
 // Skip delays
-jest.mock('@lumx/react/constants', () => ({
-    ...jest.requireActual('@lumx/react/constants'),
-    TOOLTIP_HOVER_DELAY: { open: 0, close: 0 },
-}));
+vi.mock('@lumx/react/constants', async (importActual) => {
+    const actual = (await importActual()) as Record<string, any>;
+    return {
+        ...actual,
+        TOOLTIP_HOVER_DELAY: { open: 0, close: 0 },
+        VISUALLY_HIDDEN: actual.VISUALLY_HIDDEN,
+        CSS_PREFIX: actual.CSS_PREFIX,
+    };
+});
 
 /**
  * Mounts the component and returns common DOM elements / data needed in multiple tests further down.
@@ -346,7 +352,7 @@ describe(`<${Tooltip.displayName}>`, () => {
         });
 
         it('should activate on anchor focus visible and close on escape', async () => {
-            (isFocusVisible as jest.Mock).mockReturnValue(true);
+            (isFocusVisible as unknown as MockInstance).mockReturnValue(true);
             let { tooltip } = await setup({
                 label: 'Tooltip label',
                 children: <Button>Anchor</Button>,
@@ -381,7 +387,7 @@ describe(`<${Tooltip.displayName}>`, () => {
         });
 
         it('should not activate on anchor focus if not visible', async () => {
-            (isFocusVisible as jest.Mock).mockReturnValue(false);
+            (isFocusVisible as unknown as MockInstance).mockReturnValue(false);
             let { tooltip } = await setup({
                 label: 'Tooltip label',
                 children: <Button>Anchor</Button>,

package/src/components/uploader/Uploader.test.tsx

@@ -89,9 +89,9 @@ describe(`<${Uploader.displayName}>`, () => {
         ${'button'}               | ${{}}
         ${'button isDisabled   '} | ${{ isDisabled: true }}
         ${'button aria-disabled'} | ${{ 'aria-disabled': true }}
-        ${'file input          '} | ${{ fileInputProps: { onChange: jest.fn() } }}
+        ${'file input          '} | ${{ fileInputProps: { onChange: vi.fn() } }}
     `('Events $name', ({ props }) => {
-        const onClick = jest.fn();
+        const onClick = vi.fn();
         beforeEach(() => onClick.mockClear());
         const assertClick = () => {
             if (props.isDisabled || props['aria-disabled']) {

package/src/components/user-block/UserBlock.test.tsx

@@ -36,7 +36,7 @@ describe(`<${UserBlock.displayName}>`, () => {
         });
 
         it('should render button', async () => {
-            const onClick = jest.fn();
+            const onClick = vi.fn();
             const { name, thumbnail } = setup({
                 onClick,
                 name: 'John Doe',

package/src/untypped-modules.d.ts

@@ -1,3 +1,7 @@
+// Extend CSSStyleDeclaration to support viewTransitionName for view transitions
+interface CSSStyleDeclaration {
+    viewTransitionName: string | null;
+}
 /**
  * List untypped modules here to declare them as explicit any.
  */

package/src/utils/Portal/PortalProvider.test.tsx

@@ -30,7 +30,7 @@ describe('PortalProvider', () => {
     });
 
     it('should call teardown on unmount', () => {
-        const teardownMock = jest.fn();
+        const teardownMock = vi.fn();
         const portalContainer = document.createElement('div');
         portalContainer.id = PORTAL_CONTAINER_ID;
         document.body.appendChild(portalContainer);

package/src/utils/date/getYearDisplayName.test.ts

@@ -4,7 +4,7 @@ describe(getYearDisplayName, () => {
     beforeEach(() => {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        jest.spyOn(Intl, 'DisplayNames').mockImplementation(() => ({
+        vi.spyOn(Intl, 'DisplayNames').mockImplementation(() => ({
             resolvedOptions: () => ({
                 fallback: 'code',
                 locale: 'fr',

package/src/utils/disabled/useDisableStateProps.test.tsx

@@ -59,14 +59,14 @@ describe(useDisableStateProps.name, () => {
     });
 
     it('should forward onClick when not disabled', () => {
-        const onClick = jest.fn();
+        const onClick = vi.fn();
         const { element } = setup({ onClick });
         fireEvent.click(element);
         expect(onClick).toHaveBeenCalled();
     });
 
     it('should not forward onClick when disabled', () => {
-        const onClick = jest.fn();
+        const onClick = vi.fn();
         const { element } = setup({ disabled: true, onClick });
         fireEvent.click(element);
         expect(onClick).not.toHaveBeenCalled();