@dartech/arsenal-ui 1.4.66 → 1.4.68

package/index.js

@@ -821,9 +821,10 @@ const ControlAutocomplete = _a => {
       textFieldProps = {},
       disableCloseOnSelect,
       useStringValue,
-      requiredErrorText = ''
+      requiredErrorText = '',
+      startAdornment
     } = _a,
-    autocompleteProps = __rest(_a, ["control", "validate", "name", "label", "required", "defaultValue", "disabled", "hideErrorMessage", "onChange", "labelKey", "valueKey", "options", "multiple", "textFieldProps", "disableCloseOnSelect", "useStringValue", "requiredErrorText"]);
+    autocompleteProps = __rest(_a, ["control", "validate", "name", "label", "required", "defaultValue", "disabled", "hideErrorMessage", "onChange", "labelKey", "valueKey", "options", "multiple", "textFieldProps", "disableCloseOnSelect", "useStringValue", "requiredErrorText", "startAdornment"]);
   const _b = useController({
       name,
       control,
@@ -902,7 +903,13 @@ const ControlAutocomplete = _a => {
         FormHelperTextProps: {
           variant: 'standard'
         }
-      }, textFieldProps));
+      }, startAdornment ? {
+        InputProps: Object.assign(Object.assign({}, params.InputProps), {
+          startAdornment: jsxs(Fragment, {
+            children: [startAdornment, params.InputProps.startAdornment]
+          })
+        })
+      } : {}, textFieldProps));
     }
   }, autocompleteProps));
 };
@@ -933,9 +940,10 @@ function ControlQueryAutocomplete(_a) {
       queryFunction,
       validate,
       itemQueryFunction,
-      requiredErrorText = ''
+      requiredErrorText = '',
+      startAdornment
     } = _a,
-    autocompleteProps = __rest(_a, ["name", "label", "control", "required", "searchBy", "labelKey", "multiple", "mongoQueryJson", "disabled", "valueKey", "sortBy", "hideErrorMessage", "disableCloseOnSelect", "textFieldProps", "onChange", "queryFunction", "validate", "itemQueryFunction", "requiredErrorText"]);
+    autocompleteProps = __rest(_a, ["name", "label", "control", "required", "searchBy", "labelKey", "multiple", "mongoQueryJson", "disabled", "valueKey", "sortBy", "hideErrorMessage", "disableCloseOnSelect", "textFieldProps", "onChange", "queryFunction", "validate", "itemQueryFunction", "requiredErrorText", "startAdornment"]);
   const _b = useController({
       control,
       name,
@@ -1104,14 +1112,18 @@ function ControlQueryAutocomplete(_a) {
       FormHelperTextProps: {
         variant: 'standard'
       },
-      InputProps: Object.assign(Object.assign({}, params.InputProps), {
+      InputProps: Object.assign(Object.assign(Object.assign({}, params.InputProps), {
         endAdornment: jsxs(React.Fragment, {
           children: [isFetching ? jsx(CircularProgress, {
             color: "inherit",
             size: 20
           }) : null, params.InputProps.endAdornment]
         })
-      })
+      }), startAdornment ? {
+        startAdornment: jsxs(Fragment, {
+          children: [startAdornment, params.InputProps.startAdornment]
+        })
+      } : {})
     }, textFieldProps))
   }, autocompleteProps));
 }
@@ -2074,7 +2086,7 @@ const formatTableRowValue = ({
 const digitsOnly = new RegExp('^[-+]?[0-9]+$');
 const floatsOnly = new RegExp(/^[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?$/);
 const isExpression = (value, useRecursion) => {
-  if (typeof value === 'string') return /\$(?:S?JS)?(?:\{|\()/g.test(value);
+  if (typeof value === 'string') return /[$%#{<]{1}(?:S?JS)?(?:[{(%#>]|\()/g.test(value);
   if (useRecursion) {
     if (Array.isArray(value)) {
       for (const item of value) {

package/package.json

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

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

@@ -1,5 +1,6 @@
 import { AutocompleteProps } from '@mui/material/Autocomplete';
 import { TextFieldProps } from '@mui/material/TextField';
+import { InputProps } from '@mui/material/Input';
 import { Control } from 'react-hook-form';
 import { ReactNode } from 'react';
 import { ValidateFunc } from '../../../interfaces';
@@ -62,6 +63,7 @@ export type ControlAutocompleteProps = Omit<AutocompleteProps<unknown, boolean,
     textFieldProps?: TextFieldProps;
     useStringValue?: boolean;
     requiredErrorText?: string;
+    startAdornment?: InputProps['startAdornment'];
 };
-export declare const ControlAutocomplete: ({ control, validate, name, label, required, defaultValue, disabled, hideErrorMessage, onChange: customOnChange, labelKey, valueKey, options, multiple, textFieldProps, disableCloseOnSelect, useStringValue, requiredErrorText, ...autocompleteProps }: ControlAutocompleteProps) => JSX.Element;
+export declare const ControlAutocomplete: ({ control, validate, name, label, required, defaultValue, disabled, hideErrorMessage, onChange: customOnChange, labelKey, valueKey, options, multiple, textFieldProps, disableCloseOnSelect, useStringValue, requiredErrorText, startAdornment, ...autocompleteProps }: ControlAutocompleteProps) => JSX.Element;
 export default ControlAutocomplete;

package/src/lib/Forms/ControlAutocomplete/ControlQueryAutocomplete.d.ts

@@ -16,5 +16,5 @@ type ControlQueryAutocompleteProps<T> = Omit<ControlAutocompleteProps, 'options'
     requiredErrorText?: string;
     renderInput?: AutocompleteProps<unknown, boolean, boolean, boolean, React.ElementType<any>>['renderInput'];
 };
-export declare function ControlQueryAutocomplete<T>({ name, label, control, required, searchBy, labelKey, multiple, mongoQueryJson, disabled, valueKey, sortBy, hideErrorMessage, disableCloseOnSelect, textFieldProps, onChange, queryFunction, validate, itemQueryFunction, requiredErrorText, ...autocompleteProps }: ControlQueryAutocompleteProps<T>): JSX.Element;
+export declare function ControlQueryAutocomplete<T>({ name, label, control, required, searchBy, labelKey, multiple, mongoQueryJson, disabled, valueKey, sortBy, hideErrorMessage, disableCloseOnSelect, textFieldProps, onChange, queryFunction, validate, itemQueryFunction, requiredErrorText, startAdornment, ...autocompleteProps }: ControlQueryAutocompleteProps<T>): JSX.Element;
 export default ControlQueryAutocomplete;