@dartech/arsenal-ui 1.4.71 → 1.4.73

package/index.js

@@ -903,20 +903,12 @@ const ControlAutocomplete = _a => {
         helperText: !hideErrorMessage && (error === null || error === void 0 ? void 0 : error.message),
         FormHelperTextProps: {
           variant: 'standard'
-        }
-      }, startAdornment ? {
-        InputProps: Object.assign(Object.assign({}, params.InputProps), {
-          startAdornment: jsxs(Fragment, {
-            children: [startAdornment, params.InputProps.startAdornment]
-          })
-        })
-      } : {}, endAdornment ? {
+        },
         InputProps: Object.assign(Object.assign({}, params.InputProps), {
-          endAdornment: jsxs(Fragment, {
-            children: [endAdornment, params.InputProps.endAdornment]
-          })
+          startAdornment: startAdornment ? startAdornment : params.InputProps.startAdornment,
+          endAdornment: endAdornment ? endAdornment : params.InputProps.endAdornment
         })
-      } : {}, textFieldProps));
+      }, textFieldProps));
     }
   }, autocompleteProps));
 };
@@ -1120,20 +1112,15 @@ function ControlQueryAutocomplete(_a) {
       FormHelperTextProps: {
         variant: 'standard'
       },
-      InputProps: Object.assign(Object.assign(Object.assign({}, params.InputProps), {
-        endAdornment: endAdornment ? jsxs(React.Fragment, {
+      InputProps: Object.assign(Object.assign({}, params.InputProps), {
+        endAdornment: endAdornment ? endAdornment : jsxs(React.Fragment, {
           children: [isFetching ? jsx(CircularProgress, {
             color: "inherit",
             size: 20
           }) : null, params.InputProps.endAdornment]
-        }) : jsxs(Fragment, {
-          children: [endAdornment, params.InputProps.startAdornment]
-        })
-      }), startAdornment ? {
-        startAdornment: jsxs(Fragment, {
-          children: [startAdornment, params.InputProps.startAdornment]
-        })
-      } : {})
+        }),
+        startAdornment: startAdornment ? startAdornment : params.InputProps.startAdornment
+      })
     }, textFieldProps))
   }, autocompleteProps));
 }
@@ -3294,9 +3281,10 @@ const ControlPhoneInput = _a => {
       mask = '+7 (799) 999 99 99',
       requiredErrorText = '',
       inputMaskProps,
-      disabled
+      disabled,
+      invalidErrorText
     } = _a,
-    textFieldProps = __rest(_a, ["control", "name", "label", "required", "mask", "requiredErrorText", "inputMaskProps", "disabled"]);
+    textFieldProps = __rest(_a, ["control", "name", "label", "required", "mask", "requiredErrorText", "inputMaskProps", "disabled", "invalidErrorText"]);
   return jsx(Controller, {
     control: control,
     name: name,
@@ -3307,7 +3295,7 @@ const ControlPhoneInput = _a => {
           return true;
         }
         if (!/(\+7\s\(\d{3}\)\s)(\d{3}\s\d{2})(\s\d{2})/.test(val)) {
-          return 'Incorrect phone number format';
+          return invalidErrorText || 'Incorrect phone number format';
         }
         return true;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dartech/arsenal-ui",
-  "version": "1.4.71",
+  "version": "1.4.73",
   "author": "DAR",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

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

@@ -9,8 +9,9 @@ type Props = TextFieldProps & {
     mask?: string;
     label?: ReactNode;
     requiredErrorText?: string;
+    invalidErrorText?: string;
     disabled?: boolean;
     inputMaskProps?: InputMaskProps;
 };
-export declare const ControlPhoneInput: ({ control, name, label, required, mask, requiredErrorText, inputMaskProps, disabled, ...textFieldProps }: Props) => JSX.Element;
+export declare const ControlPhoneInput: ({ control, name, label, required, mask, requiredErrorText, inputMaskProps, disabled, invalidErrorText, ...textFieldProps }: Props) => JSX.Element;
 export default ControlPhoneInput;