@megha-ui/react 1.2.754 → 1.2.755

package/dist/components/grid/hooks/useSort.d.ts

@@ -1,5 +1,11 @@
 import { Column, DataRow } from "../types/grid";
-export declare const useSort: (data: DataRow[], columns: Column[], uniqueSearch: any, multiSorting: boolean, withAscii: boolean) => {
+export declare const useSort: (data: DataRow[], columns: Column[], uniqueSearch: any, multiSorting: boolean, withAscii: boolean, combinedColumns?: {
+    name: string;
+    key: string;
+    separator: string;
+    columns: string[];
+    sortOn: string[];
+}[]) => {
     sortedData: DataRow[];
     handleSort: (column: Column | null, order?: "asc" | "desc") => void;
     sortQueries: {

package/dist/components/grid/hooks/useSort.js

@@ -1,14 +1,14 @@
 import { useState, useMemo } from "react";
-export const useSort = (data, columns, uniqueSearch, multiSorting, withAscii) => {
+export const useSort = (data, columns, uniqueSearch, multiSorting, withAscii, combinedColumns) => {
     const [sortQueries, setSortQueries] = useState({});
     const hierarchicalSort = (keys, orders) => {
         return (a, b) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
             for (let i = 0; i < keys.length; i++) {
                 const key = keys[i];
                 const column = columns.find((col) => col.key === key);
                 const order = orders[i] === "asc" ? 1 : -1;
-                const aValue = ((_a = a[key]) === null || _a === void 0 ? void 0 : _a.value)
+                let aValue = ((_a = a[key]) === null || _a === void 0 ? void 0 : _a.value)
                     ? (column === null || column === void 0 ? void 0 : column.dataType) &&
                         ((column === null || column === void 0 ? void 0 : column.dataType) === "number" || (column === null || column === void 0 ? void 0 : column.dataType) === "currency")
                         ? parseFloat((_c = (_b = a[key]) === null || _b === void 0 ? void 0 : _b.value) === null || _c === void 0 ? void 0 : _c.toString())
@@ -18,7 +18,7 @@ export const useSort = (data, columns, uniqueSearch, multiSorting, withAscii) =>
                     : (column === null || column === void 0 ? void 0 : column.dataType) === "number" || (column === null || column === void 0 ? void 0 : column.dataType) === "currency"
                         ? 0
                         : "";
-                const bValue = ((_h = b[key]) === null || _h === void 0 ? void 0 : _h.value)
+                let bValue = ((_h = b[key]) === null || _h === void 0 ? void 0 : _h.value)
                     ? (column === null || column === void 0 ? void 0 : column.dataType) &&
                         ((column === null || column === void 0 ? void 0 : column.dataType) === "number" || (column === null || column === void 0 ? void 0 : column.dataType) === "currency")
                         ? parseFloat((_k = (_j = b[key]) === null || _j === void 0 ? void 0 : _j.value) === null || _k === void 0 ? void 0 : _k.toString())
@@ -28,6 +28,30 @@ export const useSort = (data, columns, uniqueSearch, multiSorting, withAscii) =>
                     : (column === null || column === void 0 ? void 0 : column.dataType) === "number" || (column === null || column === void 0 ? void 0 : column.dataType) === "currency"
                         ? 0
                         : "";
+                if (combinedColumns && (combinedColumns === null || combinedColumns === void 0 ? void 0 : combinedColumns.length) > 0) {
+                    const combinedColumn = combinedColumns.find((col) => col.key === key);
+                    if (combinedColumn) {
+                        const { columns: combinedCols, separator, sortOn } = combinedColumn;
+                        if (sortOn) {
+                            const index = combinedCols.findIndex((colKey) => colKey === sortOn[0]);
+                            const aVals = (((_r = (_q = a[key]) === null || _q === void 0 ? void 0 : _q.value) === null || _r === void 0 ? void 0 : _r.toString()) || "").split(separator);
+                            const bVals = (((_t = (_s = b[key]) === null || _s === void 0 ? void 0 : _s.value) === null || _t === void 0 ? void 0 : _t.toString()) || "").split(separator);
+                            aValue = aVals[index] || "";
+                            bValue = bVals[index] || "";
+                            if (parseFloat(aValue).toString() !== "NaN" &&
+                                parseFloat(bValue).toString() !== "NaN") {
+                                aValue = parseFloat(aValue);
+                                bValue = parseFloat(bValue);
+                            }
+                            else {
+                                if (!withAscii) {
+                                    aValue = aValue.toUpperCase();
+                                    bValue = bValue.toUpperCase();
+                                }
+                            }
+                        }
+                    }
+                }
                 if (aValue < bValue)
                     return -1 * order;
                 if (aValue > bValue)

package/dist/components/grid/index.js

@@ -42,7 +42,7 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
 // Card wrapper props
 withCard = false, cardClassName, cardHeader, title, headerLeft, headerRight, subHeader, cardFooter, getCurrentPage = (page) => {
     console.log("Current page:", page);
-}, currentPage: propCurrentPage, }) => {
+}, currentPage: propCurrentPage, combinedColumns, }) => {
     var _a, _b, _c, _d;
     const [searchQueries, setSearchQueries] = useState({});
     const [chips, setChips] = useState([]);
@@ -533,7 +533,7 @@ withCard = false, cardClassName, cardHeader, title, headerLeft, headerRight, sub
         setSummariseDetails(newSummariseDetails);
     };
     const [totalPages, setTotalPages] = useState(0);
-    const { sortedData, handleSort, sortQueries, setSortQueries } = useSort(filteredData, gridColumns, uniqueSearch, multiSorting, withAscii);
+    const { sortedData, handleSort, sortQueries, setSortQueries } = useSort(filteredData, gridColumns, uniqueSearch, multiSorting, withAscii, combinedColumns);
     const { paginatedData, currentPage, handleChangePage, handleChangeRowsPerPage, rowsPerPage, } = usePagination(sortedData, defaultRowsPerPage, propCurrentPage, getCurrentPage, totalPages);
     useEffect(() => {
         const keys = Object.keys(summariseKeys);

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

@@ -174,6 +174,13 @@ export interface OjasGridProps {
     cardFooter?: ReactNode;
     getCurrentPage?: (page: number) => void;
     currentPage?: number;
+    combinedColumns?: {
+        name: string;
+        key: string;
+        separator: string;
+        columns: string[];
+        sortOn: string[];
+    }[];
 }
 export interface GroupedRowProps {
     item: any;

package/package.json

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