@rufous/ui 0.3.20 → 0.3.21

package/dist/main.cjs

@@ -4773,6 +4773,7 @@ function DataGrid({
   const menuRef = (0, import_react23.useRef)(null);
   const [showManageColumns, setShowManageColumns] = (0, import_react23.useState)(false);
   const [showAdvancedFilter, setShowAdvancedFilter] = (0, import_react23.useState)(false);
+  const [focusFilterIdx, setFocusFilterIdx] = (0, import_react23.useState)(-1);
   const filterableColumnsProp = initialColumnsProp.filter((c) => c.filterable !== false);
   const initialFilterCol = String(filterableColumnsProp[0]?.field || filterableColumnsProp[0]?.key || "");
   const [advancedFilters, setAdvancedFilters] = (0, import_react23.useState)([
@@ -4821,9 +4822,13 @@ function DataGrid({
       return next;
     });
   }, [initialColumnsProp]);
+  const onFiltersChangeRef = (0, import_react23.useRef)(onFiltersChange);
   (0, import_react23.useEffect)(() => {
-    onFiltersChange?.(advancedFilters);
-  }, [advancedFilters, onFiltersChange]);
+    onFiltersChangeRef.current = onFiltersChange;
+  });
+  (0, import_react23.useEffect)(() => {
+    onFiltersChangeRef.current?.(advancedFilters);
+  }, [advancedFilters]);
   const handleSort = (fieldKey, dir) => {
     if (dir !== void 0) {
       setSortField(fieldKey);
@@ -5092,6 +5097,7 @@ function DataGrid({
       if (!firstCol) return prev;
       return [{ column: String(firstCol.field), operator: getDefaultOperator(firstCol.type), value: "", logic: "AND" }];
     });
+    setFocusFilterIdx(-1);
     setShowAdvancedFilter(false);
   };
   const activeMenuCol = activeMenu ? resolvedColumns.find((c) => String(c.field) === activeMenu) : null;
@@ -5143,7 +5149,18 @@ function DataGrid({
         },
         col.headerName,
         col.sortable !== false && /* @__PURE__ */ import_react23.default.createElement("span", { className: `dg-sort-icon${isSorted ? " dg-sort-icon--active" : ""}` }, isSorted && sortDirection === "asc" && /* @__PURE__ */ import_react23.default.createElement(import_lucide_react2.ChevronUp, { size: 14 }), isSorted && sortDirection === "desc" && /* @__PURE__ */ import_react23.default.createElement(import_lucide_react2.ChevronDown, { size: 14 }), !isSorted && /* @__PURE__ */ import_react23.default.createElement(import_lucide_react2.ChevronsUpDown, { size: 14 }))
-      ), /* @__PURE__ */ import_react23.default.createElement("div", { className: `dg-th-actions${isFiltered ? " dg-th-actions--filtered" : ""}` }, isFiltered && /* @__PURE__ */ import_react23.default.createElement("button", { className: "dg-th-filter-btn", onClick: () => setShowAdvancedFilter(true) }, /* @__PURE__ */ import_react23.default.createElement(import_lucide_react2.Filter, { size: 11 })), !col.disableColumnMenu && /* @__PURE__ */ import_react23.default.createElement(
+      ), /* @__PURE__ */ import_react23.default.createElement("div", { className: `dg-th-actions${isFiltered ? " dg-th-actions--filtered" : ""}` }, isFiltered && /* @__PURE__ */ import_react23.default.createElement(
+        "button",
+        {
+          className: "dg-th-filter-btn",
+          onClick: () => {
+            const idx2 = advancedFilters.findIndex((f) => f.column === colField);
+            setFocusFilterIdx(idx2);
+            setShowAdvancedFilter(true);
+          }
+        },
+        /* @__PURE__ */ import_react23.default.createElement(import_lucide_react2.Filter, { size: 11 })
+      ), !col.disableColumnMenu && /* @__PURE__ */ import_react23.default.createElement(
         "button",
         {
           className: "dg-th-menu-btn",
@@ -5372,7 +5389,7 @@ function DataGrid({
         className: "dg-filter-input",
         placeholder: "Value\u2026",
         value: f.value,
-        autoFocus: idx === advancedFilters.length - 1,
+        autoFocus: focusFilterIdx >= 0 ? idx === focusFilterIdx : idx === advancedFilters.length - 1,
         onChange: (e) => setAdvancedFilters((p) => p.map((fi, i) => i === idx ? { ...fi, value: e.target.value } : fi))
       }
     ));
@@ -9550,7 +9567,9 @@ function SmartSelect({
   value,
   onChange,
   onSearchChange,
+  searchResults = [],
   debounceMs = 300,
+  searchThreshold = 10,
   getOptionLabel,
   getOptionValue,
   getOptionSubLabel,
@@ -9588,14 +9607,20 @@ function SmartSelect({
     return flattenTree(options, getOptionChildren);
   }, [options, getOptionChildren]);
   const flatOptionsList = (0, import_react51.useMemo)(() => flatItems.map((f) => f.option), [flatItems]);
+  const displayOptions = (0, import_react51.useMemo)(() => {
+    if (!searchResults.length) return flatOptionsList;
+    const localKeys = new Set(flatOptionsList.map((o) => getValue(o)));
+    const serverOnly = searchResults.filter((o) => !localKeys.has(getValue(o)));
+    return [...flatOptionsList, ...serverOnly];
+  }, [flatOptionsList, searchResults, getValue]);
   const depthMap = (0, import_react51.useMemo)(() => {
     const map = /* @__PURE__ */ new Map();
     flatItems.forEach(({ option, depth }) => map.set(getValue(option), depth));
     return map;
   }, [flatItems, getValue]);
   const lookup = (0, import_react51.useMemo)(
-    () => buildLookup(options, getOptionChildren, getValue),
-    [options, getOptionChildren, getValue]
+    () => buildLookup(displayOptions, getOptionChildren, getValue),
+    [displayOptions, getOptionChildren, getValue]
   );
   const selectedKeys = (0, import_react51.useMemo)(() => {
     if (multiple) {
@@ -9607,21 +9632,27 @@ function SmartSelect({
     if (!onSearchChange) return;
     if (debounceTimer.current) clearTimeout(debounceTimer.current);
     if (!inputValue) {
-      onSearchChange("");
+      onSearchChange("", 0);
       return;
     }
-    const hasLocalMatch = flatOptionsList.some(
-      (opt) => getOptionLabel(opt).toLowerCase().includes(inputValue.toLowerCase()) || (getOptionSubLabel?.(opt) ?? "").toLowerCase().includes(inputValue.toLowerCase())
-    );
-    if (hasLocalMatch) return;
+    const q = inputValue.toLowerCase();
+    let localCount = 0;
+    for (const opt of flatOptionsList) {
+      if (getOptionLabel(opt).toLowerCase().includes(q) || (getOptionSubLabel?.(opt) ?? "").toLowerCase().includes(q)) {
+        localCount++;
+        if (localCount >= searchThreshold) break;
+      }
+    }
+    if (localCount >= searchThreshold) return;
+    const needed = searchThreshold - localCount;
     if (debounceMs <= 0) {
-      onSearchChange(inputValue);
+      onSearchChange(inputValue, needed);
     } else {
       debounceTimer.current = setTimeout(() => {
-        onSearchChange(inputValue);
+        onSearchChange(inputValue, needed);
       }, debounceMs);
     }
-  }, [onSearchChange, debounceMs, flatOptionsList, getOptionLabel, getOptionSubLabel]);
+  }, [onSearchChange, debounceMs, searchThreshold, flatOptionsList, getOptionLabel, getOptionSubLabel]);
   const handleChange = (0, import_react51.useCallback)((_, newValue) => {
     if (!multiple || !allowChildNodesSelection || !getOptionChildren) {
       onChange?.(newValue);
@@ -9708,10 +9739,12 @@ function SmartSelect({
     if (multiple) {
       const selected = opts.filter((o) => selectedKeys.has(getValue(o)));
       const unselected = opts.filter((o) => !selectedKeys.has(getValue(o)));
-      const filteredRest = inputValue ? unselected.filter(
-        (opt) => getOptionLabel(opt).toLowerCase().includes(inputValue.toLowerCase()) || (getOptionSubLabel?.(opt) ?? "").toLowerCase().includes(inputValue.toLowerCase())
-      ) : unselected;
-      return [...selected, ...filteredRest];
+      if (!inputValue) return [...selected, ...unselected];
+      const q2 = inputValue.toLowerCase();
+      const filteredUnselected = unselected.filter(
+        (opt) => getOptionLabel(opt).toLowerCase().includes(q2) || (getOptionSubLabel?.(opt) ?? "").toLowerCase().includes(q2)
+      ).slice(0, searchThreshold);
+      return [...selected, ...filteredUnselected];
     }
     if (value != null) {
       const selectedLabel = getOptionLabel(value);
@@ -9727,12 +9760,12 @@ function SmartSelect({
     const q = inputValue.toLowerCase();
     return opts.filter(
       (opt) => getOptionLabel(opt).toLowerCase().includes(q) || (getOptionSubLabel?.(opt) ?? "").toLowerCase().includes(q)
-    );
-  }, [filterOptionsProp, multiple, selectedKeys, getValue, getOptionLabel, getOptionSubLabel, value]);
+    ).slice(0, searchThreshold);
+  }, [filterOptionsProp, multiple, selectedKeys, getValue, getOptionLabel, getOptionSubLabel, value, searchThreshold]);
   return /* @__PURE__ */ import_react51.default.createElement(
     Autocomplete,
     {
-      options: flatOptionsList,
+      options: displayOptions,
       value: value ?? (multiple ? [] : null),
       onChange: handleChange,
       onInputChange: handleInputChange,

package/dist/main.d.cts

@@ -1909,15 +1909,28 @@ interface SmartSelectProps<T = any> {
     /** Called when selection changes */
     onChange?: (value: T | T[] | null) => void;
     /**
-     * Called when the typed text finds no local match —
-     * use this to trigger an API / server search.
+     * Called when local matches fall below `searchThreshold`.
+     * Receives the current query and how many more records are needed to fill the threshold.
+     * Use this to trigger an API / server search and update `searchResults`.
      */
-    onSearchChange?: (query: string) => void;
+    onSearchChange?: (query: string, needed: number) => void;
+    /**
+     * Results returned by the API for the current query.
+     * Merged with local matches (duplicates excluded) to fill up to `searchThreshold`.
+     * Reset this to [] when the query is cleared.
+     */
+    searchResults?: T[];
     /**
      * Debounce delay in ms before `onSearchChange` fires.
      * Defaults to 300 ms. Pass 0 to disable debouncing.
      */
     debounceMs?: number;
+    /**
+     * Max results to show when a query is active.
+     * If local matches are fewer than this, `onSearchChange` fires with how many more are needed.
+     * Defaults to 10. Pass 0 to always call the API.
+     */
+    searchThreshold?: number;
     /** Primary display label for an option (required) */
     getOptionLabel: (option: T) => string;
     /** Unique key for an option — defaults to the label string */
@@ -1971,7 +1984,7 @@ interface SmartSelectProps<T = any> {
     style?: CSSProperties;
     sx?: SxProp;
 }
-declare function SmartSelect<T = any>({ options, value, onChange, onSearchChange, debounceMs, getOptionLabel, getOptionValue, getOptionSubLabel, getOptionChildren, multiple, allowChildNodesSelection, loading, loadingText, filterOptions: filterOptionsProp, renderOption: renderOptionProp, limitTags, label, placeholder, variant, size, disabled, error, helperText, fullWidth, required, className, style, sx, }: SmartSelectProps<T>): React__default.JSX.Element;
+declare function SmartSelect<T = any>({ options, value, onChange, onSearchChange, searchResults, debounceMs, searchThreshold, getOptionLabel, getOptionValue, getOptionSubLabel, getOptionChildren, multiple, allowChildNodesSelection, loading, loadingText, filterOptions: filterOptionsProp, renderOption: renderOptionProp, limitTags, label, placeholder, variant, size, disabled, error, helperText, fullWidth, required, className, style, sx, }: SmartSelectProps<T>): React__default.JSX.Element;
 
 type ToolbarButton = 'undo' | 'redo' | 'ai' | 'paragraph' | 'fontsize' | 'font' | 'color' | 'bold' | 'italic' | 'strike' | 'link' | 'lineheight' | 'ul' | 'ol' | 'align' | 'indent' | 'outdent' | 'table' | 'image' | 'video' | 'cut' | 'copy' | 'paste' | 'specialchars' | 'code' | 'fullscreen' | 'tts' | 'stt' | 'translate' | 'todo' | '|';
 type EditorVariant = 'default' | 'basic';

package/dist/main.d.ts

@@ -1909,15 +1909,28 @@ interface SmartSelectProps<T = any> {
     /** Called when selection changes */
     onChange?: (value: T | T[] | null) => void;
     /**
-     * Called when the typed text finds no local match —
-     * use this to trigger an API / server search.
+     * Called when local matches fall below `searchThreshold`.
+     * Receives the current query and how many more records are needed to fill the threshold.
+     * Use this to trigger an API / server search and update `searchResults`.
      */
-    onSearchChange?: (query: string) => void;
+    onSearchChange?: (query: string, needed: number) => void;
+    /**
+     * Results returned by the API for the current query.
+     * Merged with local matches (duplicates excluded) to fill up to `searchThreshold`.
+     * Reset this to [] when the query is cleared.
+     */
+    searchResults?: T[];
     /**
      * Debounce delay in ms before `onSearchChange` fires.
      * Defaults to 300 ms. Pass 0 to disable debouncing.
      */
     debounceMs?: number;
+    /**
+     * Max results to show when a query is active.
+     * If local matches are fewer than this, `onSearchChange` fires with how many more are needed.
+     * Defaults to 10. Pass 0 to always call the API.
+     */
+    searchThreshold?: number;
     /** Primary display label for an option (required) */
     getOptionLabel: (option: T) => string;
     /** Unique key for an option — defaults to the label string */
@@ -1971,7 +1984,7 @@ interface SmartSelectProps<T = any> {
     style?: CSSProperties;
     sx?: SxProp;
 }
-declare function SmartSelect<T = any>({ options, value, onChange, onSearchChange, debounceMs, getOptionLabel, getOptionValue, getOptionSubLabel, getOptionChildren, multiple, allowChildNodesSelection, loading, loadingText, filterOptions: filterOptionsProp, renderOption: renderOptionProp, limitTags, label, placeholder, variant, size, disabled, error, helperText, fullWidth, required, className, style, sx, }: SmartSelectProps<T>): React__default.JSX.Element;
+declare function SmartSelect<T = any>({ options, value, onChange, onSearchChange, searchResults, debounceMs, searchThreshold, getOptionLabel, getOptionValue, getOptionSubLabel, getOptionChildren, multiple, allowChildNodesSelection, loading, loadingText, filterOptions: filterOptionsProp, renderOption: renderOptionProp, limitTags, label, placeholder, variant, size, disabled, error, helperText, fullWidth, required, className, style, sx, }: SmartSelectProps<T>): React__default.JSX.Element;
 
 type ToolbarButton = 'undo' | 'redo' | 'ai' | 'paragraph' | 'fontsize' | 'font' | 'color' | 'bold' | 'italic' | 'strike' | 'link' | 'lineheight' | 'ul' | 'ol' | 'align' | 'indent' | 'outdent' | 'table' | 'image' | 'video' | 'cut' | 'copy' | 'paste' | 'specialchars' | 'code' | 'fullscreen' | 'tts' | 'stt' | 'translate' | 'todo' | '|';
 type EditorVariant = 'default' | 'basic';

package/dist/main.js

@@ -4628,6 +4628,7 @@ function DataGrid({
   const menuRef = useRef10(null);
   const [showManageColumns, setShowManageColumns] = useState9(false);
   const [showAdvancedFilter, setShowAdvancedFilter] = useState9(false);
+  const [focusFilterIdx, setFocusFilterIdx] = useState9(-1);
   const filterableColumnsProp = initialColumnsProp.filter((c) => c.filterable !== false);
   const initialFilterCol = String(filterableColumnsProp[0]?.field || filterableColumnsProp[0]?.key || "");
   const [advancedFilters, setAdvancedFilters] = useState9([
@@ -4676,9 +4677,13 @@ function DataGrid({
       return next;
     });
   }, [initialColumnsProp]);
+  const onFiltersChangeRef = useRef10(onFiltersChange);
   useEffect9(() => {
-    onFiltersChange?.(advancedFilters);
-  }, [advancedFilters, onFiltersChange]);
+    onFiltersChangeRef.current = onFiltersChange;
+  });
+  useEffect9(() => {
+    onFiltersChangeRef.current?.(advancedFilters);
+  }, [advancedFilters]);
   const handleSort = (fieldKey, dir) => {
     if (dir !== void 0) {
       setSortField(fieldKey);
@@ -4947,6 +4952,7 @@ function DataGrid({
       if (!firstCol) return prev;
       return [{ column: String(firstCol.field), operator: getDefaultOperator(firstCol.type), value: "", logic: "AND" }];
     });
+    setFocusFilterIdx(-1);
     setShowAdvancedFilter(false);
   };
   const activeMenuCol = activeMenu ? resolvedColumns.find((c) => String(c.field) === activeMenu) : null;
@@ -4998,7 +5004,18 @@ function DataGrid({
         },
         col.headerName,
         col.sortable !== false && /* @__PURE__ */ React75.createElement("span", { className: `dg-sort-icon${isSorted ? " dg-sort-icon--active" : ""}` }, isSorted && sortDirection === "asc" && /* @__PURE__ */ React75.createElement(ChevronUp, { size: 14 }), isSorted && sortDirection === "desc" && /* @__PURE__ */ React75.createElement(ChevronDown, { size: 14 }), !isSorted && /* @__PURE__ */ React75.createElement(ChevronsUpDown, { size: 14 }))
-      ), /* @__PURE__ */ React75.createElement("div", { className: `dg-th-actions${isFiltered ? " dg-th-actions--filtered" : ""}` }, isFiltered && /* @__PURE__ */ React75.createElement("button", { className: "dg-th-filter-btn", onClick: () => setShowAdvancedFilter(true) }, /* @__PURE__ */ React75.createElement(Filter, { size: 11 })), !col.disableColumnMenu && /* @__PURE__ */ React75.createElement(
+      ), /* @__PURE__ */ React75.createElement("div", { className: `dg-th-actions${isFiltered ? " dg-th-actions--filtered" : ""}` }, isFiltered && /* @__PURE__ */ React75.createElement(
+        "button",
+        {
+          className: "dg-th-filter-btn",
+          onClick: () => {
+            const idx2 = advancedFilters.findIndex((f) => f.column === colField);
+            setFocusFilterIdx(idx2);
+            setShowAdvancedFilter(true);
+          }
+        },
+        /* @__PURE__ */ React75.createElement(Filter, { size: 11 })
+      ), !col.disableColumnMenu && /* @__PURE__ */ React75.createElement(
         "button",
         {
           className: "dg-th-menu-btn",
@@ -5227,7 +5244,7 @@ function DataGrid({
         className: "dg-filter-input",
         placeholder: "Value\u2026",
         value: f.value,
-        autoFocus: idx === advancedFilters.length - 1,
+        autoFocus: focusFilterIdx >= 0 ? idx === focusFilterIdx : idx === advancedFilters.length - 1,
         onChange: (e) => setAdvancedFilters((p) => p.map((fi, i) => i === idx ? { ...fi, value: e.target.value } : fi))
       }
     ));
@@ -9474,7 +9491,9 @@ function SmartSelect({
   value,
   onChange,
   onSearchChange,
+  searchResults = [],
   debounceMs = 300,
+  searchThreshold = 10,
   getOptionLabel,
   getOptionValue,
   getOptionSubLabel,
@@ -9512,14 +9531,20 @@ function SmartSelect({
     return flattenTree(options, getOptionChildren);
   }, [options, getOptionChildren]);
   const flatOptionsList = useMemo3(() => flatItems.map((f) => f.option), [flatItems]);
+  const displayOptions = useMemo3(() => {
+    if (!searchResults.length) return flatOptionsList;
+    const localKeys = new Set(flatOptionsList.map((o) => getValue(o)));
+    const serverOnly = searchResults.filter((o) => !localKeys.has(getValue(o)));
+    return [...flatOptionsList, ...serverOnly];
+  }, [flatOptionsList, searchResults, getValue]);
   const depthMap = useMemo3(() => {
     const map = /* @__PURE__ */ new Map();
     flatItems.forEach(({ option, depth }) => map.set(getValue(option), depth));
     return map;
   }, [flatItems, getValue]);
   const lookup = useMemo3(
-    () => buildLookup(options, getOptionChildren, getValue),
-    [options, getOptionChildren, getValue]
+    () => buildLookup(displayOptions, getOptionChildren, getValue),
+    [displayOptions, getOptionChildren, getValue]
   );
   const selectedKeys = useMemo3(() => {
     if (multiple) {
@@ -9531,21 +9556,27 @@ function SmartSelect({
     if (!onSearchChange) return;
     if (debounceTimer.current) clearTimeout(debounceTimer.current);
     if (!inputValue) {
-      onSearchChange("");
+      onSearchChange("", 0);
       return;
     }
-    const hasLocalMatch = flatOptionsList.some(
-      (opt) => getOptionLabel(opt).toLowerCase().includes(inputValue.toLowerCase()) || (getOptionSubLabel?.(opt) ?? "").toLowerCase().includes(inputValue.toLowerCase())
-    );
-    if (hasLocalMatch) return;
+    const q = inputValue.toLowerCase();
+    let localCount = 0;
+    for (const opt of flatOptionsList) {
+      if (getOptionLabel(opt).toLowerCase().includes(q) || (getOptionSubLabel?.(opt) ?? "").toLowerCase().includes(q)) {
+        localCount++;
+        if (localCount >= searchThreshold) break;
+      }
+    }
+    if (localCount >= searchThreshold) return;
+    const needed = searchThreshold - localCount;
     if (debounceMs <= 0) {
-      onSearchChange(inputValue);
+      onSearchChange(inputValue, needed);
     } else {
       debounceTimer.current = setTimeout(() => {
-        onSearchChange(inputValue);
+        onSearchChange(inputValue, needed);
       }, debounceMs);
     }
-  }, [onSearchChange, debounceMs, flatOptionsList, getOptionLabel, getOptionSubLabel]);
+  }, [onSearchChange, debounceMs, searchThreshold, flatOptionsList, getOptionLabel, getOptionSubLabel]);
   const handleChange = useCallback11((_, newValue) => {
     if (!multiple || !allowChildNodesSelection || !getOptionChildren) {
       onChange?.(newValue);
@@ -9632,10 +9663,12 @@ function SmartSelect({
     if (multiple) {
       const selected = opts.filter((o) => selectedKeys.has(getValue(o)));
       const unselected = opts.filter((o) => !selectedKeys.has(getValue(o)));
-      const filteredRest = inputValue ? unselected.filter(
-        (opt) => getOptionLabel(opt).toLowerCase().includes(inputValue.toLowerCase()) || (getOptionSubLabel?.(opt) ?? "").toLowerCase().includes(inputValue.toLowerCase())
-      ) : unselected;
-      return [...selected, ...filteredRest];
+      if (!inputValue) return [...selected, ...unselected];
+      const q2 = inputValue.toLowerCase();
+      const filteredUnselected = unselected.filter(
+        (opt) => getOptionLabel(opt).toLowerCase().includes(q2) || (getOptionSubLabel?.(opt) ?? "").toLowerCase().includes(q2)
+      ).slice(0, searchThreshold);
+      return [...selected, ...filteredUnselected];
     }
     if (value != null) {
       const selectedLabel = getOptionLabel(value);
@@ -9651,12 +9684,12 @@ function SmartSelect({
     const q = inputValue.toLowerCase();
     return opts.filter(
       (opt) => getOptionLabel(opt).toLowerCase().includes(q) || (getOptionSubLabel?.(opt) ?? "").toLowerCase().includes(q)
-    );
-  }, [filterOptionsProp, multiple, selectedKeys, getValue, getOptionLabel, getOptionSubLabel, value]);
+    ).slice(0, searchThreshold);
+  }, [filterOptionsProp, multiple, selectedKeys, getValue, getOptionLabel, getOptionSubLabel, value, searchThreshold]);
   return /* @__PURE__ */ React108.createElement(
     Autocomplete,
     {
-      options: flatOptionsList,
+      options: displayOptions,
       value: value ?? (multiple ? [] : null),
       onChange: handleChange,
       onInputChange: handleInputChange,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rufous/ui",
   "private": false,
-  "version": "0.3.20",
+  "version": "0.3.21",
   "type": "module",
   "description": "Experimental: A lightweight React UI component library (Beta)",
   "style": "./dist/main.css",