@uxf/data-grid 11.0.0-beta.16 → 11.0.0-beta.18

package/_generator/cli.js

@@ -0,0 +1,28 @@
+const { argv, env } = require("process");
+
+module.exports = async () => {
+    const cli = require("yargs")
+        .command("$0", "UXF DataGrid generator", (yargs) => {
+            yargs.demandCommand(0, 0).usage(`
+Usage:
+  uxf-data-grid-generator [options]
+`);
+        })
+        .option("s", { alias: "source" })
+        .option("h", { alias: "help", group: "Options" })
+        .strict(false)
+        .exitProcess(false);
+
+    try {
+        const { help, source } = cli.parse(argv.slice(2));
+
+        if (Boolean(help)) {
+            return 0;
+        }
+
+        await require("./index")(source);
+    } catch (e) {
+        console.error(e);
+        return 1;
+    }
+};

package/_generator/index.js

@@ -0,0 +1,24 @@
+const { globSync } = require("fast-glob");
+const { readFileSync, writeFileSync } = require("fs");
+const { dirname } = require("path");
+
+function generateSchemaFile(jsonSchema, directory) {
+    const schemaTs = `import { Schema } from "@uxf/data-grid";
+import json from "./schema.json";
+
+export const schema: Schema<any> = json as any;`;
+
+    writeFileSync(`${directory}/schema.ts`, schemaTs);
+}
+
+function generate(jsonSchema, filename) {
+    const directory = dirname(filename);
+
+    generateSchemaFile(jsonSchema, directory);
+}
+
+module.exports = (source) => {
+    globSync(source)
+        .map((path) => process.cwd() + "/" + path)
+        .forEach((filename) => generate(readFileSync(filename), filename));
+};

package/bin/uxf-data-grid-generator.js

@@ -0,0 +1,8 @@
+#!/usr/bin/env node
+require("../_generator/cli")()
+    .then((exitCode) => {
+        process.exitCode = exitCode;
+    })
+    .catch(() => {
+        process.exitCode = 1;
+    });

package/data-grid.js

@@ -15,7 +15,6 @@ const row_counts_1 = require("./row-counts");
 const rows_per_page_select_1 = require("./rows-per-page-select");
 const selected_rows_toolbar_1 = require("./selected-rows-toolbar");
 const table_1 = require("./table");
-const action_cell_base_1 = require("./table/components/action-cell-base");
 const no_rows_fallback_1 = require("./table/no-rows-fallback");
 const toolbar_control_1 = require("./toolbar-control");
 const toolbar_customs_1 = require("./toolbar-customs");
