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

package/src/components/Checkbox/Checkbox.tsx

@@ -1,105 +1,83 @@
-import { useEffect, useState, ReactNode } from 'react';
-import clsx from 'clsx';
-import {
-  addDataTestId,
-  getSelectKeyHandler,
-  isReactNodeNotEmpty,
-} from '@true-engineering/true-react-platform-helpers';
-import { addDataAttributes } from '../../helpers';
-import { useTheme } from '../../hooks';
-import { ICommonProps } from '../../types';
-import { Icon } from '../Icon';
-import { CheckboxStyles, styles } from './Checkbox.styles';
-
-export interface ICheckboxProps<V> extends ICommonProps {
-  tweakStyles?: CheckboxStyles;
-  children?: ReactNode;
-  isChecked?: boolean;
-  isSemiChecked?: boolean;
-  isDisabled?: boolean;
-  isReadonly?: boolean;
-  isInvalid?: boolean;
-  value: V;
-  /**
-   * @default 18
-   */
-  size?: number;
-  /**
-   * @default `center`
-   */
-  alignItems?: 'top' | 'center';
-  /**
-   * @default `size - 4px`
-   */
-  textMargin?: number;
-  /**
-   * @default `right`
-   */
-  labelPosition?: 'right' | 'left';
-  testId?: string;
-  onSelect(value: { value: V; isSelected: boolean }): void;
-}
-
-export function Checkbox<V>({
-  children,
-  isDisabled,
-  isReadonly,
-  isChecked = false,
-  value,
-  size = 18,
-  alignItems = 'center',
-  textMargin,
-  data,
-  testId,
-  isSemiChecked,
-  labelPosition = 'right',
-  tweakStyles,
-  onSelect,
-}: ICheckboxProps<V>): JSX.Element {
-  const { classes } = useTheme('Checkbox', styles, tweakStyles, {
-    size,
-    alignItems,
-    textMargin,
-  });
-
-  const [isSelected, setIsSelected] = useState(false);
-
-  const hasAction = !isDisabled && !isReadonly;
-
-  const onToggle = () => {
-    const newValue = !isSelected;
-    onSelect({ value, isSelected: newValue });
-    setIsSelected(newValue);
-  };
-
-  useEffect(() => {
-    setIsSelected(isChecked);
-  }, [isChecked]);
-
-  return (
-    <label
-      className={clsx(classes.root, {
-        [classes.disabled]: isDisabled,
-        [classes.labelPositionLeft]: labelPosition === 'left',
-      })}
-      {...addDataTestId(testId)}
-      {...addDataAttributes(data)}
-    >
-      <input
-        type="checkbox"
-        className={classes.input}
-        checked={isSelected}
-        disabled={isDisabled}
-        readOnly={isReadonly}
-        {...(hasAction && {
-          onChange: onToggle,
-          onKeyDown: getSelectKeyHandler(onToggle),
-        })}
-      />
-      <div className={clsx(classes.check, isSelected && classes.checked)}>
-        <Icon type={isSemiChecked ? 'minus' : 'check'} />
-      </div>
-      {isReactNodeNotEmpty(children) && <div className={classes.children}>{children}</div>}
-    </label>
-  );
-}
+import { useEffect, useState, ReactNode } from 'react';
+import clsx from 'clsx';
+import {
+  addDataTestId,
+  getSelectKeyHandler,
+  isReactNodeNotEmpty,
+} from '@true-engineering/true-react-platform-helpers';
+import { addDataAttributes } from '../../helpers';
+import { ICommonProps } from '../../types';
+import { Icon } from '../Icon';
+import { useStyles, ICheckboxStyles } from './Checkbox.styles';
+
+export interface ICheckboxProps<V> extends ICommonProps<ICheckboxStyles> {
+  children?: ReactNode;
+  isChecked?: boolean;
+  isSemiChecked?: boolean;
+  isDisabled?: boolean;
+  isReadonly?: boolean;
+  isInvalid?: boolean;
+  value: V;
+  /**
+   * @default `right`
+   */
+  labelPosition?: 'right' | 'left';
+  onSelect(value: { value: V; isSelected: boolean }): void;
+}
+
+export function Checkbox<V>({
+  children,
+  isDisabled,
+  isReadonly,
+  isChecked = false,
+  value,
+  data,
+  testId,
+  isSemiChecked,
+  labelPosition = 'right',
+  tweakStyles,
+  onSelect,
+}: ICheckboxProps<V>): JSX.Element {
+  const classes = useStyles({ theme: tweakStyles });
+
+  const [isSelected, setIsSelected] = useState(false);
+
+  const hasAction = !isDisabled && !isReadonly;
+
+  const onToggle = () => {
+    const newValue = !isSelected;
+    onSelect({ value, isSelected: newValue });
+    setIsSelected(newValue);
+  };
+
+  useEffect(() => {
+    setIsSelected(isChecked);
+  }, [isChecked]);
+
+  return (
+    <label
+      className={clsx(classes.root, {
+        [classes.disabled]: isDisabled,
+        [classes.labelPositionLeft]: labelPosition === 'left',
+      })}
+      {...addDataTestId(testId)}
+      {...addDataAttributes(data)}
+    >
+      <input
+        type="checkbox"
+        className={classes.input}
+        checked={isSelected}
+        disabled={isDisabled}
+        readOnly={isReadonly}
+        {...(hasAction && {
+          onChange: onToggle,
+          onKeyDown: getSelectKeyHandler(onToggle),
+        })}
+      />
+      <div className={clsx(classes.check, isSelected && classes.checked)}>
+        <Icon type={isSemiChecked ? 'minus' : 'check'} />
+      </div>
+      {isReactNodeNotEmpty(children) && <div className={classes.children}>{children}</div>}
+    </label>
+  );
+}

