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

package/src/components/PhoneInput/PhoneInput.styles.ts

@@ -1,84 +1,84 @@
-import { colors, dimensions } from '../../theme';
-import { ComponentStyles } from '../../types';
-
-const COUNTRY_SELECT_WIDTH = 80;
-
-export const styles = {
-  root: {
-    width: '100%',
-    position: 'relative',
-    boxSizing: 'border-box',
-  },
-
-  countrySelectContainer: {
-    position: 'absolute',
-    left: 1,
-    top: 1,
-    width: COUNTRY_SELECT_WIDTH,
-    height: dimensions.CONTROL_HEIGHT - 2,
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'center',
-    borderRight: ['solid', 1, colors.BORDER_MAIN],
-    transition: 'border-color 0.2s ease-in',
-    cursor: 'pointer',
-    zIndex: 2,
-  },
-
-  disabledCountrySelect: {
-    cursor: 'default',
-  },
-
-  flag: {
-    width: 22,
-    height: 16,
-  },
-
-  arrow: {
-    width: 20,
-    color: colors.GREY_ACTIVE,
-    marginLeft: 8,
-    transition: 'transform .2s ease',
-  },
-
-  up: {
-    transform: 'rotate(180deg)',
-  },
-
-  invalidArrow: {
-    color: colors.RED_WARNING,
-  },
-
-  focusedBorder: {},
-
-  invalidBorder: {
-    borderColor: colors.RED_WARNING,
-  },
-
-  inputContainer: {
-    position: 'relative',
-    flex: 1,
-  },
-
-  flagListContainer: {
-    position: 'absolute',
-    width: '100%',
-    top: dimensions.CONTROL_HEIGHT + 6,
-    left: -1,
-    zIndex: 3,
-  },
-
-  tweakInput: {
-    inputWrapper: {
-      paddingLeft: COUNTRY_SELECT_WIDTH,
-    },
-
-    label: {
-      marginLeft: COUNTRY_SELECT_WIDTH,
-    },
-  },
-
-  tweakCountryList: {},
-};
-
-export type PhoneInputStyles = ComponentStyles<typeof styles>;
+import { colors, dimensions } from '../../theme';
+import { ComponentStyles } from '../../types';
+
+const COUNTRY_SELECT_WIDTH = 80;
+
+export const styles = {
+  root: {
+    width: '100%',
+    position: 'relative',
+    boxSizing: 'border-box',
+  },
+
+  countrySelectContainer: {
+    position: 'absolute',
+    left: 1,
+    top: 1,
+    width: COUNTRY_SELECT_WIDTH,
+    height: dimensions.CONTROL_HEIGHT - 2,
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+    borderRight: ['solid', 1, colors.BORDER_MAIN],
+    transition: 'border-color 0.2s ease-in',
+    cursor: 'pointer',
+    zIndex: 2,
+  },
+
+  disabledCountrySelect: {
+    cursor: 'default',
+  },
+
+  flag: {
+    width: 22,
+    height: 16,
+  },
+
+  arrow: {
+    width: 20,
+    color: colors.GREY_ACTIVE,
+    marginLeft: 8,
+    transition: 'transform .2s ease',
+  },
+
+  up: {
+    transform: 'rotate(180deg)',
+  },
+
+  invalidArrow: {
+    color: colors.RED_WARNING,
+  },
+
+  focusedBorder: {},
+
+  invalidBorder: {
+    borderColor: colors.RED_WARNING,
+  },
+
+  inputContainer: {
+    position: 'relative',
+    flex: 1,
+  },
+
+  flagListContainer: {
+    position: 'absolute',
+    width: '100%',
+    top: dimensions.CONTROL_HEIGHT + 6,
+    left: -1,
+    zIndex: 3,
+  },
+
+  tweakInput: {
+    inputWrapper: {
+      paddingLeft: COUNTRY_SELECT_WIDTH,
+    },
+
+    label: {
+      marginLeft: COUNTRY_SELECT_WIDTH,
+    },
+  },
+
+  tweakCountryList: {},
+};
+
+export type PhoneInputStyles = ComponentStyles<typeof styles>;

