@invoicebox/ui 0.1.0-alpha.62 → 0.1.0-alpha.64

package/dist/components/form/PhoneInput/constants.d.ts

@@ -1,2 +1,3 @@
 import { TCountryRule, TSupportedCountries } from './types';
+export declare const MASK_DIGIT_ITEM = "9";
 export declare const allCountriesPhoneRules: Record<TSupportedCountries, TCountryRule>;

package/dist/components/form/PhoneInput/constants.js

@@ -3,45 +3,53 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.allCountriesPhoneRules = void 0;
+exports.allCountriesPhoneRules = exports.MASK_DIGIT_ITEM = void 0;
+var MASK_DIGIT_ITEM = exports.MASK_DIGIT_ITEM = '9';
 var allCountriesPhoneRules = exports.allCountriesPhoneRules = {
   RUS: {
+    placeholder: '+7 (XXX) XXX-XX-XX',
     mask: '+9 (999) 999-99-99',
     startSubsequence: '7',
     regexp: /^\+?7(9\d{9})$/,
     flag: 'RUS'
   },
   BLR: {
+    placeholder: '+375 XX XXX-XX-XX',
     mask: '+999 99 999-99-99',
     startSubsequence: '375',
     regexp: /^(\+?375)?(24|25|29|33|44)\d{7}$/,
     flag: 'BLR'
   },
   AZE: {
+    placeholder: '+994 (XX) XXX-XXXX',
     mask: '+999 (99) 999-9999',
     startSubsequence: '994',
     regexp: /^\+?994\d{9}$/,
     flag: 'AZE'
   },
   ARM: {
+    placeholder: '+374 (XX) XXX-XXX',
     mask: '+999 (99) 999-999',
     startSubsequence: '374',
     regexp: /\+?374\d{8}/,
     flag: 'ARM'
   },
   KAZ: {
+    placeholder: '+7 (XXX) XXX-XX-XX',
     mask: '+9 (999) 999-99-99',
     startSubsequence: '7',
     regexp: /^(\+?7|8)?7\d{9}$/,
     flag: 'KAZ'
   },
   TJK: {
+    placeholder: '+992-XX-XXX-XXXX',
     mask: '+999-99-999-9999',
     startSubsequence: '992',
     regexp: /^\+?992\d{9}$/,
     flag: 'TJK'
   },
   UZB: {
+    placeholder: '+998 XX XXXXXXX',
     mask: '+999 99 9999999',
     startSubsequence: '998',
     regexp: /\+?998\d{9}/,

package/dist/components/form/PhoneInput/hooks/useValidateInitialValue.js

@@ -22,13 +22,14 @@ var useValidateInitialValue = exports.useValidateInitialValue = function useVali
   (0, _react.useEffect)(function () {
     if (isInitialValidateDone) return;
     if (initialValue) {
+      var notFormattedValue = _phoneInputLogic.phoneInputLogic.getOnlyNumbersFromString(initialValue);
       var currentCountry = Object.entries(currentCountriesPhoneRules).find(function (item) {
-        return _phoneInputLogic.phoneInputLogic.getIsHaveStartSequenceInString(initialValue, item[1].startSubsequence);
+        return _phoneInputLogic.phoneInputLogic.getIsHaveStartSequenceInString(notFormattedValue, item[1].startSubsequence);
       });
       var _countryCode = currentCountry ? currentCountry[0] : _types.RUS_COUNTRY_CODE;
-      var isValidInputValue = _phoneInputLogic.phoneInputLogic.getIsValidPhoneInput(initialValue, currentCountry ? currentCountry[1] : _constants.allCountriesPhoneRules.RUS);
+      var isValidInputValue = _phoneInputLogic.phoneInputLogic.getIsValidPhoneInput(notFormattedValue, currentCountry ? currentCountry[1] : _constants.allCountriesPhoneRules.RUS);
       if (isValidInputValue) {
-        onValid(initialValue, _countryCode);
+        onValid(notFormattedValue, _countryCode);
       } else {
         onUnValid(_countryCode);
       }

package/dist/components/form/PhoneInput/index.js

@@ -86,23 +86,38 @@ var PhoneInput = exports.PhoneInput = function PhoneInput(_ref) {
     setCountry(countryCode);
   }, [onChange]);
   (0, _useValidateInitialValue.useValidateInitialValue)(value, currentCountriesPhoneRules, handleValid, handleUnValid);
-  var handleInputValueChange = (0, _react.useCallback)(function (currentInputValue) {
-    var notFormattedValue = _phoneInputLogic.phoneInputLogic.getOnlyNumbersFromString(currentInputValue);
+
+  // хак для того чтобы сдвигать каретку в случае если при вводе "9" надо заменить на "79", каретка не двигается сама и остаётся между "7" и "9" без этой функции
+  var moveCaretByValue = (0, _react.useCallback)(function (event) {
+    return function (positionCaret) {
+      setTimeout(function () {
+        event.target.setSelectionRange(positionCaret, positionCaret);
+      }, 0);
+    };
+  }, []);
+  var getIsValidValue = (0, _react.useCallback)(function (currentValue) {
     var currentCountry = currentCountriesPhoneRules[country];
     var newCountry = Object.entries(currentCountriesPhoneRules).find(function (item) {
-      return _phoneInputLogic.phoneInputLogic.getIsHaveStartSequenceInString(notFormattedValue, item[1].startSubsequence) && currentCountry.flag !== item[1].flag;
+      return _phoneInputLogic.phoneInputLogic.getIsHaveStartSequenceInString(currentValue, item[1].startSubsequence) && currentCountry.flag !== item[1].flag;
     });
     var isNeedChangeCountry = newCountry && currentCountry.startSubsequence !== newCountry[1].startSubsequence;
-    if (isNeedChangeCountry && newCountry) {
+    var isNeedAndCanChangeCountry = isNeedChangeCountry && !!newCountry;
+    if (isNeedAndCanChangeCountry) {
       handleChangeCountry(newCountry[0]);
     }
-    var isValidInputValue = _phoneInputLogic.phoneInputLogic.getIsValidPhoneInput(notFormattedValue, isNeedChangeCountry && newCountry ? newCountry[1] : currentCountry);
+    return _phoneInputLogic.phoneInputLogic.getIsValidPhoneInput(currentValue, isNeedAndCanChangeCountry ? newCountry[1] : currentCountry);
+  }, [country, currentCountriesPhoneRules, handleChangeCountry]);
+  var handleInputValueChange = (0, _react.useCallback)(function (currentInputValue, event) {
+    var notFormattedValue = _phoneInputLogic.phoneInputLogic.getOnlyNumbersFromString(currentInputValue);
+    var moveCaret = event ? moveCaretByValue(event) : undefined;
+    var intermediateValue = country === _types.RUS_COUNTRY_CODE ? _phoneInputLogic.phoneInputLogic.formatRusPhoneToUnifiedView(notFormattedValue, moveCaret) : notFormattedValue;
+    var isValidInputValue = getIsValidValue(intermediateValue);
     setIsHaveInputError(!isValidInputValue);
-    onChange(isValidInputValue ? notFormattedValue : '');
-    setInputValue(notFormattedValue);
-  }, [country, currentCountriesPhoneRules, handleChangeCountry, onChange]);
+    onChange(isValidInputValue ? intermediateValue : '');
+    setInputValue(intermediateValue);
+  }, [country, getIsValidValue, moveCaretByValue, onChange]);
   var handleChange = (0, _react.useCallback)(function (event) {
-    handleInputValueChange(event.target.value);
+    handleInputValueChange(event.target.value, event);
   }, [handleInputValueChange]);
   var handleBlur = (0, _react.useCallback)(function (event) {
     blurHandler(event);
@@ -145,12 +160,14 @@ var PhoneInput = exports.PhoneInput = function PhoneInput(_ref) {
     mask: currentCountriesPhoneRules[country].mask,
     maskPlaceholder: null,
     disabled: disabled,
-    onPaste: handlePaste
+    onPaste: handlePaste,
+    placeholder: currentCountriesPhoneRules[country].placeholder
   }, /*#__PURE__*/_react["default"].createElement(_PureInput.PureInput, {
     id: id,
     hasError: hasError || (isFirstBlur ? false : isHaveInputError),
     inFocus: inFocus,
     name: name,
-    paddingLeft: isHaveSelectCountries ? 75 : 18
+    paddingLeft: isHaveSelectCountries ? 75 : 18,
+    autoComplete: 'off'
   }))));
 };

package/dist/components/form/PhoneInput/phoneInputLogic.d.ts

@@ -1,5 +1,6 @@
 import { TCountryRule, TCountrySelectOption, TSupportedCountries } from './types';
 declare class PhoneInputLogic {
+    private getCaretPositionByRusValue;
     getIsValidPhoneInput(value: string, country: TCountryRule): boolean;
     getCountriesSelectOptions(countries?: Array<{
         label: string;
@@ -15,6 +16,7 @@ declare class PhoneInputLogic {
         [k: string]: TCountryRule;
     };
     getIsHaveStartSequenceInString(value: string, subsequence: string): boolean;
+    formatRusPhoneToUnifiedView(value: string, moveCaret?: (positionCaret: number) => void): string;
     getOnlyNumbersFromString(value: string): string;
 }
 export declare const phoneInputLogic: PhoneInputLogic;

package/dist/components/form/PhoneInput/phoneInputLogic.js

@@ -19,6 +19,22 @@ var PhoneInputLogic = /*#__PURE__*/function () {
     _classCallCheck(this, PhoneInputLogic);
   }
   _createClass(PhoneInputLogic, [{
+    key: "getCaretPositionByRusValue",
+    value: function getCaretPositionByRusValue(value) {
+      var mask = _constants.allCountriesPhoneRules.RUS.mask.split('');
+      var counter = 0;
+      var position = 0;
+      mask.forEach(function (maskItem, index) {
+        if (maskItem === _constants.MASK_DIGIT_ITEM) {
+          counter += 1;
+          if (counter === value.length) {
+            position = index + 1;
+          }
+        }
+      });
+      return position;
+    }
+  }, {
     key: "getIsValidPhoneInput",
     value: function getIsValidPhoneInput(value, country) {
       return !!value.match(country.regexp);
@@ -58,6 +74,25 @@ var PhoneInputLogic = /*#__PURE__*/function () {
     value: function getIsHaveStartSequenceInString(value, subsequence) {
       return value.startsWith(subsequence);
     }
+
+    // '8' => '+7', '9' => '+79'
+  }, {
+    key: "formatRusPhoneToUnifiedView",
+    value: function formatRusPhoneToUnifiedView(value, moveCaret) {
+      var result = value;
+      if (value[0] === '8') {
+        result = "7".concat(value.slice(1));
+      }
+      if (value[0] === '9') {
+        var newValue = "79".concat(value.slice(1));
+        result = newValue;
+        if (moveCaret) {
+          // когда пользователь вводит номер с "9", мы подставляем в инпут "79", но каретка не переносится после "9", нужно это делать вручную
+          moveCaret(this.getCaretPositionByRusValue(newValue));
+        }
+      }
+      return result;
+    }
   }, {
     key: "getOnlyNumbersFromString",
     value: function getOnlyNumbersFromString(value) {

package/dist/components/form/PhoneInput/types.d.ts

@@ -2,6 +2,7 @@ export declare const RUS_COUNTRY_CODE = "RUS";
 export declare const supportedCountries: readonly ["RUS", "BLR", "AZE", "ARM", "KAZ", "TJK", "UZB"];
 export type TSupportedCountries = (typeof supportedCountries)[number];
 export type TCountryRule = {
+    placeholder: string;
     mask: string;
     startSubsequence: string;
     regexp: RegExp;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@invoicebox/ui",
-    "version": "0.1.0-alpha.62",
+    "version": "0.1.0-alpha.64",
     "description": "Invoicebox UI",
     "license": "Apache License 2.0",
     "scripts": {