diff --git a/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/dropped-workflow-url-hidream-dev-example-png-chromium-linux.png b/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/dropped-workflow-url-hidream-dev-example-png-chromium-linux.png index eb4903bf84..f58f438955 100644 Binary files a/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/dropped-workflow-url-hidream-dev-example-png-chromium-linux.png and b/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/dropped-workflow-url-hidream-dev-example-png-chromium-linux.png differ diff --git a/browser_tests/tests/noteNode.spec.ts-snapshots/note-nodes-chromium-linux.png b/browser_tests/tests/noteNode.spec.ts-snapshots/note-nodes-chromium-linux.png index 509067e9fb..c511957c4d 100644 Binary files a/browser_tests/tests/noteNode.spec.ts-snapshots/note-nodes-chromium-linux.png and b/browser_tests/tests/noteNode.spec.ts-snapshots/note-nodes-chromium-linux.png differ diff --git a/packages/design-system/src/css/style.css b/packages/design-system/src/css/style.css index ebcdd35169..95084d28fa 100644 --- a/packages/design-system/src/css/style.css +++ b/packages/design-system/src/css/style.css @@ -509,36 +509,40 @@ body { .comfy-markdown { /* We assign the textarea and the Tiptap editor to the same CSS grid area to stack them on top of one another. */ display: grid; -} + & > textarea, + .tiptap { + grid-area: 1 / 1 / 2 / 2; + } -.comfy-markdown > textarea { - grid-area: 1 / 1 / 2 / 2; -} + & > textarea { + opacity: 0; + pointer-events: none; + } -.comfy-markdown .tiptap { - grid-area: 1 / 1 / 2 / 2; - background-color: var(--comfy-input-bg); - color: var(--input-text); - overflow: hidden; - overflow-y: auto; - resize: none; - border: none; - box-sizing: border-box; - font-size: var(--comfy-textarea-font-size); - height: 100%; - padding: 0.5em; -} + &.editing { + & > textarea { + opacity: 1; + pointer-events: all; + } -.comfy-markdown.editing .tiptap { - display: none; -} + .tiptap { + opacity: 0; + pointer-events: none; + } + } -.comfy-markdown .tiptap :first-child { - margin-top: 0; -} + .tiptap { + overflow-y: auto; + font-size: var(--comfy-textarea-font-size); -.comfy-markdown .tiptap :last-child { - margin-bottom: 0; + :first-child { + margin-top: 0; + } + + :last-child { + margin-bottom: 0; + } + } } .comfy-markdown .tiptap blockquote { diff --git a/src/lib/litegraph/src/LGraphCanvas.ts b/src/lib/litegraph/src/LGraphCanvas.ts index 4f8b94f9cc..8c902527ec 100644 --- a/src/lib/litegraph/src/LGraphCanvas.ts +++ b/src/lib/litegraph/src/LGraphCanvas.ts @@ -2169,7 +2169,7 @@ export class LGraphCanvas } } - processMouseDown(e: PointerEvent): void { + processMouseDown(e: MouseEvent): void { if ( this.dragZoomEnabled && e.ctrlKey && diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget.ts index c3f200efa6..c54d13bdfe 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget.ts @@ -53,14 +53,7 @@ function addMarkdownWidget( widget.inputEl = inputEl widget.options.minNodeSize = [400, 200] - inputEl.addEventListener('pointerdown', (event: PointerEvent) => { - if (event.button !== 0) { - app.canvas.processMouseDown(event) - return - } - if (event.target instanceof HTMLAnchorElement) { - return - } + inputEl.addEventListener('dblclick', () => { inputEl.classList.add('editing') setTimeout(() => { textarea.focus()