@dartech/arsenal-ui 1.4.3 → 1.4.5

package/index.js

@@ -746,13 +746,13 @@ const ControlAutocomplete = _a => {
     labelKey
   });
   const handleChange = (_, value) => {
-    onChange(useStringValue ? _get(value, valueKey) : value);
+    onChange(useStringValue && valueKey ? _get(value, valueKey) : value);
     setLocalValue(value);
   };
   useEffect(() => {
     if (typeof value === 'string' && valueKey && useStringValue && !localValue && options.length && !!options[0] && typeof options[0] === 'object') {
       setLocalValue(options.find(el => _get(el, valueKey) === value));
-    } else setLocalValue(value);
+    }
   }, [localValue, options, useStringValue, value, valueKey]);
   return jsx(Autocomplete, Object.assign({}, fieldProps, {
     value: useStringValue ? localValue !== null && localValue !== void 0 ? localValue : null : value,
@@ -2548,33 +2548,23 @@ var img$2 = "data:image/svg+xml,%3csvg width='32' height='24' viewBox='0 0 32 24
 
 const ControlPhoneInput = _a => {
   var {
+      control,
       name,
       label,
       required,
       mask = '+7 (799) 999 99 99'
     } = _a,
-    textFieldProps = __rest(_a, ["name", "label", "required", "mask"]);
-  const {
-    control,
-    watch,
-    trigger
-  } = useFormContext();
-  const phoneNumber = watch(name);
-  useEffect(() => {
-    if (/(\+7\s\(\d{3}\)\s)(\d{3}\s\d{2})(\s\d{2})/.test(phoneNumber)) {
-      trigger(name);
-    }
-  }, [phoneNumber, trigger, name]);
+    textFieldProps = __rest(_a, ["control", "name", "label", "required", "mask"]);
   return jsx(Controller, {
     control: control,
     name: name,
     rules: {
       required: required && 'Please, fill this field',
       validate: val => {
-        if (/(\+7\s\(\d{3}\)\s)(\d{3}\s\d{2})(\s\d{2})/.test(val)) {
-          return true;
+        if (!/(\+7\s\(\d{3}\)\s)(\d{3}\s\d{2})(\s\d{2})/.test(val)) {
+          return 'Incorrect phone number format';
         }
-        return 'Incorrect phone number format';
+        return true;
       }
     },
     render: ({
@@ -2585,7 +2575,7 @@ const ControlPhoneInput = _a => {
     }) => jsx(InputMask, Object.assign({
       mask: mask
     }, field, {
-      children: () => jsx(TextField, Object.assign({
+      children: jsx(TextField, Object.assign({
         fullWidth: true,
         size: "small",
         label: required && label ? jsxs(Fragment, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dartech/arsenal-ui",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "author": "DAR",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -29,7 +29,7 @@
     "@rollup/plugin-node-resolve": "13.3.0",
     "lodash": "4.17.21",
     "qs": "6.11.0",
-    "react-input-mask": "2.0.4"
+    "react-input-mask": "3.0.0-alpha.2"
   },
   "module": "./index.js",
   "main": "./index.js",

package/src/lib/Forms/ControlPhoneInput.d.ts

@@ -1,10 +1,12 @@
 import { ReactNode } from 'react';
 import { TextFieldProps } from '@mui/material/TextField';
+import { Control } from 'react-hook-form';
 type Props = TextFieldProps & {
+    control: Control<any>;
     name: string;
     required?: boolean;
     mask?: string;
     label?: ReactNode;
 };
-export declare const ControlPhoneInput: ({ name, label, required, mask, ...textFieldProps }: Props) => JSX.Element;
+export declare const ControlPhoneInput: ({ control, name, label, required, mask, ...textFieldProps }: Props) => JSX.Element;
 export default ControlPhoneInput;