@true-engineering/true-react-common-ui-kit 3.8.1 → 3.9.0

package/src/components/Button/Button.tsx

@@ -1,129 +1,129 @@
-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 { useTweakStyles } from '../../hooks';
-import { ICommonProps } from '../../types';
-import { renderIcon, IIcon } from '../Icon';
-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>
-    );
-  },
-);
+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 { useTweakStyles } from '../../hooks';
+import { ICommonProps } from '../../types';
+import { renderIcon, IIcon } from '../Icon';
+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/Checkbox/Checkbox.stories.tsx

@@ -1,28 +1,28 @@
-import { ComponentStory, ComponentMeta } from '@storybook/react';
-import { Checkbox } from './Checkbox';
-
-export default {
-  title: 'Controls/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>
-);
+import { ComponentStory, ComponentMeta } from '@storybook/react';
+import { Checkbox } from './Checkbox';
+
+export default {
+  title: 'Controls/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.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useState, ReactNode } from 'react';
+import { useEffect, useState, ReactNode, ChangeEvent, KeyboardEvent } from 'react';
 import clsx from 'clsx';
 import {
   addDataTestId,
@@ -24,7 +24,10 @@ export interface ICheckboxProps<V> extends ICommonProps<ICheckboxStyles> {
   value: V;
   /** @default 'right' */
   labelPosition?: 'right' | 'left';
-  onSelect: (value: { value: V; isSelected: boolean }) => void;
+  onSelect: (
+    value: { value: V; isSelected: boolean },
+    event: ChangeEvent<HTMLInputElement> | KeyboardEvent,
+  ) => void;
 }
 
 export function Checkbox<V>({
@@ -46,9 +49,9 @@ export function Checkbox<V>({
 
   const hasAction = !isDisabled && !isReadonly;
 
-  const onToggle = () => {
+  const onToggle = (event: ChangeEvent<HTMLInputElement> | KeyboardEvent) => {
     const isSelectedNext = !isSelected;
-    onSelect({ value, isSelected: isSelectedNext });
+    onSelect({ value, isSelected: isSelectedNext }, event);
     setIsSelected(isSelectedNext);
   };
 

package/src/components/CloseButton/CloseButton.tsx

@@ -1,34 +1,34 @@
-import { FC } from 'react';
-import { addDataTestId } from '@true-engineering/true-react-platform-helpers';
-import { addDataAttributes } from '../../helpers';
-import { ICommonProps } from '../../types';
-import { Icon } from '../Icon';
-import { useStyles, ICloseButtonStyles } from './CloseButton.styles';
-
-export interface ICloseButtonProps extends ICommonProps<ICloseButtonStyles> {
-  /** @default 'close' */
-  iconType?: 'close' | 'close-large' | 'close-window';
-  onClose?: () => void;
-}
-
-export const CloseButton: FC<ICloseButtonProps> = ({
-  tweakStyles,
-  testId,
-  data,
-  iconType = 'close',
-  onClose,
-}) => {
-  const classes = useStyles({ theme: tweakStyles });
-
-  return (
-    <button
-      type="button"
-      className={classes.root}
-      onClick={onClose}
-      {...addDataTestId(testId)}
-      {...addDataAttributes(data)}
-    >
-      <Icon type={iconType} />
-    </button>
-  );
-};
+import { FC } from 'react';
+import { addDataTestId } from '@true-engineering/true-react-platform-helpers';
+import { addDataAttributes } from '../../helpers';
+import { ICommonProps } from '../../types';
+import { Icon } from '../Icon';
+import { useStyles, ICloseButtonStyles } from './CloseButton.styles';
+
+export interface ICloseButtonProps extends ICommonProps<ICloseButtonStyles> {
+  /** @default 'close' */
+  iconType?: 'close' | 'close-large' | 'close-window';
+  onClose?: () => void;
+}
+
+export const CloseButton: FC<ICloseButtonProps> = ({
+  tweakStyles,
+  testId,
+  data,
+  iconType = 'close',
+  onClose,
+}) => {
+  const classes = useStyles({ theme: tweakStyles });
+
+  return (
+    <button
+      type="button"
+      className={classes.root}
+      onClick={onClose}
+      {...addDataTestId(testId)}
+      {...addDataAttributes(data)}
+    >
+      <Icon type={iconType} />
+    </button>
+  );
+};

package/src/components/Colors/Colors.stories.tsx

@@ -1,7 +1,7 @@
-import { Colors } from './Colors';
-
-export default {
-  title: 'Data Display/Colors',
-};
-
-export const Default = (): JSX.Element => <Colors />;
+import { Colors } from './Colors';
+
+export default {
+  title: 'Data Display/Colors',
+};
+
+export const Default = (): JSX.Element => <Colors />;

package/src/components/DateInput/DateInput.tsx

@@ -1,90 +1,90 @@
-import { FormEvent, MouseEvent, forwardRef, ChangeEvent } from 'react';
-import clsx from 'clsx';
-import { addDataAttributes } from '../../helpers';
-import { useTweakStyles } from '../../hooks';
-import { ICommonProps } from '../../types';
-import { IInputProps, Input } from '../Input';
-import { EMPTY_DATE_INPUT_VALUE, EMPTY_DATE_RANGE_INPUT_VALUE } from './constants';
-import { useStyles, IDateInputStyles } from './DateInput.styles';
-
-export interface IDateInputProps
-  extends Omit<IInputProps, 'value' | 'beforeMaskedStateChange' | 'onChange' | 'tweakStyles'>,
-    ICommonProps<IDateInputStyles> {
-  date?: string;
-  /** @default  '' */
-  startDate?: string;
-  /** @default '' */
-  endDate?: string;
-  className?: string;
-  /** @default false */
-  isRange?: boolean;
-  onClick?: (event: MouseEvent<HTMLDivElement>) => void;
-  // react-datepicker ожидает event первым аргументом
-  onChange?: (event: FormEvent<HTMLInputElement>, value: string) => void;
-}
-
-export const DateInput = forwardRef<HTMLInputElement, IDateInputProps>(
-  (
-    {
-      date,
-      startDate = '',
-      endDate = '',
-      mask,
-      className,
-      placeholder,
-      data,
-      isRange = false,
-      tweakStyles,
-      onClick,
-      onChange,
-      ...inputProps
-    },
-    ref,
-  ) => {
-    const classes = useStyles({ theme: tweakStyles });
-
-    const tweakInputStyles = useTweakStyles({
-      tweakStyles,
-      className: 'tweakInput',
-      currentComponentName: 'DateInput',
-    });
-
-    const beforeMaskedStateChange: IInputProps['beforeMaskedStateChange'] = ({ nextState }) => {
-      // Если в инпуте отсутствует введенное значение, то выставляем
-      // пустую строку для корректной работы react-datepicker
-      if (
-        nextState.value === EMPTY_DATE_INPUT_VALUE ||
-        nextState.value === EMPTY_DATE_RANGE_INPUT_VALUE
-      ) {
-        return { value: '', selection: { start: 0, end: 0 } };
-      }
-      return nextState;
-    };
-
-    const handleChange: IInputProps['onChange'] = (value, event) => {
-      // Событие click срабатывает только при нажатии на кнопку очистки
-      if (event.type === 'click') {
-        // react-datepicker ожидает пустую строку в event.target.value
-        (event as ChangeEvent<HTMLInputElement>).target.value = '';
-      }
-      onChange?.(event, value);
-    };
-
-    return (
-      <div className={clsx(classes.root, className)} onClick={onClick} {...addDataAttributes(data)}>
-        <Input
-          {...inputProps}
-          ref={ref}
-          value={isRange ? `${startDate}${endDate}` : date}
-          mask={mask ?? (isRange ? '99.99.9999 - 99.99.9999' : '99.99.9999')}
-          placeholder={
-            placeholder ?? (isRange ? EMPTY_DATE_RANGE_INPUT_VALUE : EMPTY_DATE_INPUT_VALUE)
-          }
-          tweakStyles={tweakInputStyles}
-          onChange={handleChange}
-          beforeMaskedStateChange={beforeMaskedStateChange}
-        />
-      </div>
-    );
-  },
-);
+import { FormEvent, MouseEvent, forwardRef, ChangeEvent } from 'react';
+import clsx from 'clsx';
+import { addDataAttributes } from '../../helpers';
+import { useTweakStyles } from '../../hooks';
+import { ICommonProps } from '../../types';
+import { IInputProps, Input } from '../Input';
+import { EMPTY_DATE_INPUT_VALUE, EMPTY_DATE_RANGE_INPUT_VALUE } from './constants';
+import { useStyles, IDateInputStyles } from './DateInput.styles';
+
+export interface IDateInputProps
+  extends Omit<IInputProps, 'value' | 'beforeMaskedStateChange' | 'onChange' | 'tweakStyles'>,
+    ICommonProps<IDateInputStyles> {
+  date?: string;
+  /** @default  '' */
+  startDate?: string;
+  /** @default '' */
+  endDate?: string;
+  className?: string;
+  /** @default false */
+  isRange?: boolean;
+  onClick?: (event: MouseEvent<HTMLDivElement>) => void;
+  // react-datepicker ожидает event первым аргументом
+  onChange?: (event: FormEvent<HTMLInputElement>, value: string) => void;
+}
+
+export const DateInput = forwardRef<HTMLInputElement, IDateInputProps>(
+  (
+    {
+      date,
+      startDate = '',
+      endDate = '',
+      mask,
+      className,
+      placeholder,
+      data,
+      isRange = false,
+      tweakStyles,
+      onClick,
+      onChange,
+      ...inputProps
+    },
+    ref,
+  ) => {
+    const classes = useStyles({ theme: tweakStyles });
+
+    const tweakInputStyles = useTweakStyles({
+      tweakStyles,
+      className: 'tweakInput',
+      currentComponentName: 'DateInput',
+    });
+
+    const beforeMaskedStateChange: IInputProps['beforeMaskedStateChange'] = ({ nextState }) => {
+      // Если в инпуте отсутствует введенное значение, то выставляем
+      // пустую строку для корректной работы react-datepicker
+      if (
+        nextState.value === EMPTY_DATE_INPUT_VALUE ||
+        nextState.value === EMPTY_DATE_RANGE_INPUT_VALUE
+      ) {
+        return { value: '', selection: { start: 0, end: 0 } };
+      }
+      return nextState;
+    };
+
+    const handleChange: IInputProps['onChange'] = (value, event) => {
+      // Событие click срабатывает только при нажатии на кнопку очистки
+      if (event.type === 'click') {
+        // react-datepicker ожидает пустую строку в event.target.value
+        (event as ChangeEvent<HTMLInputElement>).target.value = '';
+      }
+      onChange?.(event, value);
+    };
+
+    return (
+      <div className={clsx(classes.root, className)} onClick={onClick} {...addDataAttributes(data)}>
+        <Input
+          {...inputProps}
+          ref={ref}
+          value={isRange ? `${startDate}${endDate}` : date}
+          mask={mask ?? (isRange ? '99.99.9999 - 99.99.9999' : '99.99.9999')}
+          placeholder={
+            placeholder ?? (isRange ? EMPTY_DATE_RANGE_INPUT_VALUE : EMPTY_DATE_INPUT_VALUE)
+          }
+          tweakStyles={tweakInputStyles}
+          onChange={handleChange}
+          beforeMaskedStateChange={beforeMaskedStateChange}
+        />
+      </div>
+    );
+  },
+);

package/src/components/DateInput/constants.ts

@@ -1,2 +1,2 @@
-export const EMPTY_DATE_INPUT_VALUE = '__.__.____';
-export const EMPTY_DATE_RANGE_INPUT_VALUE = `${EMPTY_DATE_INPUT_VALUE} - ${EMPTY_DATE_INPUT_VALUE}`;
+export const EMPTY_DATE_INPUT_VALUE = '__.__.____';
+export const EMPTY_DATE_RANGE_INPUT_VALUE = `${EMPTY_DATE_INPUT_VALUE} - ${EMPTY_DATE_INPUT_VALUE}`;