@uxf/data-grid 11.87.0 → 11.88.0

package/_story-utils/data.js

@@ -226,4 +226,26 @@ exports.data = [
             { id: 2, label: "ToMany 2" },
         ],
     },
+    {
+        id: 12,
+        text: "Awful",
+        bool: false,
+        tel: "777888999",
+        mail: null,
+        link: "https://google.com",
+        day: null,
+        dayAndTime: "2000-12-31T01:00:00.000-07:30",
+        uuid: "08ee844c-c27d-4ae3-8f04-9ff449649058",
+        chip: { id: 1, label: "Chip 1", color: "red" },
+        chips: [
+            { id: 1, label: "Chip 1", color: "red" },
+            { id: 2, label: "Chip 2", color: "blue" },
+        ],
+        money: { amount: "123456", currency: "CZK" },
+        toOne: { id: 1, label: "ToOne 1" },
+        toMany: [
+            { id: 1, label: "ToMany 1" },
+            { id: 2, label: "ToMany 2" },
+        ],
+    },
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@uxf/data-grid",
-    "version": "11.87.0",
+    "version": "11.88.0",
     "description": "UXF DataGrid",
     "homepage": "https://gitlab.com/uxf-npm/data-grid#readme",
     "main": "index.js",
@@ -31,10 +31,10 @@
         "typecheck": "tsc --noEmit --skipLibCheck"
     },
     "dependencies": {
-        "@uxf/core": "11.87.0",
-        "@uxf/core-react": "11.87.0",
-        "@uxf/ui": "11.87.0",
-        "dayjs": "1.11.18",
+        "@uxf/core": "11.88.0",
+        "@uxf/core-react": "11.88.0",
+        "@uxf/ui": "11.88.0",
+        "dayjs": "1.11.19",
         "deepmerge": "4.3.1",
         "fast-glob": "3.3.3",
         "qs": "6.14.0",

package/table-v2/components/header-select-all-rows-checkbox.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HeaderSelectAllRowsCheckbox = HeaderSelectAllRowsCheckbox;
 const translations_1 = require("@uxf/core-react/translations");
 const empty_array_1 = require("@uxf/core/constants/empty-array");
-const is_nil_1 = require("@uxf/core/utils/is-nil");
 const is_not_empty_1 = require("@uxf/core/utils/is-not-empty");
 const checkbox_input_1 = require("@uxf/ui/checkbox-input");
 const react_1 = __importDefault(require("react"));
@@ -14,14 +13,22 @@ function HeaderSelectAllRowsCheckbox(props) {
     var _a;
     const t = (0, translations_1.useUxfTranslation)();
     const selectedRows = (_a = props.state.selectedRows) !== null && _a !== void 0 ? _a : empty_array_1.EMPTY_ARRAY;
-    const isAllRowsSelected = (0, is_not_empty_1.isNotEmpty)(props.data) &&
-        props.data.every((row) => selectedRows.find((selectedRow) => props.keyExtractor(row) === props.keyExtractor(selectedRow)));
-    const isIndeterminate = !isAllRowsSelected && (0, is_not_empty_1.isNotEmpty)(selectedRows);
+    const selectedKeys = new Set(selectedRows.map(props.keyExtractor));
+    const isAllRowsInCurrentPageSelected = (0, is_not_empty_1.isNotEmpty)(props.data) && props.data.every((row) => selectedKeys.has(props.keyExtractor(row)));
+    const selectedRowsInCurrentPage = props.data.filter((row) => selectedKeys.has(props.keyExtractor(row)));
+    const isIndeterminate = (0, is_not_empty_1.isNotEmpty)(selectedRowsInCurrentPage) && !isAllRowsInCurrentPageSelected;
     const selectAllRowsHandler = () => {
-        props.actions.setSelectedRows(isAllRowsSelected || isIndeterminate
-            ? []
-            : props.data.filter((row) => (0, is_nil_1.isNil)(props.isRowSelectDisabled) || !props.isRowSelectDisabled(row)));
+        if (isAllRowsInCurrentPageSelected || isIndeterminate) {
+            // Deselect current page rows
+            const currentPageKeys = new Set(props.data.map(props.keyExtractor));
+            props.actions.setSelectedRows(selectedRows.filter((row) => !currentPageKeys.has(props.keyExtractor(row))));
+        }
+        else {
+            // Select current page rows (excluding disabled)
+            const selectableRows = props.data.filter((row) => { var _a; return !((_a = props.isRowSelectDisabled) === null || _a === void 0 ? void 0 : _a.call(props, row)); });
+            props.actions.setSelectedRows([...selectedRows, ...selectableRows]);
+        }
     };
     return (react_1.default.createElement("div", { className: "uxf-dg-table__cell uxf-dg-table__cell--header uxf-dg-table__select-all-rows-cell" },
-        react_1.default.createElement(checkbox_input_1.CheckboxInput, { hiddenLabel: true, indeterminate: isIndeterminate, label: t("uxf-data-grid-checkboxes:select-all"), name: "select-all-rows", onChange: selectAllRowsHandler, value: isAllRowsSelected || isIndeterminate })));
+        react_1.default.createElement(checkbox_input_1.CheckboxInput, { hiddenLabel: true, indeterminate: isIndeterminate, label: t("uxf-data-grid-checkboxes:select-all"), name: "select-all-rows", onChange: selectAllRowsHandler, value: isAllRowsInCurrentPageSelected || isIndeterminate })));
 }

package/table-v2/components/select-row-checkbox.js

@@ -10,5 +10,5 @@ const react_1 = __importDefault(require("react"));
 function SelectRowCheckbox(props) {
     const t = (0, translations_1.useUxfTranslation)();
     return (react_1.default.createElement("div", { className: "uxf-dg-table__cell uxf-dg-table__select-row-cell" },
-        react_1.default.createElement(checkbox_input_1.CheckboxInput, { className: "*:mt-0", hiddenLabel: true, isDisabled: props.isRowSelectDisabled, label: t("uxf-data-grid-checkboxes:select"), name: "select-row", onChange: props.onSelectRowChange, value: props.isRowSelected })));
+        react_1.default.createElement(checkbox_input_1.CheckboxInput, { className: "*:mt-0", hiddenLabel: true, isDisabled: props.isRowSelectDisabled, label: t("uxf-data-grid-checkboxes:select"), name: "select-row", onChange: props.onSelectRowChange, value: Boolean(props.isRowSelected) })));
 }

package/types/core.d.ts

@@ -1,7 +1,8 @@
 import { Nullish } from "@uxf/core/types";
 import { Request, Response, ResultItem } from "./api";
 import { BaseGridType } from "./schema";
-export type KeyExtractor = (row: ResultItem) => number;
+export type RowKey = number | string;
+export type KeyExtractor = (row: ResultItem) => RowKey;
 export type CsvDownloadGetUrl = (request: Request) => string;
 export type Loader = (gridName: string | undefined, request: Request, encodedRequest: string) => Promise<Response>;
 export type CallbackRef = {