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

package/package.json

@@ -6,8 +6,8 @@
         "url": "https://github.com/lumapps/design-system/issues"
     },
     "dependencies": {
-        "@lumx/core": "^3.19.1-alpha.7",
-        "@lumx/icons": "^3.19.1-alpha.7",
+        "@lumx/core": "^3.19.1-alpha.9",
+        "@lumx/icons": "^3.19.1-alpha.9",
         "@popperjs/core": "^2.5.4",
         "body-scroll-lock": "^3.1.5",
         "classnames": "^2.3.2",
@@ -30,24 +30,21 @@
         "@rollup/plugin-babel": "^6.0.4",
         "@rollup/plugin-commonjs": "^19.0.2",
         "@rollup/plugin-node-resolve": "16.0.0",
-        "@rollup/pluginutils": "5.2.0",
         "@storybook/addon-a11y": "^9.1.4",
         "@storybook/addon-docs": "^9.1.4",
         "@storybook/react-vite": "^9.1.4",
-        "@testing-library/dom": "^9.3.4",
-        "@testing-library/jest-dom": "^5.16.4",
+        "@testing-library/dom": "^10.4.1",
         "@testing-library/react": "^12.1.2",
         "@testing-library/user-event": "^14.4.3",
         "@types/body-scroll-lock": "^2.6.1",
         "@types/classnames": "^2.2.9",
         "@types/dom-view-transitions": "^1.0.5",
-        "@types/jest": "^29.2.1",
         "@types/lodash": "^4.14.149",
         "@types/react": "^17.0.2",
         "@types/react-dom": "^17.0.2",
         "@types/react-is": "^17.0.2",
+        "@vitest/ui": "^1.0.0",
         "autoprefixer": "^9.7.4",
-        "babel-jest": "29.1.2",
         "babel-loader": "^8.0.6",
         "chromatic": "^13.1.4",
         "core-js": "^3.6.4",
@@ -55,8 +52,7 @@
         "glob": "^7.1.6",
         "install-peers-cli": "^2.2.0",
         "is-ci": "^2.0.0",
-        "jest": "29.1.2",
-        "jest-environment-jsdom": "29.1.2",
+        "jsdom": "^27.2.0",
         "node-notifier": "^10.0.1",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
@@ -71,12 +67,13 @@
         "typescript": "^5.4.3",
         "vite": "^6.3.5",
         "vite-tsconfig-paths": "^5.1.4",
+        "vitest": "^1.0.0",
         "yargs": "^15.4.1"
     },
     "peerDependencies": {
         "lodash": "4.17.21",
-        "react": ">= 17.0.0",
-        "react-dom": ">= 17.0.0"
+        "react": ">= 16.13.0",
+        "react-dom": ">= 16.13.0"
     },
     "description": "The official LumApps Design System (LumX) for React applications",
     "homepage": "https://github.com/lumapps/design-system",
@@ -101,10 +98,10 @@
     "scripts": {
         "build": "rollup -c",
         "prepare": "install-peers || exit 0",
-        "test": "jest --config jest/index.js --coverage --notify --passWithNoTests --detectOpenHandles --runInBand",
+        "test": "vitest run",
         "start:storybook": "storybook dev -p 9000",
         "build:storybook": "storybook build"
     },
     "sideEffects": false,
-    "version": "3.19.1-alpha.7"
+    "version": "3.19.1-alpha.9"
 }

package/src/components/alert-dialog/AlertDialog.test.tsx

@@ -3,9 +3,10 @@ import React from 'react';
 import { commonTestsSuiteRTL } from '@lumx/react/testing/utils';
 import { queryByClassName } from '@lumx/react/testing/utils/queries';
 import { render } from '@testing-library/react';
+import { vi } from 'vitest';
 import { AlertDialog, AlertDialogProps } from './AlertDialog';
 
-jest.mock('@lumx/react/hooks/useId', () => ({ useId: () => ':r1:' }));
+vi.mock('@lumx/react/hooks/useId', () => ({ useId: () => ':r1:' }));
 
 const CLASSNAME = AlertDialog.className as string;
 
@@ -17,7 +18,7 @@ const setup = (propsOverride: Partial<AlertDialogProps> = {}) => {
         title: 'Alert',
         isOpen: true,
         description: 'Deserunt et sunt qui consequat sint sit.',
-        confirmProps: { onClick: jest.fn(), label: 'OK' },
+        confirmProps: { onClick: vi.fn(), label: 'OK' },
         ...propsOverride,
     };
     render(<AlertDialog {...props} />);

