From 341321284e5bbb5305859e000f512fe67c319c68 Mon Sep 17 00:00:00 2001 From: fundon Date: Thu, 13 Mar 2025 13:15:40 +0000 Subject: [PATCH] fix(core): should not invert label when its shape text (#10765) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: [BS-2797](https://linear.app/affine-design/issue/BS-2797/在-settings-preview-中,无需对-shape-text-颜色-label-进行反转) Releated: https://github.com/toeverything/AFFiNE/pull/10546 --- .../setting/general-setting/editor/edgeless/shape.tsx | 3 ++- .../desktop/dialogs/setting/general-setting/editor/utils.ts | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/shape.tsx b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/shape.tsx index f3cca3a11f..78771a9aa5 100644 --- a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/shape.tsx +++ b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/shape.tsx @@ -72,7 +72,8 @@ export const ShapeSettings = () => { const { palettes: textColorPalettes, getCurrentColor: getCurrentTextColor } = usePalettes( DefaultTheme.ShapeTextColorShortPalettes, - DefaultTheme.shapeTextColor + DefaultTheme.shapeTextColor, + true ); const [currentShape, setCurrentShape] = useState(ShapeType.Rect); diff --git a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/utils.ts b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/utils.ts index daf7805418..0c4edf1a2e 100644 --- a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/utils.ts +++ b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/utils.ts @@ -17,13 +17,14 @@ export const useResolvedTheme = () => { export const usePalettes = ( originalPalettes: Palette[], - defaultColor: Color + defaultColor: Color, + isShapeText = false ) => { const theme = useResolvedTheme(); const isDark = theme === ColorScheme.Dark; const palettes = originalPalettes.map(({ key, value }) => { // Title needs to be inverted. - if (isDark) { + if (!isShapeText && isDark) { if (key === 'Black') { key = 'White'; } else if (key === 'White') {