@facter/ds-core 1.18.0 → 1.20.0

package/dist/index.js

@@ -1656,21 +1656,21 @@ var DataTableSearch = React10__namespace.memo(function DataTableSearch2({
     columnInstance?.getFilterValue() ?? ""
   );
   const debouncedValue = useDebounce(value, debounce);
+  const isServerSide = !!onSearch;
   React10__namespace.useEffect(() => {
-    if (columnInstance) {
-      columnInstance.setFilterValue(debouncedValue || void 0);
-    }
-    if (onSearch) {
+    if (isServerSide) {
       onSearch(debouncedValue);
+    } else if (columnInstance) {
+      columnInstance.setFilterValue(debouncedValue || void 0);
     }
-  }, [debouncedValue, columnInstance, onSearch]);
+  }, [debouncedValue, columnInstance, onSearch, isServerSide]);
   React10__namespace.useEffect(() => {
-    if (!columnInstance) return;
+    if (isServerSide || !columnInstance) return;
     const filterValue = columnInstance.getFilterValue() ?? "";
     if (filterValue !== value) {
       setValue(filterValue);
     }
-  }, [columnInstance?.getFilterValue()]);
+  }, [columnInstance?.getFilterValue(), isServerSide]);
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: cn("relative w-[150px] lg:w-[250px]", className), children: [
     /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Search, { className: "absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground pointer-events-none" }),
     /* @__PURE__ */ jsxRuntime.jsx(
@@ -1712,14 +1712,14 @@ var DataTableFilter = React10__namespace.memo(function DataTableFilter2({
   const filterValue = column?.getFilterValue() ?? [];
   const [localValue, setLocalValue] = React10__namespace.useState("all");
   const currentValue = column ? filterValue.length > 0 ? filterValue[0] : "all" : localValue;
+  const isServerSide = !!onServerValueChange;
   const handleValueChange = React10__namespace.useCallback(
     (value) => {
       const resolvedValue = value === "all" ? void 0 : value;
-      if (column) {
-        column.setFilterValue(resolvedValue ? [resolvedValue] : void 0);
-      }
-      if (onServerValueChange) {
+      if (isServerSide) {
         onServerValueChange(resolvedValue);
+      } else if (column) {
+        column.setFilterValue(resolvedValue ? [resolvedValue] : void 0);
       }
       setLocalValue(value);
     },
@@ -1735,7 +1735,10 @@ var DataTableFilter = React10__namespace.memo(function DataTableFilter2({
       className,
       children: [
         /* @__PURE__ */ jsxRuntime.jsx(SelectItem, { value: "all", children: "Todos" }),
-        options.map((option) => /* @__PURE__ */ jsxRuntime.jsx(SelectItem, { value: option.value, children: option.label }, option.value))
+        options.map((option) => /* @__PURE__ */ jsxRuntime.jsx(SelectItem, { value: option.value, children: /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "flex items-center gap-2", children: [
+          option.icon && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "shrink-0 text-muted-foreground", children: option.icon }),
+          option.label
+        ] }) }, option.value))
       ]
     }
   );