From 8e1dc4e12d7a53385afb6d4088e83a5976d63b0c Mon Sep 17 00:00:00 2001
From: SektorDV <35644259+SektorDV@users.noreply.github.com>
Date: Thu, 1 Jul 2021 10:20:35 +0200
Subject: [PATCH] Add loader to attribute picker (#1182)

* wip multiselectfield loader

* restyled spinner display

* get rid of redundant debouncer

* wip

* wip multiselectfield loader

* restyled spinner display

* get rid of redundant debouncer

* remove redundant prop

Co-authored-by: Magdalena Markusik <magdalena.markusik@mirumee.com>
---
 .../MultiAutocompleteSelectField.tsx          | 18 +++----
 .../MultiAutocompleteSelectFieldContent.tsx   | 49 ++++++++++---------
 .../SingleAutocompleteSelectField.tsx         | 14 ++----
 .../handlers/attributeValueSearchHandler.ts   |  1 -
 4 files changed, 37 insertions(+), 45 deletions(-)

diff --git a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx
index 5f165c2e1..3c26f3ec5 100644
--- a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx
+++ b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx
@@ -181,7 +181,7 @@ const MultiAutocompleteSelectFieldComponent: React.FC<MultiAutocompleteSelectFie
                     fullWidth={true}
                     disabled={disabled}
                   />
-                  {isOpen && (!!inputValue || !!choices.length) && (
+                  {isOpen && (
                     <MultiAutocompleteSelectFieldContent
                       add={
                         add && {
@@ -249,16 +249,12 @@ const MultiAutocompleteSelectField: React.FC<MultiAutocompleteSelectFieldProps>
 
   if (fetchChoices) {
     return (
-      <DebounceAutocomplete debounceFn={fetchChoices}>
-        {debounceFn => (
-          <MultiAutocompleteSelectFieldComponent
-            testId={testId}
-            choices={choices}
-            {...props}
-            fetchChoices={debounceFn}
-          />
-        )}
-      </DebounceAutocomplete>
+      <MultiAutocompleteSelectFieldComponent
+        testId={testId}
+        choices={choices}
+        {...props}
+        fetchChoices={fetchChoices}
+      />
     );
   }
 
diff --git a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectFieldContent.tsx b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectFieldContent.tsx
index 008d928ec..945215dfe 100644
--- a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectFieldContent.tsx
+++ b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectFieldContent.tsx
@@ -125,7 +125,8 @@ const useStyles = makeStyles(
     progress: {},
     progressContainer: {
       display: "flex",
-      justifyContent: "center"
+      justifyContent: "center",
+      padding: `${theme.spacing(1)}px 0`
     },
     root: {
       borderBottomLeftRadius: 8,
@@ -173,7 +174,6 @@ const MultiAutocompleteSelectFieldContent: React.FC<MultiAutocompleteSelectField
     inputValue,
     onFetchMore
   } = props;
-
   if (!!add && !!displayCustomValue) {
     throw new Error("Add and custom value cannot be displayed simultaneously");
   }
@@ -198,12 +198,12 @@ const MultiAutocompleteSelectFieldContent: React.FC<MultiAutocompleteSelectField
     }
   }, [loading]);
 
+  const hasValuesToDisplay =
+    displayValues.length > 0 || displayCustomValue || choices.length > 0;
   return (
     <Paper className={classes.root}>
-      <div className={classes.content} ref={anchor}>
-        {choices.length > 0 ||
-        displayValues.length > 0 ||
-        displayCustomValue ? (
+      {hasValuesToDisplay && (
+        <div className={classes.content} ref={anchor}>
           <>
             {add && (
               <MenuItem
@@ -298,25 +298,26 @@ const MultiAutocompleteSelectFieldContent: React.FC<MultiAutocompleteSelectField
                 </MenuItem>
               );
             })}
-            {hasMore && (
-              <>
-                <Hr className={classes.hr} />
-                <div className={classes.progressContainer}>
-                  <CircularProgress className={classes.progress} size={24} />
-                </div>
-              </>
-            )}
           </>
-        ) : (
-          <MenuItem
-            disabled={true}
-            component="div"
-            data-test="multiautocomplete-select-no-options"
-          >
-            <FormattedMessage defaultMessage="No results found" />
-          </MenuItem>
-        )}
-      </div>
+        </div>
+      )}
+      {!loading && !hasValuesToDisplay && (
+        <MenuItem
+          disabled={true}
+          component="div"
+          data-test="multiautocomplete-select-no-options"
+        >
+          <FormattedMessage defaultMessage={"No results found"} />
+        </MenuItem>
+      )}
+      {(hasMore || loading) && (
+        <>
+          {hasMore && <Hr className={classes.hr} />}
+          <div className={classes.progressContainer}>
+            <CircularProgress className={classes.progress} size={24} />
+          </div>
+        </>
+      )}
       {choices.length > maxMenuItems && (
         <div className={classes.arrowContainer}>
           <div
diff --git a/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectField.tsx b/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectField.tsx
index 00664421b..10df39c8a 100644
--- a/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectField.tsx
+++ b/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectField.tsx
@@ -242,15 +242,11 @@ const SingleAutocompleteSelectField: React.FC<SingleAutocompleteSelectFieldProps
 
   if (fetchChoices) {
     return (
-      <DebounceAutocomplete debounceFn={fetchChoices}>
-        {debounceFn => (
-          <SingleAutocompleteSelectFieldComponent
-            choices={choices}
-            {...rest}
-            fetchChoices={debounceFn}
-          />
-        )}
-      </DebounceAutocomplete>
+      <SingleAutocompleteSelectFieldComponent
+        choices={choices}
+        {...rest}
+        fetchChoices={fetchChoices}
+      />
     );
   }
 
diff --git a/src/utils/handlers/attributeValueSearchHandler.ts b/src/utils/handlers/attributeValueSearchHandler.ts
index c1a303977..c361a8266 100644
--- a/src/utils/handlers/attributeValueSearchHandler.ts
+++ b/src/utils/handlers/attributeValueSearchHandler.ts
@@ -40,7 +40,6 @@ function createAttributeValueSearchHandler(
       search("");
     }
   }, [state.id]);
-
   return {
     loadMore,
     search: handleSearch,