@perspective-dev/viewer-datagrid 4.2.0 → 4.4.0

package/src/ts/style_handlers/column_header.ts

@@ -97,9 +97,11 @@ export function styleColumnHeaderRow(
     regularTable: RegularTableElement,
     is_menu_row: boolean,
 ): void {
-    const header_depth = this._config.group_by.length;
-    const selectedColumn = this._column_settings_selected_column;
+    const header_depth =
+        this._config.group_by.length -
+        (this._config.group_rollup_mode === "flat" ? 1 : 0);
 
+    const selectedColumn = this._column_settings_selected_column;
     for (const { element: td, metadata } of headerRow.cells) {
         if (
             !metadata ||
@@ -110,14 +112,13 @@ export function styleColumnHeaderRow(
 
         const column_name =
             metadata.column_header?.[this._config.split_by.length];
+
         const sort = this._config.sort.find((x) => x[0] === column_name);
-        let needs_border =
-            metadata.type === "corner" &&
-            metadata.row_header_x === header_depth;
         const is_corner = typeof metadata.x === "undefined";
-        needs_border =
-            needs_border ||
-            (metadata.x !== undefined &&
+        const needs_border =
+            (metadata.type === "corner" &&
+                metadata.row_header_x === header_depth) ||
+            (!is_corner &&
                 (metadata.x + 1) % this._config.columns.length === 0);
 
         td.classList.toggle("psp-header-border", needs_border);

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

@@ -17,20 +17,23 @@ import {
 } from "../../color_utils.js";
 import type { DatagridModel, ColumnConfig, ColorRecord } from "../../types.js";
 
+interface PluginWithColor extends Omit<ColumnConfig, "color"> {
+    color?: ColorRecord;
+}
+
 export function cell_style_datetime(
     this: DatagridModel,
-    plugin: ColumnConfig,
+    plugin: PluginWithColor,
     td: HTMLElement,
     metadata: CellMetadata,
 ): void {
-    const colorRecord: ColorRecord = //(() => {
-        // if (plugin?.color !== undefined) {
-        //     return plugin.color;
-        // } else {
-        // return
-        this._color;
-    // }
-    //  })();
+    const colorRecord: ColorRecord = (() => {
+        if (plugin?.color !== undefined) {
+            return plugin.color;
+        } else {
+            return this._color;
+        }
+    })();
 
     const [hex, r, g, b] = colorRecord;
 

package/src/ts/types.ts

@@ -17,6 +17,7 @@ import type {
     ColumnType,
     SortDir,
     ViewWindow,
+    ViewConfigUpdate,
 } from "@perspective-dev/client";
 import { RegularTableElement } from "regular-table";
 import { CellMetadata, DataResponse } from "regular-table/dist/esm/types";
@@ -244,7 +245,7 @@ export type FormatterCache = Map<string, FormatterCacheEntry>;
 export interface CellConfigResult {
     row: Record<string, unknown>;
     column_names: string[];
-    config: Partial<ViewConfig>;
+    config: ViewConfigUpdate;
 }
 
 // Custom event detail types
@@ -254,12 +255,7 @@ export interface PerspectiveClickDetail {
     config: Partial<ViewConfig>;
 }
 
-export interface PerspectiveSelectDetail {
-    selected: boolean;
-    row: Record<string, unknown>;
-    column_names?: string[];
-    config: Partial<ViewConfig>;
-}
+export { PerspectiveSelectDetail } from "@perspective-dev/viewer";
 
 // Mouse event with handled flag
 export interface HandledMouseEvent extends MouseEvent {

package/src/less/mitered-headers.less

@@ -1,65 +0,0 @@
-// ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-// ┃ ██████ ██████ ██████       █      █      █      █      █ █▄  ▀███ █       ┃
-// ┃ ▄▄▄▄▄█ █▄▄▄▄▄ ▄▄▄▄▄█  ▀▀▀▀▀█▀▀▀▀▀ █ ▀▀▀▀▀█ ████████▌▐███ ███▄  ▀█ █ ▀▀▀▀▀ ┃
-// ┃ █▀▀▀▀▀ █▀▀▀▀▀ █▀██▀▀ ▄▄▄▄▄ █ ▄▄▄▄▄█ ▄▄▄▄▄█ ████████▌▐███ █████▄   █ ▄▄▄▄▄ ┃
-// ┃ █      ██████ █  ▀█▄       █ ██████      █      ███▌▐███ ███████▄ █       ┃
-// ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫
-// ┃ Copyright (c) 2017, the Perspective Authors.                              ┃
-// ┃ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ ┃
-// ┃ This file is part of the Perspective library, distributed under the terms ┃
-// ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
-// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-
-.psp-header-border:not(.psp-is-top):not(.psp-header-leaf) {
-    // right
-    box-shadow: 1px 0px var(--inactive--border-color, #8b868045);
-}
-
-.psp-header-group {
-    // bottom
-    box-shadow: 0px 10px 0 -9px var(--inactive--border-color, #8b868045);
-}
-
-.psp-is-top {
-    // top-miter-right
-    box-shadow: 5px 4px 0px -4px var(--inactive--border-color, #8b868045);
-}
-
-.psp-is-top.psp-header-group:not(.psp-header-group-corner) {
-    // top-miter-right and bottom
-    box-shadow:
-        5px 4px 0px -4px var(--inactive--border-color, #8b868045),
-        0px 10px 0 -9px var(--inactive--border-color, #8b868045);
-}
-
-.psp-header-border.psp-header-group {
-    &:not(.psp-is-top):not(.psp-header-group-corner) {
-        // right and bottom
-        box-shadow:
-            1px 0px var(--inactive--border-color, #8b868045),
-            0px 10px 0 -9px var(--inactive--border-color, #8b868045);
-    }
-}
-
-@mixin disabled-menu-funky-box-shadow {
-    tr.rt-autosize .psp-header-leaf.psp-header-border:not(.psp-menu-enabled) {
-        box-shadow: 1px 0px var(--inactive--border-color, #8b868045);
-    }
-}
-
-perspective-viewer[settings] {
-    @include disabled-menu-funky-box-shadow;
-}
-
-:host-context(perspective-viewer[settings]) {
-    @include disabled-menu-funky-box-shadow;
-}
-
-.psp-header-leaf.psp-header-border {
-    // bottom-miter-right
-    box-shadow: 5px -4px 0px -4px var(--inactive--border-color, #8b868045);
-}
-
-tr:only-child th {
-    box-shadow: none !important;
-}