@dragonmastery/zinia-forms-core 0.5.2 → 0.5.4

package/dist/index.d.ts

@@ -2864,6 +2864,7 @@ interface UrlSyncOptions {
 }
 interface DataTable {
     setFilter: (field: any, filter: any) => Promise<void>;
+    clearFilter: (field: any) => Promise<void>;
     clearAllFilters: () => Promise<void>;
     setFiltersFromQueryParams: (params: Record<string, string | string[]>) => Promise<void>;
     load: () => Promise<void>;

package/dist/index.js

@@ -7839,6 +7839,9 @@ function useDataTable(schema, options) {
       delete currentFilters[fieldName];
       tableState.setFilters(currentFilters);
       tableState.setPagination(0);
+      delete filterInputValues.value[fieldName];
+      delete filterInputValues.value[`${fieldName}_start`];
+      delete filterInputValues.value[`${fieldName}_end`];
       await fetchData();
       return;
     }
@@ -8215,6 +8218,14 @@ function getFilterOptions(field, column, fieldsMetadata, filterOptionsState) {
   }
   return [];
 }
+function isBooleanOperator(operator) {
+  if (!operator) return true;
+  return OPERATORS_BY_TYPE.boolean.includes(operator);
+}
+function isEnumOperator(operator) {
+  if (!operator) return true;
+  return OPERATORS_BY_TYPE.enum.includes(operator);
+}
 function getSortLabels(field, column, fieldsMetadata) {
   if (column?.sortLabels) {
     return column.sortLabels;
@@ -8913,7 +8924,7 @@ var EnumMultiSelectFilter = (props) => {
         }
       ) })
     ] }),
-    /* @__PURE__ */ jsx("div", { class: "text-xs text-base-content/60", children: props.operator === "isOneOf" ? "Select one or more values" : "Exclude one or more values" })
+    /* @__PURE__ */ jsx("div", { class: "text-xs text-base-content/60", children: props.operator === OPERATORS.IS_ONE_OF ? "Select one or more values" : "Show rows that do not match these values" })
   ] });
 };
 var SelectFilter = (props) => {
@@ -9039,13 +9050,20 @@ function debounce(key, callback, delay = 300) {
   }, delay);
   timeoutStore.set(key, timeoutId);
 }
