fix(data-grid): improve striped row contrast

This commit is contained in:
zipg authored and GitHub committed 2026-07-22 21:43:51 +08:00
1 parent ae7c368c4a
commit 44ffec7446
3 files changed
+24 -7

No files matched your search

@@ -133,6 +133,7 @@ import { canGoNextDataGridPage, hasCompleteLocalDataGridResult } from "@/lib/dat
import { dataGridCountQueryOptions } from "@/lib/dataGrid/dataGridQueryOptions"; import { dataGridCountQueryOptions } from "@/lib/dataGrid/dataGridQueryOptions";
import { dataGridBottomScrollTop, dataGridScrollPosition, isDataGridAtScrollBottom, isDataGridNearScrollBottom, shouldCheckInfiniteScrollAfterScroll, type DataGridScrollPosition } from "@/lib/dataGrid/dataGridInfiniteScroll"; import { dataGridBottomScrollTop, dataGridScrollPosition, isDataGridAtScrollBottom, isDataGridNearScrollBottom, shouldCheckInfiniteScrollAfterScroll, type DataGridScrollPosition } from "@/lib/dataGrid/dataGridInfiniteScroll";
import { CANVAS_DATA_GRID_ROW_HEIGHT, dataGridSearchMatchKey, drawCanvasDataGrid } from "@/lib/dataGrid/canvasDataGridRenderer"; import { CANVAS_DATA_GRID_ROW_HEIGHT, dataGridSearchMatchKey, drawCanvasDataGrid } from "@/lib/dataGrid/canvasDataGridRenderer";
import { DATA_GRID_DARK_STRIPED_ROW_BG, DATA_GRID_LIGHT_STRIPED_ROW_BG } from "@/lib/dataGrid/dataGridPaintTheme";
import { createRowLowerTextCache } from "@/lib/dataGrid/dataGridRowLowerText"; import { createRowLowerTextCache } from "@/lib/dataGrid/dataGridRowLowerText";
import { dataGridPreviewLabelKey, dataGridSaveActionMode, dataGridSaveToolbarState } from "@/lib/dataGrid/dataGridSaveUi"; import { dataGridPreviewLabelKey, dataGridSaveActionMode, dataGridSaveToolbarState } from "@/lib/dataGrid/dataGridSaveUi";
import type { QueryEditabilityReason } from "@/lib/sql/sqlAnalysis"; import type { QueryEditabilityReason } from "@/lib/sql/sqlAnalysis";
@@ -4328,9 +4329,7 @@ function dataGridRowStyle(item: RowItem): CSSProperties {
? "rgb(51, 51, 55)" ? "rgb(51, 51, 55)"
: "rgb(243, 243, 243)" : "rgb(243, 243, 243)"
: item.displayIndex % 2 === 1 : item.displayIndex % 2 === 1
? dark ? `var(--data-grid-row-muted-bg, ${dark ? DATA_GRID_DARK_STRIPED_ROW_BG : DATA_GRID_LIGHT_STRIPED_ROW_BG})`
? "rgb(32, 32, 34)"
: "rgb(248, 248, 248)"
: dark : dark
? "rgb(19, 20, 22)" ? "rgb(19, 20, 22)"
: "rgb(255, 255, 255)"; : "rgb(255, 255, 255)";
@@ -9060,7 +9059,7 @@ const gridContextMenuItems = computed<ContextMenuItem[]>(() => {
@reference "../../styles/globals.css"; @reference "../../styles/globals.css";
[data-grid-root] { [data-grid-root] {
--data-grid-row-muted-bg: rgb(248, 248, 248); --data-grid-row-muted-bg: rgb(240, 240, 240);
--data-grid-row-new-bg: rgb(243, 243, 243); --data-grid-row-new-bg: rgb(243, 243, 243);
--data-grid-row-deleted-bg: rgb(255, 244, 244); --data-grid-row-deleted-bg: rgb(255, 244, 244);
--data-grid-cell-active-bg: rgb(232, 232, 232); --data-grid-cell-active-bg: rgb(232, 232, 232);
@@ -9086,7 +9085,7 @@ const gridContextMenuItems = computed<ContextMenuItem[]>(() => {
[data-grid-root].data-grid--dark, [data-grid-root].data-grid--dark,
:global(.dark) [data-grid-root] { :global(.dark) [data-grid-root] {
--data-grid-row-muted-bg: rgb(32, 32, 34); --data-grid-row-muted-bg: rgb(40, 40, 43);
--data-grid-row-new-bg: rgb(51, 51, 55); --data-grid-row-new-bg: rgb(51, 51, 55);
--data-grid-row-deleted-bg: rgb(55, 31, 32); --data-grid-row-deleted-bg: rgb(55, 31, 32);
--data-grid-cell-active-bg: rgb(64, 64, 64); --data-grid-cell-active-bg: rgb(64, 64, 64);
@@ -9112,7 +9111,7 @@ const gridContextMenuItems = computed<ContextMenuItem[]>(() => {
@supports (background: color-mix(in oklab, white 50%, transparent)) { @supports (background: color-mix(in oklab, white 50%, transparent)) {
[data-grid-root] { [data-grid-root] {
--data-grid-row-muted-bg: color-mix(in oklab, var(--muted) 30%, transparent); --data-grid-row-muted-bg: color-mix(in oklab, var(--muted) 99%, var(--foreground));
--data-grid-row-new-bg: color-mix(in oklab, var(--primary) 5%, transparent); --data-grid-row-new-bg: color-mix(in oklab, var(--primary) 5%, transparent);
--data-grid-row-deleted-bg: color-mix(in oklab, var(--destructive) 5%, transparent); --data-grid-row-deleted-bg: color-mix(in oklab, var(--destructive) 5%, transparent);
--data-grid-cell-active-bg: color-mix(in oklab, var(--primary) 15%, transparent); --data-grid-cell-active-bg: color-mix(in oklab, var(--primary) 15%, transparent);
@@ -35,6 +35,8 @@ export const DATA_GRID_DARK_SEARCH_COLORS = {
current: "rgb(116, 87, 0)", current: "rgb(116, 87, 0)",
currentBorder: "rgb(239, 177, 0)", currentBorder: "rgb(239, 177, 0)",
} as const; } as const;
export const DATA_GRID_LIGHT_STRIPED_ROW_BG = "rgb(240, 240, 240)";
export const DATA_GRID_DARK_STRIPED_ROW_BG = "rgb(40, 40, 43)";
export const DATA_GRID_DARK_ROW_NUMBER_BG = "rgb(35, 37, 42)"; export const DATA_GRID_DARK_ROW_NUMBER_BG = "rgb(35, 37, 42)";
const DATA_GRID_DARK_ROW_NUMBER_NEW_BG = "rgb(33, 45, 40)"; const DATA_GRID_DARK_ROW_NUMBER_NEW_BG = "rgb(33, 45, 40)";
const DATA_GRID_DARK_ROW_NUMBER_EDITED_BG = "rgb(48, 41, 28)"; const DATA_GRID_DARK_ROW_NUMBER_EDITED_BG = "rgb(48, 41, 28)";
@@ -239,7 +241,7 @@ export function resolveDataGridPaintTheme(options: { getVar: (name: string) => s
const destructive = cssVarColor(getVar, "--destructive", isDark ? "rgb(243, 98, 95)" : "rgb(231, 0, 11)"); const destructive = cssVarColor(getVar, "--destructive", isDark ? "rgb(243, 98, 95)" : "rgb(231, 0, 11)");
const accent = cssVarColor(getVar, "--accent", isDark ? "rgb(46, 47, 51)" : "rgb(245, 245, 245)"); const accent = cssVarColor(getVar, "--accent", isDark ? "rgb(46, 47, 51)" : "rgb(245, 245, 245)");
const activeSurface = isDark ? "rgb(64, 64, 64)" : "rgb(232, 232, 232)"; const activeSurface = isDark ? "rgb(64, 64, 64)" : "rgb(232, 232, 232)";
const rowMuted = isDark ? "rgb(32, 32, 34)" : "rgb(248, 248, 248)"; const rowMuted = isDark ? DATA_GRID_DARK_STRIPED_ROW_BG : DATA_GRID_LIGHT_STRIPED_ROW_BG;
const rowNew = isDark ? "rgb(51, 51, 55)" : "rgb(243, 243, 243)"; const rowNew = isDark ? "rgb(51, 51, 55)" : "rgb(243, 243, 243)";
const rowDeleted = isDark ? "rgb(55, 31, 32)" : "rgb(255, 244, 244)"; const rowDeleted = isDark ? "rgb(55, 31, 32)" : "rgb(255, 244, 244)";
const cellActive = activeSurface; const cellActive = activeSurface;
+16
View File
@@ -1,6 +1,7 @@
import { strict as assert } from "node:assert"; import { strict as assert } from "node:assert";
import { test } from "vitest"; import { test } from "vitest";
import { fitCanvasText } from "../../apps/desktop/src/lib/dataGrid/canvasDataGridRenderer.ts"; import { fitCanvasText } from "../../apps/desktop/src/lib/dataGrid/canvasDataGridRenderer.ts";
import { DATA_GRID_DARK_STRIPED_ROW_BG, DATA_GRID_LIGHT_STRIPED_ROW_BG, resolveDataGridPaintTheme } from "../../apps/desktop/src/lib/dataGrid/dataGridPaintTheme.ts";
function measureContext(charWidth = 1): CanvasRenderingContext2D { function measureContext(charWidth = 1): CanvasRenderingContext2D {
return { return {
@@ -21,3 +22,18 @@ test("fitCanvasText truncates only when text exceeds the available cell width",
assert.equal(fitCanvasText(ctx, "1234567890", 8), "12345..."); assert.equal(fitCanvasText(ctx, "1234567890", 8), "12345...");
}); });
test("data grid paint themes use the increased striped row contrast", () => {
const getVar = () => "";
const lightTheme = resolveDataGridPaintTheme({ getVar, isDark: false });
assert.equal(lightTheme.rowMuted, DATA_GRID_LIGHT_STRIPED_ROW_BG);
assert.notEqual(lightTheme.rowMuted, lightTheme.rowNew);
assert.equal(resolveDataGridPaintTheme({ getVar, isDark: true }).rowMuted, DATA_GRID_DARK_STRIPED_ROW_BG);
});
test("data grid paint theme uses the resolved striped row token", () => {
const getVar = (name: string) => (name === "--data-grid-row-muted-bg" ? "rgb(235, 239, 244)" : "");
assert.equal(resolveDataGridPaintTheme({ getVar, isDark: false }).rowMuted, "rgb(235, 239, 244)");
});