package/src/components/Checkbox/index.ts

@@ -1,2 +1,2 @@
-export * from './Checkbox';
-export type { CheckboxStyles } from './Checkbox.styles';
+export * from './Checkbox';
+export type { ICheckboxStyles } from './Checkbox.styles';

package/src/components/CloseButton/CloseButton.styles.ts

@@ -1,34 +1,33 @@
-import { rgba } from '../../helpers';
-import { colors } from '../../theme';
-import { ComponentStyles } from '../../types';
-
-export const styles = {
-  root: {
-    width: 40,
-    height: 40,
-    maxWidth: '100%',
-    maxHeight: '100%',
-    padding: 5,
-    color: colors.FONT_MEDIUM,
-    border: 0,
-    borderRadius: '50%',
-    appearance: 'none',
-    backgroundColor: 'transparent',
-    cursor: 'pointer',
-    transition: 'background-color 0.25s ease-in-out',
-
-    '&:hover': {
-      backgroundColor: rgba(colors.BORDER_MAIN, 0.5),
-    },
-
-    '&:focus': {
-      backgroundColor: colors.GREY_FOCUS,
-    },
-
-    '&:active': {
-      backgroundColor: rgba(colors.FONT_DISABLED, 0.5),
-    },
-  },
-};
-
-export type CloseButtonStyles = ComponentStyles<typeof styles>;
+import { rgba } from '../../helpers';
+import { colors, createThemedStyles, ITweakStyles } from '../../theme';
+
+export const useStyles = createThemedStyles('CloseButton', {
+  root: {
+    width: 40,
+    height: 40,
+    maxWidth: '100%',
+    maxHeight: '100%',
+    padding: 5,
+    color: colors.FONT_MEDIUM,
+    border: 0,
+    borderRadius: '50%',
+    appearance: 'none',
+    backgroundColor: 'transparent',
+    cursor: 'pointer',
+    transition: 'background-color 0.25s ease-in-out',
+
+    '&:hover': {
+      backgroundColor: rgba(colors.BORDER_MAIN, 0.5),
+    },
+
+    '&:focus': {
+      backgroundColor: colors.GREY_FOCUS,
+    },
+
+    '&:active': {
+      backgroundColor: rgba(colors.FONT_DISABLED, 0.5),
+    },
+  },
+});
+
+export type ICloseButtonStyles = ITweakStyles<typeof useStyles>;

