@megha-ui/react 1.2.72 → 1.2.74

package/dist/components/dropdown/index.js

@@ -262,8 +262,6 @@ const Dropdown = ({ options, selectedValues, onChange, placeholder = "Select..."
     };
     const handleClick = (e) => {
         const clearEle = document.getElementById(clearId || "");
-        console.log("clearEle", clearEle);
-        console.log("e.target", e.target, clearEle === e.target);
         if (clearEle === e.target) {
             e.preventDefault();
         }

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

@@ -46,7 +46,6 @@ const useSort = (data, columns, uniqueSearch, multiSorting, withAscii) => {
                 return false;
             });
         });
-        console.log(returnData);
         return returnData;
     }, [data, sortQueries, uniqueSearch]);
     const handleSort = (column, order) => {

package/dist/components/grid/index.js

@@ -62,7 +62,7 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
     borderLeft: "0.5rem solid #d9d9d9",
 }, defaultSort, noKeyEvents = true, customOperation, hasCustomOperation, globalSearch, headerDropdownIndex, draggable = false, resizable = false, updateGridData, widthUnits, checkboxWrapper, ignoreHugContent = false, setRendered, isSummarise = true, fullScreenAvailable = true, defaultGroupOpen, alternateRowColor = true, activeCalculateColor = "#2377BA", calculatetextColor = "#fff", actionsKey = "actions", saveAsNewView = false, handleSaveAsView, saveAsViewIcon, filterData, chipColor = "#ccc", withAscii = false, propSummariseKeys, SummariseIcon, summarizeColor = "black", isExpandable = false, expandedRow, extraRow, selectedCheckBox, setSelectedCheckbox, ignoreRowSelect, setOpenedRows, openedRows, getLoadingState, globalSearchOpen = false, updateFixedFilterValues = (fixedFilterValues) => {
     console.log("Update fixed filter values not implemented", fixedFilterValues);
-}, }) => {
+}, locale, formatOptions }) => {
     var _a, _b, _c, _d;
     const [searchQueries, setSearchQueries] = (0, react_1.useState)({});
     const [chips, setChips] = (0, react_1.useState)([]);
@@ -144,8 +144,8 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
                 return acc;
             }, {});
             _columns = _columns.map((item) => {
-                var _a;
-                return (Object.assign(Object.assign({}, item), { dataType: (_a = columnData === null || columnData === void 0 ? void 0 : columnData[item.key]) !== null && _a !== void 0 ? _a : "string" }));
+                var _a, _b;
+                return (Object.assign(Object.assign({}, item), { dataType: (_b = (_a = item.dataType) !== null && _a !== void 0 ? _a : columnData === null || columnData === void 0 ? void 0 : columnData[item.key]) !== null && _b !== void 0 ? _b : "string" }));
             });
         }
         setGridColumns(_columns);
