github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-08-01 19:06:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrey Antukh 2026-06-23 15:28:42 +02:00
commit fa9012e55f
4 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/app/common/flags.cljc
View File

@ -203,7 +203,8 @@
:enable-render-switch :enable-render-switch
:enable-render-wasm-info :enable-render-wasm-info
:enable-available-viewer-wasm :enable-available-viewer-wasm
:enable-background-blur]) :enable-background-blur
:enable-token-combobox])
(defn parse (defn parse
[& flags] [& flags]

5
frontend/playwright/ui/specs/tokens/apply.spec.js
View File

@ -186,7 +186,7 @@ test.describe("Tokens: Apply token", () => {
await tokensSidebar.getByRole("button", { name: "Full" }).click(); await tokensSidebar.getByRole("button", { name: "Full" }).click();
const tokenRow = workspacePage.rightSidebar.getByLabel('Full'); const tokenRow = workspacePage.rightSidebar.getByLabel("Full");
await expect(tokenRow).toBeVisible(); await expect(tokenRow).toBeVisible();
}); });
@ -1396,7 +1396,7 @@ test.describe("Numeric Input and Token Integration Tests", () => {
// Setup the workspace with token features enabled // Setup the workspace with token features enabled
const { workspacePage, tokensSidebar, tokenContextMenuForToken } = const { workspacePage, tokensSidebar, tokenContextMenuForToken } =
await setupTokensFileRender(page, { await setupTokensFileRender(page, {
flags: ["enable-token-combobox", "enable-feature-token-input"], flags: ["enable-feature-token-input"],
}); });
// Transform a rectangle into a flex container to expose gap properties // Transform a rectangle into a flex container to expose gap properties
@ -1444,6 +1444,7 @@ test.describe("Numeric Input and Token Integration Tests", () => {
await layoutSection await layoutSection
.getByRole("button", { name: "Show 4 sided padding options" }) .getByRole("button", { name: "Show 4 sided padding options" })
.click(); .click();
await workspacePage.page.waitForTimeout(500);
await expect( await expect(
page page

35
frontend/playwright/ui/specs/tokens/crud.spec.js
View File

@ -1932,7 +1932,7 @@ test("User disables the current set but token still have resolved values shown i
}); });
test.describe("User can't create groups that clash with token names", () => { test.describe("User can't create groups that clash with token names", () => {
const createBadToken = async (page, type, name, textFieldName, value) => { const createBadToken = async (page, type, name, textFieldName, value, inputType) => {
const tokensTabPanel = page.getByRole("tabpanel", { name: "tokens" }); const tokensTabPanel = page.getByRole("tabpanel", { name: "tokens" });
const { tokensUpdateCreateModal } = await setupTokensFileRender(page, { const { tokensUpdateCreateModal } = await setupTokensFileRender(page, {
@ -1950,7 +1950,7 @@ test.describe("User can't create groups that clash with token names", () => {
await nameField.fill(name); await nameField.fill(name);
// Fill the value // Fill the value
const valueField = tokensUpdateCreateModal.getByRole("textbox", { const valueField = tokensUpdateCreateModal.getByRole(inputType, {
name: textFieldName, name: textFieldName,
}); });
await valueField.fill(value); await valueField.fill(value);
@ -1981,7 +1981,7 @@ test.describe("User can't create groups that clash with token names", () => {
await createSet(tokenThemesSetsSidebar, "Second set"); await createSet(tokenThemesSetsSidebar, "Second set");
await createBadToken(page, "Border Radius", "rad1.bad", "Value", "10"); await createBadToken(page, "Border Radius", "rad1.bad", "Value", "10", "combobox");
}); });
test("User can't create Color token with group name that clashes with existing token", async ({ test("User can't create Color token with group name that clashes with existing token", async ({
@ -1996,7 +1996,7 @@ test.describe("User can't create groups that clash with token names", () => {
await createSet(tokenThemesSetsSidebar, "Second set"); await createSet(tokenThemesSetsSidebar, "Second set");
await createBadToken(page, "Color", "col1.bad", "Value", "red"); await createBadToken(page, "Color", "col1.bad", "Value", "red", "textbox");
}); });
test("User can't create Dimensions token with group name that clashes with existing token", async ({ test("User can't create Dimensions token with group name that clashes with existing token", async ({
@ -2011,7 +2011,7 @@ test.describe("User can't create groups that clash with token names", () => {
await createSet(tokenThemesSetsSidebar, "Second set"); await createSet(tokenThemesSetsSidebar, "Second set");
await createBadToken(page, "Dimensions", "dim1.bad", "Value", "100"); await createBadToken(page, "Dimensions", "dim1.bad", "Value", "100", "combobox");
}); });
test("User can't create Font Size token with group name that clashes with existing token", async ({ test("User can't create Font Size token with group name that clashes with existing token", async ({
@ -2026,7 +2026,7 @@ test.describe("User can't create groups that clash with token names", () => {
await createSet(tokenThemesSetsSidebar, "Second set"); await createSet(tokenThemesSetsSidebar, "Second set");
await createBadToken(page, "Font Size", "fsiz1.bad", "Value", "16"); await createBadToken(page, "Font Size", "fsiz1.bad", "Value", "16", "combobox");
}); });
test("User can't create Font Weight token with group name that clashes with existing token", async ({ test("User can't create Font Weight token with group name that clashes with existing token", async ({
@ -2041,7 +2041,7 @@ test.describe("User can't create groups that clash with token names", () => {
await createSet(tokenThemesSetsSidebar, "Second set"); await createSet(tokenThemesSetsSidebar, "Second set");
await createBadToken(page, "Font Weight", "wei1.bad", "Value", "400"); await createBadToken(page, "Font Weight", "wei1.bad", "Value", "400", "combobox");
}); });
test("User can't create Letter Spacing token with group name that clashes with existing token", async ({ test("User can't create Letter Spacing token with group name that clashes with existing token", async ({
@ -2056,7 +2056,7 @@ test.describe("User can't create groups that clash with token names", () => {
await createSet(tokenThemesSetsSidebar, "Second set"); await createSet(tokenThemesSetsSidebar, "Second set");
await createBadToken(page, "Letter Spacing", "lspa1.bad", "Value", "1"); await createBadToken(page, "Letter Spacing", "lspa1.bad", "Value", "1", "combobox");
}); });
test("User can't create Number token with group name that clashes with existing token", async ({ test("User can't create Number token with group name that clashes with existing token", async ({
@ -2071,7 +2071,7 @@ test.describe("User can't create groups that clash with token names", () => {
await createSet(tokenThemesSetsSidebar, "Second set"); await createSet(tokenThemesSetsSidebar, "Second set");
await createBadToken(page, "Number", "num1.bad", "Value", "10"); await createBadToken(page, "Number", "num1.bad", "Value", "10", "combobox");
}); });
test("User can't create Rotation token with group name that clashes with existing token", async ({ test("User can't create Rotation token with group name that clashes with existing token", async ({
@ -2086,7 +2086,7 @@ test.describe("User can't create groups that clash with token names", () => {
await createSet(tokenThemesSetsSidebar, "Second set"); await createSet(tokenThemesSetsSidebar, "Second set");
await createBadToken(page, "Rotation", "rot1.bad", "Value", "90"); await createBadToken(page, "Rotation", "rot1.bad", "Value", "90", "combobox");
}); });
test("User can't create Sizing token with group name that clashes with existing token", async ({ test("User can't create Sizing token with group name that clashes with existing token", async ({
@ -2101,7 +2101,7 @@ test.describe("User can't create groups that clash with token names", () => {
await createSet(tokenThemesSetsSidebar, "Second set"); await createSet(tokenThemesSetsSidebar, "Second set");
await createBadToken(page, "Sizing", "siz1.bad", "Value", "100"); await createBadToken(page, "Sizing", "siz1.bad", "Value", "100", "combobox");
}); });
test("User can't create Spacing token with group name that clashes with existing token", async ({ test("User can't create Spacing token with group name that clashes with existing token", async ({
@ -2116,7 +2116,7 @@ test.describe("User can't create groups that clash with token names", () => {
await createSet(tokenThemesSetsSidebar, "Second set"); await createSet(tokenThemesSetsSidebar, "Second set");
await createBadToken(page, "Spacing", "spa1.bad", "Value", "10"); await createBadToken(page, "Spacing", "spa1.bad", "Value", "10", "combobox");
}); });
test("User can't create Stroke Width token with group name that clashes with existing token", async ({ test("User can't create Stroke Width token with group name that clashes with existing token", async ({
@ -2131,7 +2131,7 @@ test.describe("User can't create groups that clash with token names", () => {
await createSet(tokenThemesSetsSidebar, "Second set"); await createSet(tokenThemesSetsSidebar, "Second set");
await createBadToken(page, "Stroke Width", "str1.bad", "Value", "2"); await createBadToken(page, "Stroke Width", "str1.bad", "Value", "2", "combobox");
}); });
test("User can't create Text Case token with group name that clashes with existing token", async ({ test("User can't create Text Case token with group name that clashes with existing token", async ({
@ -2146,7 +2146,7 @@ test.describe("User can't create groups that clash with token names", () => {
await createSet(tokenThemesSetsSidebar, "Second set"); await createSet(tokenThemesSetsSidebar, "Second set");
await createBadToken(page, "Text Case", "cas1.bad", "Value", "uppercase"); await createBadToken(page, "Text Case", "cas1.bad", "Value", "uppercase", "combobox");
}); });
test("User can't create Text Decoration token with group name that clashes with existing token", async ({ test("User can't create Text Decoration token with group name that clashes with existing token", async ({
@ -2167,6 +2167,7 @@ test.describe("User can't create groups that clash with token names", () => {
"dec1.bad", "dec1.bad",
"Value", "Value",
"strike-through", "strike-through",
"combobox"
); );
}); });
@ -2684,7 +2685,7 @@ test("BUG: 14262 Token pill must be highlighted when value references a token in
"Border radius", "Border radius",
"base-radius", "base-radius",
"Value", "Value",
"textbox", "combobox",
"20", "20",
); );
await createToken( await createToken(
@ -2692,7 +2693,7 @@ test("BUG: 14262 Token pill must be highlighted when value references a token in
"Border radius", "Border radius",
"ref-base", "ref-base",
"Value", "Value",
"textbox", "combobox",
"{base-radius}", "{base-radius}",
); );
@ -2724,7 +2725,7 @@ test("BUG: 14262 Token pill must be highlighted when value references a token in
"Border radius", "Border radius",
"new-ref", "new-ref",
"Value", "Value",
"textbox", "combobox",
"{base-radius}", "{base-radius}",
); );

4
frontend/playwright/ui/specs/tokens/tree.spec.js
View File

@ -303,9 +303,9 @@ test("User can see an error on token pill and token modal form when token has an
.getByRole("checkbox") .getByRole("checkbox")
.click(); .click();
await createToken(page, "Border radius", "a.b", "Value", "textbox", "23"); await createToken(page, "Border radius", "a.b", "Value", "combobox", "23");
await tokenThemesSetsSidebar.getByRole("button", { name: "first" }).click(); await tokenThemesSetsSidebar.getByRole("button", { name: "first" }).click();
await createToken(page, "Border radius", "a", "Value", "textbox", "25"); await createToken(page, "Border radius", "a", "Value", "combobox", "25");
await tokenThemesSetsSidebar.getByRole("button", { name: "second" }).click(); await tokenThemesSetsSidebar.getByRole("button", { name: "second" }).click();
const brokenTokenPill = tokensSidebar.getByRole("button", { const brokenTokenPill = tokensSidebar.getByRole("button", {