@hpcc-js/dgrid2 3.1.1 → 3.2.1

package/package.json

@@ -1,28 +1,29 @@
 {
     "name": "@hpcc-js/dgrid2",
-    "version": "3.1.1",
+    "version": "3.2.1",
     "description": "hpcc-js - DGrid2",
     "type": "module",
+    "main": "./dist/index.umd.cjs",
+    "module": "./dist/index.js",
     "exports": {
         ".": {
             "types": "./types/index.d.ts",
-            "default": "./dist/index.js"
+            "import": "./dist/index.js",
+            "require": "./dist/index.umd.cjs"
         },
         "./dist/*": "./dist/*"
     },
-    "module": "./dist/index.js",
-    "browser": "./dist/index.js",
+    "browser": "./dist/index.umd.cjs",
     "types": "./types/index.d.ts",
     "files": [
         "dist/*",
         "src/*",
-        "types/*",
-        "font-awesome/**/*"
+        "types/*"
     ],
     "scripts": {
         "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
-        "bundle": "node esbuild.js",
-        "bundle-watch": "npm run bundle -- --development --watch",
+        "bundle": "vite build",
+        "bundle-watch": "vite --port 5507",
         "gen-types": "tsc --project tsconfig.json",
         "gen-types-watch": "npm run gen-types -- --watch",
         "build": "run-p gen-types bundle",
@@ -36,13 +37,20 @@
         "update-major": "npx --yes npm-check-updates -u"
     },
     "dependencies": {
-        "@hpcc-js/common": "^3.2.0",
-        "@hpcc-js/util": "^3.2.0"
+        "@hpcc-js/common": "^3.3.1",
+        "@hpcc-js/util": "^3.3.1"
+    },
+    "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
     },
     "devDependencies": {
-        "@hpcc-js/esbuild-plugins": "^1.3.0",
-        "@hpcc-js/preact-shim": "^3.0.0",
-        "react-data-grid": "7.0.0-beta.47"
+        "@hpcc-js/esbuild-plugins": "^1.4.1",
+        "@types/react": "^18.0.0",
+        "@types/react-dom": "^18.0.0",
+        "@vitejs/plugin-react": "4.3.4",
+        "react-data-grid": "7.0.0-beta.47",
+        "vite-plugin-html": "3.2.2"
     },
     "repository": {
         "type": "git",
@@ -55,5 +63,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "b4f63e027feea45ebdfc578ef9c85d107bd97322"
+    "gitHead": "521692e7cfd01c274d5cfff0c54e79d1686d3dd6"
 }

package/src/hooks.ts

@@ -1,10 +1,8 @@
+import React from "react";
 import { Widget } from "@hpcc-js/common";
-import * as React from "react";
 
 export function useData(widget: Widget): [string[], Array<string | number>[]] {
-    // eslint-disable-next-line react-hooks/exhaustive-deps
     const columns: string[] = React.useMemo(() => widget.columns(), [widget, widget.dataChecksum()]);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
     const data: Array<string | number>[] = React.useMemo(() => widget.data(), [widget, widget.dataChecksum()]);
 
     return [columns, data];

package/src/reactTable.tsx

@@ -1,4 +1,4 @@
-import * as React from "react";
+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 { useData } from "./hooks.ts";
@@ -23,7 +23,7 @@ interface EmptyRowsRendererProps {
     message: string
 }
 
-const EmptyRowsRenderer: React.FunctionComponent<EmptyRowsRendererProps> = ({
+const EmptyRowsRenderer: FunctionComponent<EmptyRowsRendererProps> = ({
     message
 }) => {
 
@@ -43,7 +43,7 @@ export interface ReactTableProps {
     sort?: QuerySortItem,
 }
 
-export const ReactTable: React.FunctionComponent<ReactTableProps> = ({
+export const ReactTable: FunctionComponent<ReactTableProps> = ({
     table,
     sort
 }) => {
@@ -53,13 +53,13 @@ export const ReactTable: React.FunctionComponent<ReactTableProps> = ({
     const columnPatterns = table.columnPatterns();
     const columnFormats = table.columnFormats();
 
-    const [listColumns, setListColumns] = React.useState<ColumnEx<any[]>[]>([]);
-    const [sortColumn, setSortColumn] = React.useState<SortColumn>();
-    const [rows, setRows] = React.useState<any[]>([]);
-    const [selectedRows, setSelectedRows] = React.useState<ReadonlySet<number>>(new Set());
+    const [listColumns, setListColumns] = useState<ColumnEx<any[]>[]>([]);
+    const [sortColumn, setSortColumn] = useState<SortColumn>();
+    const [rows, setRows] = useState<any[]>([]);
+    const [selectedRows, setSelectedRows] = useState<ReadonlySet<number>>(new Set());
 
     //  Columns  ---
-    React.useEffect(() => {
+    useEffect(() => {
         setListColumns([
             ...multiSelect ? [SelectColumn as ColumnEx<any[]>] : [],
             ...columns.map((column): ColumnEx<any[]> => {
@@ -94,7 +94,7 @@ export const ReactTable: React.FunctionComponent<ReactTableProps> = ({
         ]);
     }, [columnFormats, columnPatterns, columnTypes, columns, multiSelect]);
 
-    const onSortColumnsChange = React.useCallback((sortColumns: SortColumn[]) => {
+    const onSortColumnsChange = useCallback((sortColumns: SortColumn[]) => {
         const futureSortColumn = sortColumns.slice(-1)[0];
         const sorted = futureSortColumn !== undefined;
         const isSortedDescending: boolean = futureSortColumn?.direction === "DESC";
@@ -102,20 +102,20 @@ export const ReactTable: React.FunctionComponent<ReactTableProps> = ({
         setRows(copyAndSort(rows, sorted ? futureSortColumn.columnKey : "key", sorted ? isSortedDescending : false));
     }, [rows]);
 
-    const rowKeyGetter = React.useCallback((row: any) => {
+    const rowKeyGetter = useCallback((row: any) => {
         return row.key;
     }, []);
 
-    const onSelectedRowsChange = React.useCallback((selectedRows: Set<any>) => {
+    const onSelectedRowsChange = useCallback((selectedRows: Set<any>) => {
         setSelectedRows(selectedRows);
     }, []);
 
-    const onCellClick = React.useCallback((row, column) => {
+    const onCellClick = useCallback((row, column) => {
         table.onRowClickCallback(row, column.key);
     }, [table]);
 
     //  Rows  ---
-    React.useEffect(() => {
+    useEffect(() => {
         let items = data.map((row, index) => {
             const retVal = {
                 key: index

package/src/table.ts

@@ -1,6 +1,6 @@
-import * as React from "react";
+import { createElement } from "react";
+import { createRoot } from "react-dom/client";
 import { HTMLWidget } from "@hpcc-js/common";
-import { render, unmountComponentAtNode } from "react-dom";
 import { ReactTable } from "./reactTable.tsx";
 
 import "./table.css";
@@ -10,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();
@@ -58,17 +60,18 @@ 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(React.createElement(ReactTable, { table: this }), this._div.node());
+        this._root.render(this._component);
     }
 
     exit(domNode, element) {
-        unmountComponentAtNode(this._div.node());
         this._div.remove();
         super.exit(domNode, element);
     }

package/types/reactTable.d.ts

@@ -1,4 +1,4 @@
-import * as React from "react";
+import { FunctionComponent } from "react";
 import type { Table } from "./table.ts";
 import "react-data-grid/lib/styles.css";
 export type QuerySortItem = {
@@ -9,4 +9,4 @@ export interface ReactTableProps {
     table: Table;
     sort?: QuerySortItem;
 }
-export declare const ReactTable: React.FunctionComponent<ReactTableProps>;
+export declare const ReactTable: FunctionComponent<ReactTableProps>;

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;