From 659472d69bc7e986035882ac2a2376cb35fc6b73 Mon Sep 17 00:00:00 2001 From: jaeone94 <89377375+jaeone94@users.noreply.github.com> Date: Thu, 8 Oct 2026 18:38:41 +0900 Subject: [PATCH] fix: persist Vue boolean widget edits immediately --- .../assets/inputs/boolean_input.json | 38 ++++++++++++++ .../widgets/widgetValuePersistence.spec.ts | 52 +++++++++++++++++++ .../components/WidgetToggleSwitch.test.ts | 35 +++++++++++++ .../widgets/components/WidgetToggleSwitch.vue | 11 +++- 4 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 browser_tests/assets/inputs/boolean_input.json diff --git a/browser_tests/assets/inputs/boolean_input.json b/browser_tests/assets/inputs/boolean_input.json new file mode 100644 index 00000000000..2fe77485b71 --- /dev/null +++ b/browser_tests/assets/inputs/boolean_input.json @@ -0,0 +1,38 @@ +{ + "last_node_id": 1, + "last_link_id": 0, + "nodes": [ + { + "id": 1, + "type": "PrimitiveBoolean", + "pos": [300, 200], + "size": [350, 240], + "flags": {}, + "order": 0, + "mode": 0, + "inputs": [], + "outputs": [ + { + "name": "BOOLEAN", + "type": "BOOLEAN", + "links": [] + } + ], + "properties": { + "Node name for S&R": "PrimitiveBoolean" + }, + "widgets_values": [true], + "title": "Boolean" + } + ], + "links": [], + "groups": [], + "config": {}, + "extra": { + "ds": { + "scale": 0.8, + "offset": [0, 0] + } + }, + "version": 0.4 +} diff --git a/browser_tests/tests/vueNodes/widgets/widgetValuePersistence.spec.ts b/browser_tests/tests/vueNodes/widgets/widgetValuePersistence.spec.ts index 2dc041fd4b1..af2866e57f8 100644 --- a/browser_tests/tests/vueNodes/widgets/widgetValuePersistence.spec.ts +++ b/browser_tests/tests/vueNodes/widgets/widgetValuePersistence.spec.ts @@ -1,3 +1,5 @@ +import type { Locator } from '@playwright/test' + import { comfyExpect as expect, comfyPageFixture as test @@ -5,6 +7,8 @@ import { import { WidgetSelectDropdownFixture } from '@e2e/fixtures/components/WidgetSelectDropdown' import { createMockJob } from '@e2e/fixtures/helpers/AssetsHelper' import { TestIds } from '@e2e/fixtures/selectors' +import type { DraftPayloadV2 } from '@/platform/workflow/persistence/base/draftTypes' +import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema' import { assetPath } from '@e2e/fixtures/utils/paths' import { mockViewFiles } from '@e2e/fixtures/utils/viewFileMocks' @@ -16,6 +20,54 @@ test.describe( await comfyPage.workflow.setupWorkflowsDirectory({}) }) + test.describe('Boolean drafts', () => { + test.use({ initialSettings: { 'Comfy.Workflow.Persist': true } }) + + for (const { action, toggleValue } of [ + { action: 'click', toggleValue: (toggle: Locator) => toggle.click() }, + { + action: 'Enter', + toggleValue: (toggle: Locator) => toggle.press('Enter') + } + ]) { + test(`keeps a toggle-only ${action} edit after reload`, async ({ + comfyPage + }) => { + await comfyPage.workflow.loadWorkflow('inputs/boolean_input') + await comfyPage.workflow.waitForDraftPersisted() + await comfyPage.workflow.reloadAndWaitForApp() + const toggle = comfyPage.vueNodes + .getNodeByTitle('Boolean') + .getByRole('switch') + await expect(toggle).toBeChecked() + + await toggleValue(toggle) + await expect(toggle).not.toBeChecked() + + await expect + .poll(() => + comfyPage.page.evaluate(() => { + return Object.keys(localStorage).some((key) => { + if (!key.startsWith('Comfy.Workflow.Draft.v2:')) return false + const payload: DraftPayloadV2 = JSON.parse( + localStorage.getItem(key)! + ) + const workflow: ComfyWorkflowJSON = JSON.parse(payload.data) + return workflow.nodes.some( + (node) => + node.type === 'PrimitiveBoolean' && + Object.values(node.widgets_values ?? {})[0] === false + ) + }) + }) + ) + .toBe(true) + await comfyPage.workflow.reloadAndWaitForApp() + await expect(toggle).not.toBeChecked() + }) + } + }) + test('an emptied text widget remains empty after save and reopen', async ({ comfyPage }) => { diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetToggleSwitch.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetToggleSwitch.test.ts index 6fed69993ed..404d4422901 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/WidgetToggleSwitch.test.ts +++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetToggleSwitch.test.ts @@ -1,10 +1,12 @@ import { render, screen } from '@testing-library/vue' import userEvent from '@testing-library/user-event' +import { fromPartial } from '@total-typescript/shoehorn' import { defineComponent, ref } from 'vue' import { createI18n } from 'vue-i18n' import { describe, expect, it, vi } from 'vitest' import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group' +import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore' import type { IWidgetOptions } from '@/lib/litegraph/src/types/widgets' import type { SimplifiedWidget } from '@/types/simplifiedWidget' @@ -86,6 +88,39 @@ describe('WidgetToggleSwitch Value Binding', () => { expect(onModelUpdate).toHaveBeenCalledWith(true) }) + it.for([ + { name: 'switch', options: {}, role: 'switch', label: 'test_toggle' }, + { + name: 'labelled toggle', + options: { on: 'enabled', off: 'disabled' }, + role: 'button', + label: 'disabled' + } + ])( + 'records the updated value after clicking a $name', + async ({ options, role, label }) => { + let currentValue = true + const recordedValues: boolean[] = [] + useWorkflowStore().activeWorkflow = fromPartial({ + changeTracker: { + captureCanvasState: () => recordedValues.push(currentValue) + } + }) + const { user } = mountComponent( + createToggleWidget(true, options), + true, + (value) => { + currentValue = value ?? currentValue + } + ) + + await user.click(screen.getByRole(role, { name: label })) + + expect(currentValue).toBe(false) + expect(recordedValues).toEqual([false]) + } + ) + describe('Vue Event Emission', () => { it('emits Vue event when toggled from false to true', async () => { const widget = createToggleWidget(false) diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetToggleSwitch.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetToggleSwitch.vue index 58c5ed331ad..b2cdae5ce0f 100644 --- a/src/renderer/extensions/vueNodes/widgets/components/WidgetToggleSwitch.vue +++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetToggleSwitch.vue @@ -32,10 +32,11 @@ " > @@ -47,6 +48,7 @@ import { useI18n } from 'vue-i18n' import Switch from '@/components/ui/switch/Switch.vue' import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group' +import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore' import type { IWidgetOptions } from '@/lib/litegraph/src/types/widgets' import type { SimplifiedWidget } from '@/types/simplifiedWidget' import { useHideLayoutField } from '@/types/widgetTypes' @@ -70,7 +72,12 @@ const hasLabels = computed(() => { function handleOptionChange(value: string | undefined) { if (value) { - modelValue.value = value === 'on' + updateValue(value === 'on') } } + +function updateValue(value: boolean) { + modelValue.value = value + useWorkflowStore().activeWorkflow?.changeTracker.captureCanvasState() +}