@true-engineering/true-react-common-ui-kit 2.7.0 → 3.0.0-alpha.1

package/src/components/Button/Button.tsx

@@ -1,153 +1,147 @@
-import { useMemo, ReactNode, ButtonHTMLAttributes, MouseEvent, forwardRef } from 'react';
-import clsx from 'clsx';
-import merge from 'lodash-es/merge';
-import { addDataTestId, isReactNodeNotEmpty } from '@true-engineering/true-react-platform-helpers';
-import { addDataAttributes, renderIcon } from '../../helpers';
-import { useTheme } from '../../hooks';
-import { ICommonProps, IIcon } from '../../types';
-import { ThemedPreloader, IThemedPreloaderProps, ThemedPreloaderStyles } from '../ThemedPreloader';
-import { IButtonSize, IButtonView } from './types';
-import { ButtonStyles, styles, dotsPreloaderStyles } from './Button.styles';
-
-export interface IButtonProps extends ICommonProps {
-  tweakStyles?: ButtonStyles;
-  children?: ReactNode;
-  /**
-   * @default `button`
-   */
-  type?: ButtonHTMLAttributes<unknown>['type'];
-  /**
-   * @default `l`
-   */
-  size?: IButtonSize;
-  /**
-   * @default `primary`
-   */
-  view?: IButtonView;
-  /**
-   * @default false
-   */
-  shouldSkipTabNavigation?: boolean;
-  /**
-   * @default false
-   */
-  isDisabled?: boolean;
-  /**
-   * @default false
-   */
-  isFullWidth?: boolean;
-  /**
-   * Нужно ли убирать скругление у кнопки слева
-   * @default false
-   */
-  isInline?: boolean;
-  /**
-   * Нужно ли показать лоадер и заблокировать кнопку
-   * @default false
-   */
-  isLoading?: boolean;
-  /**
-   * @default false
-   */
-  isActive?: boolean;
-  icon?: IIcon;
-  /**
-   * @default `left`
-   */
-  iconPosition?: 'left' | 'right';
-  /**
-   * @default `dots`
-   */
-  preloaderType?: IThemedPreloaderProps['type'];
-  testId?: string;
-  onClick?(event: MouseEvent<HTMLButtonElement>): void | Promise<void>;
-  onMouseDown?(event: MouseEvent<HTMLButtonElement>): void | Promise<void>;
-}
-
-export const Button = forwardRef<HTMLButtonElement, IButtonProps>(
-  (
-    {
-      type = 'button',
-      children,
-      size = 'l',
-      view = 'primary',
-      isFullWidth = false,
-      isInline = false,
-      isDisabled = false,
-      isActive = false,
-      isLoading = false,
-      shouldSkipTabNavigation = false,
-      data,
-      testId,
-      tweakStyles,
-      icon,
-      iconPosition = 'left',
-      preloaderType = 'dots',
-      onClick,
-      onMouseDown,
-    },
-    ref,
-  ) => {
-    const { classes, componentStyles } = useTheme('Button', styles, tweakStyles);
-
-    const tweakPreloaderStyles = useMemo(
-      () =>
-        merge(
-          {},
-          size === 's' || size === 'm' ? dotsPreloaderStyles : undefined,
-          componentStyles.tweakPreloader,
-          tweakStyles?.tweakPreloader,
-        ) as ThemedPreloaderStyles,
-      [tweakStyles?.tweakPreloader, size],
-    );
-
-    const hasIcon = isReactNodeNotEmpty(icon);
-    const hasChildren = isReactNodeNotEmpty(children);
-    const hasNoAction = isDisabled || isLoading;
-
-    return (
-      <button
-        ref={ref}
-        type={type}
-        className={clsx(classes.root, classes[size], classes[view], {
-          [classes.disabled]: isDisabled,
-          [classes.fullWidth]: isFullWidth,
-          [classes.inline]: isInline,
-          [classes.active]: isActive,
-          [classes.loading]: isLoading,
-          [classes.onlyIcon]: hasIcon && !hasChildren,
-        })}
-        tabIndex={shouldSkipTabNavigation ? -1 : undefined}
-        disabled={hasNoAction}
-        onClick={!hasNoAction ? onClick : undefined}
-        onMouseDown={!hasNoAction ? onMouseDown : undefined}
-        {...addDataTestId(testId)}
-        {...addDataAttributes(data)}
-      >
-        <span
-          className={clsx(classes.content, {
-            [classes.iconFromRight]: hasChildren && hasIcon && iconPosition === 'right',
-            [classes.iconFromLeft]: hasChildren && hasIcon && iconPosition === 'left',
-          })}
-        >
-          {hasIcon && (
-            <span className={classes.icon}>{isReactNodeNotEmpty(icon) && renderIcon(icon)}</span>
-          )}
-          {hasChildren && (
-            <span className={clsx(classes.children, hasIcon && classes.withIcon)}>{children}</span>
-          )}
-        </span>
-
-        {isLoading && (
-          <span className={classes.loader}>
-            <ThemedPreloader
-              type={preloaderType}
-              useCurrentColor
-              tweakStyles={tweakPreloaderStyles}
-            />
-          </span>
-        )}
-      </button>
-    );
-  },
-);
+import { ReactNode, ButtonHTMLAttributes, MouseEvent, forwardRef } from 'react';
+import clsx from 'clsx';
+import { addDataTestId, isReactNodeNotEmpty } from '@true-engineering/true-react-platform-helpers';
+import { addDataAttributes } from '../../helpers';
+import { renderIcon } from '../../helpers/snippets';
+import { useTweakStyles } from '../../hooks';
+import { ICommonProps, IIcon } from '../../types';
+import { ThemedPreloader, IThemedPreloaderProps } from '../ThemedPreloader';
+import { IButtonSize, IButtonView } from './types';
+import { useStyles, IButtonStyles, getPreloaderStyles } from './Button.styles';
+
+export interface IButtonProps extends ICommonProps<IButtonStyles> {
+  children?: ReactNode;
+  /**
+   * @default `button`
+   */
+  type?: ButtonHTMLAttributes<unknown>['type'];
+  /**
+   * @default `l`
+   */
+  size?: IButtonSize;
+  /**
+   * @default `primary`
+   */
+  view?: IButtonView;
+  /**
+   * @default false
+   */
+  shouldSkipTabNavigation?: boolean;
+  /**
+   * @default false
+   */
+  isDisabled?: boolean;
+  /**
+   * @default false
+   */
+  isFullWidth?: boolean;
+  /**
+   * Нужно ли убирать скругление у кнопки слева
+   * @default false
+   */
+  isInline?: boolean;
+  /**
+   * Нужно ли показать лоадер и заблокировать кнопку
+   * @default false
+   */
+  isLoading?: boolean;
+  /**
+   * @default false
+   */
+  isActive?: boolean;
+  icon?: IIcon;
+  /**
+   * @default `left`
+   */
+  iconPosition?: 'left' | 'right';
+  /**
+   * @default `dots`
+   */
+  preloaderType?: IThemedPreloaderProps['type'];
+  onClick?(event: MouseEvent<HTMLButtonElement>): void | Promise<void>;
+  onMouseDown?(event: MouseEvent<HTMLButtonElement>): void | Promise<void>;
+}
+
+export const Button = forwardRef<HTMLButtonElement, IButtonProps>(
+  (
+    {
+      type = 'button',
+      children,
+      size = 'l',
+      view = 'primary',
+      isFullWidth = false,
+      isInline = false,
+      isDisabled = false,
+      isActive = false,
+      isLoading = false,
+      shouldSkipTabNavigation = false,
+      data,
+      testId,
+      tweakStyles,
+      icon,
+      iconPosition = 'left',
+      preloaderType = 'dots',
+      onClick,
+      onMouseDown,
+    },
+    ref,
+  ) => {
+    const classes = useStyles({ theme: tweakStyles });
+
+    const tweakPreloaderStyles = useTweakStyles({
+      innerStyles: getPreloaderStyles(size),
+      tweakStyles,
+      className: 'tweakPreloader',
+      currentComponentName: 'Button',
+    });
+
+    const hasIcon = isReactNodeNotEmpty(icon);
+    const hasChildren = isReactNodeNotEmpty(children);
+    const hasNoAction = isDisabled || isLoading;
+
+    return (
+      <button
+        ref={ref}
+        type={type}
+        className={clsx(classes.root, classes[size], classes[view], {
+          [classes.disabled]: isDisabled,
+          [classes.fullWidth]: isFullWidth,
+          [classes.inline]: isInline,
+          [classes.active]: isActive,
+          [classes.loading]: isLoading,
+          [classes.onlyIcon]: hasIcon && !hasChildren,
+        })}
+        tabIndex={shouldSkipTabNavigation ? -1 : undefined}
+        disabled={hasNoAction}
+        onClick={!hasNoAction ? onClick : undefined}
+        onMouseDown={!hasNoAction ? onMouseDown : undefined}
+        {...addDataTestId(testId)}
+        {...addDataAttributes(data)}
+      >
+        <span
+          className={clsx(classes.content, {
+            [classes.iconFromRight]: hasChildren && hasIcon && iconPosition === 'right',
+            [classes.iconFromLeft]: hasChildren && hasIcon && iconPosition === 'left',
+          })}
+        >
+          {hasIcon && (
+            <span className={classes.icon}>{isReactNodeNotEmpty(icon) && renderIcon(icon)}</span>
+          )}
+          {hasChildren && (
+            <span className={clsx(classes.children, hasIcon && classes.withIcon)}>{children}</span>
+          )}
+        </span>
+
+        {isLoading && (
+          <span className={classes.loader}>
+            <ThemedPreloader
+              type={preloaderType}
+              useCurrentColor
+              tweakStyles={tweakPreloaderStyles}
+            />
+          </span>
+        )}
+      </button>
+    );
+  },
+);