+function clearDebounce(key) {
+  const existing = timeoutStore.get(key);
+  if (existing) {
+    clearTimeout(existing);
+    timeoutStore.delete(key);
+  }
+}
 var TextFilter = (props) => {
   const currentOperator = props.filterOperators.value[props.field] || OPERATORS.CONTAINS;
   const isArrayOperator = currentOperator === OPERATORS.IS_ONE_OF || currentOperator === OPERATORS.IS_NOT_ONE_OF;
   const isDefaultOperator = currentOperator === OPERATORS.CONTAINS;
   const showOperatorSelect = !isDefaultOperator;
   const filterInputValue = props.filterInputValues.value[props.field];
-  const displayValue = filterInputValue !== void 0 && filterInputValue !== "" ? filterInputValue : props.value || "";
+  const displayValue = filterInputValue !== void 0 ? filterInputValue : props.value || "";
   const handleFilterChange = (value, operator = currentOperator) => {
     const filter = {
       operator,
@@ -9098,13 +9116,18 @@ var TextFilter = (props) => {
           onInput: (e) => {
             const value = e.target.value;
             props.filterInputValues.value[props.field] = value;
-            debounce(
-              `filter_${props.field}`,
-              () => {
-                handleFilterChange(value);
-              },
-              300
-            );
+            if (value === "") {
+              clearDebounce(`filter_${props.field}`);
+              handleFilterChange("");
+            } else {
+              debounce(
+                `filter_${props.field}`,
+                () => {
+                  handleFilterChange(value);
+                },
+                300
+              );
+            }
           },
           onKeydown: (e) => {
             if (e.key === "Escape" && props.filterInputValues.value[props.field]) {
@@ -9129,7 +9152,7 @@ var NumberFilter = (props) => {
   const currentOperator = props.filterOperators.value[props.field] || OPERATORS.EQUALS;
   const isBetween = currentOperator === OPERATORS.BETWEEN;
   const filterInputValue = props.filterInputValues.value[props.field];
-  const displayValue = filterInputValue !== void 0 && filterInputValue !== "" ? filterInputValue : props.value !== void 0 && props.value !== null && props.value !== "" ? String(props.value) : "";
+  const displayValue = filterInputValue !== void 0 ? filterInputValue : props.value !== void 0 && props.value !== null && props.value !== "" ? String(props.value) : "";
   const handleFilterChange = (value, operator = currentOperator) => {
     const filter = {
       operator
@@ -9186,13 +9209,18 @@ var NumberFilter = (props) => {
           onInput: (e) => {
             const value = e.target.value;
             props.filterInputValues.value[props.field] = value;
-            debounce(
-              `filter_${props.field}`,
-              () => {
-                handleFilterChange(value);
-              },
-              300
-            );
+            if (value === "") {
+              clearDebounce(`filter_${props.field}`);
+              handleFilterChange("");
+            } else {
+              debounce(
+                `filter_${props.field}`,
+                () => {
+                  handleFilterChange(value);
+                },
+                300
+              );
+            }
           },
           onKeydown: (e) => {
             if (e.key === "Escape" && props.filterInputValues.value[props.field]) {
@@ -10160,7 +10188,7 @@ var FilterDrawer = (props) => {
                           isOptionsLoading: filterOptionsLoading?.value?.[field] ?? false,
                           allOptionText: column.filterAllOptionText,
                           showAllOption: column.filterShowAllOption,
-                          operator: currentFilter?.operator,
+                          operator: isEnumOperator(currentFilter?.operator) ? currentFilter?.operator : void 0,
                           fieldType: convertToDataType(props.fieldsMetadata[field]?.type || "enum"),
                           onFilterChange: props.onFilterChange,
                           onClearFilter: props.onClearFilter
@@ -10200,7 +10228,7 @@ var FilterDrawer = (props) => {
                           isLoading: props.isLoading,
                           allOptionText: column.filterAllOptionText,
                           showAllOption: column.filterShowAllOption,
-                          operator: currentFilter?.operator,
+                          operator: isBooleanOperator(currentFilter?.operator) ? currentFilter?.operator : void 0,
                           fieldType: convertToDataType(props.fieldsMetadata[field]?.type || "boolean"),
                           options: getFilterOptions(
                             field,
@@ -11590,6 +11618,10 @@ function useCursorDataTable(schema, options) {
       delete currentFilters[fieldName];
       tableState.setFilters(currentFilters);
       tableState.setCursorNavigation(void 0);
+      delete filterInputValues.value[fieldName];
+      delete filterInputValues.value[`${fieldName}_start`];
+      delete filterInputValues.value[`${fieldName}_end`];
+      await fetchData();
       return;
     }
     const validation = validateFilterValueObject(fieldName, filter, fieldRegistry);
@@ -11909,6 +11941,7 @@ function useDataTableUrlSync(table, router, options = {}) {
   const { loadOnMount = true } = options;
   const isUpdatingFromRoute = ref(false);
   const originalSetFilter = table.setFilter.bind(table);
+  const originalClearFilter = table.clearFilter.bind(table);
   const originalClearAllFilters = table.clearAllFilters.bind(table);
   const extractFilterParams = (query) => {
     const filterParams = {};
@@ -11932,12 +11965,22 @@ function useDataTableUrlSync(table, router, options = {}) {
     router.push({ query });
   };
   table.setFilter = async (field, filter) => {
-    await originalSetFilter(field, filter);
+    const filterPromise = originalSetFilter(field, filter);
+    await nextTick();
+    updateUrlFromFilters();
+    await filterPromise;
+  };
+  table.clearFilter = async (field) => {
+    const filterPromise = originalClearFilter(field);
+    await nextTick();
     updateUrlFromFilters();
+    await filterPromise;
   };
   table.clearAllFilters = async () => {
-    await originalClearAllFilters();
+    const filterPromise = originalClearAllFilters();
+    await nextTick();
     updateUrlFromFilters();
+    await filterPromise;
   };
   watch(
     () => router.currentRoute.value.query,