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: remap conflicting pasted breakpoint ids (#5898)

Oleg Isonen27eecd1a290e
diff --git a/apps/builder/app/shared/instance-utils/fragment.test.tsx b/apps/builder/app/shared/instance-utils/fragment.test.tsx
index ec6a7b60bc..381481a4fb 100644
--- a/apps/builder/app/shared/instance-utils/fragment.test.tsx
+++ b/apps/builder/app/shared/instance-utils/fragment.test.tsx
@@ -242,6 +242,7 @@ describe("fragment copy helpers", () => {
],
}),
breakpoints,
+ createId: () => "generated-breakpoint",
onBreakpointLimitMerge: () => {
didMergeDueToLimit = true;
},
diff --git a/packages/project-build/src/runtime/components.test.ts b/packages/project-build/src/runtime/components.test.ts
index 470ef5a6ff..1b4c5fb214 100644
--- a/packages/project-build/src/runtime/components.test.ts
+++ b/packages/project-build/src/runtime/components.test.ts
@@ -786,6 +786,60 @@ test("inserts webstudio jsx fragment with styles", async () => {
]);
});
+test("remaps fragment breakpoint ids that conflict with existing breakpoints", () => {
+ const parent = createParent();
+ const state = createState(parent);
+ state.breakpoints.set("1", {
+ id: "1",
+ label: "Desktop",
+ minWidth: 1280,
+ });
+
+ const mutation = insertFragment(
+ state,
+ {
+ parentInstanceId: parent.id,
+ fragment: {
+ ...createEmptyWebstudioFragment(),
+ children: [{ type: "id", value: "fragment-instance" }],
+ instances: [
+ {
+ type: "instance",
+ id: "fragment-instance",
+ component: elementComponent,
+ tag: "div",
+ children: [],
+ },
+ ],
+ styleSourceSelections: [
+ { instanceId: "fragment-instance", values: ["local-style"] },
+ ],
+ styleSources: [{ type: "local", id: "local-style" }],
+ breakpoints: [{ id: "1", label: "Tablet", maxWidth: 991 }],
+ styles: [
+ {
+ styleSourceId: "local-style",
+ breakpointId: "1",
+ property: "display",
+ value: { type: "keyword", value: "grid" },
+ },
+ ],
+ },
+ },
+ {
+ createId: createIdFactory(),
+ projectId: "project-id",
+ }
+ );
+
+ expect(getAddedValues<{ id: string }>(mutation, "breakpoints")).toEqual([
+ expect.objectContaining({ id: "generated-0", maxWidth: 991 }),
+ ]);
+ expect(getAddedValues<StyleDecl>(mutation, "styles")).toContainEqual(
+ expect.objectContaining({ breakpointId: "generated-0" })
+ );
+});
+
test("inserts fragment into legacy Slot content by normalizing shared Fragment", async () => {
const state = createState({
type: "instance",
diff --git a/packages/project-build/src/runtime/fragment.ts b/packages/project-build/src/runtime/fragment.ts
index a6d7503aeb..7a5275b0e7 100644
--- a/packages/project-build/src/runtime/fragment.ts
+++ b/packages/project-build/src/runtime/fragment.ts
@@ -493,10 +493,12 @@ const insertFragmentAssetsMutable = ({
const insertFragmentBreakpointsMutable = ({
fragment,
breakpoints,
+ createId,
onBreakpointLimitMerge,
}: {
fragment: WebstudioFragment;
breakpoints: Breakpoints;
+ createId: () => string;
onBreakpointLimitMerge?: () => void;
}) => {
let didMergeBreakpointsDueToLimit = false;
@@ -515,7 +517,17 @@ const insertFragmentBreakpointsMutable = ({
}
for (const newBreakpoint of fragment.breakpoints) {
if (mergedBreakpointIds.has(newBreakpoint.id) === false) {
- breakpoints.set(newBreakpoint.id, newBreakpoint);
+ let newBreakpointId = newBreakpoint.id;
+ while (breakpoints.has(newBreakpointId)) {
+ newBreakpointId = createId();
+ }
+ breakpoints.set(newBreakpointId, {
+ ...newBreakpoint,
+ id: newBreakpointId,
+ });
+ if (newBreakpointId !== newBreakpoint.id) {
+ mergedBreakpointIds.set(newBreakpoint.id, newBreakpointId);
+ }
}
}
return { mergedBreakpointIds, didMergeBreakpointsDueToLimit };
@@ -591,6 +603,7 @@ export const insertWebstudioFragmentCopy = ({
? insertFragmentBreakpointsMutable({
fragment,
breakpoints,
+ createId,
onBreakpointLimitMerge,
})
: {