diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.ts index 7b8b4451..2f51d8a2 100644 --- a/packages/shared/src/i18n/en-US.ts +++ b/packages/shared/src/i18n/en-US.ts @@ -790,7 +790,6 @@ export const enUS = { teal: "Teal", azure: "Blue", violet: "Purple", - plum: "Wine", pink: "Pink", slate: "Gray", }, diff --git a/packages/shared/src/i18n/ja.ts b/packages/shared/src/i18n/ja.ts index 33a7d166..c8a21c99 100644 --- a/packages/shared/src/i18n/ja.ts +++ b/packages/shared/src/i18n/ja.ts @@ -790,7 +790,6 @@ export const ja = { teal: "青緑", azure: "青", violet: "紫", - plum: "ワイン", pink: "ピンク", slate: "グレー", }, diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.ts index 2b0854d7..c99a9996 100644 --- a/packages/shared/src/i18n/zh-CN.ts +++ b/packages/shared/src/i18n/zh-CN.ts @@ -790,7 +790,6 @@ export const zhCN = { teal: "青色", azure: "蓝色", violet: "紫色", - plum: "酒红", pink: "粉色", slate: "灰色", }, diff --git a/packages/shared/src/note-prose.test.mjs b/packages/shared/src/note-prose.test.mjs index 0e858b46..51f5901a 100644 --- a/packages/shared/src/note-prose.test.mjs +++ b/packages/shared/src/note-prose.test.mjs @@ -31,6 +31,10 @@ describe("note prose", () => { expect(paletteForLegacyEditorTheme("wechat-green")).toBeNull(); expect(paletteForLegacyEditorTheme("modern-mint")).toBeNull(); expect(parseNoteProsePalette("emerald")).toBe("native"); + expect(parseNoteProsePalette("green")).toBe("native"); + expect(NoteProseUpdateSchema.safeParse({ palette: "green" }).success).toBe(false); + expect(parseNoteProsePalette("plum")).toBe("native"); + expect(NoteProseUpdateSchema.safeParse({ palette: "plum" }).success).toBe(false); expect(resolveNoteProse({ palette: "emerald" }).palette).toBe("native"); expect(paletteForLegacyEditorTheme("brief")).toBe("teal"); expect(paletteForLegacyEditorTheme("zen")).toBe("teal"); diff --git a/packages/shared/src/note-prose.ts b/packages/shared/src/note-prose.ts index 61c8ce8e..f2af7f59 100644 --- a/packages/shared/src/note-prose.ts +++ b/packages/shared/src/note-prose.ts @@ -13,7 +13,6 @@ export const NOTE_PROSE_PALETTE_IDS = [ "teal", "azure", "violet", - "plum", "pink", "slate", ] as const; @@ -166,7 +165,7 @@ export const NOTE_PROSE_PALETTES: Record { - // Green and the custom color editor were removed. Stored rows read as native. - if (value === "emerald" || value === "custom") return "native"; + // Removed palettes and the custom color editor read as native. + if (value === "emerald" || value === "green" || value === "plum" || value === "custom") return "native"; return typeof value === "string" && (NOTE_PROSE_PALETTE_CHOICES as readonly string[]).includes(value) ? value as NoteProsePaletteChoice : null;