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

This commit is contained in:
Alejandro Alonso 2025-03-07 07:54:05 +01:00
commit 0d11bafb57
7 changed files with 18 additions and 3 deletions

View file

@ -30,11 +30,13 @@
### :heart: Community contributions (Thank you!) ### :heart: Community contributions (Thank you!)
### :sparkles: New features ### :sparkles: New features
- When the workspace is empty, set default the board creation tool [Taiga #9425](https://tree.taiga.io/project/penpot/us/9425)
### :bug: Bugs fixed ### :bug: Bugs fixed
- Fix scroll on storybook docs [taiga #9962](https://tree.taiga.io/project/penpot/issue/9962)
- Navigate tracking event firing multiple times [Taiga #10415](https://tree.taiga.io/project/penpot/issue/10415) - Navigate tracking event firing multiple times [Taiga #10415](https://tree.taiga.io/project/penpot/issue/10415)
- Fix problem with selection colors [Taiga #](https://tree.taiga.io/project/penpot/issue/10376) - Fix problem with selection colors [Taiga #10376](https://tree.taiga.io/project/penpot/issue/10376)
## 2.5.1 ## 2.5.1

View file

@ -70,6 +70,7 @@ export class WorkspacePage extends BaseWebSocketPage {
); );
this.toolbarOptions = page.getByTestId("toolbar-options"); this.toolbarOptions = page.getByTestId("toolbar-options");
this.rectShapeButton = page.getByRole("button", { name: "Rectangle (R)" }); this.rectShapeButton = page.getByRole("button", { name: "Rectangle (R)" });
this.moveButton = page.getByRole("button", { name: "Move (V)" });
this.boardButton = page.getByRole("button", { name: "Board (B)" }); this.boardButton = page.getByRole("button", { name: "Board (B)" });
this.toggleToolbarButton = page.getByRole("button", { this.toggleToolbarButton = page.getByRole("button", {
name: "Toggle toolbar", name: "Toggle toolbar",

View file

@ -13,6 +13,7 @@ test("Bug 7549 - User clicks on color swatch to display the color picker next to
await workspacePage.setupEmptyFile(page); await workspacePage.setupEmptyFile(page);
await workspacePage.goToWorkspace(); await workspacePage.goToWorkspace();
await workspacePage.moveButton.click();
const swatch = workspacePage.page.getByRole("button", { name: "E8E9EA" }); const swatch = workspacePage.page.getByRole("button", { name: "E8E9EA" });
const swatchBox = await swatch.boundingBox(); const swatchBox = await swatch.boundingBox();
await swatch.click(); await swatch.click();
@ -171,6 +172,7 @@ test("Bug 9900 - Color picker has no inputs for HSV values", async ({
await workspacePage.setupEmptyFile(page); await workspacePage.setupEmptyFile(page);
await workspacePage.goToWorkspace(); await workspacePage.goToWorkspace();
await workspacePage.moveButton.click();
const swatch = workspacePage.page.getByRole("button", { name: "E8E9EA" }); const swatch = workspacePage.page.getByRole("button", { name: "E8E9EA" });
await swatch.click(); await swatch.click();

View file

@ -178,6 +178,7 @@ test("Bug 10179 - Drag & drop doesn't add colors to the Recent Colors palette",
const workspacePage = new WorkspacePage(page); const workspacePage = new WorkspacePage(page);
await workspacePage.setupEmptyFile(); await workspacePage.setupEmptyFile();
await workspacePage.goToWorkspace(); await workspacePage.goToWorkspace();
await workspacePage.moveButton.click();
await workspacePage.page.keyboard.press("Alt+p"); await workspacePage.page.keyboard.press("Alt+p");

View file

@ -0,0 +1,9 @@
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
//
// Copyright (c) KALEIDOS INC
.sb-show-main.sb-main-fullscreen {
overflow-y: auto;
}

View file

@ -13,6 +13,7 @@
@import "common/dependencies/fonts"; @import "common/dependencies/fonts";
@import "common/dependencies/animations"; @import "common/dependencies/animations";
@import "common/dependencies/highlight.scss"; @import "common/dependencies/highlight.scss";
@import "common/dependencies/storybook.scss";
@import "common/refactor/themes.scss"; @import "common/refactor/themes.scss";
@import "common/refactor/design-tokens.scss"; @import "common/refactor/design-tokens.scss";

View file

@ -478,8 +478,7 @@
(rx/of (initialize-page* file-id page-id page) (rx/of (initialize-page* file-id page-id page)
(dwth/watch-state-changes file-id page-id) (dwth/watch-state-changes file-id page-id)
(dwl/watch-component-changes) (dwl/watch-component-changes)
(when (cf/external-feature-flag "boards-02" "test") (select-frame-tool file-id page-id))
(select-frame-tool file-id page-id)))
(rx/of (dcm/go-to-workspace :file-id file-id ::rt/replace true)))))) (rx/of (dcm/go-to-workspace :file-id file-id ::rt/replace true))))))
(defn finalize-page (defn finalize-page