package/src/components/CloseButton/CloseButton.tsx

@@ -1,35 +1,33 @@
-import { FC } from 'react';
-import { addDataAttributes } from '../../helpers';
-import { useTheme } from '../../hooks';
-import { ICommonProps } from '../../types';
-import { Icon } from '../Icon';
-import { CloseButtonStyles, styles } from './CloseButton.styles';
-
-export interface ICloseButtonProps extends ICommonProps {
-  tweakStyles?: CloseButtonStyles;
-  testId?: string;
-  onClose?: () => void;
-  iconType?: 'close' | 'close-large' | 'close-window';
-}
-
-export const CloseButton: FC<ICloseButtonProps> = ({
-  tweakStyles,
-  testId,
-  data,
-  iconType = 'close',
-  onClose,
-}) => {
-  const { classes } = useTheme('CloseButton', styles, tweakStyles);
-
-  return (
-    <button
-      type="button"
-      className={classes.root}
-      onClick={onClose}
-      data-testid={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> {
+  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/CloseButton/index.ts

@@ -1,2 +1,2 @@
-export * from './CloseButton';
-export type { CloseButtonStyles } from './CloseButton.styles';
+export * from './CloseButton';
+export type { ICloseButtonStyles } from './CloseButton.styles';

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

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

package/src/components/Colors/Colors.styles.ts

@@ -1,38 +1,36 @@
-import { ComponentStyles } from '../../types';
-
-export const styles = {
-  root: {
-    display: 'flex',
-    flexWrap: 'wrap',
-  },
-
-  colorCard: {
-    width: 120,
-    border: 'solid 1px #dde3ed',
-    borderRadius: 8,
-    color: '#222a37',
-    fontSize: 14,
-    margin: 6,
-  },
-
-  color: {
-    height: 120,
-    borderTopLeftRadius: 8,
-    borderTopRightRadius: 8,
-  },
-
-  colorName: {
-    marginBottom: 6,
-    padding: 6,
-    overflow: 'hidden',
-  },
-
-  hex: {
-    marginTop: 6,
-    textTransform: 'uppercase',
-    fontWeight: 'bold',
-    padding: [0, 6, 6],
-  },
-};
-
-export type ColorsStyles = ComponentStyles<typeof styles>;
+import { createThemedStyles } from '../../theme';
+
+export const useStyles = createThemedStyles({
+  root: {
+    display: 'flex',
+    flexWrap: 'wrap',
+  },
+
+  colorCard: {
+    width: 120,
+    border: 'solid 1px #dde3ed',
+    borderRadius: 8,
+    color: '#222a37',
+    fontSize: 14,
+    margin: 6,
+  },
+
+  color: {
+    height: 120,
+    borderTopLeftRadius: 8,
+    borderTopRightRadius: 8,
+  },
+
+  colorName: {
+    marginBottom: 6,
+    padding: 6,
+    overflow: 'hidden',
+  },
+
+  hex: {
+    marginTop: 6,
+    textTransform: 'uppercase',
+    fontWeight: 'bold',
+    padding: [0, 6, 6],
+  },
+});

package/src/components/Colors/Colors.tsx

@@ -1,26 +1,26 @@
-import { FC, useContext } from 'react';
-import { useTheme, ThemeContext } from '../../hooks';
-import { styles } from './Colors.styles';
-
-// TODO: А зачем нужен то этот компонент кроме как ради сторис?????? мб его толкьо в сторис оформить?
-
-export const Colors: FC = () => {
-  const { classes } = useTheme('Colors', styles);
-  const { theme } = useContext(ThemeContext);
-  const { colors = {} } = theme;
-
-  return (
-    <div className={classes.root}>
-      {Object.entries(colors as Record<string, string>).map(([colorName, color]) => {
-        const name = colorName.split('_').join(' ').toLowerCase();
-        return (
-          <div key={colorName} className={classes.colorCard}>
-            <div className={classes.color} style={{ backgroundColor: color }} />
-            <div className={classes.colorName}>{`${name[0].toUpperCase()}${name.slice(1)}`}</div>
-            <div className={classes.hex}>{color}</div>
-          </div>
-        );
-      })}
-    </div>
-  );
-};
+import { FC, useContext } from 'react';
+import { ThemeContext } from '../../theme';
+import { useStyles } from './Colors.styles';
+
+// TODO: А зачем нужен то этот компонент кроме как ради сторис?????? мб его толкьо в сторис оформить?
+
+export const Colors: FC = () => {
+  const classes = useStyles();
+  const { theme } = useContext(ThemeContext);
+  const { colors = {} } = theme;
+
+  return (
+    <div className={classes.root}>
+      {Object.entries(colors as Record<string, string>).map(([colorName, color]) => {
+        const name = colorName.split('_').join(' ').toLowerCase();
+        return (
+          <div key={colorName} className={classes.colorCard}>
+            <div className={classes.color} style={{ backgroundColor: color }} />
+            <div className={classes.colorName}>{`${name[0].toUpperCase()}${name.slice(1)}`}</div>
+            <div className={classes.hex}>{color}</div>
+          </div>
+        );
+      })}
+    </div>
+  );
+};

package/src/components/Colors/index.ts

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

package/src/components/CssBaseline/CssBaseline.styles.ts

@@ -1,15 +1,14 @@
-import { colors } from '../../theme';
-import { ComponentStyles } from '../../types';
-
-export const styles = {
-  '@global html, body': {
-    fontFamily: 'Arial, sans-serif',
-    color: colors.FONT_MAIN,
-    padding: 0,
-    margin: 0,
-  },
-
-  root: {},
-};
-
-export type CssBaselineStyles = ComponentStyles<typeof styles>;
+import { colors, ITweakStyles, createThemedStyles } from '../../theme';
+
+export const useStyles = createThemedStyles('CssBaseline', {
+  '@global html, body': {
+    fontFamily: 'Arial, sans-serif',
+    color: colors.FONT_MAIN,
+    padding: 0,
+    margin: 0,
+  },
+
+  root: {},
+});
+
+export type ICssBaselineStyles = ITweakStyles<typeof useStyles>;

package/src/components/CssBaseline/CssBaseline.tsx

@@ -1,15 +1,13 @@
-import { FC } from 'react';
-import { addDataAttributes } from '../../helpers';
-import { useTheme } from '../../hooks';
-import { ICommonProps } from '../../types';
-import { CssBaselineStyles, styles } from './CssBaseline.styles';
-
-export interface ICssBaselineProps extends ICommonProps {
-  tweakStyles?: CssBaselineStyles;
-}
-
-export const CssBaseline: FC<ICssBaselineProps> = ({ data, tweakStyles }) => {
-  const { classes } = useTheme('CssBaseline', styles, tweakStyles);
-
-  return <div className={classes.root} {...addDataAttributes(data)} />;
-};
+import { FC } from 'react';
+import { addDataTestId } from '@true-engineering/true-react-platform-helpers';
+import { addDataAttributes } from '../../helpers';
+import { ICommonProps } from '../../types';
+import { useStyles, ICssBaselineStyles } from './CssBaseline.styles';
+
+export type ICssBaselineProps = ICommonProps<ICssBaselineStyles>;
+
+export const CssBaseline: FC<ICssBaselineProps> = ({ data, testId, tweakStyles }) => {
+  const classes = useStyles({ theme: tweakStyles });
+
+  return <div className={classes.root} {...addDataTestId(testId)} {...addDataAttributes(data)} />;
+};

package/src/components/CssBaseline/index.ts

@@ -1,2 +1,2 @@
-export * from './CssBaseline';
-export type { CssBaselineStyles } from './CssBaseline.styles';
+export * from './CssBaseline';
+export type { ICssBaselineStyles } from './CssBaseline.styles';