funuicss 3.3.9 → 3.3.10

package/css/fun.css

@@ -3528,15 +3528,13 @@ background-color: rgba(var(--borderRgb), 0.3);
 display: flex;
 align-items: center;
 justify-content: space-between;
-  padding: var(--inputRoundedPadding);
+ padding: var(--inputRoundedPadding);
 background: inherit;
 border: var(--border);
 border-radius: var(--InputButtonBorderRadius);
 cursor: pointer;
 transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
 font-size: 14px;
-line-height: 1.5;
-min-height: 48px;
 user-select: none;
 outline: none;
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.3.9",
+  "version": "3.3.10",
   "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/Export.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Cleans data by removing columns that contain objects
+ * and ensures all values are primitive types (string, number, boolean, null)
+ */
+export declare const cleanDataForExport: (data: any[]) => any[];
+/**
+ * Enhanced export function with automatic data cleaning
+ */
+export declare const ExportData: (filteredData: any, title?: any, selectedField?: any) => void;
+/**
+ * Alternative export function that logs what was cleaned (for debugging)
+ */
+export declare const ExportDataWithLog: (filteredData: any, title?: any, selectedField?: any) => void;

package/ui/table/Export.js

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExportDataWithLog = exports.ExportData = exports.cleanDataForExport = void 0;
+var react_easy_export_1 = require("react-easy-export");
+/**
+ * Cleans data by removing columns that contain objects
+ * and ensures all values are primitive types (string, number, boolean, null)
+ */
+var cleanDataForExport = function (data) {
+    if (!data || data.length === 0)
+        return [];
+    // Get all unique keys from all objects
+    var allKeys = new Set();
+    data.forEach(function (item) {
+        if (item && typeof item === 'object') {
+            Object.keys(item).forEach(function (key) { return allKeys.add(key); });
+        }
+    });
+    // Identify columns that contain objects
+    var columnsWithObjects = new Set();
+    allKeys.forEach(function (key) {
+        var hasObject = data.some(function (item) {
+            var value = item === null || item === void 0 ? void 0 : item[key];
+            return value !== null &&
+                value !== undefined &&
+                typeof value === 'object' &&
+                !Array.isArray(value) &&
+                !(value instanceof Date);
+        });
+        if (hasObject) {
+            columnsWithObjects.add(key);
+        }
+    });
+    // Clean the data by removing problematic columns and converting values
+    return data.map(function (item) {
+        if (!item || typeof item !== 'object')
+            return item;
+        var cleanedItem = {};
+        Object.keys(item).forEach(function (key) {
+            // Skip columns that contain objects
+            if (columnsWithObjects.has(key)) {
+                return;
+            }
+            var value = item[key];
+            // Handle different value types
+            if (value === null || value === undefined) {
+                cleanedItem[key] = '';
+            }
+            else if (Array.isArray(value)) {
+                // Convert arrays to comma-separated strings
+                cleanedItem[key] = value.join(', ');
+            }
+            else if (value instanceof Date) {
+                // Convert dates to ISO strings
+                cleanedItem[key] = value.toISOString();
+            }
+            else if (typeof value === 'object') {
+                // Skip objects (shouldn't reach here due to column filtering above)
+                return;
+            }
+            else {
+                // Primitive values (string, number, boolean)
+                cleanedItem[key] = value;
+            }
+        });
+        return cleanedItem;
+    }).filter(function (item) { return Object.keys(item).length > 0; }); // Remove empty objects
+};
+exports.cleanDataForExport = cleanDataForExport;
+/**
+ * Enhanced export function with automatic data cleaning
+ */
+var ExportData = function (filteredData, title, selectedField) {
+    // Clean the data before export
+    var cleanedData = (0, exports.cleanDataForExport)(filteredData);
+    // Generate filename
+    var filename = title
+        ? "".concat(title).concat(selectedField ? "_".concat(selectedField) : '', ".csv")
+        : 'data.csv';
+    // Export cleaned data
+    (0, react_easy_export_1.exportToCSV)(cleanedData, filename);
+};
+exports.ExportData = ExportData;
+/**
+ * Alternative export function that logs what was cleaned (for debugging)
+ */
+var ExportDataWithLog = function (filteredData, title, selectedField) {
+    if (!filteredData || filteredData.length === 0) {
+        console.warn('No data to export');
+        return;
+    }
+    // Get original columns
+    var originalColumns = Object.keys(filteredData[0] || {});
+    // Clean the data
+    var cleanedData = (0, exports.cleanDataForExport)(filteredData);
+    // Get cleaned columns
+    var cleanedColumns = cleanedData.length > 0 ? Object.keys(cleanedData[0]) : [];
+    // Log what was removed
+    var removedColumns = originalColumns.filter(function (col) { return !cleanedColumns.includes(col); });
+    if (removedColumns.length > 0) {
+        console.log('Removed columns containing objects:', removedColumns);
+    }
+    console.log('Cleaned data preview:', cleanedData.slice(0, 2));
+    // Generate filename
+    var filename = title
+        ? "".concat(title).concat(selectedField ? "_".concat(selectedField) : '', ".csv")
+        : 'data.csv';
+    // Export cleaned data
+    (0, react_easy_export_1.exportToCSV)(cleanedData, filename);
+};
+exports.ExportDataWithLog = ExportDataWithLog;

