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

package/dist/types.d.ts

@@ -1,12 +1,13 @@
 import { ReactElement } from 'react';
-import { Styles } from 'react-jss';
 import { Modifier, Placement } from 'react-overlays/usePopper';
-import type { ICommonIcon, IComplexIcon, IIconType, IPreloaderSvgType, ISvgIcon } from './components';
+import type { IIconType } from './components';
 export interface IDataAttributes {
     [key: string]: unknown;
 }
-export interface ICommonProps {
+export interface ICommonProps<TweakStyles> {
     data?: IDataAttributes;
+    testId?: string;
+    tweakStyles?: TweakStyles;
 }
 export interface IDropdownWithPopperOptions {
     shouldUsePopper?: boolean;
@@ -19,22 +20,3 @@ export interface IDropdownWithPopperOptions {
     flipOptions?: Record<string, any>;
 }
 export declare type IIcon = IIconType | ReactElement;
-export declare type ComponentStyles<StyleSheet, Props = unknown> = Partial<Styles<keyof StyleSheet, Props>>;
-export declare type ComponentName = 'AccountInfo' | 'AddButton' | 'Button' | 'CloseButton' | 'Checkbox' | 'CssBaseline' | 'Colors' | 'DateInput' | 'DatePicker' | 'DatePickerHeader' | 'Description' | 'DotsPreloader' | 'SvgPreloader' | 'FiltersPane' | 'FilterInterval' | 'FilterSelect' | 'FilterWithDates' | 'FilterWithPeriod' | 'FilterWrapper' | 'FilterValueView' | 'FiltersPaneSearch' | 'Flag' | 'FlexibleTable' | 'Icon' | 'IncrementInput' | 'Input' | 'List' | 'ListItem' | 'Modal' | 'MoreMenu' | 'MultiSelect' | 'MultiSelectInput' | 'MultiSelectList' | 'Notification' | 'PhoneInput' | 'PhoneInputCountryList' | 'RadioButton' | 'SearchInput' | 'Select' | 'SelectList' | 'ScrollIntoViewIfNeeded' | 'Switch' | 'TextArea' | 'TextWithInfo' | 'TextWithTooltip' | 'ThemedPreloader' | 'Tooltip' | 'Toaster';
-export declare type UiKitAnimations = Record<string, any>;
-export declare type UiKitHelpers = Record<string, Styles | (() => Styles)>;
-export interface UiKitTheme {
-    name: string;
-    components?: Partial<Record<ComponentName, ComponentStyles<any, any>>>;
-    /**
-     * Для переопределения иконок, которые есть в UiKit
-     */
-    icons?: Partial<Record<ICommonIcon, ISvgIcon>>;
-    complexIcons?: Partial<Record<IComplexIcon, string>>;
-    preloaders?: Partial<Record<IPreloaderSvgType, string>>;
-    animations?: UiKitAnimations;
-    colors?: Record<string, string>;
-    dimensions?: Record<string, number>;
-    boxShadows?: Record<string, string>;
-    helpers?: UiKitHelpers;
-}

package/dist/vite-env.d.ts

@@ -1 +1 @@
-/// <reference types="vite/client" />
+/// <reference types="vite/client" />

package/package.json

@@ -1,93 +1,93 @@
-{
-  "name": "@true-engineering/true-react-common-ui-kit",
-  "version": "2.7.0",
-  "description": "True Engineering React UI Kit with theming support",
-  "author": "True Engineering (https://trueengineering.ru)",
-  "keywords": [
-    "TE",
-    "True Engineering",
-    "UI Kit with theming support",
-    "UI Kit"
-  ],
-  "homepage": "",
-  "license": "Apache-2.0",
-  "type": "module",
-  "types": "dist/index.d.ts",
-  "main": "dist/true-react-common-ui-kit.umd.cjs",
-  "module": "./dist/true-react-common-ui-kit.js",
-  "directories": {
-    "lib": "src"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "files": [
-    "src",
-    "dist"
-  ],
-  "exports": {
-    ".": {
-      "require": "./dist/true-react-common-ui-kit.umd.cjs",
-      "import": "./dist/true-react-common-ui-kit.js"
-    },
-    "./dist/style.css": "./dist/style.css",
-    "./src": "./src/index.ts"
-  },
-  "scripts": {
-    "build": "tsc && vite build",
-    "lint": "eslint \"**/*.{js,jsx,ts,tsx}\"",
-    "format": "prettier --write \"**/*.{js,jsx,css,json,ts,tsx}\"",
-    "format:check": "prettier --check \"**/*.{js,jsx,css,json,ts,tsx}\"",
-    "full-check": "yarn format:check && yarn lint",
-    "types-check": "tsc --noEmit"
-  },
-  "dependencies": {
-    "@true-engineering/true-react-platform-helpers": "0.0.5",
-    "clsx": "1.2.1",
-    "country-flag-icons": "1.5.5",
-    "date-fns": "2.29.3",
-    "hex-to-rgba": "2.0.1",
-    "jss": "10.9.2",
-    "lodash-es": "4.17.21",
-    "react": "18.2.0",
-    "react-datepicker": "4.25.0",
-    "react-dom": "18.2.0",
-    "react-input-mask": "3.0.0-alpha.2",
-    "react-jss": "10.9.2",
-    "react-overlays": "5.2.1",
-    "react-remove-scroll": "2.5.6",
-    "react-transition-group": "4.4.5",
-    "scroll-into-view-if-needed": "3.0.6",
-    "ts-debounce": "4.0.0"
-  },
-  "devDependencies": {
-    "@babel/core": "7.20.12",
-    "@storybook/addon-actions": "6.5.15",
-    "@storybook/addon-essentials": "6.5.15",
-    "@storybook/addon-interactions": "6.5.15",
-    "@storybook/addon-links": "6.5.15",
-    "@storybook/builder-vite": "0.3.0",
-    "@storybook/react": "6.5.15",
-    "@storybook/testing-library": "0.0.13",
-    "@swc/core": "^1.3.30",
-    "@trivago/prettier-plugin-sort-imports": "4.3.0",
-    "@types/lodash-es": "4.17.11",
-    "@types/react": "18.0.26",
-    "@types/react-datepicker": "4.19.4",
-    "@types/react-dom": "18.0.9",
-    "@types/react-input-mask": "3.0.2",
-    "@types/react-transition-group": "4.4.5",
-    "@typescript-eslint/eslint-plugin": "5.48.2",
-    "@typescript-eslint/parser": "5.48.2",
-    "@vitejs/plugin-react": "3.0.0",
-    "eslint": "8.36.0",
-    "eslint-config-prettier": "8.7.0",
-    "eslint-plugin-react": "7.32.2",
-    "prettier": "2.8.3",
-    "rollup-plugin-swc3": "0.3.0",
-    "typescript": "4.9.3",
-    "unplugin-swc": "1.3.2",
-    "vite": "4.0.0",
-    "vite-plugin-dts": "1.7.1"
-  }
-}
+{
+  "name": "@true-engineering/true-react-common-ui-kit",
+  "version": "3.0.0-alpha.1",
+  "description": "True Engineering React UI Kit with theming support",
+  "author": "True Engineering (https://trueengineering.ru)",
+  "keywords": [
+    "TE",
+    "True Engineering",
+    "UI Kit with theming support",
+    "UI Kit"
+  ],
+  "homepage": "",
+  "license": "Apache-2.0",
+  "type": "module",
+  "types": "dist/index.d.ts",
+  "main": "dist/true-react-common-ui-kit.umd.cjs",
+  "module": "./dist/true-react-common-ui-kit.js",
+  "directories": {
+    "lib": "src"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "files": [
+    "src",
+    "dist"
+  ],
+  "exports": {
+    ".": {
+      "require": "./dist/true-react-common-ui-kit.umd.cjs",
+      "import": "./dist/true-react-common-ui-kit.js"
+    },
+    "./dist/style.css": "./dist/style.css",
+    "./src": "./src/index.ts"
+  },
+  "scripts": {
+    "build": "tsc && vite build",
+    "lint": "eslint \"**/*.{js,jsx,ts,tsx}\"",
+    "format": "prettier --write \"**/*.{js,jsx,css,json,ts,tsx}\"",
+    "format:check": "prettier --check \"**/*.{js,jsx,css,json,ts,tsx}\"",
+    "full-check": "yarn format:check && yarn lint",
+    "types-check": "tsc --noEmit"
+  },
+  "dependencies": {
+    "@true-engineering/true-react-platform-helpers": "0.0.6",
+    "clsx": "1.2.1",
+    "country-flag-icons": "1.5.5",
+    "date-fns": "2.29.3",
+    "hex-to-rgba": "2.0.1",
+    "jss": "10.9.2",
+    "lodash-es": "4.17.21",
+    "react": "18.2.0",
+    "react-datepicker": "4.25.0",
+    "react-dom": "18.2.0",
+    "react-input-mask": "3.0.0-alpha.2",
+    "react-jss": "10.9.2",
+    "react-overlays": "5.2.1",
+    "react-remove-scroll": "2.5.6",
+    "react-transition-group": "4.4.5",
+    "scroll-into-view-if-needed": "3.0.6",
+    "ts-debounce": "4.0.0"
+  },
+  "devDependencies": {
+    "@babel/core": "7.20.12",
+    "@storybook/addon-actions": "6.5.15",
+    "@storybook/addon-essentials": "6.5.15",
+    "@storybook/addon-interactions": "6.5.15",
+    "@storybook/addon-links": "6.5.15",
+    "@storybook/builder-vite": "0.3.0",
+    "@storybook/react": "6.5.15",
+    "@storybook/testing-library": "0.0.13",
+    "@swc/core": "^1.3.30",
+    "@trivago/prettier-plugin-sort-imports": "4.3.0",
+    "@types/lodash-es": "4.17.11",
+    "@types/react": "18.0.26",
+    "@types/react-datepicker": "4.19.4",
+    "@types/react-dom": "18.0.9",
+    "@types/react-input-mask": "3.0.2",
+    "@types/react-transition-group": "4.4.5",
+    "@typescript-eslint/eslint-plugin": "5.48.2",
+    "@typescript-eslint/parser": "5.48.2",
+    "@vitejs/plugin-react": "3.0.0",
+    "eslint": "8.36.0",
+    "eslint-config-prettier": "8.7.0",
+    "eslint-plugin-react": "7.32.2",
+    "prettier": "2.8.3",
+    "rollup-plugin-swc3": "0.3.0",
+    "typescript": "4.9.3",
+    "unplugin-swc": "1.3.2",
+    "vite": "4.0.0",
+    "vite-plugin-dts": "1.7.1"
+  }
+}

package/src/components/AccountInfo/AccountInfo.stories.tsx

@@ -1,32 +1,32 @@
-import { ComponentStory } from '@storybook/react';
-import { AccountInfo } from './AccountInfo';
-
-export default {
-  title: 'AccountInfo',
-  component: AccountInfo,
-};
-
-const Template: ComponentStory<typeof AccountInfo> = (args) => (
-  <div
-    style={{
-      display: 'flex',
-      alignItems: 'center',
-      justifyContent: 'center',
-      width: 400,
-      height: 200,
-      border: '1px dotted rgba(0, 0, 0, 0.2)',
-    }}
-  >
-    <AccountInfo {...args} options={[{ item: 'Logout', onClick: () => console.log('logout') }]} />
-  </div>
-);
-
-export const Default = Template.bind({});
-Default.args = {
-  accountName: 'Ivan Ivanov',
-};
-Default.parameters = {
-  controls: {
-    exclude: ['data', 'options', 'avatar'],
-  },
-};
+import { ComponentStory } from '@storybook/react';
+import { AccountInfo } from './AccountInfo';
+
+export default {
+  title: 'AccountInfo',
+  component: AccountInfo,
+};
+
+const Template: ComponentStory<typeof AccountInfo> = (args) => (
+  <div
+    style={{
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center',
+      width: 400,
+      height: 200,
+      border: '1px dotted rgba(0, 0, 0, 0.2)',
+    }}
+  >
+    <AccountInfo {...args} options={[{ item: 'Logout', onClick: () => console.log('logout') }]} />
+  </div>
+);
+
+export const Default = Template.bind({});
+Default.args = {
+  accountName: 'Ivan Ivanov',
+};
+Default.parameters = {
+  controls: {
+    exclude: ['data', 'options', 'avatar'],
+  },
+};

package/src/components/AccountInfo/AccountInfo.styles.ts

@@ -1,55 +1,51 @@
-import { animations } from '../../theme';
-import { ComponentStyles } from '../../types';
-
-//
-
-export const styles = {
-  root: {
-    display: 'flex',
-  },
-
-  account: {
-    display: 'flex',
-    position: 'relative',
-    alignItems: 'center',
-    cursor: 'pointer',
-  },
-
-  accountName: {
-    margin: [0, 2, 0, 10],
-    fontSize: 14,
-    transition: 'color 0.25s ease-in-out',
-  },
-
-  accountNameOpened: {},
-
-  accountChevron: {
-    width: 16,
-    height: 16,
-    transition: 'ease-in-out 0.25s',
-    transitionProperty: 'transform, color',
-  },
-
-  accountChevronOpened: {
-    transform: 'rotate(180deg)',
-  },
-
-  accountMenu: {
-    position: 'absolute',
-    zIndex: 90,
-    top: '100%',
-    right: 0,
-    marginTop: 8,
-  },
-
-  avatarIcon: {
-    width: 32,
-    height: 32,
-  },
-
-  ...animations.slideUp,
-
-  tweakList: {},
-};
-
-export type AccountInfoStyles = ComponentStyles<typeof styles>;
+import { animations, createThemedStyles, ITweakStyles } from '../../theme';
+import { IListStyles } from '../List';
+
+export const useStyles = createThemedStyles('AccountInfo', {
+  root: {
+    display: 'flex',
+  },
+
+  account: {
+    display: 'flex',
+    position: 'relative',
+    alignItems: 'center',
+    cursor: 'pointer',
+  },
+
+  accountName: {
+    margin: [0, 2, 0, 10],
+    fontSize: 14,
+    transition: 'color 0.25s ease-in-out',
+  },
+
+  accountNameOpened: {},
+
+  accountChevron: {
+    width: 16,
+    height: 16,
+    transition: 'ease-in-out 0.25s',
+    transitionProperty: 'transform, color',
+  },
+
+  accountChevronOpened: {
+    transform: 'rotate(180deg)',
+  },
+
+  accountMenu: {
+    position: 'absolute',
+    zIndex: 90,
+    top: '100%',
+    right: 0,
+    marginTop: 8,
+  },
+
+  avatarIcon: {
+    width: 32,
+    height: 32,
+  },
+
+  ...animations.slideUp,
+});
+
+export type IAccountInfoStyles = ITweakStyles<typeof useStyles, { tweakList: IListStyles }>;

package/src/components/AccountInfo/AccountInfo.tsx

@@ -1,76 +1,79 @@
-import { FC, ReactNode, useRef, useState, MouseEvent } from 'react';
-import { CSSTransition } from 'react-transition-group';
-import clsx from 'clsx';
-import { addDataAttributes } from '../../helpers';
-import { useOnClickOutsideWithRef, useTheme, useTweakStyles } from '../../hooks';
-import { ICommonProps } from '../../types';
-import { Icon } from '../Icon';
-import { IListProps, List } from '../List';
-import { ANIMATION_TIMEOUT } from './constants';
-import { AccountInfoStyles, styles } from './AccountInfo.styles';
-
-export interface IAccountInfoProps extends ICommonProps {
-  tweakStyles?: AccountInfoStyles;
-  avatar?: ReactNode;
-  accountName: ReactNode;
-  options: IListProps['items'];
-}
-
-export const AccountInfo: FC<IAccountInfoProps> = ({
-  data,
-  avatar,
-  tweakStyles,
-  accountName,
-  options,
-}) => {
-  // TODO: потестить
-  const { classes, componentStyles } = useTheme('AccountInfo', styles, tweakStyles, {
-    timeout: ANIMATION_TIMEOUT,
-  });
-  const nameRef = useRef<HTMLDivElement>(null);
-  const dropdownRef = useRef<HTMLDivElement>(null);
-
-  const [isMenuOpen, setIsMenuOpen] = useState(false);
-
-  const toggleMenu = (event: MouseEvent<HTMLDivElement>) => {
-    event.stopPropagation();
-    setIsMenuOpen((v) => !v);
-  };
-
-  useOnClickOutsideWithRef(dropdownRef, () => setIsMenuOpen(false), nameRef);
-
-  const tweakListStyles = useTweakStyles(componentStyles, tweakStyles, 'tweakList');
-
-  return (
-    <div className={classes.root} {...addDataAttributes(data)} tabIndex={0}>
-      {avatar ?? (
-        <div className={classes.avatarIcon}>
-          <Icon type="avatar" />
-        </div>
-      )}
-      <div ref={nameRef} className={classes.account} onClick={toggleMenu}>
-        <div className={clsx(classes.accountName, isMenuOpen && classes.accountNameOpened)}>
-          {accountName}
-        </div>
-        <div className={clsx(classes.accountChevron, isMenuOpen && classes.accountChevronOpened)}>
-          <Icon type="chevron-down-small" />
-        </div>
-        <CSSTransition
-          in={isMenuOpen}
-          timeout={ANIMATION_TIMEOUT}
-          unmountOnExit
-          classNames={{
-            enter: classes['slide-up-enter'],
-            enterActive: classes['slide-up-enter-active'],
-            exit: classes['slide-up-exit'],
-            exitActive: classes['slide-up-exit-active'],
-          }}
-        >
-          <div ref={dropdownRef} className={classes.accountMenu} onClick={toggleMenu}>
-            <List items={options} tweakStyles={tweakListStyles} />
-          </div>
-        </CSSTransition>
-      </div>
-    </div>
-  );
-};
+import { FC, ReactNode, useRef, useState, MouseEvent } from 'react';
+import { CSSTransition } from 'react-transition-group';
+import clsx from 'clsx';
+import { addDataTestId } from '@true-engineering/true-react-platform-helpers';
+import { addDataAttributes } from '../../helpers';
+import { useOnClickOutsideWithRef, useTweakStyles } from '../../hooks';
+import { ICommonProps } from '../../types';
+import { Icon } from '../Icon';
+import { IListProps, List } from '../List';
+import { ANIMATION_TIMEOUT } from './constants';
+import { useStyles, IAccountInfoStyles } from './AccountInfo.styles';
+
+export interface IAccountInfoProps extends ICommonProps<IAccountInfoStyles> {
+  avatar?: ReactNode;
+  accountName: ReactNode;
+  options: IListProps['items'];
+}
+
+export const AccountInfo: FC<IAccountInfoProps> = ({
+  data,
+  testId,
+  avatar,
+  tweakStyles,
+  accountName,
+  options,
+}) => {
+  const classes = useStyles({ theme: tweakStyles });
+
+  const tweakListStyles = useTweakStyles({
+    tweakStyles,
+    className: 'tweakList',
+    currentComponentName: 'AccountInfo',
+  });
+
+  const nameRef = useRef<HTMLDivElement>(null);
+  const dropdownRef = useRef<HTMLDivElement>(null);
+
+  const [isMenuOpen, setIsMenuOpen] = useState(false);
+
+  const toggleMenu = (event: MouseEvent<HTMLDivElement>) => {
+    event.stopPropagation();
+    setIsMenuOpen((v) => !v);
+  };
+
+  useOnClickOutsideWithRef(dropdownRef, () => setIsMenuOpen(false), nameRef);
+
+  return (
+    <div className={classes.root} {...addDataTestId(testId)} {...addDataAttributes(data)}>
+      {avatar ?? (
+        <div className={classes.avatarIcon}>
+          <Icon type="avatar" />
+        </div>
+      )}
+      <div ref={nameRef} className={classes.account} onClick={toggleMenu}>
+        <div className={clsx(classes.accountName, isMenuOpen && classes.accountNameOpened)}>
+          {accountName}
+        </div>
+        <div className={clsx(classes.accountChevron, isMenuOpen && classes.accountChevronOpened)}>
+          <Icon type="chevron-down-small" />
+        </div>
+        <CSSTransition
+          in={isMenuOpen}
+          timeout={ANIMATION_TIMEOUT}
+          unmountOnExit
+          classNames={{
+            enter: classes['slide-up-enter'],
+            enterActive: classes['slide-up-enter-active'],
+            exit: classes['slide-up-exit'],
+            exitActive: classes['slide-up-exit-active'],
+          }}
+        >
+          <div ref={dropdownRef} className={classes.accountMenu} onClick={toggleMenu}>
+            <List items={options} tweakStyles={tweakListStyles} />
+          </div>
+        </CSSTransition>
+      </div>
+    </div>
+  );
+};

package/src/components/AccountInfo/constants.ts

@@ -1 +1 @@
-export const ANIMATION_TIMEOUT = 150;
+export const ANIMATION_TIMEOUT = 150; // такой же тайминг должен быть в стилях анимации

package/src/components/AccountInfo/index.ts

@@ -1,2 +1,2 @@
-export * from './AccountInfo';
-export type { AccountInfoStyles } from './AccountInfo.styles';
+export * from './AccountInfo';
+export type { IAccountInfoStyles } from './AccountInfo.styles';

package/src/components/AddButton/AddButton.stories.tsx

@@ -1,21 +1,21 @@
-import { ComponentStory } from '@storybook/react';
-import { AddButton } from './AddButton';
-
-export default {
-  title: 'AddButton',
-  component: AddButton,
-};
-
-const Template: ComponentStory<typeof AddButton> = (args) => (
-  <AddButton {...args} onClick={console.log} />
-);
-
-export const Default = Template.bind({});
-
-Default.args = {
-  text: 'Добавить билет',
-  isDisabled: false,
-  isFullWidth: false,
-};
-
-Default.parameters = { controls: { exclude: ['onClick'] } };
+import { ComponentStory } from '@storybook/react';
+import { AddButton } from './AddButton';
+
+export default {
+  title: 'AddButton',
+  component: AddButton,
+};
+
+const Template: ComponentStory<typeof AddButton> = (args) => (
+  <AddButton {...args} onClick={console.log} />
+);
+
+export const Default = Template.bind({});
+
+Default.args = {
+  text: 'Добавить билет',
+  isDisabled: false,
+  isFullWidth: false,
+};
+
+Default.parameters = { controls: { exclude: ['onClick'] } };