From 580e3eb13c017242f3d1cda9e0893e7b07618eec Mon Sep 17 00:00:00 2001 From: fundon Date: Mon, 30 Dec 2024 09:41:00 +0000 Subject: [PATCH] chore(editor): use colors from default theme instead (#9425) --- blocksuite/affine/model/src/elements/brush/brush.ts | 4 ++-- .../affine/model/src/elements/connector/connector.ts | 8 ++++---- .../model/src/elements/connector/local-connector.ts | 6 +++--- blocksuite/affine/model/src/elements/shape/shape.ts | 4 ++-- blocksuite/affine/model/src/elements/text/text.ts | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/blocksuite/affine/model/src/elements/brush/brush.ts b/blocksuite/affine/model/src/elements/brush/brush.ts index 0048a514c9..557fe398a2 100644 --- a/blocksuite/affine/model/src/elements/brush/brush.ts +++ b/blocksuite/affine/model/src/elements/brush/brush.ts @@ -28,7 +28,7 @@ import { Vec, } from '@blocksuite/global/utils'; -import type { Color } from '../../themes/index.js'; +import { type Color, DefaultTheme } from '../../themes/index'; export type BrushProps = BaseElementProps & { /** @@ -131,7 +131,7 @@ export class BrushElementModel extends GfxPrimitiveElementModel { } @field() - accessor color: Color = '#000000'; + accessor color: Color = DefaultTheme.black; @watch((_, instance) => { instance['_local'].delete('commands'); diff --git a/blocksuite/affine/model/src/elements/connector/connector.ts b/blocksuite/affine/model/src/elements/connector/connector.ts index 6b31a62ddc..6e33a27e69 100644 --- a/blocksuite/affine/model/src/elements/connector/connector.ts +++ b/blocksuite/affine/model/src/elements/connector/connector.ts @@ -37,8 +37,8 @@ import { StrokeStyle, TextAlign, type TextStyleProps, -} from '../../consts/index.js'; -import type { Color } from '../../themes/index.ts'; +} from '../../consts/index'; +import { type Color, DefaultTheme } from '../../themes/index'; export type SerializedConnection = { id?: string; @@ -433,7 +433,7 @@ export class ConnectorElementModel extends GfxPrimitiveElementModel { }); } - @field('#000000' as Color) + @field(DefaultTheme.shapeTextColor) accessor color!: Color; @field() @@ -200,7 +200,7 @@ export class LocalShapeElementModel extends GfxLocalElementModel { } @prop() - accessor color: Color = '#000000'; + accessor color: Color = DefaultTheme.shapeTextColor; @prop() accessor fillColor: Color = DefaultTheme.shapeFillColor; diff --git a/blocksuite/affine/model/src/elements/text/text.ts b/blocksuite/affine/model/src/elements/text/text.ts index 945a4d202f..548fd551eb 100644 --- a/blocksuite/affine/model/src/elements/text/text.ts +++ b/blocksuite/affine/model/src/elements/text/text.ts @@ -16,8 +16,8 @@ import { FontWeight, TextAlign, type TextStyleProps, -} from '../../consts/index.js'; -import type { Color } from '../../themes/index.js'; +} from '../../consts/index'; +import { type Color, DefaultTheme } from '../../themes/index'; export type TextElementProps = BaseElementProps & { text: Y.Text; @@ -61,7 +61,7 @@ export class TextElementModel extends GfxPrimitiveElementModel } @field() - accessor color: Color = '#000000'; + accessor color: Color = DefaultTheme.black; @field() accessor fontFamily: FontFamily = FontFamily.Inter;