Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

fix: Sort style sources with temporary local source (#5949)

Oleg Isonen0b192c7802f6
diff --git a/apps/builder/app/builder/features/style-panel/style-source-section.test.ts b/apps/builder/app/builder/features/style-panel/style-source-section.test.ts
index e8a8abed76..83686863ee 100644
--- a/apps/builder/app/builder/features/style-panel/style-source-section.test.ts
+++ b/apps/builder/app/builder/features/style-panel/style-source-section.test.ts
@@ -322,3 +322,23 @@ test("reorders and clears styles through runtime mutations", () => {
expect($styles.get().has("token1:base:color:")).toEqual(false);
expect($styles.get().get("local1:base:color:")).toEqual(localStyle);
});
+
+test("reorders style sources while local style source is temporary", () => {
+ setupSelectedBody();
+ $styleSources.set(
+ new Map([
+ ["token1", { id: "token1", type: "token", name: "Primary" }],
+ ["token2", { id: "token2", type: "token", name: "Secondary" }],
+ ])
+ );
+ $styleSourceSelections.set(
+ new Map([["body", { instanceId: "body", values: ["token1", "token2"] }]])
+ );
+
+ reorderStyleSources(["token2", "token1", "temporary-local"]);
+
+ expect($styleSourceSelections.get().get("body")?.values).toEqual([
+ "token2",
+ "token1",
+ ]);
+});
diff --git a/apps/builder/app/builder/features/style-panel/style-source-section.tsx b/apps/builder/app/builder/features/style-panel/style-source-section.tsx
index 370abb109c..db1a25e49a 100644
--- a/apps/builder/app/builder/features/style-panel/style-source-section.tsx
+++ b/apps/builder/app/builder/features/style-panel/style-source-section.tsx
@@ -159,11 +159,18 @@ const reorderStyleSources = (styleSourceIds: StyleSource["id"][]) => {
if (instanceId === undefined) {
return;
}
+ const attachedStyleSourceIds = new Set(
+ $styleSourceSelections.get().get(instanceId)?.values
+ );
executeRuntimeMutation({
id: "styleSources.reorder",
input: {
instanceId,
- styleSourceIds,
+ // The style panel adds a temporary local source until local styles are
+ // persisted. Exclude it because the runtime only accepts attached IDs.
+ styleSourceIds: styleSourceIds.filter((id) =>
+ attachedStyleSourceIds.has(id)
+ ),
},
});
};