@hpcc-js/dgrid2 3.2.0 → 3.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/dgrid2",
-    "version": "3.2.0",
+    "version": "3.2.2",
     "description": "hpcc-js - DGrid2",
     "type": "module",
     "main": "./dist/index.umd.cjs",
@@ -37,14 +37,18 @@
         "update-major": "npx --yes npm-check-updates -u"
     },
     "dependencies": {
-        "@hpcc-js/common": "^3.3.0",
-        "@hpcc-js/util": "^3.3.0"
+        "@hpcc-js/common": "^3.3.2",
+        "@hpcc-js/util": "^3.3.2"
     },
     "devDependencies": {
-        "@hpcc-js/esbuild-plugins": "^1.4.0",
-        "@preact/preset-vite": "2.9.2",
-        "preact": "10.25.0",
-        "react-data-grid": "7.0.0-beta.47"
+        "@hpcc-js/esbuild-plugins": "^1.4.2",
+        "@types/react": "19.1.0",
+        "@types/react-dom": "19.1.0",
+        "@vitejs/plugin-react": "4.3.4",
+        "react": "19.1.0",
+        "react-data-grid": "7.0.0-beta.51",
+        "react-dom": "19.1.0",
+        "vite-plugin-html": "3.2.2"
     },
     "repository": {
         "type": "git",
@@ -57,5 +61,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "145a4d4c8189c70f08e9804e63959d6dd398bd9f"
+    "gitHead": "c54b3bd37ed839305001ba47f2657a1f8eb8628a"
 }

package/src/ErrorBoundary.tsx

@@ -0,0 +1,56 @@
+import React, { Component, ErrorInfo, ReactNode } from "react";
+
+interface Props {
+    children: ReactNode;
+    fallback?: ReactNode;
+}
+
+interface State {
+    hasError: boolean;
+    error: Error | null;
+}
+
+export class ErrorBoundary extends Component<Props, State> {
+    public state: State = {
+        hasError: false,
+        error: null
+    };
+
+    public static getDerivedStateFromError(error: Error): State {
+        return { hasError: true, error };
+    }
+
+    public componentDidCatch(error: Error, errorInfo: ErrorInfo) {
+        console.error("Error caught by boundary:", error);
+        console.error("Component stack:", errorInfo.componentStack);
+    }
+
+    private handleReset = () => {
+        this.setState({ hasError: false, error: null });
+    };
+
+    public render() {
+        if (this.state.hasError) {
+            if (this.props.fallback) {
+                return this.props.fallback;
+            }
+
+            return (
+                <div className="min-h-[200px] flex items-center justify-center p-8 bg-red-50 rounded-lg border border-red-100">
+                    <div className="text-center">
+                        <h2 className="text-xl font-semibold text-red-700 mb-2">Something went wrong</h2>
+                        <p className="text-red-600">{this.state.error?.message}</p>
+                        <button
+                            onClick={this.handleReset}
+                            className="mt-4 px-4 py-2 bg-red-600 text-white rounded-md hover:bg-red-700 transition-colors"
+                        >
+                            Try again
+                        </button>
+                    </div>
+                </div>
+            );
+        }
+
+        return this.props.children;
+    }
+}

package/src/hooks.ts

@@ -1,4 +1,4 @@
-import React from "preact/compat";
+import React from "react";
 import { Widget } from "@hpcc-js/common";
 
 export function useData(widget: Widget): [string[], Array<string | number>[]] {

package/src/reactTable.tsx

@@ -1,7 +1,7 @@
-import { FunctionComponent } from "preact";
-import { useCallback, useEffect, useState } from "preact/hooks";
-import DataGrid, { Column, SelectColumn, SortColumn } from "react-data-grid";
+import React, { FunctionComponent, useCallback, useEffect, useState } from "react";
+import { DataGrid, Column, SelectColumn, SortColumn } from "react-data-grid";
 import { format, timeFormat, timeParse } from "@hpcc-js/common";
+import { ErrorBoundary } from "./ErrorBoundary.tsx";
 import { useData } from "./hooks.ts";
 import type { Table } from "./table.ts";
 
@@ -140,23 +140,24 @@ export const ReactTable: FunctionComponent<ReactTableProps> = ({
         setRows(items);
     }, [listColumns, data, sort]);
 
-    return <DataGrid
-        columns={listColumns}
-        headerRowHeight={24}
-        rows={rows}
-        rowKeyGetter={rowKeyGetter}
-        rowHeight={20}
-        renderers={{ noRowsFallback: <EmptyRowsRenderer message={table.noDataMessage()} /> as any }}
-        className={table.darkMode() ? "rdg-dark" : "rdg-light"}
-        sortColumns={sortColumn ? [sortColumn] : []}
-        onSortColumnsChange={onSortColumnsChange}
-        selectedRows={selectedRows}
-        onSelectedRowsChange={multiSelect ? onSelectedRowsChange : undefined}
-        onCellClick={multiSelect ? undefined : (args, event) => onCellClick(args.row, args.column)}
-        aria-describedby={""}
-        aria-label={""}
-        aria-labelledby={""}
-        style={{ height: "100%" }}
-    />;
+    return (
+        <ErrorBoundary fallback={<div>Error loading table</div>}>
+            <DataGrid
+                columns={listColumns}
+                headerRowHeight={24}
+                rows={rows}
+                rowKeyGetter={rowKeyGetter}
+                rowHeight={20}
+                renderers={{ noRowsFallback: <EmptyRowsRenderer message={table.noDataMessage()} /> as any }}
+                className={table.darkMode() ? "rdg-dark" : "rdg-light"}
+                sortColumns={sortColumn ? [sortColumn] : []}
+                onSortColumnsChange={onSortColumnsChange}
+                selectedRows={selectedRows}
+                onSelectedRowsChange={multiSelect ? onSelectedRowsChange : undefined}
+                onCellClick={multiSelect ? undefined : (args, event) => onCellClick(args.row, args.column)}
+                style={{ height: "100%" }}
+            />
+        </ErrorBoundary>
+    );
 };
 

package/src/table.ts

@@ -1,4 +1,5 @@
-import { render, createElement } from "preact";
+import { createElement } from "react";
+import { createRoot } from "react-dom/client";
 import { HTMLWidget } from "@hpcc-js/common";
 import { ReactTable } from "./reactTable.tsx";
 
@@ -9,6 +10,8 @@ export type ColumnType = "boolean" | "number" | "string" | "time";
 export class Table extends HTMLWidget {
 
     protected _div;
+    protected _root: any;
+    protected _component: any;
 
     constructor() {
         super();
@@ -57,13 +60,15 @@ export class Table extends HTMLWidget {
             .append("div")
             .style("display", "grid")
             ;
+        this._root = createRoot(this._div.node(), { identifierPrefix: this.id() });
+        this._component = createElement(ReactTable, { table: this });
     }
 
     update(domNode, element) {
         super.update(domNode, element);
         this._div.style("width", this.width() + "px");
         this._div.style("height", this.height() + "px");
-        render(createElement(ReactTable, { table: this }), this._div.node());
+        this._root.render(this._component);
     }
 
     exit(domNode, element) {

package/types/ErrorBoundary.d.ts

@@ -0,0 +1,17 @@
+import React, { Component, ErrorInfo, ReactNode } from "react";
+interface Props {
+    children: ReactNode;
+    fallback?: ReactNode;
+}
+interface State {
+    hasError: boolean;
+    error: Error | null;
+}
+export declare class ErrorBoundary extends Component<Props, State> {
+    state: State;
+    static getDerivedStateFromError(error: Error): State;
+    componentDidCatch(error: Error, errorInfo: ErrorInfo): void;
+    private handleReset;
+    render(): string | number | bigint | boolean | Iterable<React.ReactNode> | Promise<string | number | bigint | boolean | React.ReactPortal | React.ReactElement<unknown, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode>> | React.JSX.Element;
+}
+export {};

package/types/reactTable.d.ts

@@ -1,4 +1,4 @@
-import { FunctionComponent } from "preact";
+import { FunctionComponent } from "react";
 import type { Table } from "./table.ts";
 import "react-data-grid/lib/styles.css";
 export type QuerySortItem = {

package/types/table.d.ts

@@ -3,6 +3,8 @@ import "./table.css";
 export type ColumnType = "boolean" | "number" | "string" | "time";
 export declare class Table extends HTMLWidget {
     protected _div: any;
+    protected _root: any;
+    protected _component: any;
     constructor();
     columnType(column: string): ColumnType;
     columnType(column: string, type: ColumnType): this;