@true-engineering/true-react-common-ui-kit 3.32.0 → 3.33.1

package/src/components/IncrementInput/IncrementInput.tsx

@@ -1,105 +1,105 @@
-import { FC, useEffect } from 'react';
-import clsx from 'clsx';
-import { addDataTestId, isNumberInteger } from '@true-engineering/true-react-platform-helpers';
-import { addDataAttributes, getNumberInRange, getNumberLength } from '../../helpers';
-import { useTweakStyles } from '../../hooks';
-import { ICommonProps } from '../../types';
-import { Icon } from '../Icon';
-import { INumberInputProps, NumberInput } from '../NumberInput';
-import { useStyles, IIncrementInputStyles, inputStyles } from './IncrementInput.styles';
-
-export interface IIncrementInputProps
-  extends Omit<INumberInputProps, 'canBeFloat' | 'precision' | 'tweakStyles'>,
-    ICommonProps<IIncrementInputStyles> {
-  /** @default 1 */
-  step?: number;
-}
-
-export const IncrementInput: FC<IIncrementInputProps> = ({
-  value,
-  onChange,
-  min,
-  max,
-  step = 1,
-  intPartPrecision,
-  data,
-  testId,
-  tweakStyles,
-  isDisabled,
-  isReadonly,
-  isInvalid,
-  ...props
-}) => {
-  const tweakInputStyles = useTweakStyles({
-    innerStyles: inputStyles,
-    tweakStyles,
-    className: 'tweakInput',
-    currentComponentName: 'IncrementInput',
-  });
-
-  const classes = useStyles({ theme: tweakStyles });
-
-  const isIncreaseDisabled =
-    isDisabled ||
-    isReadonly ||
-    (intPartPrecision !== undefined && getNumberLength((value ?? 0) + step) > intPartPrecision) ||
-    (max !== undefined && value !== undefined && value >= max);
-
-  const isDecreaseDisabled =
-    isDisabled || isReadonly || (min !== undefined && value !== undefined ? value <= min : false);
-
-  const increment = (): void => {
-    onChange(getNumberInRange((value ?? 0) + step, min, max));
-  };
-
-  const decrement = (): void => {
-    onChange(getNumberInRange((value ?? 0) - step, min, max));
-  };
-
-  useEffect(() => {
-    if (!isNumberInteger(step)) {
-      console.error('Параметр step должен быть целым числом');
-    }
-  }, [step]);
-
-  return (
-    <div className={classes.root} {...addDataTestId(testId)} {...addDataAttributes(data)}>
-      <NumberInput
-        {...props}
-        isInvalid={isInvalid}
-        isDisabled={isDisabled}
-        isReadonly={isReadonly}
-        min={min}
-        max={max}
-        intPartPrecision={intPartPrecision}
-        onChange={onChange}
-        value={value}
-        tweakStyles={tweakInputStyles}
-      />
-      <div className={classes.buttons}>
-        <button
-          className={clsx(classes.button, {
-            [classes.disabledButton]: isIncreaseDisabled,
-            [classes.errorButton]: isInvalid,
-          })}
-          type="button"
-          disabled={isIncreaseDisabled}
-          onClick={increment}
-        >
-          <Icon type="plus" />
-        </button>
-        <button
-          className={clsx(classes.button, {
-            [classes.disabledButton]: isDecreaseDisabled,
-            [classes.errorButton]: isInvalid,
-          })}
-          type="button"
-          disabled={isDecreaseDisabled}
-          onClick={decrement}
-        >
-          <Icon type="minus" />
-        </button>
-      </div>
-    </div>
-  );
-};
+import { FC, useEffect } from 'react';
+import clsx from 'clsx';
+import { addDataTestId, isNumberInteger } from '@true-engineering/true-react-platform-helpers';
+import { addDataAttributes, getNumberInRange, getNumberLength } from '../../helpers';
+import { useTweakStyles } from '../../hooks';
+import { ICommonProps } from '../../types';
+import { Icon } from '../Icon';
+import { INumberInputProps, NumberInput } from '../NumberInput';
+import { useStyles, IIncrementInputStyles, inputStyles } from './IncrementInput.styles';
+
+export interface IIncrementInputProps
+  extends Omit<INumberInputProps, 'canBeFloat' | 'precision' | 'tweakStyles'>,
+    ICommonProps<IIncrementInputStyles> {
+  /** @default 1 */
+  step?: number;
+}
+
+export const IncrementInput: FC<IIncrementInputProps> = ({
+  value,
+  onChange,
+  min,
+  max,
+  step = 1,
+  intPartPrecision,
+  data,
+  testId,
+  tweakStyles,
+  isDisabled,
+  isReadonly,
+  isInvalid,
+  ...props
+}) => {
+  const tweakInputStyles = useTweakStyles({
+    innerStyles: inputStyles,
+    tweakStyles,
+    className: 'tweakInput',
+    currentComponentName: 'IncrementInput',
+  });
+
+  const classes = useStyles({ theme: tweakStyles });
+
+  const isIncreaseDisabled =
+    isDisabled ||
+    isReadonly ||
+    (intPartPrecision !== undefined && getNumberLength((value ?? 0) + step) > intPartPrecision) ||
+    (max !== undefined && value !== undefined && value >= max);
+
+  const isDecreaseDisabled =
+    isDisabled || isReadonly || (min !== undefined && value !== undefined ? value <= min : false);
+
+  const increment = (): void => {
+    onChange(getNumberInRange((value ?? 0) + step, min, max));
+  };
+
+  const decrement = (): void => {
+    onChange(getNumberInRange((value ?? 0) - step, min, max));
+  };
+
+  useEffect(() => {
+    if (!isNumberInteger(step)) {
+      console.error('Параметр step должен быть целым числом');
+    }
+  }, [step]);
+
+  return (
+    <div className={classes.root} {...addDataTestId(testId)} {...addDataAttributes(data)}>
+      <NumberInput
+        {...props}
+        isInvalid={isInvalid}
+        isDisabled={isDisabled}
+        isReadonly={isReadonly}
+        min={min}
+        max={max}
+        intPartPrecision={intPartPrecision}
+        onChange={onChange}
+        value={value}
+        tweakStyles={tweakInputStyles}
+      />
+      <div className={classes.buttons}>
+        <button
+          className={clsx(classes.button, {
+            [classes.disabledButton]: isIncreaseDisabled,
+            [classes.errorButton]: isInvalid,
+          })}
+          type="button"
+          disabled={isIncreaseDisabled}
+          onClick={increment}
+        >
+          <Icon type="plus" />
+        </button>
+        <button
+          className={clsx(classes.button, {
+            [classes.disabledButton]: isDecreaseDisabled,
+            [classes.errorButton]: isInvalid,
+          })}
+          type="button"
+          disabled={isDecreaseDisabled}
+          onClick={decrement}
+        >
+          <Icon type="minus" />
+        </button>
+      </div>
+    </div>
+  );
+};