package/ui/table/Table.js

@@ -74,32 +74,39 @@ var Head_1 = __importDefault(require("./Head"));
 var Body_1 = __importDefault(require("./Body"));
 var Row_1 = __importDefault(require("./Row"));
 var Data_1 = __importDefault(require("./Data"));
+var Input_1 = __importDefault(require("../input/Input"));
 var react_1 = require("react");
 var RowFlex_1 = __importDefault(require("../specials/RowFlex"));
 var Button_1 = __importDefault(require("../button/Button"));
 var pi_1 = require("react-icons/pi");
 var Circle_1 = __importDefault(require("../specials/Circle"));
 var Text_1 = __importDefault(require("../text/Text"));
-var react_easy_export_1 = require("react-easy-export");
 var View_1 = __importDefault(require("../view/View"));
 var ScrollInView_1 = __importDefault(require("../ScrollInView/ScrollInView"));
 var Select_1 = __importDefault(require("../select/Select"));
+var Export_1 = require("./Export");
+var ToolTip_1 = __importDefault(require("../tooltip/ToolTip"));
+var Tip_1 = __importDefault(require("../tooltip/Tip"));
+var Flex_1 = __importDefault(require("../flex/Flex"));
+var ci_1 = require("react-icons/ci");
 function Table(_a) {
     var _b, _c;
-    var children = _a.children, funcss = _a.funcss, bordered = _a.bordered, noStripped = _a.noStripped, hoverable = _a.hoverable, title = _a.title, showTotal = _a.showTotal, light = _a.light, dark = _a.dark, head = _a.head, body = _a.body, data = _a.data, _d = _a.isLoading, isLoading = _d === void 0 ? false : _d, right = _a.right, hideExport = _a.hideExport, height = _a.height, _e = _a.pageSize, pageSize = _e === void 0 ? data ? 10 : 0 : _e, // Default page size,
+    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"]);
     // Check if data is null or undefined before accessing its properties
     // Replace this in your component
-    var _f = (0, react_1.useState)(''), search = _f[0], setSearch = _f[1];
-    var _g = (0, react_1.useState)(1), currentPage = _g[0], setCurrentPage = _g[1];
+    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];
     // 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 _h = (0, react_1.useState)(null), selectedField = _h[0], setSelectedField = _h[1];
