@true-engineering/true-react-common-ui-kit 2.1.0 → 2.1.1

package/src/components/NumberInput/NumberInput.tsx

@@ -1,154 +1,133 @@
-import {
-  FormEvent,
-  KeyboardEvent,
-  FocusEvent,
-  forwardRef,
-  useState,
-} from 'react';
-
-import {
-  formatNumber,
-  formatStringNumber,
-  getNumberInRange,
-  isNotEmpty,
-  removeStringFormat,
-  setCaretPosition,
-  stringToNumber,
-} from '../../helpers';
-import { Input, IInputProps } from '../Input';
-import {
-  constructRegExp,
-  formatNumberWithDefault,
-  getNewCaretPosition,
-} from './helpers';
-import { useDidMountEffect } from '../../hooks';
-
-export interface INumberInputProps
-  extends Omit<IInputProps, 'value' | 'onChange' | 'type'> {
-  value?: number;
-  precision?: number;
-  intPartPrecision?: number;
-  defaultValue?: number;
-  canBeFloat?: boolean;
-  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(isNotEmpty(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 {
+  formatNumber,
+  formatStringNumber,
+  getNumberInRange,
+  isNotEmpty,
+  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;
+  precision?: number;
+  intPartPrecision?: number;
+  defaultValue?: number;
+  canBeFloat?: boolean;
+  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(isNotEmpty(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/helpers.ts

@@ -1,87 +1,85 @@
-import { formatNumber, isNotEmpty, isSpaceChar } from '../../helpers';
-import { INumberInputProps } from './NumberInput';
-
-const getPrevSpaces = (val: string, position: number): number =>
-  val
-    .slice(0, position - 1)
-    .split('')
-    .filter(isSpaceChar).length;
-
-export const getNewCaretPosition = (
-  defaultPosition: number,
-  oldValue: string,
-  newValue: string,
-  isDeleteForwardAction?: boolean,
-): number => {
-  if (oldValue === newValue) {
-    return isDeleteForwardAction ? defaultPosition + 1 : defaultPosition;
-  }
-
-  const oldPrevSpaces = getPrevSpaces(oldValue, defaultPosition);
-  const newPrevSpaces = getPrevSpaces(newValue, defaultPosition);
-  const diff = newPrevSpaces - oldPrevSpaces;
-  const res = defaultPosition + diff;
-  if (res <= 0) {
-    return 0;
-  }
-  return res - (isSpaceChar(newValue[res - 1]) ? 1 : 0);
-};
-
-export const formatNumberWithDefault = (
-  value: number | undefined,
-  defaultValue?: number,
-): string => {
-  const val = formatNumber(value);
-  return isNotEmpty(val) ? val : formatNumber(defaultValue);
-};
-
-export const constructRegExp = ({
-  canBeFloat,
-  canBeNegative,
-  intPartPrecision,
-  precision,
-}: Pick<
-  INumberInputProps,
-  'canBeFloat' | 'canBeNegative' | 'intPartPrecision' | 'precision'
->): string => {
-  const basePart = `\\d{0,${intPartPrecision}}`;
-  const floatPart = `(\\.\\d{0,${precision}})?`;
-  const negativePart = '(\\-)?';
-
-  return `^${canBeNegative ? negativePart : ''}${basePart}${
-    canBeFloat ? floatPart : ''
-  }$`;
-};
-
-// const testNewCaretPosition = () => {
-//   console.log(getNewCaretPosition(1, '', '1') === 1);
-//   console.log(getNewCaretPosition(2, '1', '12') === 2);
-//   console.log(getNewCaretPosition(3, '12', '123') === 3);
-//   console.log(getNewCaretPosition(4, '123', '1 234') === 5);
-//   console.log(getNewCaretPosition(6, '1 234', '12 345') === 6);
-//   console.log(getNewCaretPosition(2, '1 234', '10 234') === 2);
-//   console.log(getNewCaretPosition(3, '1 234', '10 234') === 2);
-//   console.log(getNewCaretPosition(1, '1 234', '21 234') === 1);
-//   console.log(getNewCaretPosition(8, '123 456', '123 456.') === 8);
-//   console.log(getNewCaretPosition(8, '123 456', '1 234 567') === 9);
-//   console.log(getNewCaretPosition(5, '123 456', '1 230 456') === 5);
-//   console.log(getNewCaretPosition(4, '123 456', '1 230 456') === 5);
-//
-//   console.log(getNewCaretPosition(0, '1', '') === 0);
-//   console.log(getNewCaretPosition(1, '12', '1') === 1);
-//   console.log(getNewCaretPosition(2, '123', '12') === 2);
-//   console.log(getNewCaretPosition(4, '1 234', '123') === 3);
-//   console.log(getNewCaretPosition(5, '12 345', '1 234') === 5);
-//   console.log(getNewCaretPosition(1, '10 234', '1 234') === 1);
-//   console.log(getNewCaretPosition(2, '10 234', '10 234') === 2);
-//   console.log(getNewCaretPosition(0, '21 234', '1 234') === 0);
-//   console.log(getNewCaretPosition(7, '123 456.', '123 456') === 7);
-//   console.log(getNewCaretPosition(8, '1 234 567', '123 456') === 7);
-//   console.log(getNewCaretPosition(5, '1 230 456', '1 230 456') === 5);
-//   console.log(getNewCaretPosition(4, '1 230 456', '123 456') === 3);
-//
-//   console.log(getNewCaretPosition(5, '1 234 567', '123 467') === 5);
-//   console.log(getNewCaretPosition(5, '1 234 567', '1 234') === 5);
-// };
-//
-// testNewCaretPosition();
+import { formatNumber, isNotEmpty, isSpaceChar } from '../../helpers';
+import { INumberInputProps } from './NumberInput';
+
+const getPrevSpaces = (val: string, position: number): number =>
+  val
+    .slice(0, position - 1)
+    .split('')
+    .filter(isSpaceChar).length;
+
+export const getNewCaretPosition = (
+  defaultPosition: number,
+  oldValue: string,
+  newValue: string,
+  isDeleteForwardAction?: boolean,
+): number => {
+  if (oldValue === newValue) {
+    return isDeleteForwardAction ? defaultPosition + 1 : defaultPosition;
+  }
+
+  const oldPrevSpaces = getPrevSpaces(oldValue, defaultPosition);
+  const newPrevSpaces = getPrevSpaces(newValue, defaultPosition);
+  const diff = newPrevSpaces - oldPrevSpaces;
+  const res = defaultPosition + diff;
+  if (res <= 0) {
+    return 0;
+  }
+  return res - (isSpaceChar(newValue[res - 1]) ? 1 : 0);
+};
+
+export const formatNumberWithDefault = (
+  value: number | undefined,
+  defaultValue?: number,
+): string => {
+  const val = formatNumber(value);
+  return isNotEmpty(val) ? val : formatNumber(defaultValue);
+};
+
+export const constructRegExp = ({
+  canBeFloat,
+  canBeNegative,
+  intPartPrecision,
+  precision,
+}: Pick<
+  INumberInputProps,
+  'canBeFloat' | 'canBeNegative' | 'intPartPrecision' | 'precision'
+>): string => {
+  const basePart = `\\d{0,${intPartPrecision}}`;
+  const floatPart = `(\\.\\d{0,${precision}})?`;
+  const negativePart = '(\\-)?';
+
+  return `^${canBeNegative ? negativePart : ''}${basePart}${canBeFloat ? floatPart : ''}$`;
+};
+
+// const testNewCaretPosition = () => {
+//   console.log(getNewCaretPosition(1, '', '1') === 1);
+//   console.log(getNewCaretPosition(2, '1', '12') === 2);
+//   console.log(getNewCaretPosition(3, '12', '123') === 3);
+//   console.log(getNewCaretPosition(4, '123', '1 234') === 5);
+//   console.log(getNewCaretPosition(6, '1 234', '12 345') === 6);
+//   console.log(getNewCaretPosition(2, '1 234', '10 234') === 2);
+//   console.log(getNewCaretPosition(3, '1 234', '10 234') === 2);
+//   console.log(getNewCaretPosition(1, '1 234', '21 234') === 1);
+//   console.log(getNewCaretPosition(8, '123 456', '123 456.') === 8);
+//   console.log(getNewCaretPosition(8, '123 456', '1 234 567') === 9);
+//   console.log(getNewCaretPosition(5, '123 456', '1 230 456') === 5);
+//   console.log(getNewCaretPosition(4, '123 456', '1 230 456') === 5);
+//
+//   console.log(getNewCaretPosition(0, '1', '') === 0);
+//   console.log(getNewCaretPosition(1, '12', '1') === 1);
+//   console.log(getNewCaretPosition(2, '123', '12') === 2);
+//   console.log(getNewCaretPosition(4, '1 234', '123') === 3);
+//   console.log(getNewCaretPosition(5, '12 345', '1 234') === 5);
+//   console.log(getNewCaretPosition(1, '10 234', '1 234') === 1);
+//   console.log(getNewCaretPosition(2, '10 234', '10 234') === 2);
+//   console.log(getNewCaretPosition(0, '21 234', '1 234') === 0);
+//   console.log(getNewCaretPosition(7, '123 456.', '123 456') === 7);
+//   console.log(getNewCaretPosition(8, '1 234 567', '123 456') === 7);
+//   console.log(getNewCaretPosition(5, '1 230 456', '1 230 456') === 5);
+//   console.log(getNewCaretPosition(4, '1 230 456', '123 456') === 3);
+//
+//   console.log(getNewCaretPosition(5, '1 234 567', '123 467') === 5);
+//   console.log(getNewCaretPosition(5, '1 234 567', '1 234') === 5);
+// };
+//
+// testNewCaretPosition();

package/src/components/NumberInput/index.ts

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

package/src/components/PhoneInput/PhoneInput.stories.tsx

@@ -1,71 +1,70 @@
-import { ComponentStory } from '@storybook/react';
-import { useState } from 'react';
-
-import { PhoneInput } from './PhoneInput';
-import { icons } from '../Icon/icons';
-import { phoneInfo } from './phone-info';
-import { IPhoneValue } from './types';
-
-const iconTypes = [undefined, ...Object.keys(icons)];
-const inlineStyles = [undefined, 'left', 'right', 'middle'];
-const borders = [undefined, 'left', 'top', 'right', 'bottom'];
-const errorPositions = ['bottom', 'top'];
-const countryCodes = phoneInfo.map((info) => info.countryCode);
-
-export default {
-  title: 'Inputs/PhoneInput',
-  component: PhoneInput,
-  argTypes: {
-    iconType: { control: 'select', options: iconTypes },
-    errorPosition: { control: 'inline-radio', options: errorPositions },
-    border: { control: 'inline-radio', options: borders },
-    inlineStyle: { control: 'select', options: inlineStyles },
-    defaultCountryCode: { control: 'select', options: countryCodes },
-  },
-};
-
-const Template: ComponentStory<typeof PhoneInput> = (args) => {
-  const [value, setValue] = useState<IPhoneValue>({
-    dialCode: '7',
-    phoneNumber: '1234567890',
-  });
-
-  return <PhoneInput {...args} value={value} onChange={setValue} />;
-};
-
-export const Default = Template.bind({});
-
-Default.args = {
-  label: 'Label',
-  infoMessage: 'Message Info',
-  border: undefined,
-  iconType: undefined,
-  isInvalid: false,
-  errorMessage: 'Error Text',
-  errorPosition: 'bottom',
-  hasFloatingLabel: true,
-  hasRequiredLabel: true,
-  isActive: false,
-  isDisabled: false,
-  isRequired: false,
-  isReadonly: false,
-  isClearable: false,
-  isLoading: false,
-  inlineStyle: undefined,
-};
-
-Default.parameters = {
-  controls: {
-    exclude: [
-      'testId',
-      'data',
-      'tabIndex',
-      'onChange',
-      'onFocus',
-      'onBlur',
-      'onPaste',
-      'onKeyDown',
-      'onIconClick',
-    ],
-  },
-};
+import { useState } from 'react';
+import { ComponentStory } from '@storybook/react';
+import { icons } from '../Icon/icons';
+import { PhoneInput } from './PhoneInput';
+import { phoneInfo } from './phone-info';
+import { IPhoneValue } from './types';
+
+const iconTypes = [undefined, ...Object.keys(icons)];
+const inlineStyles = [undefined, 'left', 'right', 'middle'];
+const borders = [undefined, 'left', 'top', 'right', 'bottom'];
+const errorPositions = ['bottom', 'top'];
+const countryCodes = phoneInfo.map((info) => info.countryCode);
+
+export default {
+  title: 'Inputs/PhoneInput',
+  component: PhoneInput,
+  argTypes: {
+    iconType: { control: 'select', options: iconTypes },
+    errorPosition: { control: 'inline-radio', options: errorPositions },
+    border: { control: 'inline-radio', options: borders },
+    inlineStyle: { control: 'select', options: inlineStyles },
+    defaultCountryCode: { control: 'select', options: countryCodes },
+  },
+};
+
+const Template: ComponentStory<typeof PhoneInput> = (args) => {
+  const [value, setValue] = useState<IPhoneValue>({
+    dialCode: '7',
+    phoneNumber: '1234567890',
+  });
+
+  return <PhoneInput {...args} value={value} onChange={setValue} />;
+};
+
+export const Default = Template.bind({});
+
+Default.args = {
+  label: 'Label',
+  infoMessage: 'Message Info',
+  border: undefined,
+  iconType: undefined,
+  isInvalid: false,
+  errorMessage: 'Error Text',
+  errorPosition: 'bottom',
+  hasFloatingLabel: true,
+  hasRequiredLabel: true,
+  isActive: false,
+  isDisabled: false,
+  isRequired: false,
+  isReadonly: false,
+  isClearable: false,
+  isLoading: false,
+  inlineStyle: undefined,
+};
+
+Default.parameters = {
+  controls: {
+    exclude: [
+      'testId',
+      'data',
+      'tabIndex',
+      'onChange',
+      'onFocus',
+      'onBlur',
+      'onPaste',
+      'onKeyDown',
+      'onIconClick',
+    ],
+  },
+};