From aeb1048656e306ff18fc751b258a15abcecbd243 Mon Sep 17 00:00:00 2001 From: Amp Date: Fri, 25 Sep 2026 06:16:01 +0000 Subject: [PATCH 01/52] refactor: replace PrimeVue Dialog and remaining simple components Migrate the global and node-search dialogs, skeletons, remaining buttons, and the knob consumer to the design system while preserving the global dialog service contract. Harden the cloud getting-started tour against its deferred-target readiness window. Reduce the PrimeVue import allowlist from 57 to 38 files. Amp-Thread-ID: T-01a0a191-6a66-768e-96c8-fe9eeb2cfbec --- .../fixtures/components/ComfyNodeSearchBox.ts | 8 +- browser_tests/tests/nodeSearchBox.spec.ts | 16 ++- .../vueNodes/widgets/emptyNameWidget.spec.ts | 4 +- scripts/primevue-import-allowlist.json | 21 +-- .../breadcrumb/SubgraphBreadcrumb.vue | 7 +- src/components/common/InputKnob.vue | 19 +-- src/components/common/KnobControl.test.ts | 32 +++++ src/components/common/KnobControl.vue | 106 +++++++++++++++ src/components/common/LazyImage.vue | 2 +- src/components/common/UserCredit.vue | 3 +- src/components/dialog/GlobalDialog.test.ts | 67 ---------- src/components/dialog/GlobalDialog.vue | 66 --------- .../content/setting/KeybindingPanel.vue | 3 + src/components/graph/GraphCanvasMenu.vue | 2 +- .../graph/widgets/TextPreviewWidget.vue | 4 +- .../searchbox/NodeSearchBox.test.ts | 57 +++++++- src/components/searchbox/NodeSearchBox.vue | 53 ++++++-- .../searchbox/NodeSearchBoxPopover.test.ts | 95 +++++++++++-- .../searchbox/NodeSearchBoxPopover.vue | 126 ++++++++---------- src/components/topbar/CurrentUserButton.vue | 2 +- .../topbar/CurrentUserPopoverLegacy.vue | 2 +- src/components/ui/dialog/DialogContent.vue | 1 + src/components/ui/dialog/DialogOverlay.vue | 2 +- src/components/ui/dialog/dialog.variants.ts | 2 +- src/components/ui/skeleton/Skeleton.vue | 28 +++- src/composables/usePopoverSizing.test.ts | 27 ++-- src/composables/usePopoverSizing.ts | 14 +- .../assets/components/AssetBrowserModal.vue | 4 +- .../components/UploadModelConfirmation.vue | 4 +- .../CloudSubscriptionRedirectView.vue | 12 +- .../skeletons/CloudLoginViewSkeleton.vue | 2 +- .../skeletons/CloudSurveyViewSkeleton.vue | 2 +- .../subscription/components/CreditsTile.vue | 3 +- .../CurrentUserPopoverWorkspace.vue | 2 +- .../extensions/vueNodes/VideoPreview.vue | 2 +- src/stores/dialogStore.ts | 50 +------ .../components/manager/ManagerDialog.vue | 4 +- .../manager/skeleton/PackCardSkeleton.vue | 2 +- 38 files changed, 484 insertions(+), 372 deletions(-) create mode 100644 src/components/common/KnobControl.test.ts create mode 100644 src/components/common/KnobControl.vue diff --git a/browser_tests/fixtures/components/ComfyNodeSearchBox.ts b/browser_tests/fixtures/components/ComfyNodeSearchBox.ts index 9e6a02c8791..6fd22b4e14e 100644 --- a/browser_tests/fixtures/components/ComfyNodeSearchBox.ts +++ b/browser_tests/fixtures/components/ComfyNodeSearchBox.ts @@ -6,10 +6,10 @@ class ComfyNodeSearchFilterSelectionPanel { readonly header: Locator constructor(public readonly page: Page) { - this.root = page.getByRole('dialog') - this.header = this.root - .locator('div') - .filter({ hasText: 'Add node filter condition' }) + this.root = page.getByRole('dialog', { name: 'Add node filter condition' }) + this.header = this.root.getByRole('heading', { + name: 'Add node filter condition' + }) } async selectFilterType(filterType: string) { diff --git a/browser_tests/tests/nodeSearchBox.spec.ts b/browser_tests/tests/nodeSearchBox.spec.ts index d60e4d7a2a7..69855cb39e9 100644 --- a/browser_tests/tests/nodeSearchBox.spec.ts +++ b/browser_tests/tests/nodeSearchBox.spec.ts @@ -243,8 +243,7 @@ test.describe('Node search box', { tag: '@node' }, () => { const panel = comfyPage.searchBox.filterSelectionPanel await panel.header.waitFor({ state: 'visible' }) await comfyPage.page - .locator('.p-dialog-mask') - .filter({ has: panel.header }) + .getByTestId('node-search-filter-overlay') .click({ position: { x: 10, y: 10 } }) // Verify the filter selection panel is hidden @@ -264,6 +263,19 @@ test.describe('Node search box', { tag: '@node' }, () => { ).toBeFocused() }) + test('ignores Escape during IME composition', async ({ comfyPage }) => { + const panel = comfyPage.searchBox.filterSelectionPanel + await panel.root.dispatchEvent('keydown', { + key: 'Escape', + isComposing: true + }) + await expect(panel.header).toBeVisible() + await expect(comfyPage.searchBox.input).toBeVisible() + await comfyPage.page.keyboard.press('Escape') + await expect(panel.header).toBeHidden() + await expect(comfyPage.searchBox.input).toBeFocused() + }) + test('keeps search open when the filter has keyboard focus', async ({ comfyPage }) => { diff --git a/browser_tests/tests/vueNodes/widgets/emptyNameWidget.spec.ts b/browser_tests/tests/vueNodes/widgets/emptyNameWidget.spec.ts index 27d733c603b..1e08f29c072 100644 --- a/browser_tests/tests/vueNodes/widgets/emptyNameWidget.spec.ts +++ b/browser_tests/tests/vueNodes/widgets/emptyNameWidget.spec.ts @@ -26,9 +26,9 @@ test.describe( x: 400, y: 200 }) - await comfyPage.page.evaluate(() => + await comfyPage.page.evaluate(() => { graph!.nodes[0].addWidget('text', '', '', () => {}) - ) + }) }) test('renders schema widgets despite an un-keyable sibling', async ({ diff --git a/scripts/primevue-import-allowlist.json b/scripts/primevue-import-allowlist.json index ee2ae0e22a6..486e3e35ab5 100644 --- a/scripts/primevue-import-allowlist.json +++ b/scripts/primevue-import-allowlist.json @@ -4,51 +4,32 @@ { "files": ["src/**/*.{ts,tsx,vue}"], "excludeFiles": [ - "src/components/breadcrumb/SubgraphBreadcrumb.vue", - "src/components/common/InputKnob.vue", - "src/components/common/LazyImage.vue", - "src/components/common/UserCredit.vue", "src/components/dialog/GlobalDialog.test.ts", - "src/components/dialog/GlobalDialog.vue", "src/components/dialog/bodyPointerEventsRestore.test.ts", "src/components/dialog/content/setting/UsageLogsTable.test.ts", - "src/components/graph/GraphCanvasMenu.vue", "src/components/graph/SelectionToolbox.test.ts", "src/components/graph/widgets/TextPreviewWidget.test.ts", - "src/components/graph/widgets/TextPreviewWidget.vue", "src/components/node/NodePreview.test.ts", "src/components/rightSidePanel/errors/ErrorGroupList.test.ts", "src/components/rightSidePanel/errors/ErrorNodeCard.test.ts", "src/components/rightSidePanel/errors/MissingPackGroupRow.test.ts", "src/components/rightSidePanel/errors/TabErrors.test.ts", - "src/components/searchbox/NodeSearchBox.vue", "src/components/searchbox/NodeSearchBoxPopover.test.ts", - "src/components/searchbox/NodeSearchBoxPopover.vue", "src/components/sidebar/SideToolbar.test.ts", - "src/components/topbar/CurrentUserButton.vue", - "src/components/topbar/CurrentUserPopoverLegacy.vue", "src/main.ts", - "src/platform/cloud/onboarding/CloudSubscriptionRedirectView.vue", - "src/platform/cloud/onboarding/skeletons/CloudLoginViewSkeleton.vue", - "src/platform/cloud/onboarding/skeletons/CloudSurveyViewSkeleton.vue", - "src/platform/cloud/subscription/components/CreditsTile.vue", "src/platform/missingModel/components/MissingModelCard.test.ts", "src/platform/nodeReplacement/components/SwapNodeGroupRow.test.ts", "src/platform/nodeReplacement/components/SwapNodesCard.test.ts", "src/platform/updates/components/WhatsNewPopup.test.ts", - "src/platform/workspace/components/CurrentUserPopoverWorkspace.vue", - "src/renderer/extensions/vueNodes/VideoPreview.vue", "src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberInput.test.ts", "src/renderer/extensions/vueNodes/widgets/components/WidgetRecordAudio.vue", "src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.asset-mode.test.ts", "src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.test.ts", "src/renderer/extensions/vueNodes/widgets/components/form/FormSelectButton.test.ts", "src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdown.test.ts", - "src/stores/dialogStore.ts", "src/workbench/extensions/manager/components/manager/button/PackEnableToggle.test.ts", "src/workbench/extensions/manager/components/manager/packCard/PackCardFooter.test.ts", - "src/workbench/extensions/manager/components/manager/skeleton/PackCardGridSkeleton.test.ts", - "src/workbench/extensions/manager/components/manager/skeleton/PackCardSkeleton.vue" + "src/workbench/extensions/manager/components/manager/skeleton/PackCardGridSkeleton.test.ts" ], "rules": { "comfy/no-primevue-imports": "error" } } diff --git a/src/components/breadcrumb/SubgraphBreadcrumb.vue b/src/components/breadcrumb/SubgraphBreadcrumb.vue index 55707d7596f..a738318fcbc 100644 --- a/src/components/breadcrumb/SubgraphBreadcrumb.vue +++ b/src/components/breadcrumb/SubgraphBreadcrumb.vue @@ -24,9 +24,8 @@ v-if="isInSubgraph" class="back-button pointer-events-auto ml-1.5 size-8 shrink-0 border border-transparent bg-transparent p-0 transition-all hover:rounded-lg hover:border-interface-stroke hover:bg-comfy-menu-bg" data-testid="subgraph-breadcrumb-back" - text - severity="secondary" - size="small" + variant="muted-textonly" + size="icon" @click="handleBackClick" > @@ -65,12 +64,12 @@ + + diff --git a/src/components/common/LazyImage.vue b/src/components/common/LazyImage.vue index 05f9c6ddd50..641e08f2271 100644 --- a/src/components/common/LazyImage.vue +++ b/src/components/common/LazyImage.vue @@ -36,10 +36,10 @@ - - diff --git a/src/components/dialog/content/setting/KeybindingPanel.vue b/src/components/dialog/content/setting/KeybindingPanel.vue index 03307503c82..7cc8f1a00a0 100644 --- a/src/components/dialog/content/setting/KeybindingPanel.vue +++ b/src/components/dialog/content/setting/KeybindingPanel.vue @@ -112,6 +112,7 @@ import TableSortHead from '@/components/ui/table/TableSortHead.vue' import { filterByQuery, sortByText } from '@/components/ui/table/tableUtils' import type { TableSortDirection } from '@/components/ui/table/tableUtils' import { useEditKeybindingDialog } from '@/composables/useEditKeybindingDialog' +import { useOverlayChildStyle } from '@/composables/usePopoverSizing' import type { KeybindingImpl } from '@/platform/keybindings/keybinding' import { useKeybindingService } from '@/platform/keybindings/keybindingService' import { useKeybindingStore } from '@/platform/keybindings/keybindingStore' @@ -136,6 +137,8 @@ const commandStore = useCommandStore() const dialogStore = useDialogStore() const { t } = useI18n() const toast = useToast() +const primeVueOverlay = useOverlayChildStyle() +const keybindingOverlayContentStyle = primeVueOverlay.contentStyle const presetNames = ref([]) diff --git a/src/components/graph/GraphCanvasMenu.vue b/src/components/graph/GraphCanvasMenu.vue index 54188370ab5..ea12af0a5df 100644 --- a/src/components/graph/GraphCanvasMenu.vue +++ b/src/components/graph/GraphCanvasMenu.vue @@ -99,11 +99,11 @@ - - diff --git a/src/components/topbar/CurrentUserButton.vue b/src/components/topbar/CurrentUserButton.vue index d96acd55f9e..9b5bc4cd47d 100644 --- a/src/components/topbar/CurrentUserButton.vue +++ b/src/components/topbar/CurrentUserButton.vue @@ -59,10 +59,10 @@ diff --git a/src/platform/cloud/subscription/components/CreditsTile.vue b/src/platform/cloud/subscription/components/CreditsTile.vue index a6d09cfc0f0..59b705f9d79 100644 --- a/src/platform/cloud/subscription/components/CreditsTile.vue +++ b/src/platform/cloud/subscription/components/CreditsTile.vue @@ -213,10 +213,11 @@ From cbde988b1c8e4a8f7f705ba8357969f1dfa793c0 Mon Sep 17 00:00:00 2001 From: Amp Date: Mon, 5 Oct 2026 03:45:06 +0000 Subject: [PATCH 02/52] test: observe migrated text-preview skeleton directly Amp-Thread-ID: https://ampcode.com/threads/T-01a0a191-6a66-768e-96c8-fe9eeb2cfbec --- scripts/primevue-import-allowlist.json | 1 - .../graph/widgets/TextPreviewWidget.test.ts | 12 +----------- src/components/graph/widgets/TextPreviewWidget.vue | 6 +++++- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/scripts/primevue-import-allowlist.json b/scripts/primevue-import-allowlist.json index 486e3e35ab5..70ba4b55d63 100644 --- a/scripts/primevue-import-allowlist.json +++ b/scripts/primevue-import-allowlist.json @@ -8,7 +8,6 @@ "src/components/dialog/bodyPointerEventsRestore.test.ts", "src/components/dialog/content/setting/UsageLogsTable.test.ts", "src/components/graph/SelectionToolbox.test.ts", - "src/components/graph/widgets/TextPreviewWidget.test.ts", "src/components/node/NodePreview.test.ts", "src/components/rightSidePanel/errors/ErrorGroupList.test.ts", "src/components/rightSidePanel/errors/ErrorNodeCard.test.ts", diff --git a/src/components/graph/widgets/TextPreviewWidget.test.ts b/src/components/graph/widgets/TextPreviewWidget.test.ts index 5fb38cc066c..850a26a9db1 100644 --- a/src/components/graph/widgets/TextPreviewWidget.test.ts +++ b/src/components/graph/widgets/TextPreviewWidget.test.ts @@ -1,5 +1,4 @@ import { render, screen } from '@testing-library/vue' -import PrimeVue from 'primevue/config' import { beforeEach, describe, expect, it, vi } from 'vitest' import { defineComponent, nextTick, ref } from 'vue' @@ -28,16 +27,7 @@ function renderPreview( setup: () => ({ value, nodeId }), template: '' }) - return render(Harness, { - global: { - plugins: [ - [ - PrimeVue, - { pt: { skeleton: { root: { 'data-testid': 'skeleton' } } } } - ] - ] - } - }) + return render(Harness) } describe('TextPreviewWidget', () => { diff --git a/src/components/graph/widgets/TextPreviewWidget.vue b/src/components/graph/widgets/TextPreviewWidget.vue index 95e89a34965..aaef68d5c36 100644 --- a/src/components/graph/widgets/TextPreviewWidget.vue +++ b/src/components/graph/widgets/TextPreviewWidget.vue @@ -5,7 +5,11 @@
- +
From 12c0db04eea593c160d2fe9c0b4ca95b73d82c58 Mon Sep 17 00:00:00 2001 From: Alexander Brown Date: Mon, 5 Oct 2026 07:20:08 +0000 Subject: [PATCH 03/52] fix: forward InputKnob disabled state to KnobControl Amp-Thread-ID: https://ampcode.com/threads/T-01a10ae9-e82c-744e-bec7-5dd878c1f3f0 --- src/components/common/InputKnob.test.ts | 22 ++++++++++++++++++++++ src/components/common/InputKnob.vue | 1 + src/components/common/KnobControl.test.ts | 18 ++++++++++++++++++ src/components/common/KnobControl.vue | 14 ++++++++++++-- 4 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 src/components/common/InputKnob.test.ts diff --git a/src/components/common/InputKnob.test.ts b/src/components/common/InputKnob.test.ts new file mode 100644 index 00000000000..b967dc7dd59 --- /dev/null +++ b/src/components/common/InputKnob.test.ts @@ -0,0 +1,22 @@ +import { render, screen } from '@testing-library/vue' +import { describe, expect, it } from 'vitest' +import { createI18n } from 'vue-i18n' + +import InputKnob from './InputKnob.vue' + +const i18n = createI18n({ legacy: false, locale: 'en', missingWarn: false }) + +describe('InputKnob', () => { + it('disables both the knob and the number field', () => { + render(InputKnob, { + props: { modelValue: 5, disabled: true, ariaLabel: 'Strength' }, + global: { plugins: [i18n] } + }) + + expect(screen.getByRole('slider', { name: 'Strength' })).toHaveAttribute( + 'aria-disabled', + 'true' + ) + expect(screen.getByRole('spinbutton', { name: 'Strength' })).toBeDisabled() + }) +}) diff --git a/src/components/common/InputKnob.vue b/src/components/common/InputKnob.vue index 5e197b3a6ba..f51b8662c9f 100644 --- a/src/components/common/InputKnob.vue +++ b/src/components/common/InputKnob.vue @@ -5,6 +5,7 @@ :min :max :step + :disabled :aria-label="ariaLabel" :aria-labelledby="ariaLabelledby" v-bind="$attrs" diff --git a/src/components/common/KnobControl.test.ts b/src/components/common/KnobControl.test.ts index 6123a907349..be93843157b 100644 --- a/src/components/common/KnobControl.test.ts +++ b/src/components/common/KnobControl.test.ts @@ -29,4 +29,22 @@ describe('KnobControl', () => { expect(emitted()['update:modelValue']).toEqual([[10]]) }) + + it('ignores keyboard and pointer input and leaves the tab order when disabled', async () => { + const user = userEvent.setup() + const { emitted } = render(KnobControl, { + props: { modelValue: 5, min: 0, max: 10, disabled: true } + }) + const slider = screen.getByRole('slider') + + expect(slider).toHaveAttribute('aria-disabled', 'true') + await user.tab() + expect(slider).not.toHaveFocus() + + slider.focus() + await user.keyboard('{ArrowRight}') + await user.pointer({ keys: '[MouseLeft]', target: slider }) + + expect(emitted()['update:modelValue']).toBeUndefined() + }) }) diff --git a/src/components/common/KnobControl.vue b/src/components/common/KnobControl.vue index a02d66174c8..c2c04f09c66 100644 --- a/src/components/common/KnobControl.vue +++ b/src/components/common/KnobControl.vue @@ -8,12 +8,14 @@ const { min = 0, max = 100, step = 1, + disabled = false, class: className } = defineProps<{ modelValue: number min?: number max?: number step?: number + disabled?: boolean class?: string }>() @@ -26,6 +28,7 @@ const progress = computed(() => const dashOffset = computed(() => 75 * (1 - progress.value)) function setValue(value: number) { + if (disabled) return const stepped = Math.round((value - min) / step) * step + min emit('update:modelValue', Math.min(max, Math.max(min, stepped))) } @@ -65,11 +68,18 @@ function onKeydown(event: KeyboardEvent) {
Date: Mon, 5 Oct 2026 07:22:44 +0000 Subject: [PATCH 04/52] test: stack node search over a real directive-registered dialog Drop the direct @primeuix ZIndex and PrimeVue plugin usage from the node search tests. Amp-Thread-ID: https://ampcode.com/threads/T-01a10ae9-e82c-744e-bec7-5dd878c1f3f0 --- .../searchbox/NodeSearchBox.test.ts | 16 ++++++----- .../searchbox/NodeSearchBoxPopover.test.ts | 28 ++++++++----------- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/src/components/searchbox/NodeSearchBox.test.ts b/src/components/searchbox/NodeSearchBox.test.ts index 4268b675d17..d8b28738604 100644 --- a/src/components/searchbox/NodeSearchBox.test.ts +++ b/src/components/searchbox/NodeSearchBox.test.ts @@ -1,7 +1,6 @@ -import { ZIndex } from '@primeuix/utils/zindex' import { fireEvent, render, screen } from '@testing-library/vue' import userEvent from '@testing-library/user-event' -import { describe, expect, it, onTestFinished, vi } from 'vitest' +import { describe, expect, it, vi } from 'vitest' import { defineComponent, ref } from 'vue' import { createI18n } from 'vue-i18n' @@ -17,6 +16,11 @@ import NodeSearchBox from './NodeSearchBox.vue' vi.mock(import('@/platform/telemetry')) +const OpenDialog = defineComponent({ + directives: { rekaZIndex: vRekaZIndex }, + template: '
' +}) + const i18n = createI18n({ legacy: false, locale: 'en', @@ -145,11 +149,9 @@ describe('NodeSearchBox', () => { } ) - it('opens its filter dialog above search opened over a lifted modal', async () => { - const openModal = document.createElement('div') - ZIndex.set('modal', openModal, 3702) - onTestFinished(() => ZIndex.clear(openModal)) - const managerZIndex = Number(openModal.style.zIndex) + it('opens its filter dialog above search opened over another dialog', async () => { + render(OpenDialog) + const managerZIndex = Number(screen.getByTestId('open-dialog').style.zIndex) const Harness = defineComponent({ components: { NodeSearchBox }, directives: { rekaZIndex: vRekaZIndex }, diff --git a/src/components/searchbox/NodeSearchBoxPopover.test.ts b/src/components/searchbox/NodeSearchBoxPopover.test.ts index 9f462963de2..0195b7a2175 100644 --- a/src/components/searchbox/NodeSearchBoxPopover.test.ts +++ b/src/components/searchbox/NodeSearchBoxPopover.test.ts @@ -1,13 +1,12 @@ import { getActivePinia } from 'pinia' -import { ZIndex } from '@primeuix/utils/zindex' import { render, screen } from '@testing-library/vue' import userEvent from '@testing-library/user-event' -import PrimeVue from 'primevue/config' -import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { beforeEach, describe, expect, it, vi } from 'vitest' import { computed, defineComponent, nextTick } from 'vue' import { createI18n } from 'vue-i18n' import { fromPartial } from '@total-typescript/shoehorn' +import { vRekaZIndex } from '@/components/dialog/vRekaZIndex' import { CORE_SETTINGS } from '@/platform/settings/constants/coreSettings' import { useSettingStore } from '@/platform/settings/settingStore' import type { Settings } from '@/platform/settings/types' @@ -36,9 +35,12 @@ function createFilter( } } -describe('NodeSearchBoxPopover', () => { - let openModal: HTMLElement | undefined +const OpenDialog = defineComponent({ + directives: { rekaZIndex: vRekaZIndex }, + template: '
' +}) +describe('NodeSearchBoxPopover', () => { const i18n = createI18n({ legacy: false, locale: 'en', @@ -104,7 +106,7 @@ describe('NodeSearchBoxPopover', () => { const result = render(NodeSearchBoxPopover, { global: { - plugins: [i18n, PrimeVue, pinia], + plugins: [i18n, pinia], stubs: { NodeSearchBox: NodeSearchBoxStub, NodeSearchContent: NodeSearchContentStub, @@ -144,13 +146,6 @@ describe('NodeSearchBoxPopover', () => { vi.mocked(useLitegraphService().addNodeOnGraph).mockReturnValue(null) }) - afterEach(() => { - if (openModal) { - ZIndex.clear(openModal) - openModal = undefined - } - }) - describe('addFilter duplicate prevention', () => { it('should not add a duplicate filter with same id and value', async () => { const { emitAddFilter } = renderComponent({ @@ -218,10 +213,9 @@ describe('NodeSearchBoxPopover', () => { expect(screen.getByLabelText('filter count')).toHaveTextContent('0') }) - it('opens above an existing lifted dialog', async () => { - openModal = document.createElement('div') - ZIndex.set('modal', openModal, 3702) - const dialogZIndex = Number(openModal.style.zIndex) + it('opens above an already open dialog', async () => { + render(OpenDialog) + const dialogZIndex = Number(screen.getByTestId('open-dialog').style.zIndex) const { pinia } = renderComponent({ 'Comfy.NodeSearchBoxImpl': 'v1 (legacy)' }) From 0f512dc5f0254f8f5a69826fbe509558e471ee66 Mon Sep 17 00:00:00 2001 From: Alexander Brown Date: Mon, 5 Oct 2026 07:29:15 +0000 Subject: [PATCH 05/52] fix: settle confirm dialogs once and prove their focus and dismissal Repeated activation of the confirm button invoked the caller's onConfirm once per click. The footer now settles on the first choice. The confirm dialog test mounts the real GlobalDialog and store instead of asserting mocked store arguments. Amp-Thread-ID: https://ampcode.com/threads/T-01a10ae9-e82c-744e-bec7-5dd878c1f3f0 --- .../dialog/confirm/ConfirmFooter.vue | 19 ++- .../dialog/confirm/confirmDialog.test.ts | 134 +++++++++++++----- 2 files changed, 110 insertions(+), 43 deletions(-) diff --git a/src/components/dialog/confirm/ConfirmFooter.vue b/src/components/dialog/confirm/ConfirmFooter.vue index 2cb3fe7fc07..9de67af8cef 100644 --- a/src/components/dialog/confirm/ConfirmFooter.vue +++ b/src/components/dialog/confirm/ConfirmFooter.vue @@ -5,7 +5,7 @@ variant="muted-textonly" size="lg" autofocus - @click="$emit('cancel')" + @click="settle('cancel')" > {{ cancelTextX }} @@ -14,14 +14,14 @@ :variant="confirmVariant ?? 'textonly'" size="lg" :class="confirmClass" - @click="$emit('confirm')" + @click="settle('confirm')" > {{ confirmTextX }} diff --git a/src/components/dialog/confirm/confirmDialog.test.ts b/src/components/dialog/confirm/confirmDialog.test.ts index 489f04e54b3..24d020cd741 100644 --- a/src/components/dialog/confirm/confirmDialog.test.ts +++ b/src/components/dialog/confirm/confirmDialog.test.ts @@ -1,47 +1,105 @@ -/** - * Dialog migration regression net: the showConfirmDialog helper must open - * its dialog through the Reka renderer with zeroed section padding (the - * Confirm* sections carry their own). Catches accidental reverts of the - * Phase 6 renderer flip. - */ +import { render, screen, waitFor, within } from '@testing-library/vue' +import userEvent from '@testing-library/user-event' import { describe, expect, it, vi } from 'vitest' +import { createI18n } from 'vue-i18n' -import ConfirmBody from '@/components/dialog/confirm/ConfirmBody.vue' +import GlobalDialog from '@/components/dialog/GlobalDialog.vue' import { showConfirmDialog } from '@/components/dialog/confirm/confirmDialog' -import ConfirmFooter from '@/components/dialog/confirm/ConfirmFooter.vue' -import ConfirmHeader from '@/components/dialog/confirm/ConfirmHeader.vue' import { useDialogStore } from '@/stores/dialogStore' -describe('showConfirmDialog Reka renderer opt-in', () => { - it("sets renderer 'reka' with size 'md' and zeroed section padding", () => { - showConfirmDialog() - - const { showDialog } = useDialogStore() - const [args] = vi.mocked(showDialog).mock.calls[0] - expect(args.dialogComponentProps?.renderer).toBe('reka') - expect(args.dialogComponentProps?.size).toBe('md') - expect(args.dialogComponentProps?.headerClass).toBe('p-0 pr-3') - expect(args.dialogComponentProps?.bodyClass).toBe('p-0') - expect(args.dialogComponentProps?.footerClass).toBe('p-0') - expect(args.dialogComponentProps?.pt).toBeUndefined() +const i18n = createI18n({ + legacy: false, + locale: 'en', + messages: { en: { g: { cancel: 'Cancel', close: 'Close' } } }, + missingWarn: false, + fallbackWarn: false +}) + +function renderConfirm(onConfirm: () => unknown = vi.fn()) { + render( + { + components: { GlobalDialog }, + template: '' + }, + { global: { plugins: [i18n] } } + ) + const opener = screen.getByRole('button', { name: 'Open' }) + opener.focus() + + const dialogStore = useDialogStore() + const dialog = showConfirmDialog({ + key: 'confirm-test', + headerProps: { title: 'Delete secret' }, + props: { promptText: 'This cannot be undone.' }, + footerProps: { + confirmText: 'Delete', + onCancel: () => dialogStore.closeDialog(dialog), + onConfirm + } + }) + return { opener, dialogStore } +} + +describe('showConfirmDialog', () => { + it('opens a labelled dialog with focus on cancel and traps Tab inside it', async () => { + const user = userEvent.setup() + renderConfirm() + + const dialog = await screen.findByRole('dialog', { name: 'Delete secret' }) + const close = within(dialog).getByRole('button', { name: 'Close' }) + const cancel = within(dialog).getByRole('button', { name: 'Cancel' }) + const confirm = within(dialog).getByRole('button', { name: 'Delete' }) + await waitFor(() => expect(cancel).toHaveFocus()) + + await user.tab() + expect(confirm).toHaveFocus() + await user.tab() + expect(close).toHaveFocus() + await user.tab({ shift: true }) + expect(confirm).toHaveFocus() }) - it('forwards the confirm section components and caller props', () => { - showConfirmDialog({ - key: 'confirm-test', - headerProps: { title: 'Title' }, - props: { promptText: 'Prompt' }, - footerProps: { confirmText: 'Delete' } - }) - - const { showDialog } = useDialogStore() - const [args] = vi.mocked(showDialog).mock.calls[0] - expect(args.key).toBe('confirm-test') - expect(args.headerComponent).toBe(ConfirmHeader) - expect(args.component).toBe(ConfirmBody) - expect(args.footerComponent).toBe(ConfirmFooter) - expect(args.headerProps).toEqual({ title: 'Title' }) - expect(args.props).toEqual({ promptText: 'Prompt' }) - expect(args.footerProps).toEqual({ confirmText: 'Delete' }) + it.for([ + { + dismissal: 'Escape', + dismiss: (user: ReturnType) => + user.keyboard('{Escape}') + }, + { + dismissal: 'an overlay click', + dismiss: (user: ReturnType) => + user.click(screen.getByTestId('dialog-overlay')) + } + ])( + 'closes on $dismissal without confirming and returns focus to the opener', + async ({ dismiss }) => { + const user = userEvent.setup() + const onConfirm = vi.fn() + const { opener, dialogStore } = renderConfirm(onConfirm) + await screen.findByRole('dialog', { name: 'Delete secret' }) + + await dismiss(user) + + await waitFor(() => + expect(screen.queryByRole('dialog')).not.toBeInTheDocument() + ) + expect(dialogStore.isDialogOpen('confirm-test')).toBe(false) + expect(onConfirm).not.toHaveBeenCalled() + await waitFor(() => expect(opener).toHaveFocus()) + } + ) + + it('confirms exactly once when the confirm button is activated repeatedly', async () => { + const user = userEvent.setup() + const onConfirm = vi.fn(() => new Promise(() => {})) + renderConfirm(onConfirm) + const dialog = await screen.findByRole('dialog', { name: 'Delete secret' }) + const confirm = within(dialog).getByRole('button', { name: 'Delete' }) + + await user.dblClick(confirm) + confirm.focus() + await user.keyboard('{Enter}') + + expect(onConfirm).toHaveBeenCalledOnce() }) }) From 4d6ab08397181d0840b32327debfafe280c98938 Mon Sep 17 00:00:00 2001 From: Alexander Brown Date: Mon, 5 Oct 2026 07:33:52 +0000 Subject: [PATCH 06/52] refactor: drop the dialog renderer option and close dialog props Only the Reka renderer remains, so `renderer: 'reka'` was inert. The open PrimeVue-style options bag is replaced by the fields GlobalDialog reads; `unstyled`, `position`, and the PrimeVue maximize/hide callbacks had no remaining consumer. Amp-Thread-ID: https://ampcode.com/threads/T-01a10ae9-e82c-744e-bec7-5dd878c1f3f0 --- .../ComfyRunButton/CloudRunButtonWrapper.vue | 1 - .../dialog/GlobalDialog.menu.test.ts | 1 - src/components/dialog/GlobalDialog.test.ts | 31 +++++++---------- .../dialog/bodyPointerEventsRestore.test.ts | 2 +- .../dialog/confirm/confirmDialog.ts | 1 - src/components/load3d/load3dViewerDialog.ts | 1 - src/components/ui/dialog/dialog.variants.ts | 1 - src/composables/auth/useAuthDialogs.ts | 3 -- .../useBillingDialogs.comingSoon.test.ts | 3 +- .../useBillingDialogs.topUpCredits.test.ts | 5 +-- src/composables/billing/useBillingDialogs.ts | 3 -- src/composables/maskeditor/useMaskEditor.ts | 1 - .../queue/useQueueClearHistoryDialog.ts | 1 - .../assets/composables/useModelUpload.ts | 1 - src/platform/auth/sso/ssoRequired.ts | 1 - .../composables/useSubscriptionDialog.test.ts | 1 - .../composables/useSubscriptionDialog.ts | 3 -- .../composables/useSettingsDialog.test.ts | 9 +---- .../settings/composables/useSettingsDialog.ts | 1 - .../surveys/openTypeformDialog.test.ts | 5 ++- src/platform/surveys/openTypeformDialog.ts | 1 - .../composables/useDeployToComfyApiDialog.ts | 1 - .../composables/layerEditorDialog.ts | 1 - ....test.ts => dialogService.options.test.ts} | 28 ++++------------ src/services/dialogService.ts | 8 +---- src/stores/dialogStore.ts | 33 +++---------------- .../composables/agent/useAgentConsent.ts | 1 - .../composables/useImportFailedNodeDialog.ts | 2 +- .../composables/useManagerDialog.test.ts | 9 +---- .../manager/composables/useManagerDialog.ts | 1 - .../useManagerSurveyDialog.test.ts | 3 +- .../composables/useNodeConflictDialog.ts | 2 +- 32 files changed, 33 insertions(+), 132 deletions(-) rename src/services/{dialogService.renderer.test.ts => dialogService.options.test.ts} (84%) diff --git a/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue b/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue index 14b376e4eff..86bf215e94a 100644 --- a/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue +++ b/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue @@ -138,7 +138,6 @@ function showPaymentRecoveryDialog() { onUpdatePayment: updatePayment }, dialogComponentProps: { - renderer: 'reka', headless: true, contentClass: 'w-[min(360px,95vw)] max-w-[min(360px,95vw)] sm:max-w-[min(360px,95vw)] border-0 bg-transparent shadow-none' diff --git a/src/components/dialog/GlobalDialog.menu.test.ts b/src/components/dialog/GlobalDialog.menu.test.ts index f3d8455317f..c457e79e415 100644 --- a/src/components/dialog/GlobalDialog.menu.test.ts +++ b/src/components/dialog/GlobalDialog.menu.test.ts @@ -56,7 +56,6 @@ describe('Menu inside a modal Reka dialog', () => { title: 'Host dialog', component: DialogBodyWithMenu, dialogComponentProps: { - renderer: 'reka', headless: true, modal: true, closable: true diff --git a/src/components/dialog/GlobalDialog.test.ts b/src/components/dialog/GlobalDialog.test.ts index 76605aa82f0..c0a39f2aed0 100644 --- a/src/components/dialog/GlobalDialog.test.ts +++ b/src/components/dialog/GlobalDialog.test.ts @@ -132,7 +132,7 @@ describe('GlobalDialog Reka parity with PrimeVue', () => { key: 'reka-not-closable', title: 'No close', component: Body, - dialogComponentProps: { renderer: 'reka', closable: false } + dialogComponentProps: { closable: false } }) await screen.findByRole('dialog') @@ -146,8 +146,7 @@ describe('GlobalDialog Reka parity with PrimeVue', () => { store.showDialog({ key: 'reka-closable', title: 'Closable', - component: Body, - dialogComponentProps: { renderer: 'reka' } + component: Body }) await screen.findByRole('dialog') @@ -162,7 +161,7 @@ describe('GlobalDialog Reka parity with PrimeVue', () => { key: 'reka-headless', title: 'Hidden title', component: Body, - dialogComponentProps: { renderer: 'reka', headless: true } + dialogComponentProps: { headless: true } }) await screen.findByRole('dialog') @@ -176,8 +175,7 @@ describe('GlobalDialog Reka parity with PrimeVue', () => { store.showDialog({ key: 'reka-titled', title: 'Visible title', - component: Body, - dialogComponentProps: { renderer: 'reka' } + component: Body }) await screen.findByRole('dialog') @@ -197,7 +195,7 @@ describe('GlobalDialog Reka parity with PrimeVue', () => { creditsUsed: 645, currentLimit: 3000 }, - dialogComponentProps: { renderer: 'reka', headless: true } + dialogComponentProps: { headless: true } }) expect( @@ -216,7 +214,6 @@ describe('GlobalDialog Reka parity with PrimeVue', () => { component: BuilderSaveDialogContent, props: { defaultFilename: 'workflow.json' }, dialogComponentProps: { - renderer: 'reka', headless: true, useAutomaticLabeling: true } @@ -236,8 +233,7 @@ describe('GlobalDialog Reka parity with PrimeVue', () => { store.showDialog({ key: 'reka-esc-default', title: 'Esc closes', - component: Body, - dialogComponentProps: { renderer: 'reka' } + component: Body }) await screen.findByRole('dialog') @@ -255,7 +251,7 @@ describe('GlobalDialog Reka parity with PrimeVue', () => { key: 'reka-esc-blocked', title: 'Esc blocked', component: Body, - dialogComponentProps: { renderer: 'reka', closable: false } + dialogComponentProps: { closable: false } }) await screen.findByRole('dialog') @@ -273,7 +269,6 @@ describe('GlobalDialog Reka parity with PrimeVue', () => { title: 'Section classes', component: Body, dialogComponentProps: { - renderer: 'reka', headerClass: 'p-2', bodyClass: 'p-0' } @@ -303,7 +298,6 @@ describe('GlobalDialog Reka parity with PrimeVue', () => { title: 'Maximize wins', component: Body, dialogComponentProps: { - renderer: 'reka', maximizable: true, contentClass: 'w-[80vw] max-w-[80vw] sm:max-w-[80vw] h-[80vh] max-h-[80vh]' @@ -333,8 +327,7 @@ describe('GlobalDialog Reka overlay scrim', () => { store.showDialog({ key: 'reka-modal-scrim', title: 'Modal', - component: Body, - dialogComponentProps: { renderer: 'reka' } + component: Body }) await screen.findByRole('dialog') @@ -351,7 +344,7 @@ describe('GlobalDialog Reka overlay scrim', () => { key: 'reka-non-modal-scrim', title: 'Non-modal', component: Body, - dialogComponentProps: { renderer: 'reka', modal: false } + dialogComponentProps: { modal: false } }) await screen.findByRole('dialog') @@ -380,7 +373,7 @@ describe('GlobalDialog Reka overlay scrim', () => { key: 'reka-scrim-dismiss', title: 'Non-modal', component: Body, - dialogComponentProps: { renderer: 'reka', modal: false } + dialogComponentProps: { modal: false } }) await screen.findByRole('dialog') @@ -413,7 +406,6 @@ describe('GlobalDialog Reka overlay scrim', () => { component: SubscriptionRequiredDialogContentUnified, props: { onClose: () => store.closeDialog({ key }) }, dialogComponentProps: { - renderer: 'reka', headless: true, dismissableMask: false } @@ -459,7 +451,7 @@ describe('GlobalDialog Reka focus-outside binding', () => { key: 'focus-default', title: 'Focus dismisses', component: Body, - dialogComponentProps: { renderer: 'reka', modal: false } + dialogComponentProps: { modal: false } }) await screen.findByRole('dialog') @@ -488,7 +480,6 @@ describe('GlobalDialog Reka focus-outside binding', () => { title: 'Focus blocked', component: Body, dialogComponentProps: { - renderer: 'reka', modal: false, dismissOnFocusOutside: false } diff --git a/src/components/dialog/bodyPointerEventsRestore.test.ts b/src/components/dialog/bodyPointerEventsRestore.test.ts index 2a549824ed1..770800ca484 100644 --- a/src/components/dialog/bodyPointerEventsRestore.test.ts +++ b/src/components/dialog/bodyPointerEventsRestore.test.ts @@ -67,7 +67,7 @@ function openModal( key, title: key, component, - dialogComponentProps: { renderer: 'reka', modal: true } + dialogComponentProps: { modal: true } }) } diff --git a/src/components/dialog/confirm/confirmDialog.ts b/src/components/dialog/confirm/confirmDialog.ts index 06edff2730f..16d9ed4735d 100644 --- a/src/components/dialog/confirm/confirmDialog.ts +++ b/src/components/dialog/confirm/confirmDialog.ts @@ -26,7 +26,6 @@ export function showConfirmDialog( props, footerProps, dialogComponentProps: { - renderer: 'reka', size: 'md', contentClass: 'rounded-2xl border-border-default sm:max-w-lg', // Confirm sections carry their own padding — zero out the dialog diff --git a/src/components/load3d/load3dViewerDialog.ts b/src/components/load3d/load3dViewerDialog.ts index a586557f16d..0cc8634c337 100644 --- a/src/components/load3d/load3dViewerDialog.ts +++ b/src/components/load3d/load3dViewerDialog.ts @@ -1,7 +1,6 @@ import type { DialogComponentProps } from '@/stores/dialogStore' export const LOAD3D_VIEWER_DIALOG_PROPS = { - renderer: 'reka', size: 'full', contentClass: 'w-[80vw] max-w-[min(80vw,calc(100vw-var(--workspace-inset-right,0px)-1rem))] sm:max-w-[min(80vw,calc(100vw-var(--workspace-inset-right,0px)-1rem))] h-[80vh] max-h-[80vh]', diff --git a/src/components/ui/dialog/dialog.variants.ts b/src/components/ui/dialog/dialog.variants.ts index 23e7d9e20e6..353f4df0f45 100644 --- a/src/components/ui/dialog/dialog.variants.ts +++ b/src/components/ui/dialog/dialog.variants.ts @@ -43,7 +43,6 @@ export const HUG_CONTENT_CLASS = export const SELF_STYLED_PANEL_CONTENT_CLASS = `${HUG_CONTENT_CLASS} border-none bg-transparent shadow-none` export const SELF_STYLED_PANEL_DIALOG_PROPS = { - renderer: 'reka', headless: true, contentClass: SELF_STYLED_PANEL_CONTENT_CLASS } as const diff --git a/src/composables/auth/useAuthDialogs.ts b/src/composables/auth/useAuthDialogs.ts index 5db4f4a7c14..7fca7e8d526 100644 --- a/src/composables/auth/useAuthDialogs.ts +++ b/src/composables/auth/useAuthDialogs.ts @@ -38,7 +38,6 @@ export function useAuthDialogs() { onCancel: () => resolve(false) }, dialogComponentProps: { - renderer: 'reka', headless: true, contentClass: `${SELF_STYLED_PANEL_CONTENT_CLASS} p-0`, closable: true, @@ -64,7 +63,6 @@ export function useAuthDialogs() { onSuccess: () => resolve(true) }, dialogComponentProps: { - renderer: 'reka', // SignInContent is a fixed w-96 — size 'sm' (max-w-sm) leaves only // 352px after the body padding; hug the intrinsic width instead. contentClass: HUG_CONTENT_CLASS, @@ -94,7 +92,6 @@ export function useAuthDialogs() { dialogStore.closeDialog({ key: 'global-update-password' }) }, dialogComponentProps: { - renderer: 'reka', contentClass: HUG_CONTENT_CLASS } }) diff --git a/src/composables/billing/useBillingDialogs.comingSoon.test.ts b/src/composables/billing/useBillingDialogs.comingSoon.test.ts index fa8d6ead58d..257d383bf91 100644 --- a/src/composables/billing/useBillingDialogs.comingSoon.test.ts +++ b/src/composables/billing/useBillingDialogs.comingSoon.test.ts @@ -6,10 +6,9 @@ import { useDialogStore } from '@/stores/dialogStore' vi.mock(import('@/i18n')) describe('showBillingComingSoonDialog', () => { - it("sets renderer 'reka', size 'sm', and 360px contentClass", () => { + it("opens at size 'sm' with a 360px contentClass", () => { useBillingDialogs().showBillingComingSoonDialog() const [args] = vi.mocked(useDialogStore().showDialog).mock.calls[0] - expect(args.dialogComponentProps?.renderer).toBe('reka') expect(args.dialogComponentProps?.size).toBe('sm') expect(args.dialogComponentProps?.contentClass).toBe('max-w-[360px]') }) diff --git a/src/composables/billing/useBillingDialogs.topUpCredits.test.ts b/src/composables/billing/useBillingDialogs.topUpCredits.test.ts index 062d0d0ec2b..c28918838b9 100644 --- a/src/composables/billing/useBillingDialogs.topUpCredits.test.ts +++ b/src/composables/billing/useBillingDialogs.topUpCredits.test.ts @@ -61,12 +61,10 @@ describe('showTopUpCreditsDialog', () => { expect(useBillingCapabilities().initialize).not.toHaveBeenCalled() }) - it("sets renderer 'reka' with a transparent shrink-wrapped chrome", async () => { + it('opens headless with a transparent shrink-wrapped chrome', async () => { await useBillingDialogs().showTopUpCreditsDialog() const [args] = vi.mocked(useDialogStore().showDialog).mock.calls[0] - expect(args.dialogComponentProps?.renderer).toBe('reka') expect(args.dialogComponentProps?.headless).toBe(true) - expect(args.dialogComponentProps?.pt).toBeUndefined() expect(args.dialogComponentProps?.contentClass).toContain('w-fit') expect(args.dialogComponentProps?.contentClass).toContain('bg-transparent') }) @@ -83,7 +81,6 @@ describe('showTopUpCreditsDialog', () => { // The member notice draws its own header + close button, so it must open // headless or Reka wraps it in duplicate chrome. expect(args.dialogComponentProps?.headless).toBe(true) - expect(args.dialogComponentProps?.renderer).toBe('reka') const props = args.props assert(props && 'onClose' in props && typeof props.onClose === 'function') diff --git a/src/composables/billing/useBillingDialogs.ts b/src/composables/billing/useBillingDialogs.ts index d5b89b685f2..d16861639fb 100644 --- a/src/composables/billing/useBillingDialogs.ts +++ b/src/composables/billing/useBillingDialogs.ts @@ -68,7 +68,6 @@ export function useBillingDialogs() { dialogStore.closeDialog({ key: 'insufficient-credits-member' }) }, dialogComponentProps: { - renderer: 'reka', headless: true, contentClass: 'w-[min(360px,95vw)] max-w-[min(360px,95vw)] sm:max-w-[min(360px,95vw)] border-0 bg-transparent shadow-none' @@ -87,7 +86,6 @@ export function useBillingDialogs() { : TopUpCreditsDialogContentLegacy, props: options, dialogComponentProps: { - renderer: 'reka', headless: true, contentClass: SELF_STYLED_PANEL_CONTENT_CLASS } @@ -149,7 +147,6 @@ export function useBillingDialogs() { onConfirm: () => {} }, dialogComponentProps: { - renderer: 'reka', size: 'sm', contentClass: 'max-w-[360px]' } diff --git a/src/composables/maskeditor/useMaskEditor.ts b/src/composables/maskeditor/useMaskEditor.ts index f9805fe7f30..94201043864 100644 --- a/src/composables/maskeditor/useMaskEditor.ts +++ b/src/composables/maskeditor/useMaskEditor.ts @@ -23,7 +23,6 @@ export function useMaskEditor() { node }, dialogComponentProps: { - renderer: 'reka', size: 'full', // `mask-editor-dialog` is a styling-free hook class consumed by // browser_tests (MaskEditorHelper, maskEditor.spec). diff --git a/src/composables/queue/useQueueClearHistoryDialog.ts b/src/composables/queue/useQueueClearHistoryDialog.ts index 003df636141..cc69b03bfe3 100644 --- a/src/composables/queue/useQueueClearHistoryDialog.ts +++ b/src/composables/queue/useQueueClearHistoryDialog.ts @@ -9,7 +9,6 @@ export const useQueueClearHistoryDialog = () => { key: 'queue-clear-history', component: QueueClearHistoryDialog, dialogComponentProps: { - renderer: 'reka', headless: true, closable: false, closeOnEscape: true, diff --git a/src/platform/assets/composables/useModelUpload.ts b/src/platform/assets/composables/useModelUpload.ts index 79521c9acf4..a088e8f3c9e 100644 --- a/src/platform/assets/composables/useModelUpload.ts +++ b/src/platform/assets/composables/useModelUpload.ts @@ -16,7 +16,6 @@ type UploadModelContextResolver = () => UploadModelDialogContext | undefined // Contents bring their own width and padding — shrink-wrap the chrome and // zero the section padding (the PrimeVue `pt` overrides this replaces). const uploadDialogComponentProps = { - renderer: 'reka', size: 'lg', contentClass: 'w-fit max-w-[calc(100vw-1rem)]', headerClass: 'py-0 pl-0', diff --git a/src/platform/auth/sso/ssoRequired.ts b/src/platform/auth/sso/ssoRequired.ts index a3a625a6266..d0e1feca824 100644 --- a/src/platform/auth/sso/ssoRequired.ts +++ b/src/platform/auth/sso/ssoRequired.ts @@ -62,7 +62,6 @@ export function presentSsoRequired( component, props: known, dialogComponentProps: { - renderer: 'reka', headless: true, contentClass: SELF_STYLED_PANEL_CONTENT_CLASS, onClose: abandonSsoFlow diff --git a/src/platform/cloud/subscription/composables/useSubscriptionDialog.test.ts b/src/platform/cloud/subscription/composables/useSubscriptionDialog.test.ts index 9ecb0b9f1a4..43d0218c544 100644 --- a/src/platform/cloud/subscription/composables/useSubscriptionDialog.test.ts +++ b/src/platform/cloud/subscription/composables/useSubscriptionDialog.test.ts @@ -111,7 +111,6 @@ function expectRekaPricingDialogProps( dialogComponentProps: Record ) { expect(dialogComponentProps).toMatchObject({ - renderer: 'reka', size: 'full', dismissableMask: false }) diff --git a/src/platform/cloud/subscription/composables/useSubscriptionDialog.ts b/src/platform/cloud/subscription/composables/useSubscriptionDialog.ts index cc72f170257..d25c17ec16a 100644 --- a/src/platform/cloud/subscription/composables/useSubscriptionDialog.ts +++ b/src/platform/cloud/subscription/composables/useSubscriptionDialog.ts @@ -101,7 +101,6 @@ export const useSubscriptionDialog = () => { ), props: { onClose: hide }, dialogComponentProps: { - renderer: 'reka', contentClass: 'w-[min(360px,95vw)] max-w-[min(360px,95vw)] sm:max-w-[min(360px,95vw)] border-0 bg-transparent shadow-none' } @@ -118,7 +117,6 @@ export const useSubscriptionDialog = () => { trackPaywallShown(paymentIntentSource) const legacyPricingDialogProps = { - renderer: 'reka', size: 'full', dismissableMask: false, contentClass: @@ -195,7 +193,6 @@ export const useSubscriptionDialog = () => { // `md` frame. `w-fit` lets each step hug its content -- the pricing // table fills its 1280px content while the compact confirm/success // steps shrink (the content root sets its own width per checkoutStep). - renderer: 'reka', size: 'full', // A scrim click mid-checkout would silently discard typed card // details and any pending 3DS state; the X is the only close. diff --git a/src/platform/settings/composables/useSettingsDialog.test.ts b/src/platform/settings/composables/useSettingsDialog.test.ts index 4cd8fd14a79..275163ff541 100644 --- a/src/platform/settings/composables/useSettingsDialog.test.ts +++ b/src/platform/settings/composables/useSettingsDialog.test.ts @@ -1,10 +1,4 @@ import { useDialogStore } from '@/stores/dialogStore' -/** - * Settings dialog migration regression net: `useSettingsDialog().show()` must - * open the Reka-renderer path with sizing that matches the previous - * `BaseModalLayout size="sm"` (960px × 80vh). Catches accidental reverts of - * the Phase 3 renderer flip. - */ import { beforeEach, describe, expect, it, vi } from 'vitest' const showDialog = vi.hoisted(() => vi.fn()) @@ -34,11 +28,10 @@ describe('useSettingsDialog', () => { isCloudRef.value = false }) - it("show() opens the Reka renderer with size 'full' and 1280px content sizing", () => { + it("show() opens at size 'full' with 1280px content sizing", () => { useSettingsDialog().show() const [args] = showDialog.mock.calls[0] expect(args.key).toBe('global-settings') - expect(args.dialogComponentProps.renderer).toBe('reka') expect(args.dialogComponentProps.size).toBe('full') expect(args.dialogComponentProps.contentClass).toContain('max-w-[1280px]') expect(args.dialogComponentProps.contentClass).not.toContain( diff --git a/src/platform/settings/composables/useSettingsDialog.ts b/src/platform/settings/composables/useSettingsDialog.ts index aef772e58b5..5d02ccf6338 100644 --- a/src/platform/settings/composables/useSettingsDialog.ts +++ b/src/platform/settings/composables/useSettingsDialog.ts @@ -52,7 +52,6 @@ export function useSettingsDialog() { ...(settingId ? { scrollToSettingId: settingId } : {}) }, dialogComponentProps: { - renderer: 'reka', headless: true, closable: true, // Settings hosts nested PrimeVue dialogs (Edit Keybinding, Overwrite diff --git a/src/platform/surveys/openTypeformDialog.test.ts b/src/platform/surveys/openTypeformDialog.test.ts index 2f758e4c7f1..69753d665e9 100644 --- a/src/platform/surveys/openTypeformDialog.test.ts +++ b/src/platform/surveys/openTypeformDialog.test.ts @@ -6,7 +6,7 @@ import TypeformDialogContent from './TypeformDialogContent.vue' import { openTypeformDialog } from './openTypeformDialog' describe('openTypeformDialog', () => { - it('opens the form embed in a Reka dialog with the given id and hidden fields', () => { + it('opens the form embed in a dialog with the given id and hidden fields', () => { const showDialog = vi.spyOn(useDialogStore(), 'showDialog') openTypeformDialog({ @@ -20,8 +20,7 @@ describe('openTypeformDialog', () => { key: 'typeform-abc123', title: 'A Form', component: TypeformDialogContent, - props: { typeformId: 'abc123', hiddenFields: 'foo=bar' }, - dialogComponentProps: expect.objectContaining({ renderer: 'reka' }) + props: { typeformId: 'abc123', hiddenFields: 'foo=bar' } }) ) }) diff --git a/src/platform/surveys/openTypeformDialog.ts b/src/platform/surveys/openTypeformDialog.ts index b5cd2fe69e2..7559f06854a 100644 --- a/src/platform/surveys/openTypeformDialog.ts +++ b/src/platform/surveys/openTypeformDialog.ts @@ -22,7 +22,6 @@ export function openTypeformDialog({ component: TypeformDialogContent, props: { typeformId, hiddenFields }, dialogComponentProps: { - renderer: 'reka', size: 'lg' } }) diff --git a/src/platform/workflow/deploy/composables/useDeployToComfyApiDialog.ts b/src/platform/workflow/deploy/composables/useDeployToComfyApiDialog.ts index 23f9b71f0a4..1dbfdae5677 100644 --- a/src/platform/workflow/deploy/composables/useDeployToComfyApiDialog.ts +++ b/src/platform/workflow/deploy/composables/useDeployToComfyApiDialog.ts @@ -28,7 +28,6 @@ export function useDeployToComfyApiDialog() { onDismiss: hide }, dialogComponentProps: { - renderer: 'reka', dismissableMask: true, closeOnEscape: true, modal: true, diff --git a/src/renderer/extensions/layerEditor/composables/layerEditorDialog.ts b/src/renderer/extensions/layerEditor/composables/layerEditorDialog.ts index a598e179981..d6af3b5a199 100644 --- a/src/renderer/extensions/layerEditor/composables/layerEditorDialog.ts +++ b/src/renderer/extensions/layerEditor/composables/layerEditorDialog.ts @@ -13,7 +13,6 @@ export const LayerEditorDialogHeader = defineAsyncComponent( ) export const layerEditorDialogProps = { - renderer: 'reka', size: 'full', headerClass: 'border-b border-border-default p-2', bodyClass: 'flex min-h-0 flex-col p-0', diff --git a/src/services/dialogService.renderer.test.ts b/src/services/dialogService.options.test.ts similarity index 84% rename from src/services/dialogService.renderer.test.ts rename to src/services/dialogService.options.test.ts index 5aaf84db392..940d302f620 100644 --- a/src/services/dialogService.renderer.test.ts +++ b/src/services/dialogService.options.test.ts @@ -1,8 +1,3 @@ -/** - * Dialog migration regression net: when callers in `dialogService` open a - * Reka-migrated dialog, the dialog stack item must carry `renderer: 'reka'`. - * Catches accidental reverts of the Reka renderer flip. - */ import { describe, expect, it, vi } from 'vitest' vi.mock(import('@/i18n')) @@ -12,26 +7,24 @@ vi.mock(import('@/platform/telemetry')) import { useDialogService } from '@/services/dialogService' import { useDialogStore } from '@/stores/dialogStore' -describe('dialogService Reka renderer opt-in', () => { - it("prompt() sets renderer 'reka' and size 'md'", async () => { +describe('dialogService dialog options', () => { + it("prompt() opens at size 'md'", async () => { const result = useDialogService().prompt({ title: 'T', message: 'M' }) await vi.waitFor(() => expect(useDialogStore().showDialog).toHaveBeenCalled() ) const [args] = vi.mocked(useDialogStore().showDialog).mock.calls[0] - expect(args.dialogComponentProps?.renderer).toBe('reka') expect(args.dialogComponentProps?.size).toBe('md') args.dialogComponentProps?.onRemoved?.() await expect(result).resolves.toBeNull() }) - it("confirm() sets renderer 'reka' and size 'md'", async () => { + it("confirm() opens at size 'md'", async () => { const result = useDialogService().confirm({ title: 'T', message: 'M' }) await vi.waitFor(() => expect(useDialogStore().showDialog).toHaveBeenCalled() ) const [args] = vi.mocked(useDialogStore().showDialog).mock.calls[0] - expect(args.dialogComponentProps?.renderer).toBe('reka') expect(args.dialogComponentProps?.size).toBe('md') args.dialogComponentProps?.onRemoved?.() await expect(result).resolves.toBeNull() @@ -139,7 +132,7 @@ describe('dialogService Reka renderer opt-in', () => { await expect(result).resolves.toBeNull() }) - it("showExecutionErrorDialog() sets renderer 'reka' and size 'lg'", () => { + it("showExecutionErrorDialog() opens at size 'lg'", () => { useDialogService().showExecutionErrorDialog({ exception_type: 'RuntimeError', exception_message: 'boom', @@ -148,18 +141,16 @@ describe('dialogService Reka renderer opt-in', () => { traceback: ['line 1', 'line 2'] }) const [args] = vi.mocked(useDialogStore().showDialog).mock.calls[0] - expect(args.dialogComponentProps?.renderer).toBe('reka') expect(args.dialogComponentProps?.size).toBe('lg') }) - it("showErrorDialog() sets renderer 'reka' and size 'lg'", () => { + it("showErrorDialog() opens at size 'lg'", () => { useDialogService().showErrorDialog(new Error('boom')) const [args] = vi.mocked(useDialogStore().showDialog).mock.calls[0] - expect(args.dialogComponentProps?.renderer).toBe('reka') expect(args.dialogComponentProps?.size).toBe('lg') }) - it("showLayoutDialog() defaults to renderer 'reka' headless without pt", () => { + it('showLayoutDialog() defaults to headless', () => { const Component = { template: '
' } useDialogService().showLayoutDialog({ key: 'layout-test', @@ -167,9 +158,7 @@ describe('dialogService Reka renderer opt-in', () => { props: {} }) const [args] = vi.mocked(useDialogStore().showDialog).mock.calls[0] - expect(args.dialogComponentProps?.renderer).toBe('reka') expect(args.dialogComponentProps?.headless).toBe(true) - expect(args.dialogComponentProps?.pt).toBeUndefined() }) it('showLayoutDialog() lets callers override the defaults', () => { @@ -181,20 +170,17 @@ describe('dialogService Reka renderer opt-in', () => { dialogComponentProps: { closable: false, contentClass: 'w-170' } }) const [args] = vi.mocked(useDialogStore().showDialog).mock.calls[0] - expect(args.dialogComponentProps?.renderer).toBe('reka') expect(args.dialogComponentProps?.closable).toBe(false) expect(args.dialogComponentProps?.contentClass).toBe('w-170') }) - it("showSmallLayoutDialog() sets renderer 'reka' with zeroed section padding", () => { + it('showSmallLayoutDialog() zeroes section padding', () => { const Component = { template: '
' } useDialogService().showSmallLayoutDialog({ key: 'small-layout-test', component: Component }) const [args] = vi.mocked(useDialogStore().showDialog).mock.calls[0] - expect(args.dialogComponentProps?.renderer).toBe('reka') - expect(args.dialogComponentProps?.pt).toBeUndefined() expect(args.dialogComponentProps?.contentClass).toContain('w-fit') expect(args.dialogComponentProps?.headerClass).toBe('p-0') expect(args.dialogComponentProps?.bodyClass).toBe('p-0 overflow-y-hidden') diff --git a/src/services/dialogService.ts b/src/services/dialogService.ts index aaa78b19f61..690c71452ab 100644 --- a/src/services/dialogService.ts +++ b/src/services/dialogService.ts @@ -211,7 +211,6 @@ export const useDialogService = () => { component: ErrorDialogContent, props, dialogComponentProps: { - renderer: 'reka', size: 'lg', onClose: () => { useTelemetry()?.trackUiButtonClicked({ @@ -282,7 +281,6 @@ export const useDialogService = () => { component: ErrorDialogContent, props, dialogComponentProps: { - renderer: 'reka', size: 'lg', onClose: () => { useTelemetry()?.trackUiButtonClicked({ @@ -319,7 +317,6 @@ export const useDialogService = () => { placeholder }, dialogComponentProps: { - renderer: 'reka', size: 'md', onRemoved: () => { resolve(null) @@ -357,7 +354,6 @@ export const useDialogService = () => { denyLabel }, dialogComponentProps: { - renderer: 'reka', size: 'md', onRemoved: () => resolve(null) } @@ -394,7 +390,6 @@ export const useDialogService = () => { dialogComponentProps?: DialogComponentProps }) { const layoutDefaultProps: DialogComponentProps = { - renderer: 'reka', headless: true, modal: true, closable: true @@ -411,7 +406,7 @@ export const useDialogService = () => { function showSmallLayoutDialog( options: Omit & { - dialogComponentProps?: Omit + dialogComponentProps?: DialogComponentProps } ) { const { dialogComponentProps: callerProps, ...rest } = options @@ -419,7 +414,6 @@ export const useDialogService = () => { return dialogStore.showDialog({ ...rest, dialogComponentProps: { - renderer: 'reka', closable: true, contentClass: `${HUG_CONTENT_CLASS} border-border-default`, headerClass: 'p-0', diff --git a/src/stores/dialogStore.ts b/src/stores/dialogStore.ts index f6ca10d37ed..11868fb3dc1 100644 --- a/src/stores/dialogStore.ts +++ b/src/stores/dialogStore.ts @@ -5,18 +5,7 @@ import type { Component, HTMLAttributes, Ref } from 'vue' import type { DialogContentSize } from '@/components/ui/dialog/dialog.variants' import type { ComponentAttrs } from 'vue-component-type-helpers' -type DialogPosition = - | 'center' - | 'top' - | 'bottom' - | 'left' - | 'right' - | 'topleft' - | 'topright' - | 'bottomleft' - | 'bottomright' - -interface CustomDialogComponentProps { +export interface DialogComponentProps { maximizable?: boolean maximized?: boolean onClose?: () => void @@ -35,7 +24,6 @@ interface CustomDialogComponentProps { */ showCloseButton?: boolean modal?: boolean - position?: DialogPosition closeOnEscape?: boolean dismissableMask?: boolean /** @@ -46,7 +34,6 @@ interface CustomDialogComponentProps { * outside-pointer dismissal are unaffected. Defaults to `true`. */ dismissOnFocusOutside?: boolean - unstyled?: boolean headless?: boolean useAutomaticLabeling?: boolean size?: DialogContentSize @@ -62,9 +49,6 @@ interface CustomDialogComponentProps { footerClass?: HTMLAttributes['class'] } -export type DialogComponentProps = Record & - CustomDialogComponentProps - export interface DialogInstance { key: string visible: boolean @@ -207,16 +191,7 @@ export const useDialogStore = defineStore('dialog', () => { closeOnEscape: true, dismissableMask: true, ...options.dialogComponentProps, - maximized: options.dialogComponentProps?.maximized ?? false, - onMaximize: () => { - dialog.dialogComponentProps.maximized = true - }, - onUnmaximize: () => { - dialog.dialogComponentProps.maximized = false - }, - onAfterHide: () => { - closeDialog(dialog) - } + maximized: options.dialogComponentProps?.maximized ?? false } } @@ -230,8 +205,8 @@ export const useDialogStore = defineStore('dialog', () => { /** * Ensures only the top-most dialog in the stack can be closed with the Escape key. - * This is necessary because PrimeVue Dialogs do not handle `closeOnEscape` prop - * correctly when multiple dialogs are open. + * Each stacked dialog renders its own Reka root, so every one of them would + * otherwise react to the same Escape press. */ function updateCloseOnEscapeStates() { const topDialog = dialogStack.value.find((d) => d.key === activeKey.value) diff --git a/src/workbench/extensions/agent/composables/agent/useAgentConsent.ts b/src/workbench/extensions/agent/composables/agent/useAgentConsent.ts index f4566a42929..be296828e33 100644 --- a/src/workbench/extensions/agent/composables/agent/useAgentConsent.ts +++ b/src/workbench/extensions/agent/composables/agent/useAgentConsent.ts @@ -204,7 +204,6 @@ export function useAgentConsent() { } }, dialogComponentProps: { - renderer: 'reka', dismissableMask: true, closeOnEscape: true, modal: true, diff --git a/src/workbench/extensions/manager/composables/useImportFailedNodeDialog.ts b/src/workbench/extensions/manager/composables/useImportFailedNodeDialog.ts index 35e56ed199d..6a2e650ba19 100644 --- a/src/workbench/extensions/manager/composables/useImportFailedNodeDialog.ts +++ b/src/workbench/extensions/manager/composables/useImportFailedNodeDialog.ts @@ -19,7 +19,7 @@ export function useImportFailedNodeDialog() { function show( options: { conflictedPackages?: ConflictDetectionResult[] - dialogComponentProps?: Omit + dialogComponentProps?: DialogComponentProps } = {} ) { const { dialogComponentProps, conflictedPackages = [] } = options diff --git a/src/workbench/extensions/manager/composables/useManagerDialog.test.ts b/src/workbench/extensions/manager/composables/useManagerDialog.test.ts index 8d0f5e71738..e9927daceff 100644 --- a/src/workbench/extensions/manager/composables/useManagerDialog.test.ts +++ b/src/workbench/extensions/manager/composables/useManagerDialog.test.ts @@ -1,9 +1,3 @@ -/** - * Manager dialog migration regression net: `useManagerDialog().show()` must - * route through the Reka renderer at the legacy Manager dimensions (1724px - * wide × 80vh, expanding at 3000px). Catches accidental reverts of the - * Phase 4 renderer flip. - */ import { describe, expect, it, vi } from 'vitest' import { useDialogStore } from '@/stores/dialogStore' @@ -11,11 +5,10 @@ import { ManagerTab } from '@/workbench/extensions/manager/types/comfyManagerTyp import { useManagerDialog } from '@/workbench/extensions/manager/composables/useManagerDialog' describe('useManagerDialog', () => { - it("show() opens the Reka renderer with size 'full' and Manager content sizing", () => { + it("show() opens at size 'full' with Manager content sizing", () => { useManagerDialog().show() const [args] = vi.mocked(useDialogStore().showDialog).mock.calls[0] expect(args.key).toBe('global-manager') - expect(args.dialogComponentProps!.renderer).toBe('reka') expect(args.dialogComponentProps!.size).toBe('full') expect(args.dialogComponentProps!.contentClass).toContain( 'w-[min(90vw,1724px)]' diff --git a/src/workbench/extensions/manager/composables/useManagerDialog.ts b/src/workbench/extensions/manager/composables/useManagerDialog.ts index c9322298b94..89c2fbc7967 100644 --- a/src/workbench/extensions/manager/composables/useManagerDialog.ts +++ b/src/workbench/extensions/manager/composables/useManagerDialog.ts @@ -26,7 +26,6 @@ export function useManagerDialog() { initialPackId }, dialogComponentProps: { - renderer: 'reka', // Manager hosts PrimeVue overlays (SingleSelect, SearchAutocomplete) // teleported to body. Reka's modal mode traps focus and disables body // pointer-events, breaking those overlays. Mirrors Settings. diff --git a/src/workbench/extensions/manager/composables/useManagerSurveyDialog.test.ts b/src/workbench/extensions/manager/composables/useManagerSurveyDialog.test.ts index a17fa9159e8..045dad2c288 100644 --- a/src/workbench/extensions/manager/composables/useManagerSurveyDialog.test.ts +++ b/src/workbench/extensions/manager/composables/useManagerSurveyDialog.test.ts @@ -4,11 +4,10 @@ import { useDialogStore } from '@/stores/dialogStore' import { useManagerSurveyDialog } from '@/workbench/extensions/manager/composables/useManagerSurveyDialog' describe('useManagerSurveyDialog', () => { - it('show() opens the survey dialog under its own key via the Reka layout renderer', () => { + it('show() opens the survey dialog under its own key', () => { useManagerSurveyDialog().show() const [args] = vi.mocked(useDialogStore().showDialog).mock.calls[0] expect(args.key).toBe('global-manager-survey') - expect(args.dialogComponentProps?.renderer).toBe('reka') }) it('show() wires onClose to close the survey dialog', () => { diff --git a/src/workbench/extensions/manager/composables/useNodeConflictDialog.ts b/src/workbench/extensions/manager/composables/useNodeConflictDialog.ts index 1eda5916db7..7fbbd9a9a38 100644 --- a/src/workbench/extensions/manager/composables/useNodeConflictDialog.ts +++ b/src/workbench/extensions/manager/composables/useNodeConflictDialog.ts @@ -20,7 +20,7 @@ export function useNodeConflictDialog() { options: { showAfterWhatsNew?: boolean conflictedPackages?: ConflictDetectionResult[] - dialogComponentProps?: Omit + dialogComponentProps?: DialogComponentProps buttonText?: string onButtonClick?: () => void } = {} From dc331ed1198c50fa45b7a6fb3ea8c59f8671bcff Mon Sep 17 00:00:00 2001 From: Alexander Brown Date: Mon, 5 Oct 2026 07:35:25 +0000 Subject: [PATCH 07/52] refactor: drop PrimeVue overlay selectors from dialog dismissal guards No PrimeVue overlay component remains in the app, so the `.p-*` inside selectors and the `.p-overlay-mask` stacking anchor were dead. Renames rekaPrimeVueBridge to dialogDismissGuards and drops the PrimeVue plugin from dialog and node-search tests, shrinking the import allowlist. Amp-Thread-ID: https://ampcode.com/threads/T-01a10ae9-e82c-744e-bec7-5dd878c1f3f0 --- scripts/primevue-import-allowlist.json | 3 -- src/components/dialog/GlobalDialog.test.ts | 39 ++++++++++--------- src/components/dialog/GlobalDialog.vue | 2 +- .../dialog/bodyPointerEventsRestore.test.ts | 3 +- ...imeVueBridge.ts => dialogDismissGuards.ts} | 12 ++---- src/composables/usePopoverSizing.test.ts | 24 +++--------- src/composables/usePopoverSizing.ts | 4 +- 7 files changed, 33 insertions(+), 54 deletions(-) rename src/components/dialog/{rekaPrimeVueBridge.ts => dialogDismissGuards.ts} (81%) diff --git a/scripts/primevue-import-allowlist.json b/scripts/primevue-import-allowlist.json index 70ba4b55d63..1902ce8a6cd 100644 --- a/scripts/primevue-import-allowlist.json +++ b/scripts/primevue-import-allowlist.json @@ -4,8 +4,6 @@ { "files": ["src/**/*.{ts,tsx,vue}"], "excludeFiles": [ - "src/components/dialog/GlobalDialog.test.ts", - "src/components/dialog/bodyPointerEventsRestore.test.ts", "src/components/dialog/content/setting/UsageLogsTable.test.ts", "src/components/graph/SelectionToolbox.test.ts", "src/components/node/NodePreview.test.ts", @@ -13,7 +11,6 @@ "src/components/rightSidePanel/errors/ErrorNodeCard.test.ts", "src/components/rightSidePanel/errors/MissingPackGroupRow.test.ts", "src/components/rightSidePanel/errors/TabErrors.test.ts", - "src/components/searchbox/NodeSearchBoxPopover.test.ts", "src/components/sidebar/SideToolbar.test.ts", "src/main.ts", "src/platform/missingModel/components/MissingModelCard.test.ts", diff --git a/src/components/dialog/GlobalDialog.test.ts b/src/components/dialog/GlobalDialog.test.ts index c0a39f2aed0..6519faf9546 100644 --- a/src/components/dialog/GlobalDialog.test.ts +++ b/src/components/dialog/GlobalDialog.test.ts @@ -1,6 +1,5 @@ import { render, screen, waitFor } from '@testing-library/vue' import userEvent from '@testing-library/user-event' -import PrimeVue from 'primevue/config' import { describe, expect, it, vi } from 'vitest' import { defineComponent, h, nextTick } from 'vue' import { createI18n } from 'vue-i18n' @@ -10,7 +9,7 @@ import GlobalDialog from '@/components/dialog/GlobalDialog.vue' import { onRekaFocusOutside, onRekaPointerDownOutside -} from '@/components/dialog/rekaPrimeVueBridge' +} from '@/components/dialog/dialogDismissGuards' import UiDialog from '@/components/ui/dialog/Dialog.vue' import UiDialogOverlay from '@/components/ui/dialog/DialogOverlay.vue' import UiDialogPortal from '@/components/ui/dialog/DialogPortal.vue' @@ -119,11 +118,11 @@ const ClosedNonModalDialog = defineComponent({ function mountDialog() { return render(GlobalDialog, { - global: { plugins: [PrimeVue, i18n] } + global: { plugins: [i18n] } }) } -describe('GlobalDialog Reka parity with PrimeVue', () => { +describe('GlobalDialog', () => { it('omits the close button when closable is false', async () => { mountDialog() const store = useDialogStore() @@ -387,7 +386,7 @@ describe('GlobalDialog Reka overlay scrim', () => { it('keeps checkout open on the scrim while preserving explicit dismissal', async () => { render(GlobalDialog, { global: { - plugins: [PrimeVue, i18n], + plugins: [i18n], stubs: { UnifiedPricingTable: true, SubscriptionAddPaymentPreviewWorkspace: true, @@ -515,7 +514,8 @@ describe('shouldPreventRekaDismiss', () => { } it.for([ - ['class', 'p-overlay-mask'], + ['data-reka-popper-content-wrapper', ''], + ['role', 'listbox'], ['data-toast-kind', 'info'], ['data-toast-dock', ''] ] as const)( @@ -535,7 +535,7 @@ describe('shouldPreventRekaDismiss', () => { } ) - it('allows dismiss when target is outside any PrimeVue overlay', () => { + it('allows dismiss when target is outside any portaled layer', () => { const event = makeEvent(document.body) onRekaPointerDownOutside({ dismissableMask: undefined }, event) expect(event.defaultPrevented).toBe(false) @@ -575,19 +575,22 @@ describe('shouldPreventRekaDismiss', () => { expect(event.defaultPrevented).toBe(true) }) - it('focus-outside on a sibling PrimeVue dialog portal does not dismiss the parent', () => { - const overlay = document.createElement('div') - overlay.className = 'p-dialog' - const inner = document.createElement('button') - overlay.appendChild(inner) - document.body.appendChild(overlay) + it.for(['listbox', 'menu'])( + 'focus-outside on a sibling %s portal does not dismiss the parent', + (role) => { + const overlay = document.createElement('div') + overlay.setAttribute('role', role) + const inner = document.createElement('button') + overlay.appendChild(inner) + document.body.appendChild(overlay) - const event = makeEvent(inner) - onRekaFocusOutside(event) + const event = makeEvent(inner) + onRekaFocusOutside(event) - expect(event.defaultPrevented).toBe(true) - overlay.remove() - }) + expect(event.defaultPrevented).toBe(true) + overlay.remove() + } + ) it('focus-outside on a toast does not dismiss the parent', () => { const toast = document.createElement('div') diff --git a/src/components/dialog/GlobalDialog.vue b/src/components/dialog/GlobalDialog.vue index 81ad2796e71..61591ff5bf0 100644 --- a/src/components/dialog/GlobalDialog.vue +++ b/src/components/dialog/GlobalDialog.vue @@ -115,7 +115,7 @@ import DialogTitle from '@/components/ui/dialog/DialogTitle.vue' import { onRekaFocusOutside, onRekaPointerDownOutside -} from '@/components/dialog/rekaPrimeVueBridge' +} from '@/components/dialog/dialogDismissGuards' import { vRekaZIndex } from '@/components/dialog/vRekaZIndex' import type { DialogInstance } from '@/stores/dialogStore' import { useDialogStore } from '@/stores/dialogStore' diff --git a/src/components/dialog/bodyPointerEventsRestore.test.ts b/src/components/dialog/bodyPointerEventsRestore.test.ts index 770800ca484..d1360d7c664 100644 --- a/src/components/dialog/bodyPointerEventsRestore.test.ts +++ b/src/components/dialog/bodyPointerEventsRestore.test.ts @@ -1,5 +1,4 @@ import { render } from '@testing-library/vue' -import PrimeVue from 'primevue/config' import { DropdownMenuContent, DropdownMenuItem, @@ -54,7 +53,7 @@ const BodyWithMenu = defineComponent({ const settle = () => new Promise((resolve) => setTimeout(resolve, 0)) function mountDialogHost() { - render(GlobalDialog, { global: { plugins: [PrimeVue, i18n] } }) + render(GlobalDialog, { global: { plugins: [i18n] } }) return useDialogStore() } diff --git a/src/components/dialog/rekaPrimeVueBridge.ts b/src/components/dialog/dialogDismissGuards.ts similarity index 81% rename from src/components/dialog/rekaPrimeVueBridge.ts rename to src/components/dialog/dialogDismissGuards.ts index 05b4008ab44..64465a30304 100644 --- a/src/components/dialog/rekaPrimeVueBridge.ts +++ b/src/components/dialog/dialogDismissGuards.ts @@ -1,10 +1,4 @@ -// PrimeVue Dialogs (the node search box and GlobalDialog's `primevue` -// renderer) teleport to body. Reka treats clicks on body-portaled elements as -// outside its dialog and would auto-dismiss on the first interaction. Treat a -// click on a PrimeVue Dialog or its mask as inside. -const PRIMEVUE_OVERLAY_SELECTORS = '.p-overlay-mask, .p-dialog' - -// Reka portals its own dialogs / popovers / menus into the body too. When a +// Reka portals its dialogs / popovers / menus into the body. When a // nested Reka layer opens on top of a non-modal parent, the parent's // DismissableLayer sees the focus shift / pointer-down as "outside" and would // dismiss itself. These selectors cover the portaled roots so we can treat @@ -17,7 +11,7 @@ const REKA_PORTAL_SELECTORS = // ordinary scrim click. const TOAST_SELECTORS = '[data-toast-kind], [data-toast-dock]' -const OUTSIDE_LAYER_SELECTORS = `${PRIMEVUE_OVERLAY_SELECTORS}, ${REKA_PORTAL_SELECTORS}, ${TOAST_SELECTORS}` +const OUTSIDE_LAYER_SELECTORS = `${REKA_PORTAL_SELECTORS}, ${TOAST_SELECTORS}` type OutsideEvent = CustomEvent<{ originalEvent: Event }> @@ -52,7 +46,7 @@ export function onRekaPointerDownOutside( } // Focus / interact-outside fires when focus moves to a sibling portal (a -// nested Reka or PrimeVue dialog teleported to body). Without this guard a +// nested dialog teleported to body). Without this guard a // non-modal Reka dialog would dismiss itself the moment a nested dialog // receives focus. // diff --git a/src/composables/usePopoverSizing.test.ts b/src/composables/usePopoverSizing.test.ts index c5c91b30c19..76786202ea5 100644 --- a/src/composables/usePopoverSizing.test.ts +++ b/src/composables/usePopoverSizing.test.ts @@ -38,43 +38,31 @@ describe('useOverlayChildStyle', () => { it('renders above the closest Reka dialog', () => { const { overlayScopeRef, contentStyle } = mountComposable() - overlayScopeRef.value = appendOverlay('reka-dialog', 5000) + overlayScopeRef.value = appendOverlay(5000) expect(contentStyle.value).toEqual({ zIndex: 5001 }) }) - it('renders above the closest PrimeVue overlay mask', () => { - const { overlayScopeRef, contentStyle } = mountComposable() - - overlayScopeRef.value = appendOverlay('prime-overlay', 4200) - - expect(contentStyle.value).toEqual({ zIndex: 4201 }) - }) - it('does not drop below the Reka select overlay z-index floor', () => { const { overlayScopeRef, contentStyle } = mountComposable() - overlayScopeRef.value = appendOverlay('reka-dialog', 1200) + overlayScopeRef.value = appendOverlay(1200) expect(contentStyle.value).toEqual({ zIndex: 3000 }) }) - it('preserves existing stacking when the PrimeVue overlay z-index is not numeric', () => { + it('preserves existing stacking when the dialog z-index is not numeric', () => { const { overlayScopeRef, contentStyle } = mountComposable() - overlayScopeRef.value = appendOverlay('reka-dialog') + overlayScopeRef.value = appendOverlay() expect(contentStyle.value).toEqual({}) }) }) -function appendOverlay( - kind: 'reka-dialog' | 'prime-overlay', - zIndex?: number -): HTMLElement { +function appendOverlay(zIndex?: number): HTMLElement { const overlay = document.createElement('div') - if (kind === 'reka-dialog') overlay.dataset.rekaDialogContent = '' - else overlay.className = 'p-overlay-mask' + overlay.dataset.rekaDialogContent = '' if (zIndex !== undefined) { overlay.style.zIndex = String(zIndex) } diff --git a/src/composables/usePopoverSizing.ts b/src/composables/usePopoverSizing.ts index da312286418..3c71d219488 100644 --- a/src/composables/usePopoverSizing.ts +++ b/src/composables/usePopoverSizing.ts @@ -42,9 +42,7 @@ export function useOverlayChildStyle(): { } { const overlayScopeRef = ref(null) const contentStyle = computed(() => { - const overlay = overlayScopeRef.value?.closest( - '[data-reka-dialog-content], .p-overlay-mask' - ) + const overlay = overlayScopeRef.value?.closest('[data-reka-dialog-content]') if (!overlay) return {} const zIndex = Number.parseInt(getComputedStyle(overlay).zIndex, 10) From 289fceb19693edbf2e4756f3d1f367e5f196ef73 Mon Sep 17 00:00:00 2001 From: Alexander Brown Date: Mon, 5 Oct 2026 07:36:37 +0000 Subject: [PATCH 08/52] refactor: rename leftover primeVueOverlay locals Amp-Thread-ID: https://ampcode.com/threads/T-01a10ae9-e82c-744e-bec7-5dd878c1f3f0 --- src/components/dialog/content/setting/KeybindingPanel.vue | 3 --- src/platform/assets/components/AssetBrowserModal.vue | 6 +++--- src/platform/assets/components/UploadModelConfirmation.vue | 6 +++--- .../extensions/manager/components/manager/ManagerDialog.vue | 6 +++--- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/components/dialog/content/setting/KeybindingPanel.vue b/src/components/dialog/content/setting/KeybindingPanel.vue index 7cc8f1a00a0..03307503c82 100644 --- a/src/components/dialog/content/setting/KeybindingPanel.vue +++ b/src/components/dialog/content/setting/KeybindingPanel.vue @@ -112,7 +112,6 @@ import TableSortHead from '@/components/ui/table/TableSortHead.vue' import { filterByQuery, sortByText } from '@/components/ui/table/tableUtils' import type { TableSortDirection } from '@/components/ui/table/tableUtils' import { useEditKeybindingDialog } from '@/composables/useEditKeybindingDialog' -import { useOverlayChildStyle } from '@/composables/usePopoverSizing' import type { KeybindingImpl } from '@/platform/keybindings/keybinding' import { useKeybindingService } from '@/platform/keybindings/keybindingService' import { useKeybindingStore } from '@/platform/keybindings/keybindingStore' @@ -137,8 +136,6 @@ const commandStore = useCommandStore() const dialogStore = useDialogStore() const { t } = useI18n() const toast = useToast() -const primeVueOverlay = useOverlayChildStyle() -const keybindingOverlayContentStyle = primeVueOverlay.contentStyle const presetNames = ref([]) diff --git a/src/platform/assets/components/AssetBrowserModal.vue b/src/platform/assets/components/AssetBrowserModal.vue index 4c543362958..2dc18b5de74 100644 --- a/src/platform/assets/components/AssetBrowserModal.vue +++ b/src/platform/assets/components/AssetBrowserModal.vue @@ -24,7 +24,7 @@