-    var _j = (0, react_1.useState)(null), selectedValue = _j[0], setSelectedValue = _j[1];
+    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)(false), showSearch = _l[0], setshowSearch = _l[1];
+    var _m = (0, react_1.useState)(""), searchQuery = _m[0], setsearchQuery = _m[1];
     // Enhanced filter logic:
     var normalize = function (val) { return val === null || val === void 0 ? void 0 : val.toString().toLowerCase().trim(); };
     var matchesSearch = function (item) {
@@ -159,7 +166,7 @@ function Table(_a) {
     }
     // Function to export data to CSV
     var Export = function () {
-        (0, react_easy_export_1.exportToCSV)(filteredData, title ? "".concat(title, " ").concat(selectedField ? "_".concat(selectedField) : '', ".csv") : 'data.csv');
+        (0, Export_1.ExportData)(filteredData, title, selectedField);
     };
     // Extract the data array
     var dataArray = data ? data.data : [];
@@ -181,50 +188,69 @@ function Table(_a) {
                             showTotal && data &&
                                 React.createElement("div", null,
                                     React.createElement(Text_1.default, { text: 'Records: ', size: 'sm' }),
-                                    React.createElement(Text_1.default, { text: filteredData.length, size: 'h6' })),
+                                    React.createElement(Text_1.default, { text: filteredData.length, weight: 600 })),
                             title &&
                                 React.createElement("div", null,
-                                    React.createElement(Text_1.default, { text: title || "", size: 'h4' })))
+                                    React.createElement(Text_1.default, { text: title || "", size: 'h6' })))
                         :
                             React.createElement(React.Fragment, null, showTotal && data &&
                                 React.createElement("div", null,
                                     React.createElement(Text_1.default, { text: 'Records: ', size: 'sm' }),
-                                    React.createElement(Text_1.default, { text: filteredData.length, size: 'h6' }))),
+                                    React.createElement(Text_1.default, { text: filteredData.length, weight: 600, color: 'primary' }))),
                     data && filterableFields ?
