github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-07-26 16:08:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix text edition state when relesecting (#10798)

Browse Source 
* 🐛 Fix text edition state when relesecting

* 🐛 Fix CI
This commit is contained in:
Eva Marco 2026-07-24 12:15:16 +02:00 committed by GitHub
parent d5d6c61ba4
commit d94b139071
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 51 additions and 3 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,6 +344,7 @@ 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",

47
frontend/playwright/ui/specs/tokens/text.spec.js
View File

@ -1,4 +1,7 @@
import { test, expect } from "@playwright/test";
import {
unfoldTokenType,
} from "./helpers";
import { WasmWorkspacePage } from "../../pages/WasmWorkspacePage";
test.beforeEach(async ({ page }) => {
@ -27,3 +30,47 @@ test("BUG 13958 - Fill token gets detached when editing text shape", async ({ pa
// Assert token is still attached to the shape
await expect(workspacePage.rightSidebar.getByLabel("xx.alias.color.text.default", { exact: true })).toBeVisible();
});
test("Selection change clears text-edition mode so tokens can be applied", async ({ page }) => {
const workspacePage = new WasmWorkspacePage(page);
await workspacePage.setupEmptyFile();
await workspacePage.mockGetFile("workspace/get-file-13958.json");
await workspacePage.goToWorkspace();
await workspacePage.rectShapeButton.click();
await workspacePage.clickWithDragViewportAt(128, 128, 200, 100);
await workspacePage.clickLeafLayer("Rectangle");
// Enter text editing on the text layer
await workspacePage.clickLeafLayer("Design tokens are a set");
await workspacePage.page.keyboard.press("Enter");
await expect(workspacePage.page.getByTestId("text-editor")).toBeVisible();
// Shift-click another layer to change selection while editing
await workspacePage.layers
.getByTestId("layer-row")
.filter({ hasText: "Rectangle" })
.click({ modifiers: ["Shift"] });
// Text editor should close because selection change emits :interrupt
await expect(workspacePage.page.getByTestId("text-editor")).not.toBeAttached();
// Open tokens tab and try to apply a fill token — should succeed without warning
await page.getByRole("tab", { name: "Tokens" }).click();
const tokensSidebar = page.getByTestId("tokens-sidebar");
await unfoldTokenType(tokensSidebar, "color");
// Right-click a color token and apply as fill
await tokensSidebar
.getByRole('button', { name: '#934846 xx.global.color.red.' })
.click({ button: "right" });
await workspacePage.tokenContextMenuForToken.getByText("Fill").click();
// Verify no warning toast appeared about text editing
await expect(
page.getByRole("alert").filter({
hasText: /Tokens can't be applied while editing text/i,
}),
).not.toBeVisible();
});

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

@ -221,7 +221,7 @@
(ptk/reify ::deselect-shape
ptk/WatchEvent
(watch [_ _ _]
(rx/of ::dwsp/interrupt))
(rx/of :interrupt ::dwsp/interrupt))
ptk/UpdateEvent
(update [_ state]
(-> state
@ -236,7 +236,7 @@
(ptk/reify ::shift-select-shapes
ptk/WatchEvent
(watch [_ _ _]
(rx/of ::dwsp/interrupt))
(rx/of :interrupt ::dwsp/interrupt))
ptk/UpdateEvent
(update [_ state]
(let [objects (or objects (dsh/lookup-page-objects state))
@ -275,7 +275,7 @@
;; the event loop
expand-s (->> (rx/of (dwc/expand-all-parents ids objects))
(rx/observe-on :async))
interrupt-s (rx/of ::dwsp/interrupt)]
interrupt-s (rx/of :interrupt ::dwsp/interrupt)]
(rx/merge expand-s interrupt-s)))))
(defn select-all