package/src/components/PhoneInput/PhoneInput.tsx

@@ -1,223 +1,194 @@
-import { FC, useState, useRef, useMemo } from 'react';
-import clsx from 'clsx';
-
-import { Icon } from '../Icon';
-import { Flag } from '../Flag';
-import {
-  useOnClickOutsideWithRef,
-  useTheme,
-  useTweakStyles,
-} from '../../hooks';
-import { IInputProps, Input } from '../Input';
-import {
-  getCountryCodeFromPhone,
-  getFullPhone,
-  getPhoneMask,
-  getPhoneObjFromString,
-  findCountryByCode,
-} from '../../helpers';
-import { PhoneInputCountryList } from './PhoneInputCountryList';
-import { IPhoneInfo, IPhoneValue } from './types';
-
-import { PhoneInputStyles, styles } from './PhoneInput.styles';
-
-export interface IPhoneInputProps
-  extends Omit<
-    IInputProps,
-    'value' | 'onChange' | 'type' | 'mask' | 'units' | 'placeholder'
-  > {
-  tweakStyles?: PhoneInputStyles;
-  locale?: string;
-  codeSearchPlaceholder?: string;
-  noMatchesLabel?: string;
-  value?: IPhoneValue;
-  onChange: (
-    phone: IPhoneValue,
-    event: React.MouseEvent | KeyboardEvent | React.FormEvent<HTMLInputElement>,
-  ) => void;
-}
-
-const DEFAULT_VALUE: IPhoneValue = { phoneNumber: '', dialCode: '' };
-
-export const PhoneInput: FC<IPhoneInputProps> = ({
-  locale = 'ru',
-  value = DEFAULT_VALUE,
-  onChange,
-  testId,
-  isDisabled,
-  isInvalid,
-  isActive,
-  tweakStyles,
-  codeSearchPlaceholder = 'Поиск',
-  noMatchesLabel = 'Ничего не найдено',
-  ...inputProps
-}) => {
-  const { classes, componentStyles } = useTheme(
-    'PhoneInput',
-    styles,
-    tweakStyles,
-  );
-
-  const list = useRef<HTMLDivElement>(null);
-  const inputWrapper = useRef<HTMLDivElement>(null);
-  const inputRef = useRef<HTMLInputElement>(null);
-  const [isListOpen, setIsListOpen] = useState(false);
-  const [isFocused, setFocused] = useState(false);
-
-  const phoneWithCode = getFullPhone(value);
-
-  const countryCode = useMemo(
-    () => value?.countryCode ?? getCountryCodeFromPhone(phoneWithCode),
-    [value.dialCode, value.phoneNumber],
-  );
-
-  const handleClose = () => {
-    setIsListOpen(false);
-  };
-
-  const handleChange = (
-    inputValue: string,
-    event: React.FormEvent<HTMLInputElement>,
-  ) => {
-    // if (event.type === 'change') - нужно из-за InputMask
-    // Помимо change, еще могут приходить focus и blur, когда input пустой и тогда происходят неприятные сайд-эффекты
-    if (event.type === 'change') {
-      const newValue = inputValue.replace(/[^0-9]/g, '');
-      let selectedCountryCode = countryCode;
-
-      const selectedCountry = findCountryByCode(countryCode);
-
-      // Проверяем введенный номер на соответствие с selectedCountry
-      // Если не соответствует, то пытаемся найти countryCode, для которой
-      // данный номер будет валидным (функция getPhoneObjFromString)
-      if (selectedCountry !== undefined) {
-        // Сначала проверяем, что введенный телефон удовлетворяет одному
-        // из fullCode для выбранной страны
-        const isSomeFullCodeValid = selectedCountry.fullCodes.some(
-          (fullCode) => {
-            if (newValue.length >= fullCode.length) {
-              return newValue.startsWith(fullCode);
-            } else {
-              return fullCode.startsWith(newValue);
-            }
-          },
-        );
-
-        // После проверяем, что введенный телефон удовлетворяет dialCode для выбранной страны
-        const isDialCodeValid = newValue.startsWith(selectedCountry.dialCode);
-
-        if (!isSomeFullCodeValid || !isDialCodeValid) {
-          selectedCountryCode = undefined;
-        }
-      }
-
-      onChange(getPhoneObjFromString(newValue, selectedCountryCode), event);
-    }
-  };
-
-  const handleSelect = (
-    newPhoneInfo: IPhoneInfo,
-    event: React.MouseEvent | KeyboardEvent,
-  ) => {
-    if (newPhoneInfo.countryCode !== countryCode) {
-      onChange(
-        {
-          phoneNumber: '',
-          dialCode: newPhoneInfo.dialCode,
-          countryCode: newPhoneInfo.countryCode,
-        },
-        event,
-      );
-    }
-    handleClose();
-
-    const input = inputRef?.current;
-    if (input !== null) {
-      input.focus();
-    }
-  };
-
-  const handleFocus = (event: React.FocusEvent<HTMLInputElement>) => {
-    setFocused(true);
-    if (inputProps.onFocus !== undefined) {
-      inputProps?.onFocus(event);
-    }
-  };
-
-  const handleBlur = (event: React.FocusEvent<HTMLInputElement>) => {
-    setFocused(false);
-    if (inputProps.onBlur !== undefined) {
-      inputProps?.onBlur(event);
-    }
-  };
-
-  useOnClickOutsideWithRef(list, handleClose, inputWrapper);
-
-  const tweakInputStyles = useTweakStyles(
-    componentStyles,
-    tweakStyles,
-    'tweakInput',
-  );
-
-  const tweakCountryListStyles = useTweakStyles(
-    componentStyles,
-    tweakStyles,
-    'tweakCountryList',
-  );
-
-  return (
-    <div className={classes.root} data-testid={testId}>
-      <div
-        className={clsx(classes.countrySelectContainer, {
-          [classes.disabledCountrySelect]: isDisabled,
-          [classes.invalidBorder]: isInvalid,
-          [classes.focusedBorder]: isActive || isListOpen || isFocused,
-        })}
-        ref={inputWrapper}
-        onClick={!isDisabled ? () => setIsListOpen(!isListOpen) : undefined}
-      >
-        <div className={classes.flag}>
-          <Flag countryCode={countryCode} />
-        </div>
-        <div
-          className={clsx(classes.arrow, {
-            [classes.up]: isListOpen,
-            [classes.invalidArrow]: isInvalid,
-          })}
-        >
-          <Icon type="chevron-down" />
-        </div>
-      </div>
-
-      <Input
-        onChange={handleChange}
-        value={phoneWithCode}
-        mask={getPhoneMask(countryCode)}
-        // alwaysShowMask={false}
-        ref={inputRef}
-        isDisabled={isDisabled}
-        isInvalid={isInvalid}
-        isActive={isListOpen || isActive}
-        testId={testId !== undefined ? `${testId}-input` : undefined}
-        onFocus={handleFocus}
-        onBlur={handleBlur}
-        tweakStyles={tweakInputStyles}
-        {...inputProps}
-      />
-
-      {isListOpen && (
-        <div className={classes.flagListContainer} ref={list}>
-          <PhoneInputCountryList
-            selectedCountryCode={countryCode}
-            placeholder={codeSearchPlaceholder}
-            onChange={handleSelect}
-            closeList={handleClose}
-            locale={locale}
-            tweakStyles={tweakCountryListStyles}
-            noMatchesLabel={noMatchesLabel}
-          />
-        </div>
-      )}
-    </div>
-  );
-};
+import { FC, useState, useRef, useMemo } from 'react';
+import clsx from 'clsx';
+import {
+  getCountryCodeFromPhone,
+  getFullPhone,
+  getPhoneMask,
+  getPhoneObjFromString,
+  findCountryByCode,
+} from '../../helpers';
+import { useOnClickOutsideWithRef, useTheme, useTweakStyles } from '../../hooks';
+import { Flag } from '../Flag';
+import { Icon } from '../Icon';
+import { IInputProps, Input } from '../Input';
+import { PhoneInputStyles, styles } from './PhoneInput.styles';
+import { PhoneInputCountryList } from './PhoneInputCountryList';
+import { IPhoneInfo, IPhoneValue } from './types';
+
+export interface IPhoneInputProps
+  extends Omit<IInputProps, 'value' | 'onChange' | 'type' | 'mask' | 'units' | 'placeholder'> {
+  tweakStyles?: PhoneInputStyles;
+  locale?: string;
+  codeSearchPlaceholder?: string;
+  noMatchesLabel?: string;
+  value?: IPhoneValue;
+  onChange: (
+    phone: IPhoneValue,
+    event: React.MouseEvent | KeyboardEvent | React.FormEvent<HTMLInputElement>,
+  ) => void;
+}
+
+const DEFAULT_VALUE: IPhoneValue = { phoneNumber: '', dialCode: '' };
+
+export const PhoneInput: FC<IPhoneInputProps> = ({
+  locale = 'ru',
+  value = DEFAULT_VALUE,
+  onChange,
+  testId,
+  isDisabled,
+  isInvalid,
+  isActive,
+  tweakStyles,
+  codeSearchPlaceholder = 'Поиск',
+  noMatchesLabel = 'Ничего не найдено',
+  ...inputProps
+}) => {
+  const { classes, componentStyles } = useTheme('PhoneInput', styles, tweakStyles);
+
+  const list = useRef<HTMLDivElement>(null);
+  const inputWrapper = useRef<HTMLDivElement>(null);
+  const inputRef = useRef<HTMLInputElement>(null);
+  const [isListOpen, setIsListOpen] = useState(false);
+  const [isFocused, setFocused] = useState(false);
+
+  const phoneWithCode = getFullPhone(value);
+
+  const countryCode = useMemo(
+    () => value?.countryCode ?? getCountryCodeFromPhone(phoneWithCode),
+    [value.dialCode, value.phoneNumber],
+  );
+
+  const handleClose = () => {
+    setIsListOpen(false);
+  };
+
+  const handleChange = (inputValue: string, event: React.FormEvent<HTMLInputElement>) => {
+    // if (event.type === 'change') - нужно из-за InputMask
+    // Помимо change, еще могут приходить focus и blur, когда input пустой и тогда происходят неприятные сайд-эффекты
+    if (event.type === 'change') {
+      const newValue = inputValue.replace(/[^0-9]/g, '');
+      let selectedCountryCode = countryCode;
+
+      const selectedCountry = findCountryByCode(countryCode);
+
+      // Проверяем введенный номер на соответствие с selectedCountry
+      // Если не соответствует, то пытаемся найти countryCode, для которой
+      // данный номер будет валидным (функция getPhoneObjFromString)
+      if (selectedCountry !== undefined) {
+        // Сначала проверяем, что введенный телефон удовлетворяет одному
+        // из fullCode для выбранной страны
+        const isSomeFullCodeValid = selectedCountry.fullCodes.some((fullCode) => {
+          if (newValue.length >= fullCode.length) {
+            return newValue.startsWith(fullCode);
+          } else {
+            return fullCode.startsWith(newValue);
+          }
+        });
+
+        // После проверяем, что введенный телефон удовлетворяет dialCode для выбранной страны
+        const isDialCodeValid = newValue.startsWith(selectedCountry.dialCode);
+
+        if (!isSomeFullCodeValid || !isDialCodeValid) {
+          selectedCountryCode = undefined;
+        }
+      }
+
+      onChange(getPhoneObjFromString(newValue, selectedCountryCode), event);
+    }
+  };
+
+  const handleSelect = (newPhoneInfo: IPhoneInfo, event: React.MouseEvent | KeyboardEvent) => {
+    if (newPhoneInfo.countryCode !== countryCode) {
+      onChange(
+        {
+          phoneNumber: '',
+          dialCode: newPhoneInfo.dialCode,
+          countryCode: newPhoneInfo.countryCode,
+        },
+        event,
+      );
+    }
+    handleClose();
+
+    const input = inputRef?.current;
+    if (input !== null) {
+      input.focus();
+    }
+  };
+
+  const handleFocus = (event: React.FocusEvent<HTMLInputElement>) => {
+    setFocused(true);
+    if (inputProps.onFocus !== undefined) {
+      inputProps?.onFocus(event);
+    }
+  };
+
+  const handleBlur = (event: React.FocusEvent<HTMLInputElement>) => {
+    setFocused(false);
+    if (inputProps.onBlur !== undefined) {
+      inputProps?.onBlur(event);
+    }
+  };
+
+  useOnClickOutsideWithRef(list, handleClose, inputWrapper);
+
+  const tweakInputStyles = useTweakStyles(componentStyles, tweakStyles, 'tweakInput');
+
+  const tweakCountryListStyles = useTweakStyles(componentStyles, tweakStyles, 'tweakCountryList');
+
+  return (
+    <div className={classes.root} data-testid={testId}>
+      <div
+        className={clsx(classes.countrySelectContainer, {
+          [classes.disabledCountrySelect]: isDisabled,
+          [classes.invalidBorder]: isInvalid,
+          [classes.focusedBorder]: isActive || isListOpen || isFocused,
+        })}
+        ref={inputWrapper}
+        onClick={!isDisabled ? () => setIsListOpen(!isListOpen) : undefined}
+      >
+        <div className={classes.flag}>
+          <Flag countryCode={countryCode} />
+        </div>
+        <div
+          className={clsx(classes.arrow, {
+            [classes.up]: isListOpen,
+            [classes.invalidArrow]: isInvalid,
+          })}
+        >
+          <Icon type="chevron-down" />
+        </div>
+      </div>
+
+      <Input
+        onChange={handleChange}
+        value={phoneWithCode}
+        mask={getPhoneMask(countryCode)}
+        // alwaysShowMask={false}
+        ref={inputRef}
+        isDisabled={isDisabled}
+        isInvalid={isInvalid}
+        isActive={isListOpen || isActive}
+        testId={testId !== undefined ? `${testId}-input` : undefined}
+        onFocus={handleFocus}
+        onBlur={handleBlur}
+        tweakStyles={tweakInputStyles}
+        {...inputProps}
+      />
+
+      {isListOpen && (
+        <div className={classes.flagListContainer} ref={list}>
+          <PhoneInputCountryList
+            selectedCountryCode={countryCode}
+            placeholder={codeSearchPlaceholder}
+            onChange={handleSelect}
+            closeList={handleClose}
+            locale={locale}
+            tweakStyles={tweakCountryListStyles}
+            noMatchesLabel={noMatchesLabel}
+          />
+        </div>
+      )}
+    </div>
+  );
+};

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