package/src/components/Input/types.ts

@@ -1,32 +1,32 @@
-import { InputHTMLAttributes } from 'react';
-import { Props as ReactInputMaskBaseProps } from 'react-input-mask';
-
-export type IReactInputMaskProps = Pick<
-  Partial<ReactInputMaskBaseProps>,
-  'mask' | 'maskPlaceholder' | 'alwaysShowMask' | 'beforeMaskedStateChange'
->;
-
-export type IInputHTMLBaseProps = Pick<
-  InputHTMLAttributes<HTMLInputElement>,
-  | 'maxLength'
-  | 'name'
-  | 'tabIndex'
-  | 'placeholder'
-  | 'type'
-  | 'onBlur'
-  | 'onFocus'
-  | 'onInput'
-  | 'onKeyDown'
-  | 'onPaste'
->;
-// Возможно это лучше заменить на
-// Omit< InputHTMLAttributes<HTMLInputElement>,
-// | 'className'
-// | 'value'
-// | 'onChange'
-// | 'disabled'
-// | 'required'
-// | 'autoFocus'
-// | 'readOnly'
-// | 'size'
-// >
+import { InputHTMLAttributes } from 'react';
+import { Props as ReactInputMaskBaseProps } from 'react-input-mask';
+
+export type IReactInputMaskProps = Pick<
+  Partial<ReactInputMaskBaseProps>,
+  'mask' | 'maskPlaceholder' | 'alwaysShowMask' | 'beforeMaskedStateChange'
+>;
+
+export type IInputHTMLBaseProps = Pick<
+  InputHTMLAttributes<HTMLInputElement>,
+  | 'maxLength'
+  | 'name'
+  | 'tabIndex'
+  | 'placeholder'
+  | 'type'
+  | 'onBlur'
+  | 'onFocus'
+  | 'onInput'
+  | 'onKeyDown'
+  | 'onPaste'
+>;
+// Возможно это лучше заменить на
+// Omit< InputHTMLAttributes<HTMLInputElement>,
+// | 'className'
+// | 'value'
+// | 'onChange'
+// | 'disabled'
+// | 'required'
+// | 'autoFocus'
+// | 'readOnly'
+// | 'size'
+// >

package/src/components/List/List.tsx

