github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-07-28 17:06:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix area selection aborted by select-shapes interrupt (#10870)

Browse Source 
* 🐛 Fix area selection aborted by select-shapes interrupt

Only emit :interrupt from select-shapes when edition mode is active.
Unconditional :interrupt (from #10798) made drag-stopper cancel the
marquee mid-drag.

* 🔧 Fix text editor v2 fill e2e test on develop
This commit is contained in:
Alejandro Alonso 2026-07-28 10:26:31 +02:00 committed by GitHub
parent aad9bc8f65
commit 6063a45c3c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/playwright/ui/specs/text-editor-v2.spec.js
View File

@ -344,7 +344,6 @@ test("Preserves empty fill after editing text without changes", async ({ page })
await workspace.createTextShape(190, 150, 300, 200, initialText);
await workspace.textEditor.stopEditing();
await workspace.page.getByRole('button', { name: 'Fill', exact: true }).click();
const fillColorButton = workspace.page.getByRole("button", {
name: "#000000",

6
frontend/src/app/main/data/workspace/selection.cljs
View File

@ -275,7 +275,11 @@
;; the event loop
expand-s (->> (rx/of (dwc/expand-all-parents ids objects))
(rx/observe-on :async))
interrupt-s (rx/of :interrupt ::dwsp/interrupt)]
;; :interrupt aborts drag-stopper; only emit it when clearing edition
;; (unconditional emit broke marquee selection after #10798).
interrupt-s (if (some? (dm/get-in state [:workspace-local :edition]))
(rx/of :interrupt ::dwsp/interrupt)
(rx/of ::dwsp/interrupt))]
(rx/merge expand-s interrupt-s)))))
(defn select-all