funuicss 3.5.0 → 3.5.1

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.5.0",
+  "version": "3.5.1",
   "name": "funuicss",
   "description": "React and Next.js component UI Library for creating Easy and good looking websites with fewer lines of code. Elevate your web development experience with our cutting-edge React/Next.js component UI Library. Craft stunning websites effortlessly, boasting both seamless functionality and aesthetic appeal—all achieved with minimal lines of code. Unleash the power of simplicity and style in your projects!",
   "main": "index.js",

package/ui/table/Query.d.ts

@@ -1,7 +1,8 @@
 interface DataConfig {
     fields: string[];
+    priorityFields?: string[];
 }
 type GetNestedValueFunction = (obj: any, path: string) => any;
-export declare const getAdvancedFilteredData: <T = any>(filteredData: T[], searchQuery: string, data: DataConfig, getNestedValue: GetNestedValueFunction) => T[];
-export declare const getFilteredAndPaginatedData: <T = any>(filteredData: T[], searchQuery: string, data: DataConfig, getNestedValue: GetNestedValueFunction, startIndex?: number, endIndex?: number) => T[];
+export declare const getAdvancedFilteredData: <T = any>(filteredData: T[], searchQuery: string, data: DataConfig, getNestedValue: GetNestedValueFunction, priorityFields?: string[]) => T[];
+export declare const getFilteredAndPaginatedData: <T = any>(filteredData: T[], searchQuery: string, data: DataConfig, getNestedValue: GetNestedValueFunction, startIndex?: number, endIndex?: number, priorityFields?: string[]) => T[];
 export {};

package/ui/table/Query.js

@@ -1,6 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFilteredAndPaginatedData = exports.getAdvancedFilteredData = void 0;
+// Helper function to check if a nested field exists
+var fieldExists = function (obj, path, getNestedValue) {
+    try {
+        var value = getNestedValue(obj, path);
+        return value !== null && value !== undefined;
+    }
+    catch (error) {
+        return false;
+    }
+};
 // Simple Levenshtein distance function for fuzzy matching
 var levenshteinDistance = function (str1, str2) {
     var matrix = Array(str2.length + 1).fill(null).map(function () {
@@ -92,8 +102,9 @@ var searchStrategies = [
         });
     },
 ];
