@true-engineering/true-react-common-ui-kit 2.1.0 → 2.2.0

package/src/components/List/List.stories.tsx

@@ -1,62 +1,62 @@
-import { ComponentStory, ComponentMeta } from '@storybook/react';
-import { colors } from '../../theme';
-import { List, IListItem } from './List';
-
-const listItems: IListItem[] = [
-  {
-    item: 'Печатать билет',
-    onClick: console.log,
-    icon: 'sign-out',
-  },
-  { item: 'Выписать', onClick: console.log, withIconGap: true },
-  {
-    item: 'Аннулировать',
-    onClick: console.log,
-    icon: <>2</>,
-  },
-  {
-    item: 'Вернуть',
-    onClick: console.log,
-    disabled: true,
-    withIconGap: true,
-    shouldDrawSpacerBelow: true,
-  },
-  {
-    item: (() => <div style={{ color: colors.RED_ACTIVE }}>Удалить</div>)(),
-    onClick: console.log,
-    disabled: true,
-    withIconGap: true,
-  },
-  {
-    item: (() => <div style={{ color: colors.RED_ACTIVE }}>Удалить</div>)(),
-    onClick: console.log,
-    withIconGap: true,
-  },
-];
-
-export default {
-  title: 'List',
-  component: List,
-  args: {
-    items: listItems,
-  },
-  parameters: {
-    controls: {
-      exclude: ['data', 'tweakStyles', 'testId', 'onClick'],
-    },
-  },
-} as ComponentMeta<typeof List>;
-
-export const Default: ComponentStory<typeof List> = (args) => (
-  <div
-    style={{
-      border: '1px dotted rgba(0,0,0,.2)',
-      display: 'flex',
-      alignItems: 'center',
-      justifyContent: 'center',
-      padding: 40,
-    }}
-  >
-    <List {...args} />
-  </div>
-);
+import { ComponentStory, ComponentMeta } from '@storybook/react';
+import { colors } from '../../theme';
+import { List, IListItem } from './List';
+
+const listItems: IListItem[] = [
+  {
+    item: 'Печатать билет',
+    onClick: console.log,
+    icon: 'sign-out',
+  },
+  { item: 'Выписать', onClick: console.log, withIconGap: true },
+  {
+    item: 'Аннулировать',
+    onClick: console.log,
+    icon: <>2</>,
+  },
+  {
+    item: 'Вернуть',
+    onClick: console.log,
+    disabled: true,
+    withIconGap: true,
+    shouldDrawSpacerBelow: true,
+  },
+  {
+    item: (() => <div style={{ color: colors.RED_ACTIVE }}>Удалить</div>)(),
+    onClick: console.log,
+    disabled: true,
+    withIconGap: true,
+  },
+  {
+    item: (() => <div style={{ color: colors.RED_ACTIVE }}>Удалить</div>)(),
+    onClick: console.log,
+    withIconGap: true,
+  },
+];
+
+export default {
+  title: 'List',
+  component: List,
+  args: {
+    items: listItems,
+  },
+  parameters: {
+    controls: {
+      exclude: ['data', 'tweakStyles', 'testId', 'onClick'],
+    },
+  },
+} as ComponentMeta<typeof List>;
+
+export const Default: ComponentStory<typeof List> = (args) => (
+  <div
+    style={{
+      border: '1px dotted rgba(0,0,0,.2)',
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center',
+      padding: 40,
+    }}
+  >
+    <List {...args} />
+  </div>
+);

package/src/components/List/List.styles.ts