package/src/components/Button/constants.ts

@@ -1,9 +1,9 @@
-export const BUTTON_VIEWS = [
-  'primary',
-  'secondary',
-  'outline',
-  'warning',
-  'destructive',
-  'text',
-  'custom', // специальный стиль для кастомизации на своем проекте
-] as const;
+export const BUTTON_VIEWS = [
+  'primary',
+  'secondary',
+  'outline',
+  'warning',
+  'destructive',
+  'text',
+  'custom', // специальный стиль для кастомизации на своем проекте
+] as const;

package/src/components/Button/index.ts

@@ -1,3 +1,3 @@
-export * from './Button';
-export * from './types';
-export type { ButtonStyles } from './Button.styles';
+export * from './Button';
+export * from './types';
+export type { IButtonStyles } from './Button.styles';

package/src/components/Button/types.ts

@@ -1,5 +1,5 @@
-import { BUTTON_VIEWS } from './constants';
-
-export type IButtonSize = 's' | 'm' | 'l' | 'xl';
-
-export type IButtonView = (typeof BUTTON_VIEWS)[number];
+import { BUTTON_VIEWS } from './constants';
+
+export type IButtonSize = 's' | 'm' | 'l' | 'xl';
+
+export type IButtonView = (typeof BUTTON_VIEWS)[number];