@@ -23,20 +22,20 @@ const toolbar_tabs_1 = require("./toolbar-tabs");
 const classes_1 = require("./utils/classes");
 const DefaultSelectedRowsToolbarActions = () => null;
 function DataGrid(props) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     return (react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement("div", { className: (0, cx_1.cx)("uxf-data-grid", props.noBorder && classes_1.NO_BORDER_CLASS, props.className) },
             react_1.default.createElement("div", { className: (0, cx_1.cx)("uxf-data-grid__toolbar", props.noBorder && classes_1.NO_BORDER_CLASS) },
                 react_1.default.createElement(toolbar_tabs_1.ToolbarTabs, { state: props.state, actions: props.actions, schema: props.schema }),
-                react_1.default.createElement(toolbar_control_1.ToolbarControl, { state: props.state, actions: props.actions, gridName: props.gridName, filterHandlers: (_b = (_a = props.ui) === null || _a === void 0 ? void 0 : _a.FilterHandlers) !== null && _b !== void 0 ? _b : filter_handler_1.defaultFilterHandlers, schema: props.schema, onCsvDownload: props.onCsvDownload }),
+                react_1.default.createElement(toolbar_control_1.ToolbarControl, { state: props.state, actions: props.actions, gridName: props.gridName, filterHandlers: (_a = props.filterHandlers) !== null && _a !== void 0 ? _a : filter_handler_1.defaultFilterHandlers, schema: props.schema, onCsvDownload: props.onCsvDownload }),
                 react_1.default.createElement(toolbar_customs_1.ToolbarCustoms, { buttons: props.customActions })),
             react_1.default.createElement(linear_progress_1.LinearProgress, { isLoading: props.isLoading }),
-            react_1.default.createElement(filter_list_1.FilterList, { state: props.state, actions: props.actions, schema: props.schema, gridName: props.gridName, filterHandlers: (_d = (_c = props.ui) === null || _c === void 0 ? void 0 : _c.FilterHandlers) !== null && _d !== void 0 ? _d : filter_handler_1.defaultFilterHandlers, className: props.noBorder ? classes_1.NO_BORDER_CLASS : undefined }),
-            react_1.default.createElement(table_1.Table, { state: props.state, actions: props.actions, schema: props.schema, data: (_f = (_e = props.data) === null || _e === void 0 ? void 0 : _e.result) !== null && _f !== void 0 ? _f : [], isLoading: props.isLoading, error: props.error, rowClass: props.rowClass, keyExtractor: props.keyExtractor, rowHeight: props.rowHeight, headerRowHeight: props.headerRowHeight, BodyCells: (_h = (_g = props.ui) === null || _g === void 0 ? void 0 : _g.BodyCells) !== null && _h !== void 0 ? _h : body_cell_1.BodyCells, NoRowsFallback: (_k = (_j = props.ui) === null || _j === void 0 ? void 0 : _j.NoRowsFallback) !== null && _k !== void 0 ? _k : no_rows_fallback_1.NoRowsFallback, ActionCell: (_m = (_l = props.ui) === null || _l === void 0 ? void 0 : _l.ActionCell) !== null && _m !== void 0 ? _m : action_cell_base_1.ActionCellBase, onRemove: props.onRemove, onEdit: props.onEdit, getEditUrl: props.getEditUrl, onOpen: props.onOpen, getOpenUrl: props.getOpenUrl, onReload: props.onReload, isRowSelectable: props.isRowSelectable }),
+            react_1.default.createElement(filter_list_1.FilterList, { state: props.state, actions: props.actions, schema: props.schema, gridName: props.gridName, filterHandlers: (_b = props.filterHandlers) !== null && _b !== void 0 ? _b : filter_handler_1.defaultFilterHandlers, className: props.noBorder ? classes_1.NO_BORDER_CLASS : undefined }),
+            react_1.default.createElement(table_1.Table, { state: props.state, actions: props.actions, schema: props.schema, data: (_d = (_c = props.data) === null || _c === void 0 ? void 0 : _c.result) !== null && _d !== void 0 ? _d : [], isLoading: props.isLoading, error: props.error, rowClass: props.rowClass, keyExtractor: props.keyExtractor, rowHeight: props.rowHeight, headerRowHeight: props.headerRowHeight, bodyCells: (_e = props.bodyCells) !== null && _e !== void 0 ? _e : body_cell_1.BodyCells, NoRowsFallback: (_f = props.NoRowsFallback) !== null && _f !== void 0 ? _f : no_rows_fallback_1.NoRowsFallback, actionCell: props.actionCell, onReload: props.onReload, isRowSelectable: props.isRowSelectable }),
             react_1.default.createElement("div", { className: (0, cx_1.cx)("uxf-data-grid__footer", props.noBorder && classes_1.NO_BORDER_CLASS) },
                 react_1.default.createElement(rows_per_page_select_1.RowsPerPageSelect, { state: props.state, actions: props.actions }),
-                react_1.default.createElement(row_counts_1.RowCounts, { state: props.state, count: (_p = (_o = props.data) === null || _o === void 0 ? void 0 : _o.count) !== null && _p !== void 0 ? _p : 0, totalCount: (_r = (_q = props.data) === null || _q === void 0 ? void 0 : _q.totalCount) !== null && _r !== void 0 ? _r : 0 }),
-                react_1.default.createElement(pagination_1.Pagination, { state: props.state, actions: props.actions, count: (_t = (_s = props.data) === null || _s === void 0 ? void 0 : _s.count) !== null && _t !== void 0 ? _t : 0 }))),
-        react_1.default.createElement(selected_rows_toolbar_1.SelectedRowsToolbar, { state: props.state, actions: props.actions, Actions: (_v = (_u = props.ui) === null || _u === void 0 ? void 0 : _u.SelectedRowsToolbarActions) !== null && _v !== void 0 ? _v : DefaultSelectedRowsToolbarActions })));
+                react_1.default.createElement(row_counts_1.RowCounts, { state: props.state, count: (_h = (_g = props.data) === null || _g === void 0 ? void 0 : _g.count) !== null && _h !== void 0 ? _h : 0, totalCount: (_k = (_j = props.data) === null || _j === void 0 ? void 0 : _j.totalCount) !== null && _k !== void 0 ? _k : 0 }),
+                react_1.default.createElement(pagination_1.Pagination, { state: props.state, actions: props.actions, count: (_m = (_l = props.data) === null || _l === void 0 ? void 0 : _l.count) !== null && _m !== void 0 ? _m : 0 }))),
+        react_1.default.createElement(selected_rows_toolbar_1.SelectedRowsToolbar, { state: props.state, actions: props.actions, Actions: (_o = props.SelectedRowsToolbarActions) !== null && _o !== void 0 ? _o : DefaultSelectedRowsToolbarActions })));
 }
 exports.DataGrid = DataGrid;

