@perspective-dev/viewer-datagrid 4.1.0 → 4.2.0

package/src/ts/style_handlers/focus.ts

@@ -12,12 +12,7 @@
 
 import { RegularTableElement } from "regular-table";
 import type { DatagridModel, SelectedPosition } from "../types.js";
-
-import {
-    CollectedCell,
-    LocalSelectedPositionMap,
-    CellMetaExtended,
-} from "./types.js";
+import { CollectedCell, LocalSelectedPositionMap } from "./types.js";
 
 /**
  * Apply focus style to the selected cell.
@@ -35,6 +30,7 @@ export function applyFocusStyle(
     if (selected_position) {
         for (const { element: td, metadata } of cells) {
             if (
+                metadata.type === "body" &&
                 metadata.x === selected_position.x &&
                 metadata.y === selected_position.y
             ) {
@@ -77,11 +73,9 @@ export function focusSelectedCell(
     if (tbody) {
         for (const tr of tbody.children) {
             for (const cell of tr.children) {
-                const metadata = regularTable.getMeta(cell) as
-                    | CellMetaExtended
-                    | undefined;
+                const metadata = regularTable.getMeta(cell as HTMLElement);
                 if (
-                    metadata &&
+                    metadata?.type === "body" &&
                     metadata.x === selected_position.x &&
                     metadata.y === selected_position.y
                 ) {

package/src/ts/style_handlers/group_header.ts

@@ -38,8 +38,10 @@ export function applyGroupHeaderStyles(
             td.style.backgroundColor = "";
 
             const needs_border =
-                (header_depth > 0 && metadata.row_header_x === header_depth) ||
-                (metadata.x ?? -1) >= 0;
+                (metadata.type === "corner" &&
+                    header_depth > 0 &&
+                    metadata.row_header_x === header_depth) ||
+                (metadata.type === "column_header" && metadata.x >= 0);
 
             td.classList.toggle("psp-align-right", false);
             td.classList.toggle("psp-align-left", false);
@@ -48,8 +50,9 @@ export function applyGroupHeaderStyles(
             td.classList.toggle("psp-header-border", needs_border);
             td.classList.toggle(
                 "psp-header-group-corner",
-                typeof metadata.x === "undefined",
+                metadata.type === "corner",
             );
+
             td.classList.toggle("psp-color-mode-bar", false);
             td.classList.toggle("psp-header-sort-asc", false);
             td.classList.toggle("psp-header-sort-desc", false);

package/src/ts/style_handlers/table_cell/boolean.ts

@@ -13,16 +13,13 @@
 import { CellMetadata } from "regular-table/dist/esm/types.js";
 import type { DatagridModel, ColumnConfig, ColorRecord } from "../../types.js";
 
-interface CellMetaWithFlags extends CellMetadata {
-    _is_hidden_by_aggregate_depth?: boolean;
-}
-
 export function cell_style_boolean(
     this: DatagridModel,
     _plugin: ColumnConfig | undefined,
     td: HTMLElement,
-    metadata: CellMetaWithFlags,
+    metadata: CellMetadata,
 ): void {
+    // @ts-ignore
     if (metadata._is_hidden_by_aggregate_depth) {
         td.style.backgroundColor = "";
         td.style.color = "";

package/src/ts/style_handlers/table_cell/cell_flash.ts

@@ -10,12 +10,12 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-import { CellMetadata } from "regular-table/dist/esm/types.js";
+import { CellMetadataBody } from "regular-table/dist/esm/types.js";
 import type { DatagridModel, ColorRecord } from "../../types.js";
 
 export function style_cell_flash(
     this: DatagridModel,
-    metadata: CellMetadata,
+    metadata: CellMetadataBody,
     td: HTMLElement,
     [, , , , , pos_s, pos_e]: ColorRecord,
     [, , , , , neg_s, neg_e]: ColorRecord,

package/src/ts/style_handlers/table_cell/datetime.ts

@@ -17,15 +17,11 @@ import {
 } from "../../color_utils.js";
 import type { DatagridModel, ColumnConfig, ColorRecord } from "../../types.js";
 
-interface CellMetaWithFlags extends CellMetadata {
-    _is_hidden_by_aggregate_depth?: boolean;
-}
-
 export function cell_style_datetime(
     this: DatagridModel,
     plugin: ColumnConfig,
     td: HTMLElement,
-    metadata: CellMetaWithFlags,
+    metadata: CellMetadata,
 ): void {
     const colorRecord: ColorRecord = //(() => {
         // if (plugin?.color !== undefined) {
@@ -38,6 +34,7 @@ export function cell_style_datetime(
 
     const [hex, r, g, b] = colorRecord;
 
+    // @ts-ignore
     if (metadata._is_hidden_by_aggregate_depth) {
         td.style.backgroundColor = "";
         td.style.color = "";

package/src/ts/style_handlers/table_cell/row_header.ts

@@ -10,19 +10,18 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-import { CellMetadata } from "regular-table/dist/esm/types.js";
+import {
+    CellMetadata,
+    CellMetadataRowHeader,
+} from "regular-table/dist/esm/types.js";
 import type { DatagridModel } from "../../types.js";
 import { RegularTableElement } from "regular-table";
 
-interface NextMeta {
-    row_header?: unknown[];
-}
-
 export function cell_style_row_header(
     this: DatagridModel,
     regularTable: RegularTableElement,
     td: HTMLElement,
-    metadata: CellMetadata,
+    metadata: CellMetadataRowHeader,
 ): void {
     const is_not_empty =
         metadata.value !== undefined &&
@@ -33,12 +32,14 @@ export function cell_style_row_header(
     const next = regularTable.getMeta({
         dx: 0,
         dy: (metadata.y ?? 0) - (metadata.y0 ?? 0) + 1,
-    } as unknown as Element) as NextMeta | undefined;
+    } as CellMetadata);
+
     const is_collapse =
         next &&
         next.row_header &&
         typeof next.row_header[(metadata.row_header_x ?? 0) + 1] !==
             "undefined";
+
     td.classList.toggle("psp-tree-label", is_not_empty && !is_leaf);
     td.classList.toggle(
         "psp-tree-label-expand",

package/src/ts/style_handlers/types.ts

@@ -11,16 +11,16 @@
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
 import { RegularTableElement } from "regular-table";
-import { CellMetadata } from "regular-table/dist/esm/types.js";
+import {
+    CellMetadata,
+    CellMetadataBody,
+    CellMetadataRowHeader,
+} from "regular-table/dist/esm/types.js";
 import type { SelectedPosition } from "../types.js";
 
-export interface CellMetaExtended extends CellMetadata {
-    _is_hidden_by_aggregate_depth?: boolean;
-}
-
 export interface CollectedCell {
     element: HTMLElement;
-    metadata: CellMetaExtended;
+    metadata: CellMetadataRowHeader | CellMetadataBody;
     isHeader: boolean;
 }
 

package/src/ts/types.ts

@@ -23,7 +23,21 @@ import { CellMetadata, DataResponse } from "regular-table/dist/esm/types";
 
 // Re-export types from regular-table for use throughout the codebase
 export type { RegularTableElement as RegularTable };
-export type { CellMetadata as CellMeta };
+
+export function get_psp_type(
+    model: DatagridModel,
+    metadata: CellMetadata,
+): ColumnType {
+    if (
+        metadata.type === "body" ||
+        metadata.type === "column_header" ||
+        metadata.type === "corner"
+    ) {
+        return model._column_types[metadata.x];
+    } else {
+        return model._row_header_types[(metadata.row_header_x ?? 0) - 1];
+    }
+}
 
 // Edit mode for the datagrid
 export type EditMode =