@true-engineering/true-react-common-ui-kit 4.0.0-alpha54 → 4.0.0-alpha61

package/src/components/TextArea/TextArea.tsx

@@ -1,12 +1,12 @@
 import {
   ChangeEvent,
+  CSSProperties,
   FocusEvent,
   FormEvent,
   forwardRef,
   TextareaHTMLAttributes,
   useState,
 } from 'react';
-import { Styles } from 'react-jss';
 import clsx from 'clsx';
 import {
   addDataAttributes,
@@ -52,144 +52,142 @@ export interface ITextAreaProps
   onChange: (value: string, event?: FormEvent<HTMLTextAreaElement>) => void;
 }
 
-export const TextArea = forwardRef<HTMLTextAreaElement, ITextAreaProps>(
-  (
-    {
-      value = '',
-      placeholder,
-      name,
-      counterPosition = 'default',
-      shouldFocusOnMount,
-      hasCounter = true,
-      shouldTrimAfterMaxLength,
-      isAutoSized = true,
-      shouldAlwaysShowPlaceholder,
-      isActive,
-      maxLength,
-      rows,
-      data,
-      testId,
-      tweakStyles,
-      onChange,
-      onPaste,
-      onFocus,
-      onBlur,
-      // Пропсы WithMessages
-      infoMessage,
-      errorMessage,
-      // Пропсы ControlWrapper
-      label,
-      isDisabled,
-      isInvalid,
-      isRequired,
-      size,
-      groupPlacement,
-      ...textAreaProps
-    },
-    ref,
-  ) => {
-    const classes = useStyles({ theme: tweakStyles });
+export const TextArea = forwardRef<HTMLTextAreaElement, ITextAreaProps>(function TextArea(
+  {
+    value = '',
+    placeholder,
+    name,
+    counterPosition = 'default',
+    shouldFocusOnMount,
+    hasCounter = true,
+    shouldTrimAfterMaxLength,
+    isAutoSized = true,
+    shouldAlwaysShowPlaceholder,
+    isActive,
+    maxLength,
+    rows,
+    data,
+    testId,
+    tweakStyles,
+    onChange,
+    onPaste,
+    onFocus,
+    onBlur,
+    // Пропсы WithMessages
+    infoMessage,
+    errorMessage,
+    // Пропсы ControlWrapper
+    label,
+    isDisabled,
+    isInvalid,
+    isRequired,
+    size,
+    groupPlacement,
+    ...textAreaProps
+  },
+  ref,
+) {
+  const classes = useStyles({ theme: tweakStyles });
 
-    const shouldShowCounter = hasCounter && isNotEmpty(maxLength);
-    const counterString = `${value.length} / ${maxLength}`;
+  const shouldShowCounter = hasCounter && isNotEmpty(maxLength);
+  const counterString = `${value.length} / ${maxLength}`;
 
-    const tweakWithMessagesStyles = useTweakStyles({
-      tweakStyles,
-      className: 'tweakWithMessages',
-      currentComponentName: 'TextArea',
-    });
+  const tweakWithMessagesStyles = useTweakStyles({
+    tweakStyles,
+    className: 'tweakWithMessages',
+    currentComponentName: 'TextArea',
+  });
 
-    const tweakControlWrapperStyles = useTweakStyles({
-      tweakStyles,
-      className: 'tweakControlWrapper',
-      currentComponentName: 'TextArea',
-    });
+  const tweakControlWrapperStyles = useTweakStyles({
+    tweakStyles,
+    className: 'tweakControlWrapper',
+    currentComponentName: 'TextArea',
+  });
 
-    const [isFocused, setFocused] = useState(false);
+  const [isFocused, setFocused] = useState(false);
 
-    const hasFocus = isFocused || isActive;
-    const hasValue = isArrayLikeNotEmpty(value);
-    const hasLabel = isReactNodeNotEmpty(label);
-    const hasPlaceholder =
-      (!hasLabel || hasFocus || shouldAlwaysShowPlaceholder) && isStringNotEmpty(placeholder);
+  const hasFocus = isFocused || isActive;
+  const hasValue = isArrayLikeNotEmpty(value);
+  const hasLabel = isReactNodeNotEmpty(label);
+  const hasPlaceholder =
+    (!hasLabel || hasFocus || shouldAlwaysShowPlaceholder) && isStringNotEmpty(placeholder);
 
-    const handleChange = (event: ChangeEvent<HTMLTextAreaElement>) => {
-      onChange(event.currentTarget.value, event);
-    };
+  const handleChange = (event: ChangeEvent<HTMLTextAreaElement>) => {
+    onChange(event.currentTarget.value, event);
+  };
 
-    const handleFocus = (event: FocusEvent<HTMLTextAreaElement>) => {
-      setFocused(true);
-      onFocus?.(event);
-    };
+  const handleFocus = (event: FocusEvent<HTMLTextAreaElement>) => {
+    setFocused(true);
+    onFocus?.(event);
+  };
 
-    const handleBlur = (event: FocusEvent<HTMLTextAreaElement>) => {
-      setFocused(false);
-      onBlur?.(event);
-    };
+  const handleBlur = (event: FocusEvent<HTMLTextAreaElement>) => {
+    setFocused(false);
+    onBlur?.(event);
+  };
 
-    return (
-      <div
-        className={clsx(classes.root, isNotEmpty(size) && classes[size])}
-        style={{ '--counter-length': counterString.length } as Styles}
+  return (
+    <div
+      className={clsx(classes.root, isNotEmpty(size) && classes[size])}
+      style={{ '--counter-length': counterString.length } as CSSProperties}
+    >
+      <WithMessages
+        errorMessage={errorMessage}
+        infoMessage={infoMessage}
+        tweakStyles={tweakWithMessagesStyles}
+        testId={getTestId(testId, 'wrapper')}
       >
-        <WithMessages
-          errorMessage={errorMessage}
-          infoMessage={infoMessage}
-          tweakStyles={tweakWithMessagesStyles}
-          testId={getTestId(testId, 'wrapper')}
+        <ControlWrapper
+          label={label}
+          tweakStyles={tweakControlWrapperStyles}
+          isFocused={hasFocus}
+          isDisabled={isDisabled}
+          hasValue={hasValue}
+          isInvalid={isInvalid}
+          isRequired={isRequired}
+          groupPlacement={groupPlacement}
+          size={size}
+          isFullWidth
         >
-          <ControlWrapper
-            label={label}
-            tweakStyles={tweakControlWrapperStyles}
-            isFocused={hasFocus}
-            isDisabled={isDisabled}
-            hasValue={hasValue}
-            isInvalid={isInvalid}
-            isRequired={isRequired}
-            groupPlacement={groupPlacement}
-            size={size}
-            isFullWidth
+          <div
+            className={clsx(classes.wrapper, {
+              [classes.autoSized]: isAutoSized,
+              [classes.withLabel]: hasLabel,
+            })}
+            // Не менять на addDataAttributes
+            {...(isAutoSized && { 'data-value': value })}
           >
-            <div
-              className={clsx(classes.wrapper, {
-                [classes.autoSized]: isAutoSized,
-                [classes.withLabel]: hasLabel,
-              })}
-              // Не менять на addDataAttributes
-              {...(isAutoSized && { 'data-value': value })}
-            >
-              <textarea
-                ref={ref}
-                className={classes.textarea}
-                value={value}
-                disabled={isDisabled}
-                placeholder={hasPlaceholder ? placeholder : undefined}
-                maxLength={shouldTrimAfterMaxLength ? maxLength : undefined}
-                name={name}
-                rows={rows}
-                onPaste={onPaste}
-                onFocus={handleFocus}
-                onBlur={handleBlur}
-                onChange={handleChange}
-                autoFocus={shouldFocusOnMount}
-                {...addDataAttributes(data, testId)}
-                {...textAreaProps}
-              />
-              {shouldShowCounter && (
-                <span
-                  className={clsx(classes.symbolsCount, classes[`counter-${counterPosition}`], {
-                    [classes.symbolsCountError]: value.length > maxLength,
-                    [classes.symbolsCountActive]: hasFocus || hasValue,
-                  })}
-                  {...addDataAttributes({ counterPosition })}
-                >
-                  {counterString}
-                </span>
-              )}
-            </div>
-          </ControlWrapper>
-        </WithMessages>
-      </div>
-    );
-  },
-);
+            <textarea
+              ref={ref}
+              className={classes.textarea}
+              value={value}
+              disabled={isDisabled}
+              placeholder={hasPlaceholder ? placeholder : undefined}
+              maxLength={shouldTrimAfterMaxLength ? maxLength : undefined}
+              name={name}
+              rows={rows}
+              onPaste={onPaste}
+              onFocus={handleFocus}
+              onBlur={handleBlur}
+              onChange={handleChange}
+              autoFocus={shouldFocusOnMount}
+              {...addDataAttributes(data, testId)}
+              {...textAreaProps}
+            />
+            {shouldShowCounter && (
+              <span
+                className={clsx(classes.symbolsCount, classes[`counter-${counterPosition}`], {
+                  [classes.symbolsCountError]: value.length > maxLength,
+                  [classes.symbolsCountActive]: hasFocus || hasValue,
+                })}
+                {...addDataAttributes({ counterPosition })}
+              >
+                {counterString}
+              </span>
+            )}
+          </div>
+        </ControlWrapper>
+      </WithMessages>
+    </div>
+  );
+});