package/data-grid.stories.js

@@ -24,12 +24,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Default = void 0;
+const buildArray_1 = require("@uxf/core/utils/buildArray");
 const json_renderer_1 = require("@uxf/example/src/components/json-renderer");
 const toggle_1 = require("@uxf/ui/toggle");
 const react_1 = __importStar(require("react"));
 const loader_1 = require("./_story-utils/loader");
 const schema_1 = require("./_story-utils/schema");
 const data_grid_1 = require("./data-grid");
+const table_1 = require("./table");
 const use_data_grid_control_1 = require("./use-data-grid-control");
 const use_data_grid_fetching_1 = require("./use-data-grid-fetching");
 function Default() {
@@ -45,7 +47,29 @@ function Default() {
     });
     return (react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement(toggle_1.Toggle, { label: "No border", value: noBorder, onChange: (value) => setNoBorder(!!value) }),
-        react_1.default.createElement(data_grid_1.DataGrid, { onReload: onReload, state: state, actions: actions, data: data, isLoading: isLoading, error: error, schema: schema_1.schema, onCsvDownload: console.log, noBorder: noBorder, onRemove: console.log, getOpenUrl: () => "https://www.uxf.cz", getEditUrl: () => "https://www.uxf.cz", isRowSelectable: true }),
+        react_1.default.createElement(data_grid_1.DataGrid, { onReload: onReload, state: state, actions: actions, data: data, isLoading: isLoading, error: error, schema: schema_1.schema, onCsvDownload: console.log, noBorder: noBorder, isRowSelectable: true, actionCell: {
+                width: 100,
+                Component: () => {
+                    const actionCellActions = (0, buildArray_1.buildArray)()
+                        .add({
+                        icon: "arrow-right",
+                        isIconButton: true,
+                        href: "https://www.uxf.cz",
+                        target: "_blank",
+                    })
+                        .add({
+                        icon: "file",
+                        label: "Download",
+                        onClick: console.log,
+                    })
+                        .add({
+                        icon: "cloud",
+                        label: "Reload",
+                        onClick: console.log,
+                    });
+                    return react_1.default.createElement(table_1.ActionCell, { buttons: actionCellActions, visibleButtonsCount: 1 });
+                },
+            } }),
         react_1.default.createElement(json_renderer_1.JsonRenderer, { value: state })));
 }
 exports.Default = Default;

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@uxf/data-grid",
-  "version": "11.0.0-beta.16",
+  "version": "11.0.0-beta.18",
   "description": "UXF DataGrid",
   "homepage": "https://gitlab.com/uxf-npm/data-grid#readme",
   "main": "index.js",
