diff --git a/browser_tests/colorPalette.spec.ts b/browser_tests/colorPalette.spec.ts index 14a5c0a9c..5eff78c64 100644 --- a/browser_tests/colorPalette.spec.ts +++ b/browser_tests/colorPalette.spec.ts @@ -152,6 +152,7 @@ test.describe('Color Palette', () => { // doesn't update the store immediately. await comfyPage.setup() + await comfyPage.loadWorkflow('every_node_color') await comfyPage.setSetting('Comfy.ColorPalette', 'obsidian_dark') await expect(comfyPage.canvas).toHaveScreenshot( 'custom-color-palette-obsidian-dark.png' @@ -232,7 +233,7 @@ test.describe('Node Color Adjustments', () => { const workflow = await comfyPage.page.evaluate(() => { return localStorage.getItem('workflow') }) - for (const node of JSON.parse(workflow).nodes) { + for (const node of JSON.parse(workflow ?? '{}').nodes) { if (node.bgcolor) expect(node.bgcolor).not.toMatch(/hsla/) if (node.color) expect(node.color).not.toMatch(/hsla/) } diff --git a/browser_tests/colorPalette.spec.ts-snapshots/custom-color-palette-light-red-chromium-2x-linux.png b/browser_tests/colorPalette.spec.ts-snapshots/custom-color-palette-light-red-chromium-2x-linux.png index 27ae3aa59..349eb24f3 100644 Binary files a/browser_tests/colorPalette.spec.ts-snapshots/custom-color-palette-light-red-chromium-2x-linux.png and b/browser_tests/colorPalette.spec.ts-snapshots/custom-color-palette-light-red-chromium-2x-linux.png differ diff --git a/browser_tests/colorPalette.spec.ts-snapshots/custom-color-palette-light-red-chromium-linux.png b/browser_tests/colorPalette.spec.ts-snapshots/custom-color-palette-light-red-chromium-linux.png index f1b47ff3a..6915e6a26 100644 Binary files a/browser_tests/colorPalette.spec.ts-snapshots/custom-color-palette-light-red-chromium-linux.png and b/browser_tests/colorPalette.spec.ts-snapshots/custom-color-palette-light-red-chromium-linux.png differ diff --git a/browser_tests/colorPalette.spec.ts-snapshots/default-color-palette-chromium-2x-linux.png b/browser_tests/colorPalette.spec.ts-snapshots/default-color-palette-chromium-2x-linux.png index 25cf15e30..0edd41c45 100644 Binary files a/browser_tests/colorPalette.spec.ts-snapshots/default-color-palette-chromium-2x-linux.png and b/browser_tests/colorPalette.spec.ts-snapshots/default-color-palette-chromium-2x-linux.png differ diff --git a/browser_tests/colorPalette.spec.ts-snapshots/default-color-palette-chromium-linux.png b/browser_tests/colorPalette.spec.ts-snapshots/default-color-palette-chromium-linux.png index 2a7f275a4..6d0c9ca5d 100644 Binary files a/browser_tests/colorPalette.spec.ts-snapshots/default-color-palette-chromium-linux.png and b/browser_tests/colorPalette.spec.ts-snapshots/default-color-palette-chromium-linux.png differ diff --git a/src/scripts/app.ts b/src/scripts/app.ts index dde9275fa..984f97829 100644 --- a/src/scripts/app.ts +++ b/src/scripts/app.ts @@ -27,6 +27,7 @@ import { useSettingStore } from '@/stores/settingStore' import { useToastStore } from '@/stores/toastStore' import { useWidgetStore } from '@/stores/widgetStore' import { ComfyWorkflow } from '@/stores/workflowStore' +import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore' import { useWorkspaceStore } from '@/stores/workspaceStore' import type { ComfyNodeDef } from '@/types/apiTypes' import type { ComfyExtension, MissingNodeType } from '@/types/comfy' @@ -650,7 +651,7 @@ export class ComfyApp { const opacity = useSettingStore().get('Comfy.Node.Opacity') if (opacity) adjustments.opacity = opacity - if (useSettingStore().get('Comfy.ColorPalette') === 'light') { + if (useColorPaletteStore().completedActivePalette.light_theme) { adjustments.lightness = 0.5 // Lighten title bar of colored nodes on light theme