@@ -1,21 +1,21 @@
-import { ComponentStory, ComponentMeta } from '@storybook/react';
-import PhoneInputCountryList from './PhoneInputCountryList';
-
-export default {
-  title: 'Inputs/PhoneInput/PhoneInputCountryList',
-  component: PhoneInputCountryList,
-  args: {
-    locale: 'ru',
-    placeholder: 'Поиск',
-    noMatchesLabel: 'Ничего не найдено',
-  },
-  parameters: {
-    controls: {
-      exclude: ['data', 'tweakStyles', 'testId'],
-    },
-  },
-} as ComponentMeta<typeof PhoneInputCountryList>;
-
-export const Default: ComponentStory<typeof PhoneInputCountryList> = (args) => (
-  <PhoneInputCountryList {...args} />
-);
+import { ComponentStory, ComponentMeta } from '@storybook/react';
+import PhoneInputCountryList from './PhoneInputCountryList';
+
+export default {
+  title: 'Inputs/PhoneInput/PhoneInputCountryList',
+  component: PhoneInputCountryList,
+  args: {
+    locale: 'ru',
+    placeholder: 'Поиск',
+    noMatchesLabel: 'Ничего не найдено',
+  },
+  parameters: {
+    controls: {
+      exclude: ['data', 'tweakStyles', 'testId'],
+    },
+  },
+} as ComponentMeta<typeof PhoneInputCountryList>;
+
+export const Default: ComponentStory<typeof PhoneInputCountryList> = (args) => (
+  <PhoneInputCountryList {...args} />
+);