+  "bin": {
+    "uxf-data-grid-generator": "bin/uxf-data-grid-generator.js"
+  },
   "typings": "index.d.ts",
   "publishConfig": {
     "access": "public"
@@ -27,9 +30,11 @@
     "typecheck": "tsc --noEmit --skipLibCheck"
   },
   "dependencies": {
-    "@uxf/ui": "11.0.0-beta.16",
+    "@uxf/ui": "11.0.0-beta.17",
     "dayjs": "1.11.10",
-    "react-data-grid": "7.0.0-beta.39"
+    "fast-glob": "^3.3.2",
+    "react-data-grid": "7.0.0-beta.39",
+    "yargs": "^17.7.2"
   },
   "peerDependencies": {
     "react": ">=18.2.0",

package/table/components/action-cell-wrapper.d.ts

@@ -0,0 +1,2 @@
+import React, { PropsWithChildren } from "react";
+export declare function ActionCellWrapper(props: PropsWithChildren): React.JSX.Element;

package/table/components/{action-cell-base.js → action-cell-wrapper.js}

@@ -23,11 +23,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActionCellBase = exports.ActionCellWrapper = void 0;
-const button_1 = require("@uxf/ui/button");
-const icon_1 = require("@uxf/ui/icon");
+exports.ActionCellWrapper = void 0;
 const react_1 = __importStar(require("react"));
-const ActionCellWrapper = (props) => {
+function ActionCellWrapper(props) {
     const innerRef = (0, react_1.useRef)(null);
     (0, react_1.useEffect)(() => {
         var _a;
@@ -56,29 +54,5 @@ const ActionCellWrapper = (props) => {
         };
     }, []);
     return (react_1.default.createElement("div", { className: "uxf-data-grid__action-cell-wrapper", ref: innerRef }, props.children));
-};
+}
 exports.ActionCellWrapper = ActionCellWrapper;
-const Button = (props) => {
-    if (props.getUrl) {
-        const href = props.getUrl(props.row);
-        if (!href) {
-            return null;
-        }
-        return (react_1.default.createElement(button_1.Button, { href: href, title: props.title, variant: "white", size: "sm", isIconButton: true },
-            react_1.default.createElement(icon_1.Icon, { name: props.icon })));
-    }
-    if (props.onClick) {
-        return (react_1.default.createElement(button_1.Button, { variant: "white", size: "sm", onClick: () => { var _a; return (_a = props.onClick) === null || _a === void 0 ? void 0 : _a.call(props, props.row); }, isIconButton: true },
-            react_1.default.createElement(icon_1.Icon, { name: props.icon })));
-    }
-    return null;
-};
-const ActionCellBase = (props) => {
-    const onRemove = props.onRemove;
-    const handleRemove = onRemove ? () => onRemove(props.row, props.reload) : undefined;
-    return (react_1.default.createElement(exports.ActionCellWrapper, null,
-        react_1.default.createElement(Button, { row: props.row, onClick: props.onOpen, getUrl: props.getOpenUrl, icon: "circle-info", title: "Detail" }),
-        react_1.default.createElement(Button, { row: props.row, onClick: props.onEdit, getUrl: props.getEditUrl, icon: "pen", title: "Upravit" }),
-        react_1.default.createElement(Button, { row: props.row, onClick: handleRemove, getUrl: undefined, icon: "trash", title: "Smazat" })));
-};
-exports.ActionCellBase = ActionCellBase;

package/table/components/action-cell.d.ts

@@ -0,0 +1,7 @@
+import { ButtonListProps } from "@uxf/ui/button-list";
+import React from "react";
+export interface ActionCellProps {
+    buttons: ButtonListProps["buttons"];
+    visibleButtonsCount: ButtonListProps["visibleButtonsCount"];
+}
+export declare function ActionCell(props: ActionCellProps): React.JSX.Element;

package/table/components/action-cell.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActionCell = void 0;
+const button_list_1 = require("@uxf/ui/button-list");
+const react_1 = __importDefault(require("react"));
+const action_cell_wrapper_1 = require("./action-cell-wrapper");
+function ActionCell(props) {
+    return (react_1.default.createElement(action_cell_wrapper_1.ActionCellWrapper, null,
+        react_1.default.createElement(button_list_1.ButtonList, { buttons: props.buttons, visibleButtonsCount: props.visibleButtonsCount, variant: "white", size: "xs" })));
+}
+exports.ActionCell = ActionCell;

package/{hooks → table/hooks}/use-rdg-visuals.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="react" />
 import { DataGridHandle } from "react-data-grid";
-import { BaseGridType, DataGridBaseProps } from "../types";
+import { DataGridBaseProps } from "../../types/data-grid-props";
+import { BaseGridType } from "../../types/schema";
 export declare function useRdgVisuals(props: {
     headerRowHeight?: DataGridBaseProps<BaseGridType, any>["headerRowHeight"];
-    mode?: DataGridBaseProps<BaseGridType, any>["mode"];
     rowHeight?: DataGridBaseProps<BaseGridType, any>["rowHeight"];
     rows: any[];
 }): {

package/{hooks → table/hooks}/use-rdg-visuals.js

@@ -9,7 +9,7 @@ function useRdgVisuals(props) {
     const rowHeight = (_a = props.rowHeight) !== null && _a !== void 0 ? _a : 44;
     const headerRowHeight = (_b = props.headerRowHeight) !== null && _b !== void 0 ? _b : 36;
     const contentHeight = typeof rowHeight === "function"
-        ? props.rows.reduce((prev, curr) => prev + rowHeight({ type: "ROW", row: curr }))
+        ? props.rows.reduce((prev, curr) => prev + rowHeight(curr))
         : rowHeight * props.rows.length;
     const ref = (0, react_1.useRef)(null);
     const size = {
@@ -36,7 +36,7 @@ function useRdgVisuals(props) {
         return () => observer.disconnect();
     }, [mounted, storedSize]);
     return {
-        className: `uxf-data-grid__table ${props.mode === "light" ? "rdg-light" : props.mode === "dark" ? "rdg-dark" : ""}`,
+        className: "uxf-data-grid__table rdg-light",
         headerRowHeight,
         ready: mounted,
         ref,

package/table/hooks/use-react-data-grid-columns.js

@@ -25,14 +25,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useReactDataGridColumns = void 0;
 const cx_1 = require("@uxf/core/utils/cx");
-const is_not_nil_1 = require("@uxf/core/utils/is-not-nil");
 const react_1 = __importStar(require("react"));
 const react_data_grid_1 = require("react-data-grid");
-const action_cell_base_1 = require("../components/action-cell-base");
 function useReactDataGridColumns(props, state) {
-    var _a;
-    const { onReload, actionCellWidth, schema, isRowSelectable, BodyCells, getOpenUrl, onOpen, getEditUrl, onEdit, onRemove, } = props;
-    const ActionCell = (_a = props.ActionCell) !== null && _a !== void 0 ? _a : action_cell_base_1.ActionCellBase;
+    const { onReload, schema, isRowSelectable, bodyCells, actionCell } = props;
     const columnsConfig = state.userConfig.columns;
     return (0, react_1.useMemo)(() => {
         var _a;
@@ -58,7 +54,7 @@ function useReactDataGridColumns(props, state) {
                 renderCell: (p) => {
                     var _a;
                     const columnType = schemaColumn.type;
-                    const BodyCell = (_a = BodyCells === null || BodyCells === void 0 ? void 0 : BodyCells[columnType]) !== null && _a !== void 0 ? _a : BodyCells === null || BodyCells === void 0 ? void 0 : BodyCells.default;
+                    const BodyCell = (_a = bodyCells === null || bodyCells === void 0 ? void 0 : bodyCells[columnType]) !== null && _a !== void 0 ? _a : bodyCells === null || bodyCells === void 0 ? void 0 : bodyCells.default;
                     if (!BodyCell) {
                         return null;
                     }
@@ -71,29 +67,18 @@ function useReactDataGridColumns(props, state) {
                 },
             });
         }
-        columns.push({
-            key: "__action_column",
-            name: "",
-            resizable: false,
-            headerCellClass: "uxf-data-grid__action-cell",
-            cellClass: "uxf-data-grid__action-cell",
-            width: actionCellWidth,
-            renderCell: (p) => (0, is_not_nil_1.isNotNil)(ActionCell) ? (react_1.default.createElement(ActionCell, { reload: async () => onReload === null || onReload === void 0 ? void 0 : onReload(), row: p.row, getEditUrl: getEditUrl, onEdit: onEdit, getOpenUrl: getOpenUrl, onOpen: onOpen, onRemove: onRemove })) : null,
-        });
+        if (actionCell) {
+            columns.push({
+                key: "__action_column",
+                name: "",
+                resizable: false,
+                headerCellClass: "uxf-data-grid__action-cell",
+                cellClass: "uxf-data-grid__action-cell",
+                width: actionCell.width,
+                renderCell: (p) => react_1.default.createElement(actionCell.Component, { reload: async () => onReload === null || onReload === void 0 ? void 0 : onReload(), row: p.row }),
+            });
+        }
         return columns;
-    }, [
-        columnsConfig,
-        ActionCell,
-        actionCellWidth,
-        schema.columns,
-        BodyCells,
-        isRowSelectable,
-        onOpen,
-        getOpenUrl,
-        onEdit,
-        getEditUrl,
-        onRemove,
-        onReload,
-    ]);
+    }, [columnsConfig, actionCell, schema.columns, bodyCells, isRowSelectable, onReload]);
 }
 exports.useReactDataGridColumns = useReactDataGridColumns;

package/table/index.d.ts

@@ -1 +1,3 @@
+export * from "./components/action-cell";
+export * from "./components/action-cell-wrapper";
 export * from "./table";

package/table/index.js

@@ -14,4 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./components/action-cell"), exports);
+__exportStar(require("./components/action-cell-wrapper"), exports);
 __exportStar(require("./table"), exports);

package/table/table.d.ts

@@ -1,3 +1,3 @@
 import React from "react";
 import { TableProps } from "./types";
-export declare function Table(props: TableProps<any>): React.JSX.Element | null;
+export declare function Table(props: TableProps<any>): React.JSX.Element;

package/table/table.js

@@ -27,10 +27,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Table = void 0;
+const show_1 = require("@uxf/core/components/show");
 const useIsMounted_1 = require("@uxf/core/hooks/useIsMounted");
 const react_1 = __importStar(require("react"));
 const react_data_grid_1 = __importDefault(require("react-data-grid"));
 const select_row_checkbox_1 = require("./components/select-row-checkbox");
+const use_rdg_visuals_1 = require("./hooks/use-rdg-visuals");
 const use_react_data_grid_columns_1 = require("./hooks/use-react-data-grid-columns");
 const defaultKeyExtractor = (r) => r.id;
 const DefaultNoRowsFallback = () => react_1.default.createElement("div", null, "no rows");
@@ -41,7 +43,7 @@ function Table(props) {
     const headerRowHeight = (_b = props.headerRowHeight) !== null && _b !== void 0 ? _b : 36;
     const keyExtractor = (_c = props.keyExtractor) !== null && _c !== void 0 ? _c : defaultKeyExtractor;
     const contentHeight = typeof rowHeight === "function"
-        ? props.data.reduce((prev, curr) => prev + rowHeight({ type: "ROW", row: curr }))
+        ? props.data.reduce((prev, curr) => prev + rowHeight(curr))
         : (rowHeight + 1) * props.data.length;
     const reactDataGridStyles = {
         border: 0,
@@ -75,9 +77,12 @@ function Table(props) {
     const sortColumns = props.state.request.sort && props.state.request.dir
         ? [{ columnKey: props.state.request.sort, direction: props.state.request.dir.toUpperCase() }]
         : [];
-    if (!isMounted) {
-        return null;
-    }
-    return (react_1.default.createElement(react_data_grid_1.default, { style: reactDataGridStyles, className: "uxf-data-grid__table", columns: columns, rows: props.data, enableVirtualization: false, onSortColumnsChange: onSortColumnChange, sortColumns: sortColumns, rowHeight: rowHeight, headerRowHeight: headerRowHeight, rowClass: props.rowClass, rowKeyGetter: (_e = props.keyExtractor) !== null && _e !== void 0 ? _e : defaultKeyExtractor, selectedRows: new Set((_g = (_f = props.state.selectedRows) === null || _f === void 0 ? void 0 : _f.map(keyExtractor)) !== null && _g !== void 0 ? _g : []), onSelectedRowsChange: onSelectRows, renderers: components }));
+    const rdgVisuals = (0, use_rdg_visuals_1.useRdgVisuals)({
+        headerRowHeight: props.headerRowHeight,
+        rowHeight: props.rowHeight,
+        rows: props.data,
+    });
+    return (react_1.default.createElement(show_1.Show, { when: isMounted },
+        react_1.default.createElement(react_data_grid_1.default, { ref: rdgVisuals.ref, style: reactDataGridStyles, className: rdgVisuals.className, columns: columns, rows: props.data, enableVirtualization: false, onSortColumnsChange: onSortColumnChange, sortColumns: sortColumns, rowHeight: rdgVisuals.rowHeight, headerRowHeight: rdgVisuals.headerRowHeight, rowClass: props.rowClass, rowKeyGetter: (_e = props.keyExtractor) !== null && _e !== void 0 ? _e : defaultKeyExtractor, selectedRows: new Set((_g = (_f = props.state.selectedRows) === null || _f === void 0 ? void 0 : _f.map(keyExtractor)) !== null && _g !== void 0 ? _g : []), onSelectedRowsChange: onSelectRows, renderers: components })));
 }
 exports.Table = Table;

package/table/table.stories.js

@@ -14,7 +14,7 @@ const table_1 = require("./table");
 function Default() {
     const { state, actions } = (0, use_data_grid_control_1.useDataGridControl)({ schema: schema_1.schema });
     return (react_1.default.createElement(react_1.default.Fragment, null,
-        react_1.default.createElement(table_1.Table, { state: state, actions: actions, data: data_1.data, isLoading: true, error: undefined, schema: schema_1.schema, BodyCells: body_cell_1.BodyCells, isRowSelectable: true, onOpen: console.log, onEdit: console.log, onRemove: console.log }),
+        react_1.default.createElement(table_1.Table, { state: state, actions: actions, data: data_1.data, isLoading: true, error: undefined, schema: schema_1.schema, bodyCells: body_cell_1.BodyCells, isRowSelectable: true }),
         react_1.default.createElement(json_renderer_1.JsonRenderer, { value: state })));
 }
 exports.Default = Default;

package/table/types.d.ts

@@ -1,6 +1,7 @@
 import { Nullish } from "@uxf/core/types";
-import { DataGridProps as RDGProps } from "react-data-grid";
-import { ActionCellComponent, BodyCellComponents, KeyExtractor, Schema } from "../types";
+import { ActionCellComponent, BodyCellComponents } from "../types/components";
+import { KeyExtractor } from "../types/core";
+import { Schema } from "../types/schema";
 import { DataGridControl } from "../use-data-grid-control";
 import { NoRowsFallbackComponent } from "./no-rows-fallback";
 export interface TableProps<Row> extends DataGridControl {
@@ -9,18 +10,15 @@ export interface TableProps<Row> extends DataGridControl {
     isLoading?: boolean;
     error?: any | Nullish;
     onReload?: () => void;
-    rowHeight?: RDGProps<any>["rowHeight"];
-    headerRowHeight?: RDGProps<any>["headerRowHeight"];
+    rowHeight?: number | ((row: Row) => number);
+    headerRowHeight?: number;
     rowClass?: (row: Row) => "success" | "warning" | "error" | "primary" | "secondary" | string | null | undefined;
     keyExtractor?: KeyExtractor;
-    BodyCells?: BodyCellComponents<any, any>;
-    ActionCell?: ActionCellComponent<any>;
-    actionCellWidth?: number;
+    bodyCells?: BodyCellComponents<any, any>;
+    actionCell?: {
+        width: number;
+        Component: ActionCellComponent<any>;
+    };
     NoRowsFallback?: NoRowsFallbackComponent;
     isRowSelectable?: boolean;
-    onOpen?: (row: Row) => void;
-    getOpenUrl?: (row: Row) => string | null | undefined;
-    onEdit?: (row: Row) => void;
-    getEditUrl?: (row: Row) => string | null | undefined;
-    onRemove?: (row: Row, reload: () => void) => void;
 }

package/types/components.d.ts

@@ -3,11 +3,6 @@ import { RequestFilter } from "./api";
 import { BaseGridType, Columns, Filter } from "./schema";
 export interface ActionCellProps<R> {
     row: R;
-    onOpen?: (row: R) => void;
-    getOpenUrl?: (row: R) => string | null | undefined;
-    onEdit?: (row: R) => void;
-    getEditUrl?: (row: R) => string | null | undefined;
-    onRemove?: (row: R, reload: () => void) => void;
     reload: () => void;
 }
 export type ActionCellComponent<R> = FC<ActionCellProps<R>>;

package/types/data-grid-props.d.ts

@@ -1,10 +1,13 @@
-import { DataGridProps as RDGProps } from "react-data-grid";
+import { FilterHandlers } from "../filter-handler";
+import { SelectedRowsToolbarActionsComponent } from "../selected-rows-toolbar";
+import { NoRowsFallbackComponent } from "../table/no-rows-fallback";
+import { TableProps } from "../table/types";
 import { ToolbarCustomsProps } from "../toolbar-customs";
 import { DataGridControl } from "../use-data-grid-control";
 import { DataGridFetchingResult } from "../use-data-grid-fetching";
+import { BodyCellComponents } from "./components";
 import { CsvDownloadHandler, KeyExtractor } from "./core";
 import { BaseGridType, Schema } from "./schema";
-import { UIComponents } from "./ui-components";
 export type DataGridControlProps = DataGridControl;
 export type DataGridDataProps<Row> = DataGridFetchingResult<Row>;
 export type DataGridBaseProps<GridType extends BaseGridType, Row> = {
@@ -12,20 +15,18 @@ export type DataGridBaseProps<GridType extends BaseGridType, Row> = {
     gridName?: string;
     keyExtractor?: KeyExtractor;
     onCsvDownload?: CsvDownloadHandler;
-    onOpen?: (row: Row) => void;
-    getOpenUrl?: (row: Row) => string | null | undefined;
-    onEdit?: (row: Row) => void;
-    getEditUrl?: (row: Row) => string | null | undefined;
-    onRemove?: (row: Row, reload: () => void) => void;
     noBorder?: boolean;
-    rowHeight?: RDGProps<any>["rowHeight"];
-    headerRowHeight?: RDGProps<any>["headerRowHeight"];
+    rowHeight?: number | ((row: Row) => number);
+    headerRowHeight?: number;
     rowClass?: (row: Row) => "success" | "warning" | "error" | "primary" | "secondary" | string | null | undefined;
-    debug?: boolean;
     className?: string;
     customActions?: ToolbarCustomsProps["buttons"];
-    mode?: "light" | "dark";
-    ui?: UIComponents<GridType, Row>;
+    actionCell?: TableProps<Row>["actionCell"];
+    bodyCells?: BodyCellComponents<GridType["columns"], Row>;
+    filterHandlers?: FilterHandlers;
+    NoRowsFallback?: NoRowsFallbackComponent;
+    SelectedRowsToolbarActions?: SelectedRowsToolbarActionsComponent;
     isRowSelectable?: boolean;
+    isDebug?: boolean;
 };
 export type DataGridProps<GridType extends BaseGridType, Row> = DataGridBaseProps<GridType, Row> & DataGridDataProps<Row> & DataGridControlProps;

package/types/index.d.ts

@@ -4,4 +4,3 @@ export * from "./core";
 export * from "./data-grid-props";
 export * from "./schema";
 export * from "./state";
-export * from "./ui-components";

package/types/index.js

@@ -20,4 +20,3 @@ __exportStar(require("./core"), exports);
 __exportStar(require("./data-grid-props"), exports);
 __exportStar(require("./schema"), exports);
 __exportStar(require("./state"), exports);
-__exportStar(require("./ui-components"), exports);

package/table/components/action-cell-base.d.ts

@@ -1,4 +0,0 @@
-import { FC, PropsWithChildren } from "react";
-import { ActionCellComponent } from "../../types";
-export declare const ActionCellWrapper: FC<PropsWithChildren>;
-export declare const ActionCellBase: ActionCellComponent<any>;

package/types/ui-components.d.ts

@@ -1,18 +0,0 @@
-import { FilterHandlers } from "../filter-handler";
-import { SelectedRowsToolbarActionsComponent } from "../selected-rows-toolbar";
-import { NoRowsFallbackComponent } from "../table/no-rows-fallback";
-import { ActionCellComponent, BodyCellComponents } from "./components";
-import { BaseGridType } from "./schema";
-export type ActionCellWithRequiredWidth<R> = {
-    ActionCell?: ActionCellComponent<R>;
-    actionCellWidth: number;
-} | {
-    ActionCell?: never;
-    actionCellWidth?: never;
-};
-export type UIComponents<GridType extends BaseGridType, R> = {
-    BodyCells?: BodyCellComponents<GridType["columns"], R>;
-    FilterHandlers?: FilterHandlers;
-    NoRowsFallback?: NoRowsFallbackComponent;
-    SelectedRowsToolbarActions?: SelectedRowsToolbarActionsComponent;
-} & ActionCellWithRequiredWidth<R>;

package/types/ui-components.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });