@invoicebox/ui 0.1.0-alpha.71 → 0.1.0-alpha.73

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

@@ -67,7 +67,7 @@ var allCountriesPhoneRules = exports.allCountriesPhoneRules = {
     placeholder: '',
     mask: '+999999999999999999',
     startSubsequence: '',
-    regexp: /^\d+$/,
+    regexp: /^\d{7,}$/,
     flag: 'UNKNOWN'
   }
 };

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

@@ -0,0 +1,9 @@
+import { TSupportedCountries } from './types';
+declare class ExternalPhoneLogic {
+    getIsValidPhone(value: string, countries?: Array<{
+        label: string;
+        value: TSupportedCountries;
+    }>): boolean;
+}
+export declare const phoneLogic: ExternalPhoneLogic;
+export {};

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

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.phoneLogic = void 0;
+var _constants = require("./constants");
+var _phoneInputLogic = require("./phoneInputLogic");
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+var ExternalPhoneLogic = /*#__PURE__*/function () {
+  function ExternalPhoneLogic() {
+    _classCallCheck(this, ExternalPhoneLogic);
+  }
+  _createClass(ExternalPhoneLogic, [{
+    key: "getIsValidPhone",
+    value: function getIsValidPhone(value, countries) {
+      var notFormattedValue = _phoneInputLogic.phoneInputLogic.getOnlyNumbersFromString(value);
+      var countrySelectOptions = _phoneInputLogic.phoneInputLogic.getCountriesSelectOptions(countries);
+      var currentCountriesPhoneRules = _phoneInputLogic.phoneInputLogic.getCountriesPhoneRules(countrySelectOptions);
+      var country = Object.entries(currentCountriesPhoneRules).find(function (item) {
+        return _phoneInputLogic.phoneInputLogic.getIsHaveStartSequenceInString(notFormattedValue, item[1].startSubsequence);
+      });
+      return _phoneInputLogic.phoneInputLogic.getIsValidPhoneInputByCountry(notFormattedValue, country ? country[1] : _constants.allCountriesPhoneRules.RUS);
+    }
+  }]);
+  return ExternalPhoneLogic;
+}();
+var phoneLogic = exports.phoneLogic = new ExternalPhoneLogic();

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

@@ -76,47 +76,42 @@ var PhoneInput = exports.PhoneInput = function PhoneInput(_ref) {
       onCountryChange(countryCode);
     }
   }, [onCountryChange]);
-  var handleValid = (0, _react.useCallback)(function (currentInputValue, countryCode) {
+  var handleInitialValid = (0, _react.useCallback)(function (currentInputValue, countryCode) {
     onChange(currentInputValue);
     setIsHaveInputError(false);
     setCountry(countryCode);
   }, [onChange]);
-  var handleUnValid = (0, _react.useCallback)(function (countryCode) {
+  var handleInitialUnValid = (0, _react.useCallback)(function (countryCode) {
     onChange('');
     setIsHaveInputError(true);
     setCountry(countryCode);
   }, [onChange]);
-  (0, _useValidateInitialValue.useValidateInitialValue)(value, currentCountriesPhoneRules, handleValid, handleUnValid);
-
-  // хак для того чтобы сдвигать каретку в случае если при вводе "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) {
+  (0, _useValidateInitialValue.useValidateInitialValue)(value, currentCountriesPhoneRules, handleInitialValid, handleInitialUnValid);
+  var getNewCountryByInputValue = (0, _react.useCallback)(function (currentValue) {
     var currentCountry = currentCountriesPhoneRules[country];
     var newCountry = Object.entries(currentCountriesPhoneRules).find(function (item) {
-      return _phoneInputLogic.phoneInputLogic.getIsHaveStartSequenceInString(currentValue, item[1].startSubsequence) && currentCountry.flag !== item[1].flag && item[1].flag !== 'UNKNOWN';
+      return _phoneInputLogic.phoneInputLogic.getIsHaveStartSequenceInString(currentValue, item[1].startSubsequence) && currentCountry.flag !== item[1].flag;
     });
-    var isNeedChangeCountry = newCountry && currentCountry.startSubsequence !== newCountry[1].startSubsequence;
+    var isNeedChangeCountry = _phoneInputLogic.phoneInputLogic.getIsNeedChangeCountry(currentValue, currentCountry, newCountry);
     var isNeedAndCanChangeCountry = isNeedChangeCountry && !!newCountry;
     if (isNeedAndCanChangeCountry) {
       handleChangeCountry(newCountry[0]);
     }
-    return _phoneInputLogic.phoneInputLogic.getIsValidPhoneInputByCountry(currentValue, isNeedAndCanChangeCountry ? newCountry[1] : currentCountry);
+    return isNeedAndCanChangeCountry ? newCountry[1] : currentCountry;
   }, [country, currentCountriesPhoneRules, handleChangeCountry]);
+  var getIsValidValue = (0, _react.useCallback)(function (currentValue) {
+    var currentCountry = getNewCountryByInputValue(currentValue);
+    return _phoneInputLogic.phoneInputLogic.getIsValidPhoneInputByCountry(currentValue, currentCountry);
+  }, [getNewCountryByInputValue]);
   var handleInputValueChange = (0, _react.useCallback)(function (currentInputValue, event) {
     var notFormattedValue = _phoneInputLogic.phoneInputLogic.getOnlyNumbersFromString(currentInputValue);
-    var moveCaret = event ? moveCaretByValue(event) : undefined;
+    var moveCaret = event ? _phoneInputLogic.phoneInputLogic.moveCaretByValue(event) : undefined;
     var intermediateValue = country === _types.RUS_COUNTRY_CODE ? _phoneInputLogic.phoneInputLogic.formatRusPhoneToUnifiedView(notFormattedValue, moveCaret) : notFormattedValue;
     var isValidInputValue = getIsValidValue(intermediateValue);
     setIsHaveInputError(!isValidInputValue);
     onChange(isValidInputValue ? intermediateValue : '');
     setInputValue(intermediateValue);
-  }, [country, getIsValidValue, moveCaretByValue, onChange]);
+  }, [country, getIsValidValue, onChange]);
   var handleChange = (0, _react.useCallback)(function (event) {
     handleInputValueChange(event.target.value, event);
   }, [handleInputValueChange]);
@@ -132,11 +127,12 @@ var PhoneInput = exports.PhoneInput = function PhoneInput(_ref) {
     var isValidInputValue = _phoneInputLogic.phoneInputLogic.getIsValidPhoneInputByCountry(inputValue, currentCountry);
     setIsFirstBlur(false);
     setIsHaveInputError(!isValidInputValue);
+    onChange(isValidInputValue ? inputValue : '');
     setTimeout(function () {
       var _inputRef$current;
       (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 || _inputRef$current.focus();
     }, 0);
-  }, [currentCountriesPhoneRules, handleChangeCountry, inputValue]);
+  }, [currentCountriesPhoneRules, handleChangeCountry, inputValue, onChange]);
   var handlePaste = (0, _react.useCallback)(function (event) {
     event.preventDefault();
     var pasteText = event.clipboardData.getData('Text').trim();

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

@@ -1,4 +1,5 @@
 import { TCountryRule, TCountrySelectOption, TSupportedCountries } from './types';
+import { ChangeEvent } from 'react';
 declare class PhoneInputLogic {
     private getCaretPositionByRusValue;
     getIsValidPhoneInputByCountry(value: string, country: TCountryRule): boolean;
@@ -22,10 +23,8 @@ declare class PhoneInputLogic {
     getIsHaveStartSequenceInString(value: string, subsequence: string): boolean;
     formatRusPhoneToUnifiedView(value: string, moveCaret?: (positionCaret: number) => void): string;
     getOnlyNumbersFromString(value: string): string;
+    moveCaretByValue(event: ChangeEvent<HTMLInputElement>): (positionCaret: number) => void;
+    getIsNeedChangeCountry(inputValue: string, currentCountry: TCountryRule, newCountry?: [string, TCountryRule]): boolean | "" | undefined;
 }
 export declare const phoneInputLogic: PhoneInputLogic;
-export declare const getIsValidPhone: (value: string, countries?: {
-    label: string;
-    value: TSupportedCountries;
-}[] | undefined) => boolean;
 export {};

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

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.phoneInputLogic = exports.getIsValidPhone = void 0;
+exports.phoneInputLogic = void 0;
+var _types = require("./types");
 var _constants = require("./constants");
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -110,8 +111,23 @@ var PhoneInputLogic = /*#__PURE__*/function () {
       var _value$match;
       return ((_value$match = value.match(/\d/g)) === null || _value$match === void 0 ? void 0 : _value$match.join('')) || '';
     }
+
+    // хак для того чтобы сдвигать каретку в случае если при вводе "9" надо заменить на "79", каретка не двигается сама и остаётся между "7" и "9" без этой функции
+  }, {
+    key: "moveCaretByValue",
+    value: function moveCaretByValue(event) {
+      return function (positionCaret) {
+        setTimeout(function () {
+          event.target.setSelectionRange(positionCaret, positionCaret);
+        }, 0);
+      };
+    }
+  }, {
+    key: "getIsNeedChangeCountry",
+    value: function getIsNeedChangeCountry(inputValue, currentCountry, newCountry) {
+      return newCountry && currentCountry.startSubsequence !== newCountry[1].startSubsequence && inputValue && (newCountry[0] === _types.UNKNOWN_COUNTRY_CODE ? !this.getIsHaveStartSequenceInString(inputValue, currentCountry.startSubsequence) : true);
+    }
   }]);
   return PhoneInputLogic;
 }();