package/src/components/TextButton/TextButton.tsx

@@ -1,7 +1,9 @@
 import { forwardRef, ReactNode } from 'react';
 import clsx from 'clsx';
-import { addDataTestId, isReactNodeNotEmpty } from '@true-engineering/true-react-platform-helpers';
-import { addDataAttributes } from '../../helpers';
+import {
+  addDataAttributes,
+  isReactNodeNotEmpty,
+} from '@true-engineering/true-react-platform-helpers';
 import { useTweakStyles } from '../../hooks';
 import { ICommonProps } from '../../types';
 import { IIcon, renderIcon } from '../Icon';
@@ -36,75 +38,72 @@ export interface ITextButtonProps
   preloaderType?: IThemedPreloaderProps['type'];
 }
 
-export const TextButton = forwardRef<HTMLButtonElement, ITextButtonProps>(
-  (
-    {
-      children,
-      icon,
-      view = 'primary',
-      isDisabled = false,
-      isBold = false,
-      isLoading = false,
-      isActive = false,
-      hasCircleUnderIcon = false,
-      size = 'l',
-      iconPosition = 'left',
-      preloaderType = 'dots',
-      type = 'button',
-      testId,
-      tweakStyles,
-      data,
-      onClick,
-      ...restProps
-    },
-    ref,
-  ) => {
-    const classes = useStyles({ theme: tweakStyles });
-
-    const tweakPreloaderStyles = useTweakStyles({
-      innerStyles: preloaderStyles,
-      tweakStyles,
-      className: 'tweakPreloader',
-      currentComponentName: 'TextButton',
-    });
+export const TextButton = forwardRef<HTMLButtonElement, ITextButtonProps>(function TextButton(
+  {
+    children,
+    icon,
+    view = 'primary',
+    isDisabled = false,
+    isBold = false,
+    isLoading = false,
+    isActive = false,
+    hasCircleUnderIcon = false,
+    size = 'l',
+    iconPosition = 'left',
+    preloaderType = 'dots',
+    type = 'button',
+    testId,
+    tweakStyles,
+    data,
+    onClick,
+    ...restProps
+  },
+  ref,
+) {
+  const classes = useStyles({ theme: tweakStyles });
 
-    const hasNoAction = isDisabled || isLoading;
+  const tweakPreloaderStyles = useTweakStyles({
+    innerStyles: preloaderStyles,
+    tweakStyles,
+    className: 'tweakPreloader',
+    currentComponentName: 'TextButton',
+  });
 
-    return (
-      <button
-        ref={ref}
-        type={type}
-        className={clsx(classes.root, classes[size], classes[view], {
-          [classes.bold]: isBold,
-          [classes.loading]: isLoading,
-          [classes.active]: isActive,
-          [classes.disabled]: isDisabled,
-        })}
-        disabled={hasNoAction}
-        onClick={!hasNoAction ? onClick : undefined}
-        {...restProps}
-        {...addDataTestId(testId)}
-        {...addDataAttributes(data)}
-      >
-        <span className={clsx(classes.content, iconPosition === 'right' && classes.reverseContent)}>
-          {isReactNodeNotEmpty(icon) && (
-            <span className={clsx(classes.iconContainer, hasCircleUnderIcon && classes.circle)}>
-              <span className={classes.icon}>{renderIcon(icon)}</span>
-            </span>
-          )}
-          {children}
-        </span>
+  const hasNoAction = isDisabled || isLoading;
 
-        {isLoading && (
-          <span className={classes.loader}>
-            <ThemedPreloader
-              type={preloaderType}
-              useCurrentColor
-              tweakStyles={tweakPreloaderStyles}
-            />
+  return (
+    <button
+      ref={ref}
+      type={type}
+      className={clsx(classes.root, classes[size], classes[view], {
+        [classes.bold]: isBold,
+        [classes.loading]: isLoading,
+        [classes.active]: isActive,
+        [classes.disabled]: isDisabled,
+      })}
+      disabled={hasNoAction}
+      onClick={!hasNoAction ? onClick : undefined}
+      {...restProps}
+      {...addDataAttributes(data, testId)}
+    >
+      <span className={clsx(classes.content, iconPosition === 'right' && classes.reverseContent)}>
+        {isReactNodeNotEmpty(icon) && (
+          <span className={clsx(classes.iconContainer, hasCircleUnderIcon && classes.circle)}>
+            <span className={classes.icon}>{renderIcon(icon)}</span>
           </span>
         )}
-      </button>
-    );
-  },
-);
+        {children}
+      </span>
+
+      {isLoading && (
+        <span className={classes.loader}>
+          <ThemedPreloader
+            type={preloaderType}
+            useCurrentColor
+            tweakStyles={tweakPreloaderStyles}
+          />
+        </span>
+      )}
+    </button>
+  );
+});

package/src/components/TextWithInfo/TextWithInfo.tsx

@@ -1,7 +1,6 @@
 import { FC } from 'react';
 import clsx from 'clsx';
-import { addDataTestId } from '@true-engineering/true-react-platform-helpers';
-import { addDataAttributes } from '../../helpers';
+import { addDataAttributes } from '@true-engineering/true-react-platform-helpers';
 import { ICommonProps } from '../../types';
 import { Icon } from '../Icon';
 import { TextWithTooltip } from '../TextWithTooltip';
@@ -34,8 +33,7 @@ export const TextWithInfo: FC<ITextWithInfoProps> = ({
   return (
     <div
       className={clsx(classes.root, isSelected && classes.selected)}
-      {...addDataTestId(testId)}
-      {...addDataAttributes(data)}
+      {...addDataAttributes(data, testId)}
     >
       <div className={classes.container}>
         <div className={classes.text} onClick={onClick}>

package/src/components/TextWithTooltip/TextWithTooltip.tsx

@@ -2,8 +2,7 @@ import { CSSProperties, FC, ReactNode, useEffect, useRef, useState } from 'react
 import { Portal } from 'react-overlays';
 import usePopper, { Modifier, Placement } from 'react-overlays/usePopper';
 import clsx from 'clsx';
-import { addDataTestId } from '@true-engineering/true-react-platform-helpers';
-import { addDataAttributes } from '../../helpers';
+import { addDataAttributes } from '@true-engineering/true-react-platform-helpers';
 import { useOnClickOutsideWithRef, useTweakStyles } from '../../hooks';
 import { ICommonProps } from '../../types';
 import { ITooltipProps, Tooltip } from '../Tooltip';
@@ -21,6 +20,8 @@ export interface ITextWithTooltipProps extends ICommonProps<ITextWithTooltipStyl
   /** @default [] */
   tooltipModifiers?: Array<Partial<Modifier<any, any>>>;
   tooltipOffsetOptions?: Record<string, unknown>;
+  /** @default 'undefined' */
+  tooltipSize?: ITooltipProps['size'];
   /** @default 'hover' */
   mouseEventType?: 'hover' | 'click';
   hoverDelay?: number;
@@ -39,6 +40,7 @@ export const TextWithTooltip: FC<ITextWithTooltipProps> = ({
   tooltipType = 'info',
   tooltipModifiers = [],
   tooltipOffsetOptions,
+  tooltipSize,
   isDisabled = false,
   shouldRenderInBody = true,
   mouseEventType = 'hover',
@@ -128,8 +130,7 @@ export const TextWithTooltip: FC<ITextWithTooltipProps> = ({
         mouseEventType === 'click' && shouldShowTooltip && classes.clickable,
       )}
       {...(shouldShowTooltip ? props : undefined)}
-      {...addDataTestId(testId)}
-      {...addDataAttributes(data)}
+      {...addDataAttributes(data, testId)}
       ref={root}
     >
       {shouldShowTooltip && (
@@ -144,6 +145,7 @@ export const TextWithTooltip: FC<ITextWithTooltipProps> = ({
               view={tooltipView}
               type={tooltipType}
               text={tooltipText}
+              size={tooltipSize}
               tweakStyles={tweakTooltipStyles}
             />
           </div>

package/src/components/ThemedPreloader/ThemedPreloader.tsx

@@ -1,7 +1,6 @@
 import { FC } from 'react';
 import clsx from 'clsx';
-import { addDataTestId } from '@true-engineering/true-react-platform-helpers';
-import { addDataAttributes } from '../../helpers';
+import { addDataAttributes } from '@true-engineering/true-react-platform-helpers';
 import { useTweakStyles } from '../../hooks';
 import { ICommonProps } from '../../types';
 import { SvgPreloader, DotsPreloader } from './components';
@@ -41,8 +40,7 @@ export const ThemedPreloader: FC<IThemedPreloaderProps> = ({
       className={clsx(classes.root, classes[type], {
         [classes.currentColor]: useCurrentColor,
       })}
-      {...addDataTestId(testId)}
-      {...addDataAttributes(data)}
+      {...addDataAttributes(data, testId)}
     >
       {type === 'dots' ? (
         <DotsPreloader tweakStyles={tweakDotsPreloaderStyles} />

package/src/components/Toaster/Toaster.tsx

@@ -1,12 +1,11 @@
 import { FC, ReactNode, useEffect } from 'react';
 import clsx from 'clsx';
 import {
-  addDataTestId,
+  addDataAttributes,
   isEmpty,
   isNotEmpty,
   isReactNodeNotEmpty,
 } from '@true-engineering/true-react-platform-helpers';
-import { addDataAttributes } from '../../helpers';
 import { useTweakStyles } from '../../hooks';
 import { ICommonProps } from '../../types';
 import { Icon } from '../Icon';
@@ -70,8 +69,7 @@ export const Toaster: FC<IToasterProps> = ({
     <div
       className={classes.root}
       onClick={shouldCloseOnClick ? onClose : undefined}
-      {...addDataTestId(testId)}
-      {...addDataAttributes(data)}
+      {...addDataAttributes(data, testId)}
     >
       <div className={clsx(classes.iconContainer, classes[type])}>
         <Icon type={`status-${type}`} />

package/src/components/Tooltip/Tooltip.stories.tsx

@@ -1,6 +1,14 @@
 import { type Meta } from '@storybook/react';
+import { IExtendableProps } from '../../types';
 import { Tooltip } from './Tooltip';
 
+const SIZES = ['micro'] as const;
+
+declare module './types' {
+  // eslint-disable-next-line @typescript-eslint/no-empty-object-type
+  export interface ITooltipSizes extends IExtendableProps<typeof SIZES> {}
+}
+
 const meta: Meta<typeof Tooltip> = {
   title: 'Data Display/Tooltip',
   component: Tooltip,
@@ -8,11 +16,13 @@ const meta: Meta<typeof Tooltip> = {
     text: 'Tooltip Text',
     view: 'tooltip',
     type: 'info',
+    size: undefined,
   },
   argTypes: {
     text: { control: 'text' },
     view: { control: 'inline-radio', options: ['tooltip', 'hint'] },
     type: { control: 'inline-radio', options: ['info', 'error'] },
+    size: { options: [undefined, ...SIZES], control: 'inline-radio' },
   },
 };
 

package/src/components/Tooltip/Tooltip.styles.ts

@@ -1,5 +1,6 @@
 import { rgba } from '../../helpers';
 import { colors, createThemedStyles, dimensions, ITweakStyles } from '../../theme';
+import { ITooltipSizes } from './types';
 
 export const useStyles = createThemedStyles('Tooltip', {
   root: {
@@ -48,4 +49,4 @@ export const useStyles = createThemedStyles('Tooltip', {
   },
 });
 
-export type ITooltipStyles = ITweakStyles<typeof useStyles>;
+export type ITooltipStyles = ITweakStyles<typeof useStyles, ITooltipSizes>;

package/src/components/Tooltip/Tooltip.tsx

@@ -1,8 +1,8 @@
 import { FC, ReactNode } from 'react';
 import clsx from 'clsx';
-import { addDataTestId } from '@true-engineering/true-react-platform-helpers';
-import { addDataAttributes } from '../../helpers';
+import { addDataAttributes, isNotEmpty } from '@true-engineering/true-react-platform-helpers';
 import { ICommonProps } from '../../types';
+import { ITooltipSize } from './types';
 import { useStyles, ITooltipStyles } from './Tooltip.styles';
 
 export interface ITooltipProps extends ICommonProps<ITooltipStyles> {
@@ -11,12 +11,15 @@ export interface ITooltipProps extends ICommonProps<ITooltipStyles> {
   view?: 'tooltip' | 'hint' | 'custom';
   /** @default 'info' */
   type?: 'info' | 'error';
+  /** @default 'undefined' */
+  size?: ITooltipSize;
 }
 
 export const Tooltip: FC<ITooltipProps> = ({
   text,
   view = 'tooltip',
   type = 'info',
+  size,
   data,
   testId,
   tweakStyles,
@@ -25,9 +28,13 @@ export const Tooltip: FC<ITooltipProps> = ({
 
   return (
     <div
-      className={clsx(classes.root, classes[view], classes[type])}
-      {...addDataTestId(testId)}
-      {...addDataAttributes(data)}
+      className={clsx(
+        classes.root,
+        classes[view],
+        classes[type],
+        isNotEmpty(size) && classes[size],
+      )}
+      {...addDataAttributes(data, testId)}
     >
       {text}
     </div>

package/src/components/Tooltip/types.ts

@@ -1 +1,6 @@
 export type ITooltipType = 'info' | 'warning';
+
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
+export interface ITooltipSizes {}
+
+export type ITooltipSize = keyof ITooltipSizes;