package/src/components/autocomplete/Autocomplete.test.tsx

@@ -53,7 +53,7 @@ describe(`<${Autocomplete.displayName}>`, () => {
     describe('Events', () => {
         it('should trigger the onChange callback when there is a change on the Text Field', async () => {
             const name = 'autocomplete-name';
-            const onChange = jest.fn();
+            const onChange = vi.fn();
             const { inputNative } = setup({
                 name,
                 onChange,
@@ -68,8 +68,8 @@ describe(`<${Autocomplete.displayName}>`, () => {
         });
 
         it('should trigger the onFocus/onBlur callback when the text field is focused and blurred', async () => {
-            const onFocus = jest.fn();
-            const onBlur = jest.fn();
+            const onFocus = vi.fn();
+            const onBlur = vi.fn();
             const { inputNative } = setup({
                 onFocus,
                 onBlur,

package/src/components/button/Button.test.tsx

@@ -68,7 +68,7 @@ describe(`<${Button.displayName}>`, () => {
 
     describe('Disabled state', () => {
         it('should render disabled button', async () => {
-            const onClick = jest.fn();
+            const onClick = vi.fn();
             const { button } = setup({ children: 'Label', disabled: true, onClick });
             expect(button).toHaveAttribute('disabled');
             await userEvent.click(button);
@@ -76,17 +76,18 @@ describe(`<${Button.displayName}>`, () => {
         });
 
         it('should render disabled link', async () => {
-            const onClick = jest.fn();
+            const onClick = vi.fn();
             const { button } = setup({ children: 'Label', disabled: true, href: 'https://example.com', onClick });
-            // Disabled link do not exist so we fallback to a button
-            expect(screen.queryByRole('link')).not.toBeInTheDocument();
-            expect(button).toHaveAttribute('disabled');
+            expect(screen.queryByRole('link')).toBeInTheDocument();
+            expect(button).toHaveAttribute('aria-disabled', 'true');
+            // Simulate standard disabled state (not focusable)
+            expect(button).toHaveAttribute('tabindex', '-1');
             await userEvent.click(button);
             expect(onClick).not.toHaveBeenCalled();
         });
 
         it('should render aria-disabled button', async () => {
-            const onClick = jest.fn();
+            const onClick = vi.fn();
             const { button } = setup({ children: 'Label', 'aria-disabled': true, onClick });
             expect(button).toHaveAttribute('aria-disabled');
             await userEvent.click(button);
@@ -94,7 +95,7 @@ describe(`<${Button.displayName}>`, () => {
         });
 
         it('should render aria-disabled link', async () => {
-            const onClick = jest.fn();
+            const onClick = vi.fn();
             const { button } = setup({
                 children: 'Label',
                 'aria-disabled': true,
@@ -102,8 +103,7 @@ describe(`<${Button.displayName}>`, () => {
                 onClick,
             });
             expect(button).toHaveAccessibleName('Label');
-            // Disabled link do not exist so we fallback to a button
-            expect(screen.queryByRole('link')).not.toBeInTheDocument();
+            expect(screen.queryByRole('link')).toBeInTheDocument();
             expect(button).toHaveAttribute('aria-disabled', 'true');
             await userEvent.click(button);
             expect(onClick).not.toHaveBeenCalled();

package/src/components/button/ButtonRoot.tsx

@@ -1,17 +1,15 @@
 import React, { AriaAttributes, ButtonHTMLAttributes, DetailedHTMLProps, RefObject } from 'react';
 
-import isEmpty from 'lodash/isEmpty';
-
 import classNames from 'classnames';
 
 import { ColorPalette, Emphasis, Size, Theme } from '@lumx/react';
 import { CSS_PREFIX } from '@lumx/react/constants';
 import { GenericProps, HasTheme } from '@lumx/react/utils/type';
 import { handleBasicClasses } from '@lumx/core/js/utils/className';
-import { renderLink } from '@lumx/react/utils/react/renderLink';
 import { forwardRef } from '@lumx/react/utils/react/forwardRef';
-import { useDisableStateProps } from '@lumx/react/utils/disabled/useDisableStateProps';
 import { HasAriaDisabled } from '@lumx/react/utils/type/HasAriaDisabled';
+import { RawClickable } from '@lumx/react/utils/react/RawClickable';
+import { useDisableStateProps } from '@lumx/react/utils/disabled';
 
 type HTMLButtonProps = DetailedHTMLProps<ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>;
 
@@ -107,18 +105,14 @@ export const ButtonRoot = forwardRef<ButtonRootProps, HTMLButtonElement | HTMLAn
         color,
         emphasis,
         hasBackground,
-        href,
         isSelected,
         isActive,
         isFocused,
         isHovered,
         linkAs,
-        name,
         size,
-        target,
         theme,
         variant,
-        type = 'button',
         fullWidth,
         ...forwardedProps
     } = otherProps;
@@ -139,7 +133,7 @@ export const ButtonRoot = forwardRef<ButtonRootProps, HTMLButtonElement | HTMLAn
             color: adaptedColor,
             emphasis,
             isSelected,
-            isDisabled: isAnyDisabled,
+            isDisabled: props.isDisabled || props['aria-disabled'],
             isActive,
             isFocused,
             isHovered,
@@ -151,42 +145,18 @@ export const ButtonRoot = forwardRef<ButtonRootProps, HTMLButtonElement | HTMLAn
         }),
     );
 
-    /**
-     * If the linkAs prop is used, we use the linkAs component instead of a <button>.
-     * If there is an href attribute, we display an <a> instead of a <button>.
-     *
-     * However, in any case, if the component is disabled, we returned a <button> since disabled is not compatible with <a>.
-     */
-    if ((linkAs || !isEmpty(props.href)) && !isAnyDisabled) {
-        return renderLink(
-            {
-                linkAs,
-                ...forwardedProps,
-                'aria-label': ariaLabel,
-                href,
-                target,
-                className: buttonClassName,
-                ref: ref as RefObject<HTMLAnchorElement>,
-            },
-            children,
-        );
-    }
     return (
-        <button
+        <RawClickable
+            as={linkAs || (forwardedProps.href ? 'a' : 'button')}
             {...forwardedProps}
             {...disabledStateProps}
             aria-disabled={isAnyDisabled}
             aria-label={ariaLabel}
             ref={ref as RefObject<HTMLButtonElement>}
             className={buttonClassName}
-            name={name}
-            type={
-                // eslint-disable-next-line react/button-has-type
-                type
-            }
         >
             {children}
-        </button>
+        </RawClickable>
     );
 });
 ButtonRoot.displayName = COMPONENT_NAME;

package/src/components/checkbox/Checkbox.test.tsx

@@ -98,7 +98,7 @@ describe(`<${Checkbox.displayName}>`, () => {
     });
 
     describe('Events', () => {
-        const onChange = jest.fn();
+        const onChange = vi.fn();
 
         it('should trigger `onChange` when checkbox is clicked', async () => {
             const value = 'value';
@@ -114,7 +114,7 @@ describe(`<${Checkbox.displayName}>`, () => {
 
     describe('Disabled state', () => {
         it('should be disabled with isDisabled', async () => {
-            const onChange = jest.fn();
+            const onChange = vi.fn();
             const { checkbox, input } = setup({ isDisabled: true, onChange });
 
             expect(checkbox).toHaveClass('lumx-checkbox--is-disabled');
@@ -126,7 +126,7 @@ describe(`<${Checkbox.displayName}>`, () => {
         });
 
         it('should be disabled with aria-disabled', async () => {
-            const onChange = jest.fn();
+            const onChange = vi.fn();
             const { checkbox, input } = setup({ 'aria-disabled': true, onChange });
 
             expect(checkbox).toHaveClass('lumx-checkbox--is-disabled');

package/src/components/chip/Chip.test.tsx

@@ -42,7 +42,7 @@ describe('<Chip />', () => {
         });
 
         it('should render clickable', () => {
-            const onClick = jest.fn();
+            const onClick = vi.fn();
             const { chip } = setup({ children: 'Chip text', onClick });
             expect(chip).toHaveAttribute('role', 'button');
             expect(chip.className).toMatchInlineSnapshot(
@@ -70,11 +70,13 @@ describe('<Chip />', () => {
     });
 
     describe('Events', () => {
-        const onClick = jest.fn();
-        const onAfterClick = jest.fn();
-        const onBeforeClick = jest.fn();
+        const onClick = vi.fn();
+        const onAfterClick = vi.fn();
+        const onBeforeClick = vi.fn();
 
-        beforeEach(jest.clearAllMocks);
+        beforeEach(() => {
+            vi.clearAllMocks();
+        });
 
         it('should trigger onBeforeClick only when clicking on the "before" element', async () => {
             const { after, before, chip } = setup({
@@ -88,12 +90,12 @@ describe('<Chip />', () => {
             await userEvent.click(chip);
             expect(onBeforeClick).not.toHaveBeenCalled();
 
-            jest.clearAllMocks();
+            vi.clearAllMocks();
 
             await userEvent.click(after as any);
             expect(onBeforeClick).not.toHaveBeenCalled();
 
-            jest.clearAllMocks();
+            vi.clearAllMocks();
 
             await userEvent.click(before as any);
             expect(onBeforeClick).toHaveBeenCalled();
@@ -111,12 +113,12 @@ describe('<Chip />', () => {
             await userEvent.click(chip);
             expect(onClick).toHaveBeenCalled();
 
-            jest.clearAllMocks();
+            vi.clearAllMocks();
 
             await userEvent.click(after as any);
             expect(onClick).not.toHaveBeenCalled();
 
-            jest.clearAllMocks();
+            vi.clearAllMocks();
 
             await userEvent.click(before as any);
             expect(onClick).not.toHaveBeenCalled();
@@ -134,12 +136,12 @@ describe('<Chip />', () => {
             await userEvent.click(chip);
             expect(onAfterClick).not.toHaveBeenCalled();
 
-            jest.clearAllMocks();
+            vi.clearAllMocks();
 
             await userEvent.click(after as any);
             expect(onAfterClick).toHaveBeenCalled();
 
-            jest.clearAllMocks();
+            vi.clearAllMocks();
 
             await userEvent.click(before as any);
             expect(onAfterClick).not.toHaveBeenCalled();
@@ -162,7 +164,7 @@ describe('<Chip />', () => {
         });
 
         it('should forward key down event', async () => {
-            const onKeyDown = jest.fn();
+            const onKeyDown = vi.fn();
             const { chip } = setup({ onClick, onKeyDown });
 
             fireEvent.keyDown(chip, { key: 'A', code: 'KeyA' });
@@ -171,7 +173,7 @@ describe('<Chip />', () => {
 
         it('should forward key down event and trigger `onClick` when pressing Enter', async () => {
             const user = userEvent.setup();
-            const onKeyDown = jest.fn();
+            const onKeyDown = vi.fn();
             const { chip } = setup({ onClick, onKeyDown });
 
             await user.tab();
@@ -187,7 +189,7 @@ describe('<Chip />', () => {
 
     describe('Disabled state', () => {
         it('should render disabled chip button', async () => {
-            const onClick = jest.fn();
+            const onClick = vi.fn();
             const { chip } = setup({ children: 'Label', isDisabled: true, onClick });
             expect(chip).toHaveAttribute('aria-disabled', 'true');
             await userEvent.click(chip);
@@ -195,7 +197,7 @@ describe('<Chip />', () => {
         });
 
         it('should render disabled chip link', async () => {
-            const onClick = jest.fn();
+            const onClick = vi.fn();
             const { chip } = setup({ children: 'Label', isDisabled: true, href: 'https://example.com', onClick });
             // Disabled link should not have an href.
             expect(chip).not.toHaveAttribute('href');
@@ -205,7 +207,7 @@ describe('<Chip />', () => {
         });
 
         it('should render aria-disabled chip button', async () => {
-            const onClick = jest.fn();
+            const onClick = vi.fn();
             const { chip } = setup({ children: 'Label', 'aria-disabled': true, onClick });
             expect(chip).toHaveAttribute('aria-disabled', 'true');
             await userEvent.click(chip);
@@ -214,7 +216,7 @@ describe('<Chip />', () => {
         });
 
         it('should render aria-disabled chip link', async () => {
-            const onClick = jest.fn();
+            const onClick = vi.fn();
             const { chip } = setup({
                 children: 'Label',
                 'aria-disabled': true,

package/src/components/date-picker/DatePicker.test.tsx

@@ -9,15 +9,15 @@ import { DatePicker } from '.';
 import { CLASSNAME } from './constants';
 
 const mockedDate = new Date(1487721600000);
-Date.now = jest.fn(() => mockedDate.valueOf());
-jest.mock('@lumx/react/utils/date/getYearDisplayName', () => ({
+Date.now = vi.fn(() => mockedDate.valueOf());
+vi.mock('@lumx/react/utils/date/getYearDisplayName', () => ({
     getYearDisplayName: () => 'année',
 }));
 
 const setup = (propsOverride: Partial<DatePickerProps> = {}) => {
     const props: DatePickerProps = {
         locale: 'fr',
-        onChange: jest.fn(),
+        onChange: vi.fn(),
         value: mockedDate,
         nextButtonProps: { label: 'Next month' },
         previousButtonProps: { label: 'Previous month' },

package/src/components/date-picker/DatePickerControlled.test.tsx

@@ -10,8 +10,8 @@ import { DatePickerControlled, DatePickerControlledProps } from './DatePickerCon
 import { CLASSNAME } from './constants';
 
 const mockedDate = new Date(1487721600000);
-Date.now = jest.fn(() => mockedDate.valueOf());
-jest.mock('@lumx/react/utils/date/getYearDisplayName', () => ({
+Date.now = vi.fn(() => mockedDate.valueOf());
+vi.mock('@lumx/react/utils/date/getYearDisplayName', () => ({
     getYearDisplayName: () => 'année',
 }));
 
@@ -20,14 +20,14 @@ type SetupProps = Partial<DatePickerControlledProps>;
 const setup = (propsOverride: SetupProps = {}) => {
     const props: DatePickerControlledProps = {
         locale: 'fr',
-        onChange: jest.fn(),
-        onNextMonthChange: jest.fn(),
-        onPrevMonthChange: jest.fn(),
+        onChange: vi.fn(),
+        onNextMonthChange: vi.fn(),
+        onPrevMonthChange: vi.fn(),
         selectedMonth: mockedDate,
         value: mockedDate,
         nextButtonProps: { label: 'Next month' },
         previousButtonProps: { label: 'Previous month' },
-        onMonthChange: jest.fn(),
+        onMonthChange: vi.fn(),
         ...propsOverride,
     };
     render(<DatePickerControlled {...props} />);

package/src/components/date-picker/DatePickerField.test.tsx

@@ -10,8 +10,8 @@ import { DatePickerField, DatePickerFieldProps } from './DatePickerField';
 import { CLASSNAME } from './constants';
 
 const mockedDate = new Date(1487721600000);
-Date.now = jest.fn(() => mockedDate.valueOf());
-jest.mock('@lumx/react/utils/date/getYearDisplayName', () => ({
+Date.now = vi.fn(() => mockedDate.valueOf());
+vi.mock('@lumx/react/utils/date/getYearDisplayName', () => ({
     getYearDisplayName: () => 'année',
 }));
 
@@ -19,7 +19,7 @@ const setup = (propsOverride: Partial<DatePickerFieldProps> = {}, { wrapper }: S
     const props: DatePickerFieldProps = {
         label: 'DatePickerField',
         locale: 'fr',
-        onChange: jest.fn(),
+        onChange: vi.fn(),
         value: mockedDate,
         nextButtonProps: { label: 'Next month' },
         previousButtonProps: { label: 'Previous month' },

package/src/components/dialog/Dialog.test.tsx

@@ -51,7 +51,7 @@ describe(`<${Dialog.displayName}>`, () => {
 
     describe('Events', () => {
         it('should trigger `onClose` when pressing `escape` key', async () => {
-            const onClose = jest.fn();
+            const onClose = vi.fn();
             setup({ isOpen: true, onClose });
 
             await userEvent.keyboard('[Escape]');
@@ -59,7 +59,7 @@ describe(`<${Dialog.displayName}>`, () => {
         });
 
         it('should not trigger `onClose` when pressing any other key', async () => {
-            const onClose = jest.fn();
+            const onClose = vi.fn();
             setup({ isOpen: true, onClose });
 
             await userEvent.keyboard('a');
@@ -67,7 +67,7 @@ describe(`<${Dialog.displayName}>`, () => {
         });
 
         it('should not trigger `onClose` when pressing `escape` key with `preventAutoClose` set to `true`', async () => {
-            const onClose = jest.fn();
+            const onClose = vi.fn();
             setup({ isOpen: true, onClose, preventAutoClose: true });
 
             await userEvent.keyboard('[Escape]');
@@ -75,7 +75,7 @@ describe(`<${Dialog.displayName}>`, () => {
         });
 
         it('should not trigger `onClose` when pressing `escape` key with `preventCloseOnEscape` set to `true`', async () => {
-            const onClose = jest.fn();
+            const onClose = vi.fn();
             setup({ isOpen: true, onClose, preventCloseOnEscape: true });
 
             await userEvent.keyboard('[Escape]');

package/src/components/dropdown/Dropdown.test.tsx

@@ -28,7 +28,7 @@ const setup = (propsOverride: Partial<DropdownProps> = {}) => {
 describe(`<${Dropdown.displayName}>`, () => {
     describe('Events', () => {
         it('should trigger `onClose` when pressing `escape` key', async () => {
-            const onClose = jest.fn();
+            const onClose = vi.fn();
             setup({
                 closeOnEscape: true,
                 onClose,
@@ -40,7 +40,7 @@ describe(`<${Dropdown.displayName}>`, () => {
         });
 
         it('should not trigger `onClose` when pressing any other key', async () => {
-            const onClose = jest.fn();
+            const onClose = vi.fn();
             setup({ isOpen: true, onClose, closeOnEscape: true });
 
             await userEvent.keyboard('a');
@@ -48,7 +48,7 @@ describe(`<${Dropdown.displayName}>`, () => {
         });
 
         it('should not trigger `onClose` when pressing `escape` key with `closeOnEscape` set to `false`', async () => {
-            const onClose = jest.fn();
+            const onClose = vi.fn();
             setup({ isOpen: true, onClose, closeOnEscape: false });
 
             await userEvent.keyboard('[Escape]');

package/src/components/expansion-panel/ExpansionPanel.test.tsx

@@ -1,3 +1,4 @@
+import { Mock } from 'vitest';
 import React from 'react';
 
 import { commonTestsSuiteRTL, SetupRenderOptions } from '@lumx/react/testing/utils';
@@ -11,7 +12,7 @@ import { ExpansionPanel, ExpansionPanelProps } from '.';
 
 const CLASSNAME = ExpansionPanel.className as string;
 
-jest.mock('@lumx/react/utils/browser/isFocusVisible');
+vi.mock('@lumx/react/utils/browser/isFocusVisible');
 
 const mockChildrenContent = 'children content';
 
@@ -55,7 +56,7 @@ const setup = (
 };
 
 describe(`<${ExpansionPanel.displayName}>`, () => {
-    (isFocusVisible as jest.Mock).mockReturnValue(false);
+    (isFocusVisible as Mock).mockReturnValue(false);
 
     describe('Render', () => {
         it('should render default', () => {
@@ -100,9 +101,9 @@ describe(`<${ExpansionPanel.displayName}>`, () => {
     });
 
     describe('Events', () => {
-        const onOpen = jest.fn();
-        const onClose = jest.fn();
-        const onToggleOpen = jest.fn();
+        const onOpen = vi.fn();
+        const onClose = vi.fn();
+        const onToggleOpen = vi.fn();
 
         beforeEach(onOpen.mockClear);
         beforeEach(onClose.mockClear);

package/src/components/icon/Icon.stories.tsx

@@ -1,21 +1,47 @@
-import DefaultStory, { SizeAndShape as DefaultSizeAndShape } from '@lumx/core/js/components/Icon/Stories';
 import { mdiEmail } from '@lumx/icons';
-import { ColorPalette, ColorVariant, GridColumn, Icon, Size } from '@lumx/react';
+import { ColorPalette, ColorVariant, GridColumn, Icon, IconSizes, Size } from '@lumx/react';
 import { withCombinations } from '@lumx/react/stories/decorators/withCombinations';
 import { withUndefined } from '@lumx/react/stories/controls/withUndefined';
+import { iconArgType } from '@lumx/react/stories/controls/icons';
+import { colorArgType, colorVariantArgType } from '@lumx/react/stories/controls/color';
 import { withWrapper } from '@lumx/react/stories/decorators/withWrapper';
 
+const iconSizes: Array<IconSizes> = [Size.xxs, Size.xs, Size.s, Size.m, Size.l, Size.xl, Size.xxl];
+
 export default {
     title: 'LumX components/icon/Icon',
     component: Icon,
-    ...DefaultStory,
+    args: Icon.defaultProps,
+    argTypes: {
+        icon: iconArgType,
+        hasShape: { control: 'boolean' },
+        color: colorArgType,
+        colorVariant: colorVariantArgType,
+    },
 };
 
 /**
  * All combinations of size and shape
  */
 export const SizeAndShape = {
-    ...DefaultSizeAndShape,
+    args: {
+        icon: mdiEmail,
+    },
+    argTypes: {
+        hasShape: { control: false },
+        size: { control: false },
+    },
+    decorators: [
+        withCombinations({
+            combinations: {
+                cols: { key: 'size', options: withUndefined(iconSizes) },
+                rows: {
+                    Default: {},
+                    'Has shape': { hasShape: true },
+                },
+            },
+        }),
+    ],
 };
 
 /**