-var phoneInputLogic = exports.phoneInputLogic = new PhoneInputLogic();
-var getIsValidPhone = exports.getIsValidPhone = phoneInputLogic.getIsValidPhone;
+var phoneInputLogic = exports.phoneInputLogic = new PhoneInputLogic();

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

@@ -1,5 +1,6 @@
 import { TFlagKey } from '../../common/Flag';
 export declare const RUS_COUNTRY_CODE = "RUS";
+export declare const UNKNOWN_COUNTRY_CODE = "UNKNOWN";
 export declare const supportedCountries: readonly ["RUS", "BLR", "AZE", "ARM", "KAZ", "TJK", "UZB", "KGZ", "UNKNOWN"];
 export type TSupportedCountries = (typeof supportedCountries)[number];
 export type TCountryRule = {

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

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.supportedCountries = exports.RUS_COUNTRY_CODE = void 0;
+exports.supportedCountries = exports.UNKNOWN_COUNTRY_CODE = exports.RUS_COUNTRY_CODE = void 0;
 var RUS_COUNTRY_CODE = exports.RUS_COUNTRY_CODE = 'RUS';
-var supportedCountries = exports.supportedCountries = [RUS_COUNTRY_CODE, 'BLR', 'AZE', 'ARM', 'KAZ', 'TJK', 'UZB', 'KGZ', 'UNKNOWN'];
+var UNKNOWN_COUNTRY_CODE = exports.UNKNOWN_COUNTRY_CODE = 'UNKNOWN';
+var supportedCountries = exports.supportedCountries = [RUS_COUNTRY_CODE, 'BLR', 'AZE', 'ARM', 'KAZ', 'TJK', 'UZB', 'KGZ', UNKNOWN_COUNTRY_CODE];

package/dist/index.d.ts

@@ -28,8 +28,8 @@ export type { TProps as TFlagProps, TFlagKey } from './components/common/Flag';
 export { CountrySelect } from './components/form/CountrySelect';
 export type { TProps as TCountrySelectProps } from './components/form/CountrySelect';
 export { PhoneInput } from './components/form/PhoneInput';
-export { getIsValidPhone } from './components/form/PhoneInput/phoneInputLogic';
 export type { TProps as TPhoneInputProps } from './components/form/PhoneInput';
+export { phoneLogic } from './components/form/PhoneInput/externalPhoneLogic';
 export { PaletteProvider } from './palette';
 export type { TAbstractPalette } from './palette';
 export { useOutsideClick } from './hooks/useOutsideClick';

package/dist/index.js

@@ -129,10 +129,10 @@ Object.defineProperty(exports, "WarningIcon", {
     return _WarningIcon.WarningIcon;
   }
 });
-Object.defineProperty(exports, "getIsValidPhone", {
+Object.defineProperty(exports, "phoneLogic", {
   enumerable: true,
   get: function get() {
-    return _phoneInputLogic.getIsValidPhone;
+    return _externalPhoneLogic.phoneLogic;
   }
 });
 Object.defineProperty(exports, "useInputFocus", {
@@ -167,7 +167,7 @@ var _SearchInput = require("./components/form/SearchInput");
 var _Flag = require("./components/common/Flag");
 var _CountrySelect = require("./components/form/CountrySelect");
 var _PhoneInput = require("./components/form/PhoneInput");
-var _phoneInputLogic = require("./components/form/PhoneInput/phoneInputLogic");
+var _externalPhoneLogic = require("./components/form/PhoneInput/externalPhoneLogic");
 var _palette = require("./palette");
 var _useOutsideClick = require("./hooks/useOutsideClick");
 var _useInputFocus = require("./hooks/useInputFocus");

package/package.json

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