package/src/components/Checkbox/Checkbox.stories.tsx

@@ -1,32 +1,28 @@
-import { ComponentStory, ComponentMeta } from '@storybook/react';
-import { Checkbox } from './Checkbox';
-
-export default {
-  title: 'Checkbox',
-  component: Checkbox,
-  args: {
-    value: 'value',
-    size: 18,
-    alignItems: 'center',
-    labelPosition: 'right',
-    isReadonly: false,
-    isInvalid: false,
-    isDisabled: false,
-    isSemiChecked: false,
-  },
-  argTypes: {
-    value: { control: 'text' },
-    alignItems: { control: 'inline-radio', options: ['top', 'center'] },
-  },
-  parameters: {
-    controls: {
-      exclude: ['data', 'tweakStyles', 'testId', 'onSelect'],
-    },
-  },
-} as ComponentMeta<typeof Checkbox>;
-
-export const Default: ComponentStory<typeof Checkbox> = (args) => (
-  <Checkbox {...args} onSelect={(value) => console.log('Value was selected', value)}>
-    <div>some text</div>
-  </Checkbox>
-);
+import { ComponentStory, ComponentMeta } from '@storybook/react';
+import { Checkbox } from './Checkbox';
+
+export default {
+  title: 'Checkbox',
+  component: Checkbox,
+  args: {
+    value: 'value',
+    labelPosition: 'right',
+    isReadonly: false,
+    isInvalid: false,
+    isDisabled: false,
+    isSemiChecked: false,
+  },
+  parameters: {
+    controls: {
+      exclude: ['data', 'tweakStyles', 'testId', 'onSelect'],
+    },
+  },
+} as ComponentMeta<typeof Checkbox>;
+
+export const Default: ComponentStory<typeof Checkbox> = (args) => (
+  <div style={{ width: 200 }}>
+    <Checkbox {...args} onSelect={(value) => console.log('Value was selected', value)}>
+      <div>Some text</div>
+    </Checkbox>
+  </div>
+);

