@dartech/arsenal-ui 1.4.23 → 1.4.25

package/index.js

@@ -810,7 +810,6 @@ const ControlAutocomplete = _a => {
 };
 
 function ControlQueryAutocomplete(_a) {
-  var _b;
   var {
       name,
       label,
@@ -832,7 +831,7 @@ function ControlQueryAutocomplete(_a) {
       requiredErrorText = ''
     } = _a,
     autocompleteProps = __rest(_a, ["name", "label", "control", "required", "searchBy", "labelKey", "multiple", "disabled", "valueKey", "sortBy", "hideErrorMessage", "disableCloseOnSelect", "textFieldProps", "onChange", "queryFunction", "validate", "itemQueryFunction", "requiredErrorText"]);
-  const _c = useController({
+  const _b = useController({
       control,
       name,
       defaultValue: multiple ? [] : null,
@@ -841,19 +840,19 @@ function ControlQueryAutocomplete(_a) {
         validate
       }
     }),
-    _d = _c.field,
+    _c = _b.field,
     {
       ref,
       onChange: setFieldValue,
       value: formValue
-    } = _d,
-    fieldProps = __rest(_d, ["ref", "onChange", "value"]),
+    } = _c,
+    fieldProps = __rest(_c, ["ref", "onChange", "value"]),
     {
       fieldState: {
         error,
         isDirty
       }
-    } = _c;
+    } = _b;
   const {
     getOptionLabel,
     isOptionEqualToValue,
@@ -862,6 +861,7 @@ function ControlQueryAutocomplete(_a) {
     valueKey,
     labelKey
   });
+  const [options, setOptions] = useState([]);
   const [open, setOpen] = useState(false);
   const [inputValue, setInputValue] = useState('');
   const [searchValue, setSearchValue] = useState('');
@@ -880,6 +880,15 @@ function ControlQueryAutocomplete(_a) {
       ignoreQueryPrefix: true
     });
     return queryFunction(params);
+  }, {
+    // keepPreviousData: true,
+    onSuccess(data) {
+      if (searchValue) {
+        setOptions(data.collection);
+      } else {
+        setOptions(state => state.length === 1 ? data.collection : [...state, ...data.collection]);
+      }
+    }
   });
   const debouncedChange = useDebounce(val => {
     setPage(0);
@@ -895,6 +904,7 @@ function ControlQueryAutocomplete(_a) {
       onChange(event, value);
     }
   }, [setFieldValue, onChange]);
+  console.log(isDirty, formValue, searchValue);
   useEffect(() => {
     if (!isDirty && formValue && itemQueryFunction) {
       let requestValue = formValue;
@@ -904,15 +914,15 @@ function ControlQueryAutocomplete(_a) {
       itemQueryFunction(requestValue).then(item => {
         setFieldValue(item);
         setInputValue(_get(item, labelKey));
-      }).catch();
+      }).catch(console.error);
     }
   }, [formValue, isDirty, valueKey, labelKey, itemQueryFunction, setFieldValue]);
   const handleOnScroll = useCallback(event => {
     const listboxNode = event.currentTarget;
-    if (listboxNode.scrollHeight - listboxNode.scrollTop - listboxNode.clientHeight <= 1 && (data === null || data === void 0 ? void 0 : data.collection.length) < (data === null || data === void 0 ? void 0 : data.totalItems)) {
+    if (listboxNode.scrollHeight - listboxNode.scrollTop - listboxNode.clientHeight <= 1 && options.length < (data === null || data === void 0 ? void 0 : data.totalItems)) {
       setPage(page => page + 1);
     }
-  }, [data]);
+  }, [data, options]);
   const handleOpen = () => {
     setOpen(true);
   };
@@ -925,7 +935,7 @@ function ControlQueryAutocomplete(_a) {
     disablePortal: true,
     size: "small",
     readOnly: disabled,
-    options: (_b = data === null || data === void 0 ? void 0 : data.collection) !== null && _b !== void 0 ? _b : [],
+    options: options,
     multiple: multiple,
     getOptionLabel: getOptionLabel,
     isOptionEqualToValue: isOptionEqualToValue,
@@ -2106,7 +2116,6 @@ const ControlDate = _a => {
     rules: {
       required: required ? requiredErrorText || DEFAULT_REQUIRED_ERROR_TEXT : false,
       validate: val => {
-        console.log('DATE', val);
         if (val === '' || isMatch(val, localFormat)) {
           return true;
         }

package/package.json

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