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

🐛 Fix empty text shape not being removed (#10541)

Browse Source
This commit is contained in:
Belén Albeza 2026-07-06 15:42:42 +02:00 committed by GitHub
parent a4ba5fc2e0
commit 83d2edf256
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
frontend/playwright/ui/specs/text-editor-v3.spec.js
View File

@ -67,3 +67,44 @@ test.describe("BUG 10502 - Mixed families and variants", () => {
});
});
test.describe("BUG 10530 - Empty text box left behind when leaving the editor", () => {
test("An empty text box is removed when leaving the editor by clicking outside", async ({
page,
}) => {
const workspace = new WasmWorkspacePage(page, { textEditor: true });
await workspace.setupEmptyFile();
await workspace.goToWorkspace();
await workspace.waitForFirstRender();
const layerRows = workspace.layers.getByTestId("layer-row");
await expect(layerRows).toHaveCount(0);
// Draw an empty text box
await workspace.createTextShape(200, 150, 320, 210);
// The shape exists while it is being edited
await expect(layerRows).toHaveCount(1);
// Leave the editor by clicking outside
await workspace.clickAt(500, 400);
await expect(layerRows).toHaveCount(0);
});
test("A non-empty text box is kept when leaving the editor by clicking outside", async ({
page,
}) => {
const workspace = new WasmWorkspacePage(page, { textEditor: true });
await workspace.setupEmptyFile();
await workspace.goToWorkspace();
await workspace.waitForFirstRender();
const layerRows = workspace.layers.getByTestId("layer-row");
// A text box with content must survive leaving the editor by clicking outside.
await workspace.createTextShape(200, 150, 320, 210, "hello");
await workspace.clickAt(500, 400);
await expect(layerRows).toHaveCount(1);
});
});

4
frontend/src/app/main/data/workspace/edition.cljs
View File

@ -10,7 +10,6 @@
[app.main.data.workspace.path.common :as dwpc]
[app.main.features :as features]
[app.render-wasm.api :as wasm.api]
[app.render-wasm.text-editor :as text-editor]
[beicon.v2.core :as rx]
[potok.v2.core :as ptk]))
@ -66,6 +65,7 @@
ptk/EffectEvent
(effect [_ state _]
(when (features/active-feature? state "text-editor-wasm/v1")
(text-editor/text-editor-dispose)
;; NOTE: the WASM text editor is disposed by the v3 editor component on
;; unmount, *after* it finalizes its content.
(wasm.api/request-render "clear-edition-mode")))))

12
frontend/src/app/main/ui/workspace/shapes/text/v3_editor.cljs
View File

@ -318,11 +318,13 @@
(fn []
(when-let [node (mf/ref-val contenteditable-ref)]
(.focus node))
;; Explicitly call on-blur here instead of relying on browser blur events,
;; because in Firefox blur is not reliably fired when leaving the text editor
;; by clicking elsewhere. The component does unmount when the shape is
;; deselected, so we can safely call the blur handler here to finalize the editor.
on-blur))
;; On unmount, finalize the editor content and then dispose the WASM editor.
;; We finalize on unmount instead of relying on the browser blur event, because
;; it was not being reliable (timing issues, Firefox issues…)
(fn []
(on-blur)
(text-editor/text-editor-dispose)
(wasm.api/request-render "text-editor-dispose"))))
(mf/use-effect
(fn []