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

Merge remote-tracking branch 'origin/main' into staging

Browse Source
This commit is contained in:
Andrey Antukh 2026-07-28 10:42:03 +02:00
commit 458fa41036
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