package/src/components/Checkbox/Checkbox.styles.ts

@@ -1,62 +1,46 @@
-import { ComponentStyles } from '../../types';
-import type { ICheckboxProps } from './Checkbox';
-
-interface IStyleProps {
-  size: NonNullable<ICheckboxProps<unknown>['size']>;
-  alignItems: NonNullable<ICheckboxProps<unknown>['alignItems']>;
-  textMargin: ICheckboxProps<unknown>['textMargin'];
-}
-
-export const styles = {
-  root: {
-    cursor: 'pointer',
-    display: 'flex',
-    alignItems: ({ alignItems }: IStyleProps): string =>
-      alignItems === 'top' ? 'flex-start' : 'center',
-  },
-
-  disabled: {
-    cursor: 'default',
-    pointerEvents: 'none',
-  },
-
-  input: {
-    width: 1,
-    height: 1,
-    position: 'absolute',
-    opacity: 0,
-  },
-
-  children: {
-    maxWidth: 'calc(100% - 32px)',
-    display: 'flex',
-    alignItems: 'center',
-  },
-
-  check: {
-    width: ({ size }: IStyleProps): number => size,
-    height: ({ size }: IStyleProps): number => size,
-    borderRadius: 2,
-    flexShrink: 0,
-    marginRight: ({ size, textMargin }: IStyleProps): number =>
-      textMargin !== undefined ? textMargin : size - 4,
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'center',
-    boxSizing: 'border-box',
-  },
-
-  checked: {},
-
-  labelPositionLeft: {
-    flexDirection: 'row-reverse',
-
-    '& $check': {
-      marginRight: 0,
-      marginLeft: ({ size, textMargin }: IStyleProps): number =>
-        textMargin !== undefined ? textMargin : size - 4,
-    },
-  },
-};
-
-export type CheckboxStyles = ComponentStyles<typeof styles, IStyleProps>;
+import { createThemedStyles, ITweakStyles } from '../../theme';
+
+export const useStyles = createThemedStyles('Checkbox', {
+  root: {
+    cursor: 'pointer',
+    display: 'flex',
+    gap: 14,
+    width: 'fit-content',
+  },
+
+  disabled: {
+    cursor: 'default',
+    pointerEvents: 'none',
+  },
+
+  input: {
+    width: 1,
+    height: 1,
+    position: 'absolute',
+    opacity: 0,
+  },
+
+  children: {
+    display: 'flex',
+    alignItems: 'center',
+  },
+
+  check: {
+    width: 18,
+    height: 18,
+    borderRadius: 2,
+    flexShrink: 0,
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+    boxSizing: 'border-box',
+  },
+
+  checked: {},
+
+  labelPositionLeft: {
+    flexDirection: 'row-reverse',
+  },
+});
+
+export type ICheckboxStyles = ITweakStyles<typeof useStyles>;