Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(sheets): improve gridline and scrollbar theme colors (#7501)
Univer2cfea02f783f
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/defaultstyle-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/defaultstyle-ci-chromium-linux.pngindex 960e9af0b8..3799d18481 100644Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/defaultstyle-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/defaultstyle-ci-chromium-linux.png differdiff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/facade-sheet-hooks-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/facade-sheet-hooks-ci-chromium-linux.pngindex 960e9af0b8..3799d18481 100644Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/facade-sheet-hooks-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/facade-sheet-hooks-ci-chromium-linux.png differdiff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/set-force-string-cell-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/set-force-string-cell-ci-chromium-linux.pngindex 1375409569..191814be79 100644Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/set-force-string-cell-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/set-force-string-cell-ci-chromium-linux.png differdiff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/set-text-format-number-cell-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/set-text-format-number-cell-ci-chromium-linux.pngindex 04e09d71d0..0f3c5e3479 100644Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/set-text-format-number-cell-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/set-text-format-number-cell-ci-chromium-linux.png differdiff --git a/packages/engine-render/src/components/sheets/spreadsheet.ts b/packages/engine-render/src/components/sheets/spreadsheet.tsindex 66bc3d0c96..23668ec82c 100644--- a/packages/engine-render/src/components/sheets/spreadsheet.ts+++ b/packages/engine-render/src/components/sheets/spreadsheet.ts@@ -885,7 +885,7 @@ export class Spreadsheet extends SheetComponent {ctx.setLineWidthByPrecision(1);- const defaultGridlinesColor = ctx.__mode === 'printing' ? getColor([214, 216, 219]) : 'gray.200';+ const defaultGridlinesColor = ctx.__mode === 'printing' ? getColor([214, 216, 219]) : 'mix(gray.200, gray.900, 0.07)';ctx.strokeStyle = gridlinesColor ?? ctx.renderConfig.gridlinesColor ?? defaultGridlinesColor;const columnWidthAccumulationLength = columnWidthAccumulation.length;diff --git a/packages/engine-render/src/services/__tests__/canvas-color.service.spec.ts b/packages/engine-render/src/services/__tests__/canvas-color.service.spec.tsindex 180a26a5f8..27812a5077 100644--- a/packages/engine-render/src/services/__tests__/canvas-color.service.spec.ts+++ b/packages/engine-render/src/services/__tests__/canvas-color.service.spec.ts@@ -14,8 +14,8 @@* limitations under the License.*/-import { Injector, ThemeService } from '@univerjs/core';-import { describe, expect, it } from 'vitest';+import { ColorKit, Injector, ThemeService } from '@univerjs/core';+import { describe, expect, it, vi } from 'vitest';import {CanvasColorService,DumbCanvasColorService,@@ -78,6 +78,91 @@ describe('CanvasColorService', () => {expect(service.getRenderColor('gray.900')).toBe(service.getRenderColor(gray900));});+ it('resolves and caches mixed theme colors without becoming stale after theme changes', () => {+ const injector = new Injector();+ injector.add([ThemeService]);+ injector.add([ICanvasColorService, { useClass: CanvasColorService }]);+ const themeService = injector.get(ThemeService);+ const service = injector.get(ICanvasColorService);+ const mixSpy = vi.spyOn(ColorKit, 'mix');+ const expression = 'mix(gray.200, gray.900, 0.07)';++ expect(service.getRenderColor(expression)).toBe('#d5d7dc');+ expect(service.getRenderColor(expression)).toBe('#d5d7dc');+ expect(mixSpy).toHaveBeenCalledTimes(1);++ themeService.setDarkMode(true);+ expect(service.getRenderColor(expression)).toBe(service.getRenderColor('#d5d7dc'));+ expect(mixSpy).toHaveBeenCalledTimes(1);++ themeService.setDarkMode(false);+ const theme = themeService.getCurrentTheme();+ themeService.setTheme({+ ...theme,+ gray: {+ ...theme.gray,+ 200: '#ccddee',+ 900: '#112233',+ },+ });++ expect(service.getRenderColor(expression)).toBe('#bfd0e1');+ expect(mixSpy).toHaveBeenCalledTimes(2);+ mixSpy.mockRestore();+ });++ it('resolves and caches alpha theme colors without becoming stale after theme changes', () => {+ const injector = new Injector();+ injector.add([ThemeService]);+ injector.add([ICanvasColorService, { useClass: CanvasColorService }]);+ const themeService = injector.get(ThemeService);+ const service = injector.get(ICanvasColorService);+ const alphaSpy = vi.spyOn(ColorKit.prototype, 'setAlpha');+ const expression = 'alpha(gray.50, 0.5)';++ expect(service.getRenderColor(expression)).toBe('rgba(249,250,251,0.5)');+ expect(service.getRenderColor(expression)).toBe('rgba(249,250,251,0.5)');+ expect(alphaSpy).toHaveBeenCalledTimes(1);++ themeService.setDarkMode(true);+ expect(service.getRenderColor(expression)).toBe(service.getRenderColor('rgba(249,250,251,0.5)'));+ expect(alphaSpy).toHaveBeenCalledTimes(1);++ themeService.setDarkMode(false);+ const theme = themeService.getCurrentTheme();+ themeService.setTheme({+ ...theme,+ gray: {+ ...theme.gray,+ 50: '#101827',+ },+ });++ expect(service.getRenderColor(expression)).toBe('rgba(16,24,39,0.5)');+ expect(alphaSpy).toHaveBeenCalledTimes(2);+ alphaSpy.mockRestore();+ });++ it('resolves alpha CSS color names', () => {+ const injector = new Injector();+ injector.add([ThemeService]);+ injector.add([ICanvasColorService, { useClass: CanvasColorService }]);+ const service = injector.get(ICanvasColorService);++ expect(service.getRenderColor('alpha(white, 0.5)')).toBe('rgba(255,255,255,0.5)');+ expect(service.getRenderColor('alpha(white, 0.7)')).toBe('rgba(255,255,255,0.7)');+ });++ it('rejects invalid alpha color expressions', () => {+ const injector = new Injector();+ injector.add([ThemeService]);+ injector.add([ICanvasColorService, { useClass: CanvasColorService }]);+ const service = injector.get(ICanvasColorService);++ expect(() => service.getRenderColor('alpha(gray.50, 1.1)')).toThrow('[CanvasColorService]: illegal color');+ expect(() => service.getRenderColor('alpha(not-a-color, 0.5)')).toThrow('[CanvasColorService]: illegal color');+ });+it('maps render colors for dark mode rendering', () => {const injector = new Injector();injector.add([ThemeService]);diff --git a/packages/engine-render/src/services/canvas-color.service.ts b/packages/engine-render/src/services/canvas-color.service.tsindex 3c62a6c5f1..844365f790 100644--- a/packages/engine-render/src/services/canvas-color.service.ts+++ b/packages/engine-render/src/services/canvas-color.service.ts@@ -69,39 +69,41 @@ const DARK_RENDER_COLOR_OVERRIDES: Record<string, string> = {'rgba(148,163,184,0.45)': 'rgba(148,163,184,0.52)',};+const COLOR_MIX_REGEXP = /^mix\(\s*([^,()]+)\s*,\s*([^,()]+)\s*,\s*(0(?:\.\d+)?|1(?:\.0+)?)\s*\)$/;+const COLOR_ALPHA_REGEXP = /^alpha\(\s*([^,()]+)\s*,\s*(0(?:\.\d+)?|1(?:\.0+)?)\s*\)$/;+/*** This service inverts a color for dark mode. This service is exposed*/export class CanvasColorService extends Disposable implements ICanvasColorService {- private readonly _cache = new Map<string, string>();+ private readonly _darkModeCache = new Map<string, string>();+ private readonly _resolvedColorCache = new Map<string, string>();private _invertAlgo = invertColorByMatrix;constructor(@Inject(ThemeService) private readonly _themeService: ThemeService) {super();++ this.disposeWithMe(this._themeService.currentTheme$.subscribe(() => {+ this._resolvedColorCache.clear();+ this._darkModeCache.clear();+ }));}getRenderColor(inputColor: string): string {- let color = inputColor;-- if (color.includes('.')) {- const themeColor = this._themeService.getColorFromTheme<unknown>(color);- if (typeof themeColor === 'string' && this._themeService.isValidThemeColor(color)) {- color = themeColor;- }- }+ const color = this._resolveColor(inputColor);if (!this._themeService.darkMode) {return color;}- if (this._cache.has(color)) {- return this._cache.get(color)!;+ if (this._darkModeCache.has(color)) {+ return this._darkModeCache.get(color)!;}if (normalizeRenderColor(color) === 'transparent') {- this._cache.set(color, 'transparent');+ this._darkModeCache.set(color, 'transparent');return 'transparent';}@@ -139,9 +141,64 @@ export class CanvasColorService extends Disposable implements ICanvasColorServicthrow new Error(`[CanvasColorService]: illegal color "${color}"`);}- this._cache.set(color, cachedColor);+ this._darkModeCache.set(color, cachedColor);return cachedColor;}++ private _resolveColor(inputColor: string): string {+ const cachedColor = this._resolvedColorCache.get(inputColor);+ if (cachedColor !== undefined) {+ return cachedColor;+ }++ const mixMatch = inputColor.match(COLOR_MIX_REGEXP);+ if (mixMatch) {+ const color1 = this._resolveThemeColor(mixMatch[1].trim());+ const color2 = this._resolveThemeColor(mixMatch[2].trim());+ const amount = Number(mixMatch[3]);+ const color = ColorKit.mix(color1, color2, amount).toHexString();+ this._resolvedColorCache.set(inputColor, color);+ return color;+ }++ const alphaMatch = inputColor.match(COLOR_ALPHA_REGEXP);+ if (alphaMatch) {+ const baseColor = this._resolveThemeColor(alphaMatch[1].trim());+ const colorKit = new ColorKit(baseColor);++ if (!colorKit.isValid) {+ throw new Error(`[CanvasColorService]: illegal color "${inputColor}"`);+ }++ const color = colorKit.setAlpha(Number(alphaMatch[2])).toRgbString();+ this._resolvedColorCache.set(inputColor, color);+ return color;+ }++ if (inputColor.trim().startsWith('alpha(')) {+ throw new Error(`[CanvasColorService]: illegal color "${inputColor}"`);+ }++ const color = this._resolveThemeColor(inputColor);+ if (color !== inputColor) {+ this._resolvedColorCache.set(inputColor, color);+ }++ return color;+ }++ private _resolveThemeColor(inputColor: string): string {+ let color = inputColor;++ if (color.includes('.')) {+ const themeColor = this._themeService.getColorFromTheme<unknown>(color);+ if (typeof themeColor === 'string' && this._themeService.isValidThemeColor(color)) {+ color = themeColor;+ }+ }++ return color;+ }}export function getDarkRenderColorOverride(color: string): string | null {diff --git a/packages/engine-render/src/shape/__tests__/scroll-bar.spec.ts b/packages/engine-render/src/shape/__tests__/scroll-bar.spec.tsindex e6c10f5d48..6223ce6dff 100644--- a/packages/engine-render/src/shape/__tests__/scroll-bar.spec.ts+++ b/packages/engine-render/src/shape/__tests__/scroll-bar.spec.ts@@ -129,6 +129,19 @@ describe('ScrollBar', () => {scrollBar.dispose();});+ it('uses translucent white for default track colors', () => {+ const scrollBar = new ScrollBar(viewport);++ expect(scrollBar.horizonScrollTrack?.fill).toBe('alpha(white, 0.5)');+ expect(scrollBar.horizonScrollTrack?.stroke).toBe('alpha(white, 0.7)');+ expect(scrollBar.verticalScrollTrack?.fill).toBe('alpha(white, 0.5)');+ expect(scrollBar.verticalScrollTrack?.stroke).toBe('alpha(white, 0.7)');+ expect(scrollBar.placeholderBarRect?.fill).toBe('alpha(white, 0.5)');+ expect(scrollBar.placeholderBarRect?.stroke).toBe('alpha(white, 0.7)');++ scrollBar.dispose();+ });+it('optionally hides unscrollable tracks and restores them when content overflows', () => {const scrollBar = ScrollBar.attachTo(viewport, {enableHorizontal: true,diff --git a/packages/engine-render/src/shape/scroll-bar.ts b/packages/engine-render/src/shape/scroll-bar.tsindex 1c1ea33ed2..fe065cfff2 100644--- a/packages/engine-render/src/shape/scroll-bar.ts+++ b/packages/engine-render/src/shape/scroll-bar.ts@@ -107,8 +107,8 @@ export class ScrollBar extends Disposable {private _thumbDefaultBackgroundColor = 'gray.300';private _thumbHoverBackgroundColor = 'gray.400';private _thumbActiveBackgroundColor = 'gray.500';- private _trackBackgroundColor = 'gray.50';- private _trackBorderColor = 'gray.200';+ private _trackBackgroundColor = 'alpha(white, 0.5)';+ private _trackBorderColor = 'alpha(white, 0.7)';/*** The thickness of a scrolling track