@megha-ui/react 1.2.420 → 1.2.421

package/dist/components/grid/index.js

@@ -1,14 +1,3 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState, useEffect, useRef, useMemo, } from "react";
 import * as XLSX from "xlsx";
@@ -30,6 +19,7 @@ import { MdFullscreen, MdFullscreenExit } from "react-icons/md";
 import Dropdown from "../dropdown";
 import Loader from "../loader";
 import Button from "../button";
+import Card from "../card";
 import { TbAntennaBarsOff, TbCalculator, TbCalculatorFilled, TbCalculatorOff, } from "react-icons/tb";
 import { TbCopy, TbCopyOff } from "react-icons/tb";
 import { formatValue } from "../../services/commonService";
@@ -37,7 +27,9 @@ 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, isSummarise = false, isHideDups = false, 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, exportOptions, }) => {
+}, locale, formatOptions, exportOptions, 
+// Card wrapper props
+withCard = false, cardClassName, cardHeader, title, headerLeft, headerRight, subHeader, cardFooter, }) => {
     var _a, _b, _c, _d;
     const [searchQueries, setSearchQueries] = useState({});
     const [chips, setChips] = useState([]);
@@ -146,6 +138,8 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
                 return filterValue.includes(cellValue);
             })
             : true);
+        console.log(searchQueries, "searchQueries");
+        console.log(filterColumns);
         _filteredData = _filteredData.filter((item) => searchOp === "and"
             ? filterColumns.every((column) => {
                 var _a, _b, _c;
@@ -158,7 +152,7 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
                     const regex = createRegexFromWildcard(query);
                     return regex.test(value);
                 }
-                console.log("searchQueries[column.key]?.type", searchQueries[column.key]);
+                console.log({ query, value, column, searchQueries });
                 switch ((_c = searchQueries[column.key]) === null || _c === void 0 ? void 0 : _c.type) {
                     case "contains":
                         return value.toLowerCase().includes(query.toLowerCase());
@@ -236,13 +230,14 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
                     const regex = createRegexFromWildcard(query);
                     return regex.test(value);
                 }
+                console.log({ query, value, column, searchQueries });
                 switch ((_c = searchQueries[column.key]) === null || _c === void 0 ? void 0 : _c.type) {
                     case "contains":
                         return value.toLowerCase().includes(query.toLowerCase());
                     case "doesNotContain":
                         return !value.toLowerCase().includes(query.toLowerCase());
                     case "equals":
-                        return queryData.includes(value.toLowerCase());
+                        return !queryData.includes(value.toLowerCase());
                     case "gt":
                         if (!isNaN(parseFloat(query))) {
                             return parseFloat(value) > parseFloat(query);
@@ -353,8 +348,6 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
         fixedFilterValues,
         hideDuplicates,
         actionsKey,
-        fixedColumns,
-        searchOp,
     ]);
     const recalculate = (_summariseKeys) => {
         const filteredData = paginate ? paginatedData : sortedData;
@@ -806,8 +799,8 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
     const handleSearch = (key, value, type) => {
         setSearchQueries((prev) => (Object.assign(Object.assign({}, prev), { [key]: { text: value, type, operation: "and" } })));
         setUniqueSearch((prev) => {
-            const _a = prev, _b = key, _removed = _a[_b], rest = __rest(_a, [typeof _b === "symbol" ? _b : _b + ""]);
-            return rest;
+            delete prev[key];
+            return prev;
         });
     };
     useEffect(() => {
@@ -1260,8 +1253,8 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
     //     setGridGroupBy(groupBy);
     //   }
     // };
-    return (_jsxs("div", { style: {
-            height,
+    const gridBody = (_jsxs("div", { style: {
+            height: withCard ? "100%" : height,
             backgroundColor: isFullScreen ? "var(--background)" : "transparent",
         }, className: wrapperClass, ref: entrieGridRef, children: [isOpen && (_jsx("div", { style: {
                     position: "fixed",
@@ -1536,5 +1529,15 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
                             paddingRight: 10,
                             fontSize: "inherit",
                         }, children: ["Showing ", sortedData.length, " results", " ", paginate && (_jsxs("span", { children: ["(", currentPage, " of ", totalPages, " pages)"] }))] }), _jsx("div", { style: { marginLeft: "auto" }, children: _jsx(Pagination, { currentPage: currentPage, totalPages: totalPages, handleChangePage: handleChangePage, rowsPerPage: rowsPerPage, handleChangeRowsPerPage: handleChangeRowsPerPage, rowsPerPageOptions: rowsPerPageOptions }) })] }))] }));
+    if (withCard) {
+        const headerNode = cardHeader !== null && cardHeader !== void 0 ? cardHeader : (_jsxs("div", { style: { display: "flex", flexDirection: "column", gap: "0.5rem" }, children: [_jsxs("div", { style: {
+                        display: "flex",
+                        alignItems: "center",
+                        justifyContent: "space-between",
+                        width: "100%",
+                    }, children: [_jsxs("div", { style: { display: "flex", alignItems: "center", gap: "0.5rem" }, children: [headerLeft, title && _jsx("div", { children: title })] }), _jsx("div", { style: { display: "flex", alignItems: "center", gap: "0.5rem" }, children: headerRight })] }), subHeader && _jsx("div", { children: subHeader })] }));
+        return (_jsx(Card, { className: cardClassName, header: headerNode, content: gridBody, footer: cardFooter, height: height }));
+    }
+    return gridBody;
 };
 export default Grid;

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

@@ -1,4 +1,4 @@
-import { DragEvent, JSX } from "react";
+import { DragEvent, JSX, ReactNode } from "react";
 import { Calculate } from "..";
 export interface Column {
     render?: any;
@@ -158,6 +158,14 @@ export interface OjasGridProps {
     locale?: string;
     formatOptions?: any;
     exportOptions?: any;
+    withCard?: boolean;
+    cardClassName?: string;
+    cardHeader?: ReactNode;
+    title?: ReactNode;
+    headerLeft?: ReactNode;
+    headerRight?: ReactNode;
+    subHeader?: ReactNode;
+    cardFooter?: ReactNode;
 }
 export interface GroupedRowProps {
     item: any;

package/dist/services/commonService.js

@@ -1,21 +1,35 @@
 import { isValidDateFormat } from "../components/grid/utils/regexUtils";
 // Function to format numbers
 const formatNumber = (value, locale = "sv-SE", options) => {
-    var _a;
     const { compactDisplay, notation, signDisplay, unit, unitDisplay, currencySign, minimumFractionDigits, maximumFractionDigits, minimumSignificantDigits, maximumSignificantDigits, } = options !== null && options !== void 0 ? options : {};
-    const formatter = new Intl.NumberFormat(locale, {
-        style: (_a = options.Numberstyle) !== null && _a !== void 0 ? _a : "decimal",
-        compactDisplay,
-        notation,
-        signDisplay,
-        unit,
-        unitDisplay,
-        currencySign,
+    // Base options restricted to fields guaranteed in NumberFormatOptions
+    const base = {
+        // Retain custom field name if provided by callers
+        style: (options && options.Numberstyle) || "decimal",
         minimumFractionDigits,
         maximumFractionDigits,
-        minimumSignificantDigits,
-        maximumSignificantDigits,
-    });
+    };
+    // Extend with newer fields in a type-safe, conditional way
+    const extended = Object.assign({}, base);
+    if (notation)
+        extended.notation = notation;
+    if (typeof compactDisplay !== "undefined")
+        extended.compactDisplay = compactDisplay;
+    if (typeof minimumSignificantDigits !== "undefined")
+        extended.minimumSignificantDigits = minimumSignificantDigits;
+    if (typeof maximumSignificantDigits !== "undefined")
+        extended.maximumSignificantDigits = maximumSignificantDigits;
+    if (signDisplay)
+        extended.signDisplay = signDisplay;
+    if (unit) {
+        extended.style = "unit";
+        extended.unit = unit;
+        if (unitDisplay)
+            extended.unitDisplay = unitDisplay;
+    }
+    if (currencySign)
+        extended.currencySign = currencySign;
+    const formatter = new Intl.NumberFormat(locale, extended);
     return formatter.format(value);
 };
 // ISO-like string including local time (no timezone)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@megha-ui/react",
-  "version": "1.2.420",
+  "version": "1.2.421",
   "description": "A collection of reusable UI components for React applications, built with TypeScript.",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -8,7 +8,6 @@
   "scripts": {
     "build": "tsc",
     "prepublishOnly": "npm run build",
-    "test": "jest",
     "publish:patch": "npm version patch && npm publish --access public",
     "publish:minor": "npm version minor && npm publish --access public",
     "publish:major": "npm version major && npm publish --access public"
@@ -29,11 +28,8 @@
   "homepage": "https://github.com/nrg-tools/nrg-text-input#readme",
   "devDependencies": {
     "@types/file-saver": "^2.0.7",
-    "@types/jest": "^27.5.2",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
-    "jest": "^27.5.1",
-    "ts-jest": "^29.4.0",
     "typescript": "^5.8.3"
   },
   "peerDependencies": {