@true-engineering/true-react-common-ui-kit 3.31.0 → 3.32.0

package/src/components/Notification/Notification.tsx

@@ -1,69 +1,77 @@
-import { FC, ReactNode } from 'react';
-import clsx from 'clsx';
-import {
-  addDataTestId,
-  isReactNodeNotEmpty,
-  isStringNotEmpty,
-} from '@true-engineering/true-react-platform-helpers';
-import { addDataAttributes } from '../../helpers';
-import { ICommonProps } from '../../types';
-import { Icon } from '../Icon';
-import { INotificationType } from './types';
-import { useStyles, INotificationStyles } from './Notification.styles';
-
-export interface INotificationProps extends ICommonProps<INotificationStyles> {
-  type: INotificationType;
-  /** @default true */
-  isFullWidth?: boolean;
-  text?: string;
-  title?: string;
-  /** @default 's' */
-  size?: 's' | 'm' | 'l';
-  children?: ReactNode;
-}
-
-export const Notification: FC<INotificationProps> = ({
-  children,
-  type,
-  isFullWidth = true,
-  text,
-  title,
-  testId,
-  size = 's',
-  data,
-  tweakStyles,
-}) => {
-  const classes = useStyles({ theme: tweakStyles });
-
-  const hasText = isStringNotEmpty(text);
-  const hasTitle = isStringNotEmpty(title);
-
-  return (
-    <div
-      className={clsx(classes.root, classes[size], classes[type], {
-        [classes.inline]: !isFullWidth,
-        [classes.withTitle]: hasTitle,
-        [classes.withText]: hasText,
-      })}
-      {...addDataTestId(testId)}
-      {...addDataAttributes(data)}
-    >
-      <div className={classes.icon}>
-        <Icon type={`status-${type}`} />
-      </div>
-      <div className={classes.body}>
-        {hasTitle && (
-          <span className={classes.title} {...addDataTestId(testId, 'title')}>
-            {title}
-          </span>
-        )}
-        {hasText && (
-          <span className={classes.text} {...addDataTestId(testId, 'text')}>
-            {text}
-          </span>
-        )}
-        {isReactNodeNotEmpty(children) && <div className={classes.content}>{children}</div>}
-      </div>
-    </div>
-  );
-};
+import { FC, ReactNode } from 'react';
+import clsx from 'clsx';
+import {
+  addDataTestId,
+  isReactNodeNotEmpty,
+  isStringNotEmpty,
+} from '@true-engineering/true-react-platform-helpers';
+import { addDataAttributes } from '../../helpers';
+import { ICommonProps } from '../../types';
+import { Icon, IIcon, renderIcon } from '../Icon';
+import { INotificationType } from './types';
+import { useStyles, INotificationStyles } from './Notification.styles';
+
+export interface INotificationProps extends ICommonProps<INotificationStyles> {
+  type: INotificationType;
+  /** @default true */
+  isFullWidth?: boolean;
+  text?: string;
+  title?: string;
+  /** @default 's' */
+  size?: 's' | 'm' | 'l';
+  icon?: IIcon;
+  children?: ReactNode;
+}
+
+export const Notification: FC<INotificationProps> = ({
+  children,
+  type,
+  isFullWidth = true,
+  text,
+  title,
+  testId,
+  size = 's',
+  data,
+  icon,
+  tweakStyles,
+}) => {
+  const classes = useStyles({ theme: tweakStyles });
+
+  const hasText = isStringNotEmpty(text);
+  const hasTitle = isStringNotEmpty(title);
+  const isDefaultType = type !== 'custom';
+  const hasIcon = isReactNodeNotEmpty(icon) || isDefaultType;
+
+  return (
+    <div
+      className={clsx(classes.root, classes[size], classes[type], {
+        [classes.inline]: !isFullWidth,
+        [classes.withTitle]: hasTitle,
+        [classes.withText]: hasText,
+      })}
+      {...addDataTestId(testId)}
+      {...addDataAttributes(data)}
+    >
+      {hasIcon && (
+        <div className={classes.icon}>
+          {isReactNodeNotEmpty(icon)
+            ? renderIcon(icon)
+            : isDefaultType && <Icon type={`status-${type}`} />}
+        </div>
+      )}
+      <div className={classes.body}>
+        {hasTitle && (
+          <span className={classes.title} {...addDataTestId(testId, 'title')}>
+            {title}
+          </span>
+        )}
+        {hasText && (
+          <span className={classes.text} {...addDataTestId(testId, 'text')}>
+            {text}
+          </span>
+        )}
+        {isReactNodeNotEmpty(children) && <div className={classes.content}>{children}</div>}
+      </div>
+    </div>
+  );
+};

