Add special case when it's the last value

eea · Jun 15, 2023 · 621be65 · 621be65
1 parent 5160c41
commit 621be65
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/searchlib/components/FilterList/ActiveFilterValue.jsx b/searchlib/components/FilterList/ActiveFilterValue.jsx
@@ -35,11 +35,19 @@ const ActiveFilterValue = (props) => {
               name="close"
               tabIndex={0}
               onClick={() => {
-                removeFilter(field, null, type || filterConfig.filterType);
+                if (values.length === 1) {
+                  removeFilter(field, null, type || filterConfig.filterType);
+                } else {
+                  removeFilter(field, value, type || filterConfig.filterType);
+                }
               }}
               onKeyDown={(e) => {
                 if (e.key === 'Enter') {
-                  removeFilter(field, null, type || filterConfig.filterType);
+                  if (values.length === 1) {
+                    removeFilter(field, null, type || filterConfig.filterType);
+                  } else {
+                    removeFilter(field, value, type || filterConfig.filterType);
+                  }
                 }
               }}
             />

diff --git a/searchlib/components/SearchApp/request.js b/searchlib/components/SearchApp/request.js
@@ -94,6 +94,14 @@ export function removeFilter(name, value, type) {
     }
   } else if (value) {
     updatedFilters = removeSingleFilterValue(filters, name, value, type);
+    // console.log('updated', {
+    //   name,
+    //   value,
+    //   type,
+    //   updatedFilters,
+    //   filter,
+    //   filters,
+    // });
   } else {
     if (filter.missing) {
       updatedFilters = [