@dartech/arsenal-ui 1.3.84 → 1.3.85

package/index.js

@@ -709,9 +709,10 @@ const ControlAutocomplete = _a => {
       options = [],
       multiple,
       textFieldProps = {},
-      disableCloseOnSelect
+      disableCloseOnSelect,
+      useStringValue
     } = _a,
-    autocompleteProps = __rest(_a, ["control", "validate", "name", "label", "required", "defaultValue", "disabled", "hideErrorMessage", "onChange", "labelKey", "valueKey", "options", "multiple", "textFieldProps", "disableCloseOnSelect"]);
+    autocompleteProps = __rest(_a, ["control", "validate", "name", "label", "required", "defaultValue", "disabled", "hideErrorMessage", "onChange", "labelKey", "valueKey", "options", "multiple", "textFieldProps", "disableCloseOnSelect", "useStringValue"]);
   const _b = useController({
       name,
       control,
@@ -724,14 +725,16 @@ const ControlAutocomplete = _a => {
     _c = _b.field,
     {
       ref,
-      onChange
+      onChange,
+      value
     } = _c,
-    fieldProps = __rest(_c, ["ref", "onChange"]),
+    fieldProps = __rest(_c, ["ref", "onChange", "value"]),
     {
       fieldState: {
         error
       }
     } = _b;
+  const [localValue, setLocalValue] = useState();
   const {
     getOptionLabel,
     isOptionEqualToValue,
@@ -741,9 +744,16 @@ const ControlAutocomplete = _a => {
     labelKey
   });
   const handleChange = (_, value) => {
-    onChange(value);
+    onChange(useStringValue ? 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 => el[valueKey] === value));
+    }
+  }, [localValue, options, useStringValue, value, valueKey]);
   return jsx(Autocomplete, Object.assign({}, fieldProps, {
+    value: useStringValue ? localValue !== null && localValue !== void 0 ? localValue : null : value,
     fullWidth: true,
     disablePortal: true,
     size: "small",

package/package.json

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

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

@@ -60,10 +60,11 @@ export type ControlAutocompleteProps = Omit<AutocompleteProps<unknown, boolean,
      */
     options: string[] | unknown[];
     textFieldProps?: TextFieldProps;
+    useStringValue?: boolean;
 };
 /**
  * Material UI `Autocomplete` controlled component. Used with react-hook-form
  * @category Forms
  */
-export declare const ControlAutocomplete: ({ control, validate, name, label, required, defaultValue, disabled, hideErrorMessage, onChange: customOnChange, labelKey, valueKey, options, multiple, textFieldProps, disableCloseOnSelect, ...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, ...autocompleteProps }: ControlAutocompleteProps) => JSX.Element;
 export default ControlAutocomplete;

package/src/lib/Property/UpsertProperty/PropertyValueField/BooleanValueField.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 type Props = {
     name: string;
     label?: string;

package/src/lib/Property/UpsertProperty/PropertyValueField/DateTimeValueField.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 type Props = {
     name: string;
     label?: string;

package/src/lib/Property/UpsertProperty/PropertyValueField/DateValueField.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 type Props = {
     name: string;
     format: string;

package/src/lib/Property/UpsertProperty/PropertyValueField/JsonValueField.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 type Props = {
     name: string;
     label?: string;

package/src/lib/Property/UpsertProperty/PropertyValueField/TimeValueField.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 type Props = {
     name: string;
     label?: string;

package/src/lib/Property/ViewProperty/PropertyItem.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PropertyUnion } from '../../../interfaces';
 type PropertyItemProps = {
     property: PropertyUnion;