@dartech/arsenal-ui 1.4.68 → 1.4.70

package/index.js

@@ -822,9 +822,10 @@ const ControlAutocomplete = _a => {
       disableCloseOnSelect,
       useStringValue,
       requiredErrorText = '',
-      startAdornment
+      startAdornment,
+      endAdornment
     } = _a,
-    autocompleteProps = __rest(_a, ["control", "validate", "name", "label", "required", "defaultValue", "disabled", "hideErrorMessage", "onChange", "labelKey", "valueKey", "options", "multiple", "textFieldProps", "disableCloseOnSelect", "useStringValue", "requiredErrorText", "startAdornment"]);
+    autocompleteProps = __rest(_a, ["control", "validate", "name", "label", "required", "defaultValue", "disabled", "hideErrorMessage", "onChange", "labelKey", "valueKey", "options", "multiple", "textFieldProps", "disableCloseOnSelect", "useStringValue", "requiredErrorText", "startAdornment", "endAdornment"]);
   const _b = useController({
       name,
       control,
@@ -909,6 +910,12 @@ const ControlAutocomplete = _a => {
             children: [startAdornment, params.InputProps.startAdornment]
           })
         })
+      } : {}, endAdornment ? {
+        InputProps: Object.assign(Object.assign({}, params.InputProps), {
+          endAdornment: jsxs(Fragment, {
+            children: [endAdornment, params.InputProps.endAdornment]
+          })
+        })
       } : {}, textFieldProps));
     }
   }, autocompleteProps));
@@ -941,9 +948,10 @@ function ControlQueryAutocomplete(_a) {
       validate,
       itemQueryFunction,
       requiredErrorText = '',
-      startAdornment
+      startAdornment,
+      endAdornment
     } = _a,
-    autocompleteProps = __rest(_a, ["name", "label", "control", "required", "searchBy", "labelKey", "multiple", "mongoQueryJson", "disabled", "valueKey", "sortBy", "hideErrorMessage", "disableCloseOnSelect", "textFieldProps", "onChange", "queryFunction", "validate", "itemQueryFunction", "requiredErrorText", "startAdornment"]);
+    autocompleteProps = __rest(_a, ["name", "label", "control", "required", "searchBy", "labelKey", "multiple", "mongoQueryJson", "disabled", "valueKey", "sortBy", "hideErrorMessage", "disableCloseOnSelect", "textFieldProps", "onChange", "queryFunction", "validate", "itemQueryFunction", "requiredErrorText", "startAdornment", "endAdornment"]);
   const _b = useController({
       control,
       name,
@@ -1113,11 +1121,13 @@ function ControlQueryAutocomplete(_a) {
         variant: 'standard'
       },
       InputProps: Object.assign(Object.assign(Object.assign({}, params.InputProps), {
-        endAdornment: jsxs(React.Fragment, {
+        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, {
@@ -6879,7 +6889,7 @@ const PropertyFiller = ({
         });
       } else if (!property.isRequired && (property.defaultValue === null || property.value === null)) {
         setValue(name, null);
-      } else if (!(isPropertyValueEmpty(property.defaultValue) || isPropertyValueEmpty(property.value))) {
+      } else if (!isPropertyValueEmpty(property.defaultValue) || !isPropertyValueEmpty(property.value)) {
         setValue(name, property.defaultValue || property.value);
       }
     }

package/package.json

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

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

@@ -64,6 +64,7 @@ export type ControlAutocompleteProps = Omit<AutocompleteProps<unknown, boolean,
     useStringValue?: boolean;
     requiredErrorText?: string;
     startAdornment?: InputProps['startAdornment'];
+    endAdornment?: InputProps['endAdornment'];
 };
-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 declare const ControlAutocomplete: ({ control, validate, name, label, required, defaultValue, disabled, hideErrorMessage, onChange: customOnChange, labelKey, valueKey, options, multiple, textFieldProps, disableCloseOnSelect, useStringValue, requiredErrorText, startAdornment, endAdornment, ...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, startAdornment, ...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, endAdornment, ...autocompleteProps }: ControlQueryAutocompleteProps<T>): JSX.Element;
 export default ControlQueryAutocomplete;