Revert "Chore/review components (#93)" (#94)

This reverts commit 3e62507.

README.md

@@ -191,41 +191,6 @@ If you want to dive deeper into the components Tetrisly offers, check out our of
 
 You can also check out our Storybook, which is our Documentation for React components (now in progress): [Tetrisly Storybook](https://virtuslab.github.io/tetrisly-react/?path=/docs/alertbanner--docs)
 
-## Customization
-
-All Tetrisly components have a `custom` prop. It makes it possible to customize the component without the need to create a new one. Below you can see an example of Button customization
-
-### Button
-
-If you want to change any of button styles, you can make it by passing custom props with object based on
-specific component config.
-
-For instance, to change background-color of appereance="primary" intent="secondary" variant to pink, just pass
-refferenced object structure:
-
-```jsx
-<Button
-  label="Button label"
-  appearance="primary"
-  intent="success"
-  custom={{
-    variants: {
-      appearance: {
-        primary: {
-          intent: {
-            success: {
-              backgroundColor: 'raspberry-0', // you can also pass any color value not included in default theme
-            },
-          },
-        },
-      },
-    },
-  }}
-/>
-```
-
-we are still working on it, thanks for your feedback here!
-
 ### Useful links
 
 - [Tetrisly Storybook](https://storybook.tetrisly.com/)

package.json

@@ -84,7 +84,7 @@
   "exports": {
     ".": {
       "import": "./dist/tetrisly-react.es.js",
-      "require": "./dist/tetrisly-react.umd.js"
+      "require": "./dist/tetrisly-react.umd.cjs"
     }
   },
   "repository": {

src/components/AlertBanner/AlertBanner.stories.tsx

@@ -23,13 +23,6 @@ const meta = {
       },
     ],
   },
-  argTypes: {
-    intent: {
-      options: ['none', 'success', 'warning', 'negative'],
-      defaultValue: 'none',
-      control: { type: 'radio' },
-    },
-  },
   parameters: {
     docs: {
       description: {
@@ -53,7 +46,7 @@ export const Default: Story = {};
 
 export const Positive: Story = {
   args: {
-    intent: 'success',
+    intent: 'positive',
   },
 };
 

src/components/AlertBanner/AlertBanner.styles.ts

@@ -23,7 +23,7 @@ export const defaultConfig = {
       backgroundColor: '$color-background-neutral-strong',
       color: '$color-content-primary-inverted',
     },
-    success: {
+    positive: {
       backgroundColor: '$color-background-positive-strong',
       color: '$color-content-primary-inverted',
     },
@@ -53,13 +53,13 @@ export const defaultConfig = {
   },
 } satisfies AlertBannerConfig;
 
-export const resolveIconName = (intent: AlertBannerIntent) => {
-  const iconConfig = {
+export const resolveIconName = (intent: AlertBannerIntent): IconName<20> => {
+  const iconConfig: Record<AlertBannerIntent, IconName<20>> = {
     none: '20-info-fill',
-    success: '20-check-circle-fill',
+    positive: '20-info-fill',
     warning: '20-warning-fill',
     negative: '20-alert-fill',
-  } satisfies Record<AlertBannerIntent, IconName<20>>;
+  };
 
   return iconConfig[intent];
 };

src/components/AlertBanner/AlertBanner.test.tsx

@@ -53,9 +53,9 @@ describe('AlertBanner', () => {
     expect(alertBanner).toHaveStyle('background-color: rgb(85, 95, 109);');
   });
 
-  it('should render correct intent color (success)', () => {
+  it('should render correct intent color (positive)', () => {
     const alertBanner = getAlertBanner(
-      <AlertBanner text="Alert" intent="success" />,
+      <AlertBanner text="Alert" intent="positive" />,
     );
     expect(alertBanner).toHaveStyle('color: rgb(255,255,255);');
     expect(alertBanner).toHaveStyle('background-color:  rgb(29, 124, 77);');

src/components/AlertBanner/types/AlertBannerIntent.type.ts

@@ -1 +1 @@
-export type AlertBannerIntent = 'none' | 'success' | 'warning' | 'negative';
+export type AlertBannerIntent = 'none' | 'positive' | 'warning' | 'negative';

src/components/Avatar/Avatar.stories.tsx

@@ -17,12 +17,9 @@ const meta = {
     img: { if: { arg: 'appearance', eq: 'image' } },
     initials: { if: { arg: 'appearance', neq: 'image' } },
     emphasis: { if: { arg: 'appearance', neq: 'image' } },
-    appearance: {
-      options: appearances,
-      control: { type: 'select' },
-    },
   },
   parameters: {
+    controls: { sort: 'alpha' },
     docs: {
       description: {
         component:

src/components/Avatar/Avatar.styles.ts

@@ -119,7 +119,7 @@ export const defaultConfig = {
     orange: {
       emphasis: {
         high: {
-          color: '$color-nonSemantic-grey-content-primary',
+          color: '$color-nonSemantic-white-content-primary',
           backgroundColor: '$color-nonSemantic-orange-background-strong',
         },
         low: {

src/components/Avatar/Avatar.tsx

@@ -1,4 +1,4 @@
-import { type FC, useMemo } from 'react';
+import { FC, useMemo } from 'react';
 
 import type { AvatarProps } from './Avatar.props';
 import { stylesBuilder } from './stylesBuilder';

src/components/Avatar/types/AvatarAppearance.type.ts

@@ -1,20 +1,17 @@
-export const avatarAppearanceColors = [
-  'blue',
-  'green',
-  'grey',
-  'red',
-  'orange',
-  'raspberry',
-  'magenta',
-  'purple',
-  'grape',
-  'violet',
-  'cyan',
-  'teal',
-  'aquamarine',
-  'emerald',
-] as const;
+export type AvatarAppearanceColors =
+  | 'blue'
+  | 'green'
+  | 'grey'
+  | 'red'
+  | 'orange'
+  | 'raspberry'
+  | 'magenta'
+  | 'purple'
+  | 'grape'
+  | 'violet'
+  | 'cyan'
+  | 'teal'
+  | 'aquamarine'
+  | 'emerald';
 
-export type AvatarAppearanceColors = (typeof avatarAppearanceColors)[number];
-
-export type AvatarAppearance = 'image' | AvatarAppearanceColors;
+export type AvatarAppearance = AvatarAppearanceColors | 'image';

src/components/Badge/Badge.stories.tsx

@@ -1,7 +1,6 @@
 import type { Meta, StoryObj } from '@storybook/react';
 
 import { Badge } from './Badge';
-import type { BadgeEmphasis } from './BadgeEmphasis.type';
 
 import { BadgeDocs } from '@/docs-components/BadgeDocs';
 import { TetDocs } from '@/docs-components/TetDocs';
@@ -10,14 +9,6 @@ const meta = {
   title: 'Badge',
   component: Badge,
   tags: ['autodocs'],
-  argTypes: {
-    emphasis: {
-      control: {
-        type: 'select',
-        options: ['high', 'medium', 'low'] satisfies BadgeEmphasis[],
-      },
-    },
-  },
   parameters: {
     docs: {
       description: {

src/components/Badge/Badge.styles.ts

@@ -271,7 +271,7 @@ export const defaultConfig = {
         },
         medium: {
           border: '1px solid',
-          borderColor: '$color-nonSemantic-grey-border-subtle',
+          borderColor: '$color-nonSemantic-grey-border-strong',
           color: '$color-nonSemantic-grey-content-primary',
           backgroundColor: '$color-nonSemantic-white-background-strong',
         },

src/components/Badge/Badge.tsx

@@ -1,11 +1,11 @@
 import { Icon } from '@virtuslab/tetrisly-icons';
-import { type FC, useMemo } from 'react';
+import { FC, useMemo } from 'react';
 
-import type { BadgeProps } from './Badge.props';
+import { BadgeProps } from './Badge.props';
 import { stylesBuilder } from './stylesBuilder';
 
 import { tet } from '@/tetrisly';
-import type { MarginProps } from '@/types/MarginProps';
+import { MarginProps } from '@/types/MarginProps';
 
 export const Badge: FC<BadgeProps & MarginProps> = ({
   appearance,

src/components/Button/Button.stories.tsx

@@ -23,16 +23,6 @@ const meta = {
       defaultValue: 'medium',
       control: { type: 'radio' },
     },
-    variant: {
-      options: ['default', 'ghost', 'bare'],
-      defaultValue: 'default',
-      control: { type: 'radio' },
-    },
-    intent: {
-      options: ['none', 'success', 'destructive'],
-      defaultValue: 'none',
-      control: { type: 'radio' },
-    },
   },
   parameters: {
     docs: {

src/components/Button/Button.styles.ts

@@ -178,7 +178,7 @@ const size = {
 
 const commonConfig = {
   display: 'inline-flex',
-  gap: '$space-component-gap-xSmall',
+  gap: '$space-component-gap-small',
   w: 'fit-content',
   justifyContent: 'center',
   alignItems: 'center',
@@ -304,7 +304,7 @@ const defaultButtonConfig = {
 
 const ghostButtonConfig = {
   ...commonConfig,
-  borderRadius: '$border-radius-large',
+  borderRadius: '$border-radius-medium',
   backgroundColor: {
     _: 'transparent',
     hover: '$color-action-ghost-hover',

src/components/Button/Button.tsx

@@ -1,7 +1,7 @@
 import { Icon } from '@virtuslab/tetrisly-icons';
-import { type FC, useMemo } from 'react';
+import { FC, useMemo } from 'react';
 
-import type { ButtonProps } from './Button.props';
+import { ButtonProps } from './Button.props';
 import { stylesBuilder } from './stylesBuilder';
 import { tet } from '../../tetrisly';
 import { Loader } from '../Loader';
@@ -67,7 +67,7 @@ export const Button: FC<ButtonProps & MarginProps> = ({
       )}
       {beforeIcon && state !== 'loading' && <Icon name={beforeIcon} />}
       {children}
-      {dropdown && <Icon name="20-chevron-down-small" />}
+      {dropdown && <Icon name="20-chevron-down" />}
       {afterIcon && !dropdown && <Icon name={afterIcon} />}
     </tet.button>
   );

src/components/Button/stylesBuilder/stylesBuilder.test.ts

@@ -27,7 +27,7 @@ describe('stylesBuilder', () => {
         boxShadow: '$elevation-bottom-100',
         color: '$color-action-inverted-normal',
         display: 'inline-flex',
-        gap: '$space-component-gap-xSmall',
+        gap: '$space-component-gap-small',
         justifyContent: 'center',
         opacity: {
           disabled: '$opacity-disabled',

src/components/Checkbox/Checkbox.props.ts

@@ -1,7 +1,6 @@
 import type { InputHTMLAttributes } from 'react';
 
 import type { CheckboxConfig } from './Checkbox.styles';
-import { HelperTextProps } from '../HelperText';
 
 export type CheckboxProps = {
   isChecked?: boolean;
@@ -14,11 +13,5 @@ export type CheckboxProps = {
 > &
   (
     | { label?: string; helperText?: never }
-    | {
-        label: string;
-        helperText?: Pick<
-          HelperTextProps,
-          'hasBeforeIcon' | 'counter' | 'text'
-        >;
-      }
+    | { label: string; helperText?: string }
   );

src/components/Checkbox/Checkbox.stories.tsx

@@ -11,14 +11,6 @@ const meta = {
   title: 'Checkbox',
   component: Checkbox,
   tags: ['autodocs'],
-  argTypes: {
-    state: {
-      control: {
-        type: 'select',
-        options: [undefined, 'disabled', 'alert'],
-      },
-    },
-  },
   parameters: {
     docs: {
       description: {
@@ -42,7 +34,6 @@ export const Default: Story = {};
 export const Checked: Story = {
   args: {
     isChecked: true,
-    onChange: () => {},
   },
 };
 
@@ -96,7 +87,7 @@ export const Alert: Story = {
   args: {
     state: 'alert',
     label: 'Label',
-    helperText: { text: 'Helper text' },
+    helperText: 'Helper text',
   },
 };
 
@@ -109,6 +100,6 @@ export const Label: Story = {
 export const HelperText: Story = {
   args: {
     label: 'Label',
-    helperText: { text: 'Helper text' },
+    helperText: 'Helper text',
   },
 };

src/components/Checkbox/Checkbox.test.tsx

@@ -19,19 +19,16 @@ const getCheckbox = (jsx: JSX.Element) => {
 };
 
 describe('Checkbox', () => {
-  customPropTester(
-    <Checkbox label="Label" helperText={{ text: 'Helper Text' }} />,
-    {
-      containerId: 'checkbox',
-      innerElements: {
-        input: [],
-        checkboxContainer: [],
-        checkboxIcon: [],
-        label: [],
-        helperText: [],
-      },
+  customPropTester(<Checkbox label="Label" helperText="Helper Text" />, {
+    containerId: 'checkbox',
+    innerElements: {
+      input: [],
+      checkboxContainer: [],
+      checkboxIcon: [],
+      label: [],
+      helperText: [],
     },
-  );
+  });
 
   beforeEach(() => {
     handleEventMock.mockReset();
@@ -104,7 +101,7 @@ describe('Checkbox', () => {
 
   it('should render helper text if props provided', () => {
     const { label, helperText } = getCheckbox(
-      <Checkbox label="Label" helperText={{ text: 'Helper text' }} />,
+      <Checkbox label="Label" helperText="Helper text" />,
     );
 
     expect(label).toHaveTextContent('Label');