-                        React.createElement("div", { className: "col width-200-max" },
-                            React.createElement(RowFlex_1.default, { gap: 0.7 },
-                                !selectedField &&
-                                    React.createElement(Select_1.default, { searchable: true, value: selectedField || '', onChange: function (e) { return handleFieldChange(e); }, options: __spreadArray([
-                                            { text: '🔍 Filter', value: '' },
+                        React.createElement("div", null,
+                            React.createElement(Flex_1.default, { width: '100%', wrap: 'nowrap', alignItems: 'center', gap: 0.7 },
+                                !selectedField && !showSearch &&
+                                    React.createElement(ScrollInView_1.default, null,
+                                        React.createElement(Select_1.default, { fullWidth: true, searchable: true, funcss: 'min-w-300 w-full', rounded: true, value: selectedField || '', onChange: function (e) { return handleFieldChange(e); }, options: __spreadArray([
+                                                { text: '🔍 Filter', value: '' },
+                                                { text: 'All*', value: '' }
+                                            ], (filterableFields || []).map(function (field) { return ({
+                                                text: field,
+                                                value: field
+                                            }); }), true) })),
+                                selectedField && !showSearch && (React.createElement(ScrollInView_1.default, null,
+                                    React.createElement(Select_1.default, { rounded: true, searchable: true, funcss: 'min-w-300 w-full', fullWidth: true, value: selectedValue || '', onChange: function (e) {
+                                            if (e === 'clear_all') {
+                                                setSelectedField('');
+                                            }
+                                            else {
+                                                handleValueChange(e);
+                                                handleChangePage(1);
+                                            }
+                                        }, options: __spreadArray(__spreadArray([
                                             { text: 'All*', value: '' }
-                                        ], (filterableFields || []).map(function (field) { return ({
-                                            text: field,
-                                            value: field
-                                        }); }), true) }),
-                                selectedField && (React.createElement(Select_1.default, { searchable: true, funcss: "width-200-max", value: selectedValue || '', onChange: function (e) {
-                                        if (e === 'clear_all') {
-                                            setSelectedField('');
-                                        }
-                                        else {
-                                            handleValueChange(e);
-                                            handleChangePage(1);
-                                        }
-                                    }, options: __spreadArray(__spreadArray([
-                                        { text: 'All*', value: '' }
-                                    ], uniqueValues
-                                        .filter(Boolean) // remove null/undefined/empty
-                                        .map(function (item) { return ({
-                                        text: item.toString(),
-                                        value: item
-                                    }); }), true), [
-                                        { text: 'Clear', value: 'clear_all' }
-                                    ], false) }))))
+                                        ], uniqueValues
+                                            .filter(Boolean) // remove null/undefined/empty
+                                            .map(function (item) { return ({
+                                            text: item.toString(),
+                                            value: item
+                                        }); }), true), [
+                                            { text: 'Clear', value: 'clear_all' }
+                                        ], false) }))),
+                                showSearch ?
+                                    React.createElement(Flex_1.default, { gap: 0.5, wrap: 'nowrap', alignItems: 'center' },
+                                        React.createElement(ScrollInView_1.default, null,
+                                            React.createElement(Input_1.default, { borderless: true, funcss: 'min-w-300', fullWidth: true, rounded: true, value: searchQuery, onChange: function (e) { return setsearchQuery(e.target.value); }, label: "Search..." })),
+                                        React.createElement(ScrollInView_1.default, { delay: 0.2 },
+                                            React.createElement("div", { onClick: function () { return setshowSearch(false); } },
+                                                React.createElement(ToolTip_1.default, null,
+                                                    React.createElement(pi_1.PiXThin, { className: 'pointer', size: 23, onClick: function () { return setshowSearch(false); } }),
+                                                    React.createElement(Tip_1.default, { tip: "bottom", animation: "Opacity", duration: 1, content: "Close Search" })))))
+                                    :
+                                        React.createElement(ScrollInView_1.default, { delay: 0.2 },
+                                            React.createElement(ToolTip_1.default, null,
+                                                React.createElement(ci_1.CiSearch, { className: 'pointer', size: 23, onClick: function () { return setshowSearch(true); } }),
+                                                React.createElement(Tip_1.default, { tip: "bottom", animation: "Opacity", duration: 1, content: "Search Data" })))))
                         : '',
                     React.createElement(React.Fragment, null,
                         React.createElement(RowFlex_1.default, { gap: 0.5 },
                             right && right,
                             !hideExport &&
-                                React.createElement(Button_1.default, { small: true, bold: true, text: 'Export', startIcon: React.createElement(pi_1.PiFileCsv, null), color: 'gradient', onClick: Export }))))),
+                                React.createElement(ToolTip_1.default, null,
+                                    React.createElement(Circle_1.default, { bg: 'lighter', bordered: true, onClick: Export },
+                                        React.createElement(pi_1.PiExportThin, null)),
+                                    React.createElement(Tip_1.default, { tip: "bottom", animation: "Opacity", duration: 1, content: "Export Data" })))))),
         React.createElement("main", { style: { overflow: "auto", width: "100%" } },
             React.createElement("table", __assign({ className: "table  ".concat(bordered ? 'border' : '', " ").concat(noStripped ? '' : 'stripped', " ").concat(hoverable ? 'hoverableTr' : '', " ").concat(light ? 'light' : '', " ").concat(dark ? 'dark' : ''), style: {
                     height: height ? height + "px" : ""
@@ -236,7 +262,35 @@ function Table(_a) {
                 head && React.createElement(Head_1.default, null, head),
                 body && React.createElement(Body_1.default, null, body),
                 data &&
-                    filteredData.slice(startIndex, endIndex).map(function (mdoc, index) { return (React.createElement(Row_1.default, { funcss: 'animated slide-down', rowKey: index },
+                    filteredData.filter(function (mdoc, index) {
+                        if (searchQuery) {
+                            // Convert search query to lowercase for case-insensitive search
+                            var query_1 = searchQuery.toLowerCase().trim();
+                            if (!query_1)
+                                return true; // If empty query after trim, show all
+                            // Search through all fields defined in data.fields
+                            return data.fields.some(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 = String(value).toLowerCase();
+                                        return stringValue.includes(query_1);
+                                    }
+                                    return false;
+                                }
+                                catch (error) {
+                                    // Handle any errors in accessing nested values
+                                    console.warn("Error accessing field ".concat(field, ":"), error);
+                                    return false;
+                                }
+                            });
+                        }
+                        else {
+                            return true; // If no search query, return all items
+                        }
+                    }).slice(startIndex, endIndex).map(function (mdoc, index) { return (React.createElement(Row_1.default, { funcss: 'animated slide-down', rowKey: 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)));