@@ -1,52 +1,52 @@
-import { colors } from '../../theme';
-import { ComponentStyles } from '../../types';
-
-const ITEM_HORIZONTAL_PADDING = 16;
-const ICON_SIZE = 20;
-const ICON_GAP = 12;
-
-export const styles = {
-  root: {
-    minWidth: 180,
-    backgroundColor: colors.CLASSIC_WHITE,
-    padding: [8, 0],
-    listStyle: 'none',
-    margin: 0,
-  },
-
-  item: {
-    display: 'flex',
-    alignItems: 'center',
-    boxSizing: 'border-box',
-    fontSize: 16,
-    whiteSpace: 'nowrap',
-    minHeight: 40,
-    padding: [0, ITEM_HORIZONTAL_PADDING],
-    transition: 'background-color 0.25s ease-in-out',
-    cursor: 'pointer',
-  },
-
-  disabledItem: {
-    cursor: 'default',
-  },
-
-  spacer: {
-    height: 1,
-    backgroundColor: colors.BORDER_LIGHT,
-  },
-
-  withIconGap: {
-    paddingLeft: ITEM_HORIZONTAL_PADDING + ICON_SIZE + ICON_GAP,
-  },
-
-  icon: {
-    width: ICON_SIZE,
-    height: ICON_SIZE,
-    marginRight: ICON_GAP,
-    flexShrink: 0,
-  },
-
-  content: {},
-};
-
-export type ListStyles = ComponentStyles<typeof styles>;
+import { colors } from '../../theme';
+import { ComponentStyles } from '../../types';
+
+const ITEM_HORIZONTAL_PADDING = 16;
+const ICON_SIZE = 20;
+const ICON_GAP = 12;
+
+export const styles = {
+  root: {
+    minWidth: 180,
+    backgroundColor: colors.CLASSIC_WHITE,
+    padding: [8, 0],
+    listStyle: 'none',
+    margin: 0,
+  },
+
+  item: {
+    display: 'flex',
+    alignItems: 'center',
+    boxSizing: 'border-box',
+    fontSize: 16,
+    whiteSpace: 'nowrap',
+    minHeight: 40,
+    padding: [0, ITEM_HORIZONTAL_PADDING],
+    transition: 'background-color 0.25s ease-in-out',
+    cursor: 'pointer',
+  },
+
+  disabledItem: {
+    cursor: 'default',
+  },
+
+  spacer: {
+    height: 1,
+    backgroundColor: colors.BORDER_LIGHT,
+  },
+
+  withIconGap: {
+    paddingLeft: ITEM_HORIZONTAL_PADDING + ICON_SIZE + ICON_GAP,
+  },
+
+  icon: {
+    width: ICON_SIZE,
+    height: ICON_SIZE,
+    marginRight: ICON_GAP,
+    flexShrink: 0,
+  },
+
+  content: {},
+};
+
+export type ListStyles = ComponentStyles<typeof styles>;

package/src/components/List/List.tsx