package/src/components/Notification/types.ts

@@ -1 +1 @@
-export type INotificationType = 'error' | 'info' | 'warning' | 'ok' | 'not-ok';
+export type INotificationType = 'error' | 'info' | 'warning' | 'ok' | 'not-ok' | 'custom';

package/src/components/NumberInput/NumberInput.tsx

@@ -1,137 +1,137 @@
-import { FormEvent, KeyboardEvent, FocusEvent, forwardRef, useState } from 'react';
-import { isStringNotEmpty } from '@true-engineering/true-react-platform-helpers';
-import {
-  formatNumber,
-  formatStringNumber,
-  getNumberInRange,
-  removeStringFormat,
-  setCaretPosition,
-  stringToNumber,
-} from '../../helpers';
-import { useDidMountEffect } from '../../hooks';
-import { Input, IInputProps } from '../Input';
-import { constructRegExp, formatNumberWithDefault, getNewCaretPosition } from './helpers';
-
-export interface INumberInputProps extends Omit<IInputProps, 'value' | 'onChange' | 'type'> {
-  value?: number;
-  /** @default 3 */
-  precision?: number;
-  /** @default 7 */
-  intPartPrecision?: number;
-  defaultValue?: number;
-  /** @default false */
-  canBeFloat?: boolean;
-  /** @default false */
-  canBeNegative?: boolean;
-  min?: number;
-  max?: number;
-  onChange: (value: number | undefined, event?: FormEvent<HTMLInputElement>) => void;
-}
-
-export const NumberInput = forwardRef<HTMLInputElement, INumberInputProps>(
-  (
-    {
-      value,
-      canBeFloat = false,
-      canBeNegative = false,
-      defaultValue,
-      precision = 3,
-      intPartPrecision = 7,
-      onChange,
-      onBlur,
-      min,
-      max,
-      ...props
-    },
-    ref,
-  ) => {
-    const [showedValue, setShowedValue] = useState(() =>
-      formatNumberWithDefault(value, defaultValue),
-    );
-
-    // специальный костыль для обработки Delete - т.к. без него каретка будет работать неправильно при удалении пробелов
-    const [isDeleteForwardAction, setIsDeleteForwardAction] = useState(false);
-
-    const handleKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
-      setIsDeleteForwardAction(event.key === 'Delete');
-    };
-
-    const setShowedValueWithDefault = (v: string) => {
-      setShowedValue(isStringNotEmpty(v) ? v : formatNumber(defaultValue));
-    };
-
-    const handleChange = async (
-      inputValue: string,
-      event: FormEvent<HTMLInputElement>,
-    ): Promise<void> => {
-      const oldValue = showedValue;
-      const target = event.target as HTMLInputElement;
-      const defaultCaretPos = target.selectionStart ?? 0;
-      const numString = removeStringFormat(inputValue);
-
-      if (numString === '') {
-        onChange(undefined);
-        // не убирать - ломается каретка
-        setShowedValue('');
-        return;
-      }
-
-      const numberRegexp = new RegExp(
-        constructRegExp({
-          precision,
-          intPartPrecision,
-          canBeNegative,
-          canBeFloat,
-        }),
-      );
-
-      if (!numberRegexp.test(numString)) {
-        await setShowedValue(oldValue);
-        setCaretPosition(target, defaultCaretPos - 1);
-        return;
-      }
-
-      const hasDot = canBeFloat && /^[-]*[\d\s]*[.,]$/.test(inputValue);
-      const formattedValue = formatStringNumber(numString);
-      const newValue = hasDot ? `${formattedValue}.` : formattedValue;
-      await setShowedValue(newValue);
-      setCaretPosition(
-        target,
-        getNewCaretPosition(defaultCaretPos, oldValue, newValue, isDeleteForwardAction),
-      );
-    };
-
-    const handleBlur = (event: FocusEvent<HTMLInputElement>): void => {
-      const val = event.currentTarget.value;
-      const num = stringToNumber(val);
-      const newValue = num !== undefined ? getNumberInRange(num, min, max) : undefined;
-      if (newValue !== value) {
-        onChange(newValue);
-      } else {
-        setShowedValueWithDefault(formatNumber(value));
-      }
-      if (onBlur !== undefined) {
-        onBlur(event);
-      }
-    };
-
-    useDidMountEffect(() => {
-      if (value !== undefined) {
-        setShowedValueWithDefault(formatNumber(value));
-      } else {
-        setShowedValue(formatNumber(value));
-      }
-    }, [value]);
-
-    return (
-      <Input
-        value={showedValue}
-        onChange={handleChange}
-        onBlur={handleBlur}
-        onKeyDown={handleKeyDown}
-        ref={ref}
-        {...props}
-      />
-    );
-  },
-);
+import { FormEvent, KeyboardEvent, FocusEvent, forwardRef, useState } from 'react';
+import { isStringNotEmpty } from '@true-engineering/true-react-platform-helpers';
+import {
+  formatNumber,
+  formatStringNumber,
+  getNumberInRange,
+  removeStringFormat,
+  setCaretPosition,
+  stringToNumber,
+} from '../../helpers';
+import { useDidMountEffect } from '../../hooks';
+import { Input, IInputProps } from '../Input';
+import { constructRegExp, formatNumberWithDefault, getNewCaretPosition } from './helpers';
+
+export interface INumberInputProps extends Omit<IInputProps, 'value' | 'onChange' | 'type'> {
+  value?: number;
+  /** @default 3 */
+  precision?: number;
+  /** @default 7 */
+  intPartPrecision?: number;
+  defaultValue?: number;
+  /** @default false */
+  canBeFloat?: boolean;
+  /** @default false */
+  canBeNegative?: boolean;
+  min?: number;
+  max?: number;
+  onChange: (value: number | undefined, event?: FormEvent<HTMLInputElement>) => void;
+}
+
+export const NumberInput = forwardRef<HTMLInputElement, INumberInputProps>(
+  (
+    {
+      value,
+      canBeFloat = false,
+      canBeNegative = false,
+      defaultValue,
+      precision = 3,
+      intPartPrecision = 7,
+      onChange,
+      onBlur,
+      min,
+      max,
+      ...props
+    },
+    ref,
+  ) => {
+    const [showedValue, setShowedValue] = useState(() =>
+      formatNumberWithDefault(value, defaultValue),
+    );
+
+    // специальный костыль для обработки Delete - т.к. без него каретка будет работать неправильно при удалении пробелов
+    const [isDeleteForwardAction, setIsDeleteForwardAction] = useState(false);
+
+    const handleKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
+      setIsDeleteForwardAction(event.key === 'Delete');
+    };
+
+    const setShowedValueWithDefault = (v: string) => {
+      setShowedValue(isStringNotEmpty(v) ? v : formatNumber(defaultValue));
+    };
+
+    const handleChange = async (
+      inputValue: string,
+      event: FormEvent<HTMLInputElement>,
+    ): Promise<void> => {
+      const oldValue = showedValue;
+      const target = event.target as HTMLInputElement;
+      const defaultCaretPos = target.selectionStart ?? 0;
+      const numString = removeStringFormat(inputValue);
+
+      if (numString === '') {
+        onChange(undefined);
+        // не убирать - ломается каретка
+        setShowedValue('');
+        return;
+      }
+
+      const numberRegexp = new RegExp(
+        constructRegExp({
+          precision,
+          intPartPrecision,
+          canBeNegative,
+          canBeFloat,
+        }),
+      );
+
+      if (!numberRegexp.test(numString)) {
+        await setShowedValue(oldValue);
+        setCaretPosition(target, defaultCaretPos - 1);
+        return;
+      }
+
+      const hasDot = canBeFloat && /^[-]*[\d\s]*[.,]$/.test(inputValue);
+      const formattedValue = formatStringNumber(numString);
+      const newValue = hasDot ? `${formattedValue}.` : formattedValue;
+      await setShowedValue(newValue);
+      setCaretPosition(
+        target,
+        getNewCaretPosition(defaultCaretPos, oldValue, newValue, isDeleteForwardAction),
+      );
+    };
+
+    const handleBlur = (event: FocusEvent<HTMLInputElement>): void => {
+      const val = event.currentTarget.value;
+      const num = stringToNumber(val);
+      const newValue = num !== undefined ? getNumberInRange(num, min, max) : undefined;
+      if (newValue !== value) {
+        onChange(newValue);
+      } else {
+        setShowedValueWithDefault(formatNumber(value));
+      }
+      if (onBlur !== undefined) {
+        onBlur(event);
+      }
+    };
+
+    useDidMountEffect(() => {
+      if (value !== undefined) {
+        setShowedValueWithDefault(formatNumber(value));
+      } else {
+        setShowedValue(formatNumber(value));
+      }
+    }, [value]);
+
+    return (
+      <Input
+        value={showedValue}
+        onChange={handleChange}
+        onBlur={handleBlur}
+        onKeyDown={handleKeyDown}
+        ref={ref}
+        {...props}
+      />
+    );
+  },
+);

package/src/components/NumberInput/index.ts

@@ -1 +1 @@
-export * from './NumberInput';
+export * from './NumberInput';