@megha-ui/react 1.2.370 → 1.2.371

package/dist/components/grid/index.js

@@ -15,7 +15,7 @@ import { MdFilterAltOff, MdGroupOff, MdSave } from "react-icons/md";
 import SummariseDetails from "./utils/SummariseDetails";
 import GlobalSearchChiProps from "./utils/globalSearchChips";
 import GroupedGridDetails from "./utils/groupedGridDetails";
-import { MdFullscreen, MdFullscreenExit, } from "react-icons/md";
+import { MdFullscreen, MdFullscreenExit } from "react-icons/md";
 import Dropdown from "../dropdown";
 import Loader from "../loader";
 import Button from "../button";
@@ -367,14 +367,18 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
                 const columnLevelTokens = groupedColumns
                     ? groupedColumns.split(">").filter(Boolean)
                     : [];
-                const expandedColumnTokens = columnLevelTokens
-                    .flatMap((tok) => tok.split("+").map((s) => s.trim()).filter(Boolean));
+                const expandedColumnTokens = columnLevelTokens.flatMap((tok) => tok
+                    .split("+")
+                    .map((s) => s.trim())
+                    .filter(Boolean));
                 // Values are always flattened and separated by '>'
                 const filterTokens = filterValue
                     ? filterValue.split(">").filter(Boolean)
                     : [];
-                const expandedValueTokens = filterTokens
-                    .flatMap((tok) => tok.split("+").map((s) => s.trim()).filter(Boolean));
+                const expandedValueTokens = filterTokens.flatMap((tok) => tok
+                    .split("+")
+                    .map((s) => s.trim())
+                    .filter(Boolean));
                 const filteredValues = filteredData
                     .filter((row) => {
                     var _a, _b, _c, _d;
@@ -1205,6 +1209,23 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
             .filter((item) => item !== chip)
             .join(","));
     };
+    const comparator = (a, b, type, order) => {
+        const isNumeric = type === "currency" || typeof a === "number" || typeof b === "number";
+        let cmp = 0;
+        if (isNumeric) {
+            const an = a == null || a === "" ? Number.NEGATIVE_INFINITY : Number(a);
+            const bn = b == null || b === "" ? Number.NEGATIVE_INFINITY : Number(b);
+            cmp = an === bn ? 0 : an < bn ? -1 : 1;
+        }
+        else {
+            const as = a == null ? "" : String(a).toLowerCase();
+            const bs = b == null ? "" : String(b).toLowerCase();
+            cmp = as.localeCompare(bs);
+        }
+        if (cmp !== 0)
+            return order === "asc" ? cmp : -cmp;
+        return 0;
+    };
     // const handleReset = () => {
     //   const popped = changed[changed.length - 1];
     //   setChanged((prev) => prev.filter((item) => item !== popped));
@@ -1398,7 +1419,7 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
                                 ? (_a = data[column.key].value) === null || _a === void 0 ? void 0 : _a.toString()
                                 : "";
                         }),
-                    ];
+                    ].sort((a, b) => { var _a, _b; return comparator(a, b, (_a = column.dataType) !== null && _a !== void 0 ? _a : "", (_b = column.fixedFilterOrder) !== null && _b !== void 0 ? _b : "asc"); });
                     selectedValues.forEach((item) => {
                         if (!options.includes(item)) {
                             options.push(item);
@@ -1434,7 +1455,7 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
                                                 updateFixedFilterValues(updatedValues);
                                         }
                                     }
-                                    : undefined, isClear: true, searchEnabled: true, dropdownListWidth: "max-content", className: "h-8 mt-2", isMultiple: column.fixedFilter === "multi-select" }) }, column.key));
+                                    : undefined, isSort: column.fixedFilterOrder ? false : undefined, isClear: true, searchEnabled: true, dropdownListWidth: "max-content", className: "h-8 mt-2", isMultiple: column.fixedFilter === "multi-select" }) }, column.key));
                     }
                     return null;
                 }) }), _jsxs("div", { style: {

package/dist/components/grid/types/grid.d.ts

@@ -5,6 +5,7 @@ export interface Column {
     hidden?: any;
     fixed?: boolean;
     fixedFilter?: string;
+    fixedFilterOrder?: "asc" | "desc";
     freeze?: boolean;
     overflowHidden?: boolean;
     searchType?: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@megha-ui/react",
-  "version": "1.2.370",
+  "version": "1.2.371",
   "description": "A collection of reusable UI components for React applications, built with TypeScript.",
   "main": "./dist/index.js",
   "module": "./dist/index.js",