@@ -1392,10 +1392,10 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
                         }, children: (0, jsx_runtime_1.jsx)(loader_1.default, { size: 32 }) })), (0, jsx_runtime_1.jsx)("div", { id: "table-body", children: gridGroupBy !== "" ? ((0, jsx_runtime_1.jsx)(groupedGridDetails_1.default, { groupedData: groupedData, rowOpened: rowOpened, startIndex: startIndex, endIndex: endIndex, alternateRowColor: alternateRowColor, updateRowOpened: updateRowOpened, columnWidths: columnWidths, columnHeights: columnHeights, groupBy: groupBy, widthMode: widthMode, rowKey: rowKey, rowHeight: rowHeight, headerBackground: headerBackground, isSummarise: summariseAvailable, gridGroupBy: gridGroupBy, rowStyle: rowStyle, sortable: sortable, cellStyle: cellStyle, summariseKeys: summariseKeys, summariseDetails: summariseDetails, activeCalculateColor: activeCalculateColor, gridRef: gridRef, setCalculatePosition: setCalculatePosition, calculatePosition: calculatePosition, calculatetextColor: calculatetextColor, setCalculateVisible: setCalculateVisible, calculateVisible: calculateVisible, summariseDisplay: summariseDisplay, recalculate: recalculate, selectedRowStyle: selectedRowStyle, isLoading: isLoading, selectedRow: selectedRow, onRowClick: onRowClick, gridColumns: gridColumns, bulkSelect: bulkSelect, selectedRows: selectedRows, toggleRowSelection: toggleRowSelection, hasVerticalScroll: hasVerticalScroll, setColumnWidths: setColumnWidths, setColumnHeights: setColumnHeights, actionsKey: actionsKey })) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(paginate ? paginatedData : sortedData).map((item, index) => {
                                     var _a, _b, _c, _d;
                                     if (paginate) {
-                                        return ((0, jsx_runtime_1.jsx)(gridRow_1.default, { item: item, index: index, rowStyle: Object.assign(Object.assign({}, rowStyle), (selectedRow === index ? selectedRowStyle : {})), handleDragStart: handleDragStart, handleDragOver: handleDragOver, handleDrop: handleDrop, draggable: draggable, cellStyle: cellStyle, rowHeight: rowHeight, alternateRowColor: alternateRowColor, bulkSelect: bulkSelect, selectedRows: selectedRows ? selectedRows : new Set([""]), ignoreRowSelect: ignoreRowSelect ? ignoreRowSelect : new Set([""]), toggleRowSelection: toggleRowSelection, columns: gridColumns, widthMode: widthMode, hasVerticalScroll: hasVerticalScroll, onRowClick: onRowClick, loading: isLoading, groupBy: gridGroupBy, rowKey: rowKey, rowIndex: rowIndex, columnIndex: columnIndex, hlBorderColor: hlBorderColor, hugColumnWidths: columnWidths, hugColumnHeights: columnHeights, expandedRow: expandedRow, isExpandable: isExpandable, checkboxWrapper: checkboxWrapper }, String((_b = (_a = item.id) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : index)));
+                                        return ((0, jsx_runtime_1.jsx)(gridRow_1.default, { item: item, index: index, rowStyle: Object.assign(Object.assign({}, rowStyle), (selectedRow === index ? selectedRowStyle : {})), handleDragStart: handleDragStart, handleDragOver: handleDragOver, handleDrop: handleDrop, draggable: draggable, cellStyle: cellStyle, rowHeight: rowHeight, alternateRowColor: alternateRowColor, bulkSelect: bulkSelect, selectedRows: selectedRows ? selectedRows : new Set([""]), ignoreRowSelect: ignoreRowSelect ? ignoreRowSelect : new Set([""]), toggleRowSelection: toggleRowSelection, columns: gridColumns, widthMode: widthMode, hasVerticalScroll: hasVerticalScroll, onRowClick: onRowClick, loading: isLoading, groupBy: gridGroupBy, rowKey: rowKey, rowIndex: rowIndex, columnIndex: columnIndex, hlBorderColor: hlBorderColor, hugColumnWidths: columnWidths, hugColumnHeights: columnHeights, expandedRow: expandedRow, isExpandable: isExpandable, checkboxWrapper: checkboxWrapper, locale: locale, formatOptions: formatOptions }, String((_b = (_a = item.id) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : index)));
                                     }
                                     else if (index >= startIndex && index <= endIndex) {
-                                        return ((0, jsx_runtime_1.jsx)(gridRow_1.default, { item: item, index: index, rowStyle: Object.assign(Object.assign({}, rowStyle), (selectedRow === index ? selectedRowStyle : {})), handleDragStart: handleDragStart, handleDragOver: handleDragOver, handleDrop: handleDrop, draggable: draggable, cellStyle: cellStyle, rowHeight: rowHeight, alternateRowColor: alternateRowColor, bulkSelect: bulkSelect, selectedRows: selectedRows ? selectedRows : new Set([""]), ignoreRowSelect: ignoreRowSelect ? ignoreRowSelect : new Set([""]), toggleRowSelection: toggleRowSelection, columns: gridColumns, widthMode: widthMode, hasVerticalScroll: hasVerticalScroll, onRowClick: onRowClick, loading: isLoading, groupBy: gridGroupBy, rowKey: rowKey, rowIndex: rowIndex, columnIndex: columnIndex, hlBorderColor: hlBorderColor, hugColumnWidths: columnWidths, hugColumnHeights: columnHeights, expandedRow: expandedRow, isExpandable: isExpandable, checkboxWrapper: checkboxWrapper }, String((_d = (_c = item.id) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : index)));
+                                        return ((0, jsx_runtime_1.jsx)(gridRow_1.default, { item: item, index: index, rowStyle: Object.assign(Object.assign({}, rowStyle), (selectedRow === index ? selectedRowStyle : {})), handleDragStart: handleDragStart, handleDragOver: handleDragOver, handleDrop: handleDrop, draggable: draggable, cellStyle: cellStyle, rowHeight: rowHeight, alternateRowColor: alternateRowColor, bulkSelect: bulkSelect, selectedRows: selectedRows ? selectedRows : new Set([""]), ignoreRowSelect: ignoreRowSelect ? ignoreRowSelect : new Set([""]), toggleRowSelection: toggleRowSelection, columns: gridColumns, widthMode: widthMode, hasVerticalScroll: hasVerticalScroll, onRowClick: onRowClick, loading: isLoading, groupBy: gridGroupBy, rowKey: rowKey, rowIndex: rowIndex, columnIndex: columnIndex, hlBorderColor: hlBorderColor, hugColumnWidths: columnWidths, hugColumnHeights: columnHeights, expandedRow: expandedRow, isExpandable: isExpandable, checkboxWrapper: checkboxWrapper, locale: locale, formatOptions: formatOptions }, String((_d = (_c = item.id) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : index)));
                                     }
                                 }), extraRow && extraRow, (paginate ? paginatedData : sortedData).length === 0 &&
                                     typeof extraRow === "undefined" && ((0, jsx_runtime_1.jsx)("div", { style: {

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

@@ -153,6 +153,8 @@ export interface OjasGridProps {
     updateFixedFilterValues?: (fixedFilterValues: {
         [key: string]: string[];
     }) => void;
+    locale?: string;
+    formatOptions?: any;
 }
 export interface GroupedRowProps {
     item: any;
@@ -279,6 +281,8 @@ export interface GridRowProps {
     isExpandable: boolean;
     expandedRow?: string;
     ignoreRowSelect?: Set<string>;
+    locale?: string;
+    formatOptions?: any;
 }
 export interface SearchQuery {
     text: string;

package/dist/components/grid/utils/gridHeader.js

@@ -111,7 +111,6 @@ const GridHeader = ({ columns, onSearch, searchQueries, sortable, search, resiza
         };
     }, []);
     (0, react_1.useEffect)(() => {
-        console.log({ columns });
         setHeaderColumns(columns);
     }, [columns]);
     const toggleDropdown = (columnKey) => {

package/dist/components/grid/utils/gridRow.js

@@ -7,6 +7,7 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const shimmer_1 = __importDefault(require("./shimmer"));
 const checkbox_1 = __importDefault(require("../../checkbox"));
+const commonService_1 = require("../../../services/commonService");
 const isUrl = (value) => {
     if (value) {
         const urlPattern = new RegExp("^(https?:\\/\\/)?" +
@@ -21,7 +22,7 @@ const isUrl = (value) => {
     }
     return false;
 };
-const GridRow = ({ item, rowStyle, cellStyle, rowHeight, bulkSelect, selectedRows, toggleRowSelection, columns, widthMode, index, rowKey, hasVerticalScroll, onRowClick, loading, groupBy, rowIndex, columnIndex, hlBorderColor, handleDragStart, handleDragOver, handleDrop, draggable, checkboxWrapper, hugColumnWidths, hugColumnHeights, alternateRowColor, isExpandable, expandedRow, ignoreRowSelect, }) => {
+const GridRow = ({ item, rowStyle, cellStyle, rowHeight, bulkSelect, selectedRows, toggleRowSelection, columns, widthMode, index, rowKey, hasVerticalScroll, onRowClick, loading, groupBy, rowIndex, columnIndex, hlBorderColor, handleDragStart, handleDragOver, handleDrop, draggable, checkboxWrapper, hugColumnWidths, hugColumnHeights, alternateRowColor, isExpandable, expandedRow, ignoreRowSelect, locale, formatOptions }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const [itemsAlign, setItemsAlign] = (0, react_1.useState)("stretch");
     const handleRowClick = (0, react_1.useCallback)(() => {
@@ -59,12 +60,12 @@ const GridRow = ({ item, rowStyle, cellStyle, rowHeight, bulkSelect, selectedRow
                                 ? "var(--row-bg)"
                                 : "var(--row-bg-even)",
                         }, className: `column index-${groupBy}`, children: (0, jsx_runtime_1.jsx)("div", { children: ((_d = item[groupBy]) === null || _d === void 0 ? void 0 : _d.html) || ((_e = item[groupBy]) === null || _e === void 0 ? void 0 : _e.value) }) })), columns.map((column, colIndex) => {
-                        var _a, _b;
+                        var _a, _b, _c;
                         const cellData = item[column.key];
                         const cellValue = cellData && Object.keys(cellData).includes("html")
                             ? cellData === null || cellData === void 0 ? void 0 : cellData.html
                             : cellData && Object.keys(cellData).includes("value")
-                                ? cellData === null || cellData === void 0 ? void 0 : cellData.value
+                                ? (0, commonService_1.formatValue)(cellData === null || cellData === void 0 ? void 0 : cellData.value, (_a = column.dataType) !== null && _a !== void 0 ? _a : "string", locale, formatOptions)
                                 : cellData
                                     ? cellData
                                     : "";
@@ -98,7 +99,7 @@ const GridRow = ({ item, rowStyle, cellStyle, rowHeight, bulkSelect, selectedRow
                                                 : column.dataType === "number"
                                                     ? "end"
                                                     : "start",
-                                        }, children: isUrl(cellUrl) ? ((0, jsx_runtime_1.jsx)("a", { href: cellUrl, target: "_blank", rel: "noopener noreferrer", children: cellValue })) : column.render ? (column.render(cellValue)) : (cellValue) }))] }, `${column.key}-${(_b = (_a = item.id) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : index}`));
+                                        }, children: isUrl(cellUrl) ? ((0, jsx_runtime_1.jsx)("a", { href: cellUrl, target: "_blank", rel: "noopener noreferrer", children: cellValue })) : column.render ? (column.render(cellValue)) : (cellValue) }))] }, `${column.key}-${(_c = (_b = item.id) === null || _b === void 0 ? void 0 : _b.value) !== null && _c !== void 0 ? _c : index}`));
                         }
                         return null;
                     })] }), isExpandable &&

package/dist/components/grid/utils/groupedGridDetails.js

@@ -38,17 +38,6 @@ const GroupedGrid = ({ groupedData, rowOpened, startIndex, endIndex, alternateRo
                     .join(">"));
         }),
     ]);
-    (0, react_1.useEffect)(() => {
-        const evenOdd = {
-            even: [],
-            odd: []
-        };
-        groupedData.forEach((item, index) => {
-            if (item.type !== "main") {
-                console.log("Grouped Row", item);
-            }
-        });
-    }, [groupedData]);
     return ((0, jsx_runtime_1.jsx)("div", { ref: groupedDiv, children: groupedData
             .filter((item) => {
             return item.type === "main" && item.level === 1

package/dist/services/commonService.js

@@ -28,8 +28,9 @@ const formatValue = (value, type = "number", locale = "sv-SE", options = {
         const date = new Date(value);
         return formatDate(date, locale, options);
     }
-    else if (type === "currency" && typeof value === "number") {
-        return formatCurrency(value, locale, options.currency, options);
+    else if (type === "currency") {
+        const num = parseFloat(value.toString());
+        return formatCurrency(num, locale, options.currency, options);
     }
     else {
         return value;

package/package.json

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