@vuu-ui/vuu-filters 0.8.20-debug → 0.8.21-debug

package/esm/index.js

@@ -905,7 +905,7 @@ import React4, {
 } from "react";
 
 // ../vuu-layout/src/overflow-container/useOverflowContainer.ts
-import { useDragDropNext as useDragDrop } from "@vuu-ui/vuu-ui-controls";
+import { useDragDrop } from "@vuu-ui/vuu-ui-controls";
 import {
   isValidNumber,
   MEASURES,
@@ -2565,21 +2565,13 @@ var TextInput = forwardRef6(function TextInput2({
   const [typeaheadValues, setTypeaheadValues] = useState10([]);
   const getSuggestions = suggestionProvider();
   const handleSingleValueSelectionChange = useCallback17(
-    (evt, value2) => onInputComplete(value2),
+    (_, value2) => onInputComplete(value2),
     [onInputComplete]
   );
   const handleMultiValueSelectionChange = useCallback17(
-    (evt, value2) => {
-      if (value2.length === 1) {
-        onInputComplete(value2[0]);
-      } else if (value2.length > 1) {
-        onInputComplete(value2);
-      }
-    },
+    (_, values) => onInputComplete(values),
     [onInputComplete]
   );
-  useEffect2(() => {
-  }, [column]);
   useEffect2(() => {
     if (table) {
       const params = valueInputValue ? [table, column.name, valueInputValue] : [table, column.name];
@@ -4231,7 +4223,7 @@ var KeySet = class {
   }
   next() {
     if (this.free.length > 0) {
-      return this.free.pop();
+      return this.free.shift();
     } else {
       return this.nextKeyValue++;
     }
@@ -4269,7 +4261,7 @@ var KeySet = class {
     return key;
   }
   toDebugString() {
-    return Array.from(this.keys.entries()).map((k, v) => \`\${k}=>\${v}\`).join(",");
+    return Array.from(this.keys.entries()).map(([k, v]) => \`\${k}=>\${v}\`).join(",");
   }
 };
 
@@ -10008,12 +10000,12 @@ var useFilters = ({
     [filters, onFiltersChanged, saveFilterToSettings, setFilters]
   );
   const handleChangeFilter = useCallback31(
-    (filter) => {
+    (oldFilter, newFilter) => {
       let index = -1;
       const newFilters = filters.map((f, i) => {
-        if (f === filter) {
+        if (f === oldFilter) {
           index = i;
-          return filter;
+          return newFilter;
         } else {
           return f;
         }
@@ -10218,21 +10210,27 @@ var useFilterBar = ({
     },
     [deleteFilter, editPillLabel, filters, focusFilterClause]
   );
+  const addIfNewElseUpdate = useCallback32(
+    (edited, existing) => {
+      if (existing === void 0) {
+        const idx = onAddFilter(edited);
+        editPillLabel(idx);
+        return idx;
+      } else {
+        return onChangeFilter(existing, edited);
+      }
+    },
+    [editPillLabel, onAddFilter, onChangeFilter]
+  );
   const handleMenuAction = useCallback32(
     ({ menuId }) => {
       switch (menuId) {
         case "apply-save": {
-          const isNewFilter = editingFilter.current === void 0;
-          const newFilter = editFilter;
-          const changeHandler = isNewFilter ? onAddFilter : onChangeFilter;
-          const indexOfNewFilter = changeHandler(newFilter);
-          if (isNewFilter) {
-            editPillLabel(indexOfNewFilter);
-          }
+          const editedFilter = editFilter;
+          const idx = addIfNewElseUpdate(editedFilter, editingFilter.current);
+          setActiveFilterIndex(appendIfNotPresent(idx));
           setEditFilter(void 0);
-          setActiveFilterIndex(
-            (indices) => indices.includes(indexOfNewFilter) ? indices : indices.concat(indexOfNewFilter)
-          );
+          editingFilter.current = void 0;
           setShowMenu(false);
           return true;
         }
@@ -10241,7 +10239,6 @@ var useFilterBar = ({
             editFilter,
             EMPTY_FILTER_CLAUSE
           );
-          console.log({ newFilter });
           setEditFilter(newFilter);
           setShowMenu(false);
           return true;
@@ -10256,7 +10253,7 @@ var useFilterBar = ({
           return false;
       }
     },
-    [editFilter, editPillLabel, onAddFilter, onChangeFilter]
+    [editFilter, addIfNewElseUpdate]
   );
   useEffect11(() => {
     if (activeFilterIndex.length > 0) {
@@ -10409,6 +10406,7 @@ var useFilterBar = ({
     showMenu
   };
 };
+var appendIfNotPresent = (n) => (ns) => ns.includes(n) ? ns : ns.concat(n);
 
 // src/filter-bar/FilterBarMenu.tsx
 import { PopupMenu as PopupMenu3 } from "@vuu-ui/vuu-popups";