diff --git a/browser_tests/tests/interaction.spec.ts b/browser_tests/tests/interaction.spec.ts index 607795ff058..4dc6358bfe2 100644 --- a/browser_tests/tests/interaction.spec.ts +++ b/browser_tests/tests/interaction.spec.ts @@ -351,16 +351,9 @@ test.describe('Node Interaction', () => { await expect(comfyPage.canvas).toHaveScreenshot( 'text-encode-toggled-off.png' ) - // Re-expand: clicking the canvas toggler on a collapsed node is - // unreliable because DOM widget overlays may intercept the pointer - // event. Use programmatic collapse() for the expand step. - // TODO(#11006): Restore click-to-expand once DOM widget overlay pointer interception is fixed - await comfyPage.page.evaluate((nodeId) => { - const node = window.app!.graph.getNodeById(nodeId)! - node.collapse() - window.app!.canvas.setDirty(true, true) - }, targetNode.id) - await comfyPage.nextFrame() + await comfyPage.canvas.click({ + position: togglerPos + }) await expect.poll(() => targetNode.isCollapsed()).toBe(false) // Move mouse away to avoid hover highlight differences. await comfyPage.canvasOps.moveMouseToEmptyArea() diff --git a/src/components/graph/widgets/DomWidget.test.ts b/src/components/graph/widgets/DomWidget.test.ts index 16f8266faf3..7659f6da31b 100644 --- a/src/components/graph/widgets/DomWidget.test.ts +++ b/src/components/graph/widgets/DomWidget.test.ts @@ -114,4 +114,21 @@ describe('DomWidget disabled style', () => { expect(root.style.pointerEvents).toBe('none') expect(root.style.opacity).toBe('0.5') }) + + it('disables pointer events when widget is not visible', async () => { + const widgetState = createWidgetState(false) + widgetState.visible = false + const { container } = render(DomWidget, { + props: { + widgetState + } + }) + + widgetState.zIndex = 3 + await nextTick() + + // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access + const root = container.querySelector('.dom-widget') as HTMLElement + expect(root.style.pointerEvents).toBe('none') + }) }) diff --git a/src/components/graph/widgets/DomWidget.vue b/src/components/graph/widgets/DomWidget.vue index 24fce2755a1..381c79d8a34 100644 --- a/src/components/graph/widgets/DomWidget.vue +++ b/src/components/graph/widgets/DomWidget.vue @@ -113,7 +113,10 @@ function composeStyle() { ...positionStyle.value, ...(enableDomClipping.value ? clippingStyle.value : {}), zIndex: widgetState.zIndex, - pointerEvents: widgetState.readonly || isDisabled ? 'none' : 'auto', + pointerEvents: + !widgetState.visible || widgetState.readonly || isDisabled + ? 'none' + : 'auto', opacity: isDisabled ? 0.5 : 1 } }