@true-engineering/true-react-common-ui-kit 4.0.0-alpha66 → 4.0.0-alpha68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@true-engineering/true-react-common-ui-kit",
-  "version": "4.0.0-alpha66",
+  "version": "4.0.0-alpha68",
   "description": "True Engineering React UI Kit with theming support",
   "author": "True Engineering (https://trueengineering.ru)",
   "keywords": [

package/src/components/Notification/Notification.stories.tsx

@@ -39,7 +39,9 @@ const meta: Meta<typeof Story> = {
     shouldUseChildrenInstead: false,
   },
   argTypes: {
-    icon: { options: [undefined, ...Object.keys(iconsMap)], control: 'select' },
+    icon: { options: [undefined, null, ...Object.keys(iconsMap)], control: 'select' },
+    size: { options: ['s', 'm', 'l'], control: 'inline-radio' },
+    type: { options: ['info', 'error', 'warning', 'ok', 'not-ok', 'custom'], control: 'select' },
   },
   parameters: {
     controls: {

package/src/components/Notification/Notification.tsx

@@ -3,11 +3,11 @@ import clsx from 'clsx';
 import {
   addDataAttributes,
   addDataTestId,
+  isNotEmpty,
   isReactNodeNotEmpty,
-  isStringNotEmpty,
 } from '@true-engineering/true-react-platform-helpers';
 import { ICommonProps } from '../../types';
-import { Icon, IIcon, renderIcon } from '../Icon';
+import { IIcon, renderIcon } from '../Icon';
 import { INotificationType } from './types';
 import { useStyles, INotificationStyles } from './Notification.styles';
 
@@ -15,11 +15,11 @@ export interface INotificationProps extends ICommonProps<INotificationStyles> {
   type: INotificationType;
   /** @default true */
   isFullWidth?: boolean;
-  text?: string;
-  title?: string;
+  text?: ReactNode;
+  title?: ReactNode;
   /** @default 's' */
   size?: 's' | 'm' | 'l';
-  icon?: IIcon;
+  icon?: IIcon | null;
   children?: ReactNode;
 }
 
@@ -32,15 +32,13 @@ export const Notification: FC<INotificationProps> = ({
   testId,
   size = 's',
   data,
-  icon,
+  icon = type !== 'custom' ? `status-${type}` : undefined,
   tweakStyles,
 }) => {
   const classes = useStyles({ theme: tweakStyles });
 
-  const hasText = isStringNotEmpty(text);
-  const hasTitle = isStringNotEmpty(title);
-  const isDefaultType = type !== 'custom';
-  const hasIcon = isReactNodeNotEmpty(icon) || isDefaultType;
+  const hasText = isReactNodeNotEmpty(text);
+  const hasTitle = isReactNodeNotEmpty(title);
 
   return (
     <div
@@ -51,13 +49,7 @@ export const Notification: FC<INotificationProps> = ({
       })}
       {...addDataAttributes(data, testId)}
     >
-      {hasIcon && (
-        <div className={classes.icon}>
-          {isReactNodeNotEmpty(icon)
-            ? renderIcon(icon)
-            : isDefaultType && <Icon type={`status-${type}`} />}
-        </div>
-      )}
+      {isNotEmpty(icon) && <div className={classes.icon}>{renderIcon(icon)}</div>}
       <div className={classes.body}>
         {hasTitle && (
           <span className={classes.title} {...addDataTestId(testId, 'title')}>

package/src/components/Selector/Selector.stories.tsx

@@ -49,6 +49,10 @@ const meta: Meta<typeof Story> = {
     isInvalid: false,
     isRequired: false,
   },
+  argTypes: {
+    size: { options: ['s', 'm', 'l'], control: 'inline-radio' },
+    iconPosition: { options: ['left', 'right'], control: 'inline-radio' },
+  },
   parameters: {
     controls: {
       exclude: excludeStorybookParams(['options', 'value']),

package/src/components/Selector/Selector.styles.ts

@@ -1,165 +1,63 @@
-import { CSSProperties } from 'react';
-import { isNotEmpty } from '@true-engineering/true-react-platform-helpers';
-import { colors, dimensions, ITweakStyles, createThemedStyles, animations } from '../../theme';
-
-const SELECTOR_TOTAL_GAP = 4;
-const SELECTOR_BORDER_WIDTH = 1;
-export const SELECTOR_GAP = SELECTOR_TOTAL_GAP - SELECTOR_BORDER_WIDTH;
-
-export const getSelectorLineStyle = (activeElementData?: {
-  clientWidth: number;
-  offsetLeft: number;
-}): CSSProperties | undefined =>
-  isNotEmpty(activeElementData)
-    ? {
-        width: activeElementData.clientWidth - SELECTOR_GAP * 2,
-        transform: `translateX(${activeElementData.offsetLeft}px)`,
-      }
-    : undefined;
+import { ITweakStyles, createThemedStyles, animations } from '../../theme';
 
 export const useStyles = createThemedStyles('Selector', {
-  root: {
-    display: 'flex',
-    alignItems: 'center',
-    listStyle: 'none',
+  selector: {
+    display: 'grid',
+    gridAutoFlow: 'column',
+    gridAutoColumns: 'auto',
+    boxSizing: 'border-box',
     position: 'relative',
-  },
 
-  required: {
-    '&::before': {
-      top: '50%',
-      left: -12,
-      width: 6,
-      height: 6,
+    '&:has($active)::before': {
       content: '""',
       position: 'absolute',
-      transform: 'translate(0, -50%)',
-      borderRadius: '50%',
-      backgroundColor: colors.ORANGE_FOCUS,
+      transition: animations.defaultTransition,
+      transitionProperty: 'left, width',
+      width: 'var(--active-element-width)',
+      height: 'var(--active-element-height)',
+      top: 'var(--active-element-top)',
+      left: 'var(--active-element-left)',
     },
   },
 
-  invalid: {},
-
-  optionWrapper: {
-    height: '100%',
+  autoWidth: {
+    gridAutoColumns: '1fr',
   },
 
+  required: {},
+
+  invalid: {},
+
   option: {
+    appearance: 'none',
+    background: 'none',
+    border: 'none',
+
     display: 'flex',
     alignItems: 'center',
     justifyContent: 'center',
-    appearance: 'none',
-    borderRadius: 0,
-    padding: 0,
-    border: 'none',
-    cursor: 'pointer',
-    width: '100%',
-  },
+    zIndex: 1,
 
-  active: {
-    cursor: 'default',
+    '$iconFromRight &': {
+      flexDirection: 'row-reverse',
+    },
   },
 
-  disabled: {
-    cursor: 'default',
+  active: {},
 
-    '& $optionText': {
-      color: colors.FONT_LABEL,
-    },
-  },
+  disabled: {},
 
-  optionIcon: {
-    width: 20,
-    height: 20,
-  },
+  optionIcon: {},
 
   optionText: {},
 
-  iconFromRight: {
-    '& $option': {
-      flexDirection: 'row-reverse',
-    },
-  },
+  iconFromRight: {},
 
   s: {},
 
   m: {},
 
   l: {},
-
-  line: {},
-
-  selector: {
-    display: 'grid',
-    gridAutoFlow: 'column',
-    gridAutoColumns: '1fr',
-    borderRadius: dimensions.BORDER_RADIUS_SMALL,
-    backgroundColor: colors.BORDER_LIGHT,
-    width: 'fit-content',
-    position: 'relative',
-    border: ['solid', SELECTOR_BORDER_WIDTH, 'transparent'],
-
-    '& $line': {
-      content: '""',
-      position: 'absolute',
-      left: SELECTOR_GAP,
-      height: `calc(100% - ${SELECTOR_GAP * 2}px)`,
-      backgroundColor: colors.CLASSIC_WHITE,
-      borderRadius: dimensions.BORDER_RADIUS_SMALL,
-      transition: animations.defaultTransition,
-      transitionProperty: 'transform, width',
-    },
-
-    '&$invalid': {
-      borderColor: colors.RED_WARNING,
-    },
-
-    '& $option': {
-      gap: 6,
-      position: 'relative',
-      zIndex: 1,
-      height: '100%',
-      color: colors.FONT_MEDIUM,
-      fontSize: 16,
-      transition: animations.defaultTransition,
-      transitionProperty: 'color',
-      background: 'none',
-
-      '&$s': {
-        padding: [4, 8],
-        fontSize: 10,
-        lineHeight: '14px',
-      },
-
-      '&$m': {
-        padding: [14, 18],
-      },
-
-      '&$l': {
-        padding: [16, 24],
-      },
-
-      '&:hover, &:focus': {
-        color: colors.FONT_MAIN,
-      },
-
-      '&$active': {
-        color: colors.FONT_MAIN,
-      },
-    },
-  },
-
-  autoWidth: {
-    '&$selector': {
-      gridAutoColumns: 'auto',
-
-      '& $line': {
-        width: 'unset',
-        transform: 'unset',
-      },
-    },
-  },
 });
 
 export type ISelectorStyles = ITweakStyles<typeof useStyles>;

package/src/components/Selector/Selector.tsx

@@ -1,16 +1,15 @@
-import { useEffect, useRef, useState } from 'react';
 import clsx from 'clsx';
 import {
   addDataTestId,
   addDataAttributes,
-  hasDuplicates,
-  isNotEmpty,
   isReactNodeNotEmpty,
+  isNotEmpty,
 } from '@true-engineering/true-react-platform-helpers';
+import { useResizeRef } from '../../hooks';
 import { ICommonProps } from '../../types';
 import { renderIcon } from '../Icon';
 import { ISelectorOption, ISelectorValue } from './types';
-import { getSelectorLineStyle, ISelectorStyles, useStyles } from './Selector.styles';
+import { ISelectorStyles, useStyles } from './Selector.styles';
 
 export interface ISelectorProps<V extends ISelectorValue> extends ICommonProps<ISelectorStyles> {
   options: Array<ISelectorOption<V>>;
@@ -44,67 +43,55 @@ export function Selector<V extends ISelectorValue>({
   tweakStyles,
   onChange,
 }: ISelectorProps<V>): JSX.Element {
-  const classes = useStyles({ theme: tweakStyles });
-  const optionsValues = options.map((opt) => opt.value);
-
-  const [elementsData, setElementsData] = useState<HTMLElement[]>([]);
-  const listRef = useRef<HTMLDivElement>(null);
+  const classes = useStyles({ tweakStyles });
 
-  if (hasDuplicates(optionsValues)) {
-    console.error('Selector: Значения options.value должны быть уникальными');
-  }
-
-  useEffect(() => {
-    const listEl = listRef.current;
-    if (listEl === null) {
-      return;
+  const updateVariables = (active: HTMLElement | null): void => {
+    if (isNotEmpty(active?.parentElement)) {
+      active.parentElement.style.setProperty('--active-element-width', `${active.clientWidth}px`);
+      active.parentElement.style.setProperty('--active-element-height', `${active.clientHeight}px`);
+      active.parentElement.style.setProperty('--active-element-left', `${active.offsetLeft}px`);
+      active.parentElement.style.setProperty('--active-element-top', `${active.offsetTop}px`);
     }
+  };
 
-    setElementsData([...listEl.querySelectorAll<HTMLElement>(`.${classes.optionWrapper}`)]);
-  }, [options, size]);
-
-  const activeElementData = isNotEmpty(value)
-    ? elementsData[optionsValues.indexOf(value)]
-    : undefined;
+  const resizeRef = useResizeRef<HTMLDivElement>({
+    onTargetChange: (target) => updateVariables(target.querySelector(`.${classes.active}`)),
+  });
 
   return (
     <div
-      className={clsx(classes.root, classes.selector, {
+      ref={resizeRef}
+      className={clsx(classes.selector, classes[size], {
         [classes.iconFromRight]: iconPosition === 'right',
         [classes.invalid]: isInvalid,
         [classes.required]: isRequired,
         [classes.autoWidth]: hasSameOptionsWidth,
       })}
-      ref={listRef}
       {...addDataAttributes(data, testId)}
     >
-      {isNotEmpty(activeElementData) && (
-        <div className={classes.line} style={getSelectorLineStyle(activeElementData)} />
-      )}
-
       {options.map((option) => {
-        const optionId = option.value.toString();
-        const isDisabledOption = option.isDisabled ?? isDisabled;
+        const optionId = String(option.value);
+        const isDisabledOption = option.isDisabled || isDisabled;
         const isActiveOption = option.value === value;
 
         return (
-          <div key={optionId} className={classes.optionWrapper}>
-            <button
-              type="button"
-              className={clsx(classes.option, classes[size], {
-                [classes.active]: isActiveOption,
-                [classes.disabled]: isDisabledOption,
-              })}
-              disabled={isDisabledOption}
-              onClick={!isDisabledOption ? () => onChange(option.value) : undefined}
-              {...addDataTestId(testId, optionId)}
-            >
-              {isReactNodeNotEmpty(option.icon) && (
-                <div className={classes.optionIcon}>{renderIcon(option.icon)}</div>
-              )}
-              <div className={classes.optionText}>{option.label}</div>
-            </button>
-          </div>
+          <button
+            ref={isActiveOption ? updateVariables : undefined}
+            key={optionId}
+            type="button"
+            className={clsx(classes.option, {
+              [classes.active]: isActiveOption,
+              [classes.disabled]: isDisabledOption,
+            })}
+            disabled={isDisabledOption}
+            onClick={!isDisabledOption ? () => onChange(option.value) : undefined}
+            {...addDataTestId(testId, optionId)}
+          >
+            {isReactNodeNotEmpty(option.icon) && (
+              <div className={classes.optionIcon}>{renderIcon(option.icon)}</div>
+            )}
+            <div className={classes.optionText}>{option.label}</div>
+          </button>
         );
       })}
     </div>

package/src/hooks/use-resize-ref.ts

@@ -2,14 +2,14 @@ import { RefCallback, useMemo, useEffect } from 'react';
 import { isNotEmpty } from '@true-engineering/true-react-platform-helpers';
 import { useLatestRef } from './use-latest-ref';
 
-export interface IResizeRefOptions {
+export interface IResizeRefOptions<T extends Element> {
   /** @default false */
   isDisabled?: boolean;
   onChange?: (entry: ResizeObserverEntry) => void;
-  onTargetChange?: (target: Element) => void;
+  onTargetChange?: (target: T) => void;
 }
 
-export const useResizeRef = (options: IResizeRefOptions): RefCallback<Element> => {
+export const useResizeRef = <T extends Element>(options: IResizeRefOptions<T>): RefCallback<T> => {
   const optionsRef = useLatestRef(options);
 
   const { ref, disconnect } = useMemo(() => {
@@ -17,11 +17,11 @@ export const useResizeRef = (options: IResizeRefOptions): RefCallback<Element> =
       const { current } = optionsRef;
       if (!current.isDisabled) {
         current.onChange?.(entry);
-        current.onTargetChange?.(entry.target);
+        current.onTargetChange?.(entry.target as T);
       }
     });
 
-    const observerRef: RefCallback<Element> = (node) => {
+    const observerRef: RefCallback<T> = (node) => {
       observer.disconnect();
       if (!isNotEmpty(node)) {
         return;