-// MAIN FUNCTION: Direct replacement for your original code
-var getAdvancedFilteredData = function (filteredData, searchQuery, data, getNestedValue) {
+// MAIN FUNCTION: Enhanced with priority fields support
+var getAdvancedFilteredData = function (filteredData, searchQuery, data, getNestedValue, priorityFields // New optional parameter for priority fields
+) {
     return filteredData.filter(function (mdoc, index) {
         if (searchQuery) {
             // Convert search query to lowercase for case-insensitive search
@@ -102,27 +113,68 @@ var getAdvancedFilteredData = function (filteredData, searchQuery, data, getNest
                 return true; // If empty query after trim, show all
             // Split query into multiple terms for multi-term search
             var queryTerms_1 = query_1.split(/\s+/).filter(function (term) { return term.length > 0; });
-            // Search through all fields defined in data.fields
-            return data.fields.some(function (field) {
+            // Determine which fields to search and in what order
+            var fieldsToSearch = [];
+            if (priorityFields && priorityFields.length > 0) {
+                // First add priority fields that exist in the data config and in the object
+                var validPriorityFields = priorityFields.filter(function (field) {
+                    return data.fields.includes(field) && fieldExists(mdoc, field, getNestedValue);
+                });
+                fieldsToSearch.push.apply(fieldsToSearch, validPriorityFields);
+                // Then add remaining fields from data.fields that aren't in priority and exist in the object
+                var remainingFields = data.fields.filter(function (field) {
+                    return !priorityFields.includes(field) && fieldExists(mdoc, field, getNestedValue);
+                });
+                fieldsToSearch.push.apply(fieldsToSearch, remainingFields);
+            }
+            else {
+                // Use data.priorityFields if available, otherwise use data.fields
+                var priorityFromConfig_1 = data.priorityFields || [];
+                if (priorityFromConfig_1.length > 0) {
+                    var validPriorityFields = priorityFromConfig_1.filter(function (field) {
+                        return data.fields.includes(field) && fieldExists(mdoc, field, getNestedValue);
+                    });
+                    fieldsToSearch.push.apply(fieldsToSearch, validPriorityFields);
+                    var remainingFields = data.fields.filter(function (field) {
+                        return !priorityFromConfig_1.includes(field) && fieldExists(mdoc, field, getNestedValue);
+                    });
+                    fieldsToSearch.push.apply(fieldsToSearch, remainingFields);
+                }
+                else {
+                    // Just use fields that exist in the object
+                    fieldsToSearch = data.fields.filter(function (field) { return fieldExists(mdoc, field, getNestedValue); });
+                }
+            }
+            var _loop_1 = function (field) {
                 try {
                     // Get the value using the same getNestedValue function used for display
                     var value = getNestedValue(mdoc, field);
                     // Convert value to string and search
                     if (value !== null && value !== undefined) {
                         var stringValue_1 = String(value).toLowerCase();
-                        // Use advanced search strategies instead of just includes
-                        return searchStrategies.some(function (strategy) {
+                        // Use advanced search strategies
+                        var foundMatch = searchStrategies.some(function (strategy) {
                             return strategy(stringValue_1, query_1, queryTerms_1);
                         });
+                        if (foundMatch) {
+                            return { value: true };
+                        }
                     }
-                    return false;
                 }
                 catch (error) {
                     // Handle any errors in accessing nested values
                     console.warn("Error accessing field ".concat(field, ":"), error);
-                    return false;
+                    return "continue";
                 }
-            });
+            };
+            // Search through fields in priority order - return true on first match
+            for (var _i = 0, fieldsToSearch_1 = fieldsToSearch; _i < fieldsToSearch_1.length; _i++) {
+                var field = fieldsToSearch_1[_i];
+                var state_1 = _loop_1(field);
+                if (typeof state_1 === "object")
+                    return state_1.value;
+            }
+            return false; // No matches found in any field
         }
         else {
             return true; // If no search query, return all items
@@ -131,9 +183,10 @@ var getAdvancedFilteredData = function (filteredData, searchQuery, data, getNest
 };
 exports.getAdvancedFilteredData = getAdvancedFilteredData;
 // Optional: Simplified version with pagination built-in
-var getFilteredAndPaginatedData = function (filteredData, searchQuery, data, getNestedValue, startIndex, endIndex) {
+var getFilteredAndPaginatedData = function (filteredData, searchQuery, data, getNestedValue, startIndex, endIndex, priorityFields // Added priority fields parameter
+) {
     if (startIndex === void 0) { startIndex = 0; }
-    var filtered = (0, exports.getAdvancedFilteredData)(filteredData, searchQuery, data, getNestedValue);
+    var filtered = (0, exports.getAdvancedFilteredData)(filteredData, searchQuery, data, getNestedValue, priorityFields);
     return endIndex !== undefined ? filtered.slice(startIndex, endIndex) : filtered.slice(startIndex);
 };
 exports.getFilteredAndPaginatedData = getFilteredAndPaginatedData;

package/ui/table/Table.d.ts

@@ -18,6 +18,7 @@ type TableProps = {
         "funcss": string[];
     };
     filterOnchange?: (filter?: any, value?: any, totals?: number) => {};
+    clearSearch?: boolean;
     head?: React.ReactNode;
     right?: React.ReactNode;
     body?: React.ReactNode;
@@ -34,8 +35,9 @@ type TableProps = {
         onClick?: (data: any) => void;
     }[];
     filterableFields?: string[];
+    prioritizeSearchFields?: string[];
 };
 export default function Table({ children, funcss, bordered, noStripped, hoverable, title, showTotal, light, dark, head, body, data, isLoading, right, hideExport, height, pageSize, // Default page size,
 customColumns, filterableFields, // New prop
-emptyResponse, filterOnchange, ...rest }: TableProps): React.JSX.Element;
+emptyResponse, filterOnchange, clearSearch, prioritizeSearchFields, ...rest }: TableProps): React.JSX.Element;
 export {};

package/ui/table/Table.js

@@ -95,20 +95,25 @@ function Table(_a) {
     var _b, _c;
     var children = _a.children, funcss = _a.funcss, bordered = _a.bordered, noStripped = _a.noStripped, hoverable = _a.hoverable, _d = _a.title, title = _d === void 0 ? "" : _d, showTotal = _a.showTotal, light = _a.light, dark = _a.dark, head = _a.head, body = _a.body, data = _a.data, _e = _a.isLoading, isLoading = _e === void 0 ? false : _e, right = _a.right, hideExport = _a.hideExport, height = _a.height, _f = _a.pageSize, pageSize = _f === void 0 ? data ? 10 : 0 : _f, // Default page size,
     customColumns = _a.customColumns, filterableFields = _a.filterableFields, // New prop
-    emptyResponse = _a.emptyResponse, filterOnchange = _a.filterOnchange, rest = __rest(_a, ["children", "funcss", "bordered", "noStripped", "hoverable", "title", "showTotal", "light", "dark", "head", "body", "data", "isLoading", "right", "hideExport", "height", "pageSize", "customColumns", "filterableFields", "emptyResponse", "filterOnchange"]);
+    emptyResponse = _a.emptyResponse, filterOnchange = _a.filterOnchange, clearSearch = _a.clearSearch, _g = _a.prioritizeSearchFields, prioritizeSearchFields = _g === void 0 ? [] : _g, rest = __rest(_a, ["children", "funcss", "bordered", "noStripped", "hoverable", "title", "showTotal", "light", "dark", "head", "body", "data", "isLoading", "right", "hideExport", "height", "pageSize", "customColumns", "filterableFields", "emptyResponse", "filterOnchange", "clearSearch", "prioritizeSearchFields"]);
     // Check if data is null or undefined before accessing its properties
     // Replace this in your component
-    var _g = (0, react_1.useState)(''), search = _g[0], setSearch = _g[1];
-    var _h = (0, react_1.useState)(1), currentPage = _h[0], setCurrentPage = _h[1];
+    var _h = (0, react_1.useState)(''), search = _h[0], setSearch = _h[1];
+    var _j = (0, react_1.useState)(1), currentPage = _j[0], setCurrentPage = _j[1];
     // Determine the total number of pages based on data length and page size
     var totalPages = data ? Math.ceil((((_b = data === null || data === void 0 ? void 0 : data.data) === null || _b === void 0 ? void 0 : _b.length) || 0) / pageSize) : 0;
     // Calculate start and end indices for data pagination
     var startIndex = data ? (currentPage - 1) * pageSize : 0;
     var endIndex = data ? Math.min(startIndex + pageSize, ((_c = data === null || data === void 0 ? void 0 : data.data) === null || _c === void 0 ? void 0 : _c.length) || 0) : 0;
-    var _j = (0, react_1.useState)(null), selectedField = _j[0], setSelectedField = _j[1];
-    var _k = (0, react_1.useState)(null), selectedValue = _k[0], setSelectedValue = _k[1];
-    var _l = (0, react_1.useState)(true), showSearch = _l[0], setshowSearch = _l[1];
-    var _m = (0, react_1.useState)(""), searchQuery = _m[0], setsearchQuery = _m[1];
+    var _k = (0, react_1.useState)(null), selectedField = _k[0], setSelectedField = _k[1];
+    var _l = (0, react_1.useState)(null), selectedValue = _l[0], setSelectedValue = _l[1];
+    var _m = (0, react_1.useState)(true), showSearch = _m[0], setshowSearch = _m[1];
+    var _o = (0, react_1.useState)(""), searchQuery = _o[0], setsearchQuery = _o[1];
+    React.useEffect(function () {
+        if (clearSearch) {
+            setsearchQuery('');
+        }
+    }, [clearSearch]);
     // Enhanced filter logic:
     var normalize = function (val) { return val === null || val === void 0 ? void 0 : val.toString().toLowerCase().trim(); };
     var matchesSearch = function (item) {
@@ -269,41 +274,20 @@ function Table(_a) {
                 head && React.createElement(Head_1.default, null, head),
                 body && React.createElement(Body_1.default, null, body),
                 data &&
-                    // filteredData.filter((mdoc, index) => {
-                    //   if(searchQuery){
-                    //     // Convert search query to lowercase for case-insensitive search
-                    //     const query = searchQuery.toLowerCase().trim();
-                    //     if (!query) return true; // If empty query after trim, show all
-                    //     // Search through all fields defined in data.fields
-                    //     return data.fields.some(field => {
-                    //       try {
-                    //         // Get the value using the same getNestedValue function used for display
-                    //         const value = getNestedValue(mdoc, field);
-                    //         // Convert value to string and search
-                    //         if (value !== null && value !== undefined) {
-                    //           const stringValue = String(value).toLowerCase();
-                    //           return stringValue.includes(query);
-                    //         }
-                    //         return false;
-                    //       } catch (error) {
-                    //         // Handle any errors in accessing nested values
-                    //         console.warn(`Error accessing field ${field}:`, error);
-                    //         return false;
-                    //       }
-                    //     });
-                    //   } else {
-                    //     return true; // If no search query, return all items
-                    //   }
-                    // })
-                    (0, Query_1.getAdvancedFilteredData)(filteredData, searchQuery, data, getNestedValue).slice(startIndex, endIndex).map(function (mdoc, index) { return (React.createElement("tr", { className: 'animated slide-up', key: index },
-                        data.fields.map(function (fdoc, findex) {
-                            var _a;
-                            return (React.createElement(Data_1.default, { key: fdoc, funcss: data.funcss ? ((_a = data === null || data === void 0 ? void 0 : data.funcss) === null || _a === void 0 ? void 0 : _a[findex]) || '' : '' }, getNestedValue(mdoc, fdoc)));
-                        }),
-                        customColumns ?
-                            customColumns.map(function (column, columnIndex) { return (React.createElement("td", { key: columnIndex },
-                                column.render && column.render(mdoc),
-                                column.onClick && (React.createElement(Button_1.default, { onClick: function () { return column.onClick && column.onClick(mdoc); } }, column.title)))); }) : "")); }),
+                    (function () {
+                        var results = (0, Query_1.getAdvancedFilteredData)(filteredData, searchQuery, data, getNestedValue, prioritizeSearchFields);
+                        var shouldSlice = !searchQuery || results.length > 10;
+                        return (shouldSlice ? results.slice(startIndex, endIndex) : results)
+                            .map(function (mdoc, index) { return (React.createElement("tr", { className: 'animated slide-up', key: index },
+                            data.fields.map(function (fdoc, findex) {
+                                var _a;
+                                return (React.createElement(Data_1.default, { key: fdoc, funcss: data.funcss ? ((_a = data === null || data === void 0 ? void 0 : data.funcss) === null || _a === void 0 ? void 0 : _a[findex]) || '' : '' }, getNestedValue(mdoc, fdoc)));
+                            }),
+                            customColumns ?
+                                customColumns.map(function (column, columnIndex) { return (React.createElement("td", { key: columnIndex },
+                                    column.render && column.render(mdoc),
+                                    column.onClick && (React.createElement(Button_1.default, { onClick: function () { return column.onClick && column.onClick(mdoc); } }, column.title)))); }) : "")); });
+                    })(),
                 isLoading &&
                     [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(function () { return (React.createElement(Row_1.default, { funcss: 'skeleton' })); }),
                 children ? children : ''),