@@ -1,82 +1,64 @@
-import { FC, Fragment, ReactElement, ReactNode } from 'react';
-import clsx from 'clsx';
-import { useTheme } from '../../hooks';
-import { ICommonProps } from '../../types';
-import {
-  isNotEmpty,
-  getTestId,
-  addDataTestId,
-  addDataAttributes,
-} from '../../helpers';
-import { Icon, IIconType } from '../Icon';
-
-import { ListStyles, styles } from './List.styles';
-
-export interface IListItem {
-  item: ReactNode;
-  icon?: IIconType | ReactElement;
-  disabled?: boolean;
-  shouldDrawSpacerAbove?: boolean;
-  shouldDrawSpacerBelow?: boolean;
-  withIconGap?: boolean;
-  testId?: string;
-  onClick(): void;
-}
-
-export interface IListProps extends ICommonProps {
-  tweakStyles?: ListStyles;
-  items: IListItem[];
-  testId?: string;
-  onClick?(): void;
-}
-
-export const List: FC<IListProps> = ({
-  items,
-  testId,
-  data,
-  tweakStyles,
-  onClick,
-}) => {
-  const { classes } = useTheme('List', styles, tweakStyles);
-
-  const handleItemClick = (item: IListItem) => {
-    item.onClick();
-    onClick?.();
-  };
-
-  return (
-    <div
-      className={classes.root}
-      {...addDataTestId(testId)}
-      {...addDataAttributes(data)}
-    >
-      {items.map((item, idx) => (
-        <Fragment key={idx}>
-          {item.shouldDrawSpacerAbove && <div className={classes.spacer} />}
-          <div
-            className={clsx(classes.item, {
-              [classes.disabledItem]: item.disabled,
-              [classes.withIconGap]: item.withIconGap,
-            })}
-            {...addDataTestId(item.testId ?? getTestId(testId, `item-${idx}`))}
-            {...(item.disabled &&
-              addDataAttributes({ disabled: item.disabled }))}
-            onClick={item.disabled ? undefined : () => handleItemClick(item)}
-          >
-            {isNotEmpty(item.icon) && (
-              <span className={classes.icon}>
-                {typeof item.icon === 'string' ? (
-                  <Icon type={item.icon} />
-                ) : (
-                  item.icon
-                )}
-              </span>
-            )}
-            <span className={classes.content}>{item.item}</span>
-          </div>
-          {item.shouldDrawSpacerBelow && <div className={classes.spacer} />}
-        </Fragment>
-      ))}
-    </div>
-  );
-};
+import { FC, Fragment, ReactNode } from 'react';
+import clsx from 'clsx';
+import {
+  addDataTestId,
+  getTestId,
+  isReactNodeNotEmpty,
+} from '@true-engineering/true-react-platform-helpers';
+import { addDataAttributes } from '../../helpers';
+import { renderIcon } from '../../helpers/snippets';
+import { useTheme } from '../../hooks';
+import { ICommonProps, IIcon } from '../../types';
+import { ListStyles, styles } from './List.styles';
+
+export interface IListItem {
+  item: ReactNode;
+  icon?: IIcon;
+  disabled?: boolean;
+  shouldDrawSpacerAbove?: boolean;
+  shouldDrawSpacerBelow?: boolean;
+  withIconGap?: boolean;
+  testId?: string;
+  onClick(): void;
+}
+
+export interface IListProps extends ICommonProps {
+  tweakStyles?: ListStyles;
+  items: IListItem[];
+  testId?: string;
+  onClick?(): void;
+}
+
+export const List: FC<IListProps> = ({ items, testId, data, tweakStyles, onClick }) => {
+  const { classes } = useTheme('List', styles, tweakStyles);
+
+  const handleItemClick = (item: IListItem) => {
+    item.onClick();
+    onClick?.();
+  };
+
+  return (
+    <div className={classes.root} {...addDataTestId(testId)} {...addDataAttributes(data)}>
+      {items.map((item, idx) => (
+        <Fragment key={idx}>
+          {item.shouldDrawSpacerAbove && <div className={classes.spacer} />}
+          <div
+            className={clsx(classes.item, {
+              [classes.disabledItem]: item.disabled,
+              [classes.withIconGap]: item.withIconGap,
+            })}
+            onClick={item.disabled ? undefined : () => handleItemClick(item)}
+            {...addDataTestId(item.testId ?? getTestId(testId, `item-${idx}`))}
+            {...(item.disabled && addDataAttributes({ disabled: item.disabled }))}
+          >
+            {isReactNodeNotEmpty(item.icon) && (
+              <span className={classes.icon}>{renderIcon(item.icon)}</span>
+            )}
+            <span className={classes.content}>{item.item}</span>
+          </div>
+          {item.shouldDrawSpacerBelow && <div className={classes.spacer} />}
+        </Fragment>
+      ))}
+    </div>
+  );
+};

package/src/components/List/index.ts

@@ -1,2 +1,2 @@
-export * from './List';
-export type { ListStyles } from './List.styles';
+export * from './List';
+export type { ListStyles } from './List.styles';

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

@@ -1,113 +1,105 @@
-import { ComponentStory } from '@storybook/react';
-import { FC, useState } from 'react';
-import { IModalProps, Modal } from './Modal';
-import { Button } from '../Button';
-
-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: '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: '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,
+};