@@ -49,7 +49,9 @@ export const List: FC<IListProps> = ({ items, testId, data, tweakStyles, onClick
                 placement="right-start"
                 popupOffset={0}
                 shouldRenderInBody={false}
-                trigger={({ isActive }) => <ListItem {...itemProps} isFocused={isActive} />}
+                trigger={({ triggerProps }) => (
+                  <ListItem {...itemProps} isFocused={triggerProps.isActive} />
+                )}
               >
                 <div className={classes.nestedItems}>
                   <List items={item.nestedItems} onClick={onClick} />

package/src/components/Modal/Modal.stories.tsx

@@ -1,105 +1,105 @@
-import { FC, useState } from 'react';
-import { ComponentStory } from '@storybook/react';
-import { Button } from '../Button';
-import { IModalProps, Modal } from './Modal';
-
-const smallText =
-  'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.';
-const text =
-  'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat.';
-const largeText = [...text, ...text, ...text];
-const texts = { small: smallText, medium: text, large: largeText };
-
-export interface IModalWithCustomProps extends IModalProps {
-  textSize: 'small' | 'medium' | 'large';
-}
-
-const ModalWithCustomProps: FC<IModalWithCustomProps> = ({ size, textSize, ...args }) => {
-  const [isModalOpen, setIsModalOpen] = useState(false);
-  const [isSecondModalOpen, setIsSecondModalOpen] = useState(false);
-
-  return (
-    <div>
-      <Button onClick={() => setIsModalOpen(true)}>Open</Button>
-      <Button onClick={() => setIsSecondModalOpen(true)}>Open 2</Button>
-
-      <Modal
-        {...args}
-        isOpen={isModalOpen}
-        onClose={() => setIsModalOpen(false)}
-        buttons={[
-          <Button
-            key="1"
-            view="secondary"
-            onClick={() => setIsModalOpen(false)}
-            size={size === 's' ? 'm' : 'l'}
-          >
-            Отмена
-          </Button>,
-          <Button
-            key="2"
-            size={size === 's' ? 'm' : 'l'}
-            onClick={() => {
-              setIsModalOpen(false);
-              setIsSecondModalOpen(true);
-            }}
-          >
-            Применить
-          </Button>,
-        ]}
-      >
-        <div style={{ lineHeight: 1.6 }}>{texts[textSize]}</div>
-      </Modal>
-
-      <Modal {...args} isOpen={isSecondModalOpen} onClose={() => setIsSecondModalOpen(false)}>
-        Text
-      </Modal>
-    </div>
-  );
-};
-
-export default {
-  title: 'Feedback/Modal',
-  component: Modal,
-  argTypes: {
-    buttonsAlign: {
-      control: 'inline-radio',
-      options: ['left', 'center', 'right'],
-    },
-    textSize: {
-      control: 'inline-radio',
-      options: ['small', 'medium', 'large'],
-    },
-    size: { control: 'inline-radio', options: ['s', 'm', 'l'] },
-    position: {
-      control: 'inline-radio',
-      options: ['center', 'left', 'right', 'static'],
-    },
-  },
-};
-
-const Template: ComponentStory<typeof ModalWithCustomProps> = (args) => (
-  <div
-    style={{
-      border: '1px dotted rgba(0,0,0,.2)',
-      height: 1000, // чтобы был скролл на странице
-    }}
-  >
-    <ModalWithCustomProps {...args} />
-  </div>
-);
-
-export const Default = Template.bind({});
-
-Default.args = {
-  title: 'Some modal title',
-  size: 'm',
-  textSize: 'small',
-  buttonsAlign: 'right',
-  shouldCloseOnEsc: true,
-  hasOverlay: true,
-  hasCloseButton: true,
-  shouldCloseOnOverlayClick: true,
-  shouldBlockScroll: true,
-  isFooterSticky: false,
-};
+import { FC, useState } from 'react';
+import { ComponentStory } from '@storybook/react';
+import { Button } from '../Button';
+import { IModalProps, Modal } from './Modal';
+
+const smallText =
+  'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.';
+const text =
+  'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat.';
+const largeText = [...text, ...text, ...text];
+const texts = { small: smallText, medium: text, large: largeText };
+
+export interface IModalWithCustomProps extends IModalProps {
+  textSize: 'small' | 'medium' | 'large';
+}
+
+const ModalWithCustomProps: FC<IModalWithCustomProps> = ({ size, textSize, ...args }) => {
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const [isSecondModalOpen, setIsSecondModalOpen] = useState(false);
+
+  return (
+    <div>
+      <Button onClick={() => setIsModalOpen(true)}>Open</Button>
+      <Button onClick={() => setIsSecondModalOpen(true)}>Open 2</Button>
+
+      <Modal
+        {...args}
+        isOpen={isModalOpen}
+        onClose={() => setIsModalOpen(false)}
+        buttons={[
+          <Button
+            key="1"
+            view="secondary"
+            onClick={() => setIsModalOpen(false)}
+            size={size === 's' ? 'm' : 'l'}
+          >
+            Отмена
+          </Button>,
+          <Button
+            key="2"
+            size={size === 's' ? 'm' : 'l'}
+            onClick={() => {
+              setIsModalOpen(false);
+              setIsSecondModalOpen(true);
+            }}
+          >
+            Применить
+          </Button>,
+        ]}
+      >
+        <div style={{ lineHeight: 1.6 }}>{texts[textSize]}</div>
+      </Modal>
+
+      <Modal {...args} isOpen={isSecondModalOpen} onClose={() => setIsSecondModalOpen(false)}>
+        Text
+      </Modal>
+    </div>
+  );
+};
+
+export default {
+  title: 'Feedback/Modal',
+  component: Modal,
+  argTypes: {
+    buttonsAlign: {
+      control: 'inline-radio',
+      options: ['left', 'center', 'right'],
+    },
+    textSize: {
+      control: 'inline-radio',
+      options: ['small', 'medium', 'large'],
+    },
+    size: { control: 'inline-radio', options: ['s', 'm', 'l'] },
+    position: {
+      control: 'inline-radio',
+      options: ['center', 'left', 'right', 'static'],
+    },
+  },
+};
+
+const Template: ComponentStory<typeof ModalWithCustomProps> = (args) => (
+  <div
+    style={{
+      border: '1px dotted rgba(0,0,0,.2)',
+      height: 1000, // чтобы был скролл на странице
+    }}
+  >
+    <ModalWithCustomProps {...args} />
+  </div>
+);
+
+export const Default = Template.bind({});
+
+Default.args = {
+  title: 'Some modal title',
+  size: 'm',
+  textSize: 'small',
+  buttonsAlign: 'right',
+  shouldCloseOnEsc: true,
+  hasOverlay: true,
+  hasCloseButton: true,
+  shouldCloseOnOverlayClick: true,
+  shouldBlockScroll: true,
+  isFooterSticky: false,
+};

package/src/components/MultiSelect/MultiSelect.stories.tsx

@@ -1,46 +1,46 @@
-import { useState } from 'react';
-import { ComponentStory } from '@storybook/react';
-import { MultiSelect } from './MultiSelect';
-
-export default {
-  title: 'Controls/MultiSelect',
-  component: MultiSelect,
-  argTypes: {
-    corners: { control: 'inline-radio', options: ['full', 'left', 'right'] },
-  },
-};
-
-const stringOptions = [
-  'Опция 1',
-  'Опция 11',
-  'Еще одна опция',
-  'Еще выбор',
-  'Очень длинная опция вот такой текст',
-  '1',
-  '2',
-  '3',
-  '4',
-];
-
-const Template: ComponentStory<typeof MultiSelect> = (args) => {
-  const [value, setValue] = useState<string[]>([]);
-
-  return (
-    <MultiSelect
-      {...args}
-      value={{ include: value }}
-      onChange={(e) => setValue(e?.include ?? [])}
-      fetchOptions={() => Promise.resolve(stringOptions)}
-    />
-  );
-};
-
-export const Default = Template.bind({});
-
-Default.args = {
-  placeholder: 'Placeholder',
-  corners: 'full',
-  isInvalid: false,
-  isDisabled: false,
-  isRequired: false,
-};
+import { useState } from 'react';
+import { ComponentStory } from '@storybook/react';
+import { MultiSelect } from './MultiSelect';
+
+export default {
+  title: 'Controls/MultiSelect',
+  component: MultiSelect,
+  argTypes: {
+    corners: { control: 'inline-radio', options: ['full', 'left', 'right'] },
+  },
+};
+
+const stringOptions = [
+  'Опция 1',
+  'Опция 11',
+  'Еще одна опция',
+  'Еще выбор',
+  'Очень длинная опция вот такой текст',
+  '1',
+  '2',
+  '3',
+  '4',
+];
+
+const Template: ComponentStory<typeof MultiSelect> = (args) => {
+  const [value, setValue] = useState<string[]>([]);
+
+  return (
+    <MultiSelect
+      {...args}
+      value={{ include: value }}
+      onChange={(e) => setValue(e?.include ?? [])}
+      fetchOptions={() => Promise.resolve(stringOptions)}
+    />
+  );
+};
+
+export const Default = Template.bind({});
+
+Default.args = {
+  placeholder: 'Placeholder',
+  corners: 'full',
+  isInvalid: false,
+  isDisabled: false,
+  isRequired: false,
+};