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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
Prevent cyclic slot reparent (#1496)
Bogdan Chadkin972bbf174d19
diff --git a/apps/builder/app/shared/tree-utils.test.ts b/apps/builder/app/shared/tree-utils.test.tsindex c6246a6504..e8bfb0769e 100644--- a/apps/builder/app/shared/tree-utils.test.ts+++ b/apps/builder/app/shared/tree-utils.test.ts@@ -450,6 +450,38 @@ test("reparent instance into slot", () => {]),]));++ // prevent reparenting into own children to avoid infinite loop+ reparentInstanceMutable(instances, ["slot1", "root"], {+ parentSelector: ["fragment11", "slot1", "root"],+ position: "end",+ });+ expect(instances).toEqual(+ new Map([+ createInstancePair("root", "Body", [+ { type: "id", value: "slot1" },+ { type: "id", value: "box3" },+ ]),+ createInstancePair("slot1", "Slot", [+ { type: "id", value: "fragment11" },+ ]),+ createInstancePair("fragment11", "Fragment", []),+ createInstancePair("box2", "Box", [+ { type: "id", value: "box21" },+ { type: "id", value: "box22" },+ { type: "id", value: "box23" },+ ]),+ createInstancePair("box21", "Box", []),+ createInstancePair("box22", "Box", []),+ createInstancePair("box23", "Box", []),+ createInstancePair("slot3", "Slot", [+ { type: "id", value: expectString },+ ]),+ createInstancePair(expectString, "Fragment", [+ { type: "id", value: "box2" },+ ]),+ ])+ );});test("insert tree of instances copy and provide map from ids map", () => {diff --git a/apps/builder/app/shared/tree-utils.ts b/apps/builder/app/shared/tree-utils.tsindex 405013c6e2..2218daa9ac 100644--- a/apps/builder/app/shared/tree-utils.ts+++ b/apps/builder/app/shared/tree-utils.ts@@ -2,6 +2,7 @@ import { nanoid } from "nanoid";import {Breakpoint,Breakpoints,+ findTreeInstanceIds,findTreeInstanceIdsExcludingSlotDescendants,getStyleDeclKey,Instance,@@ -174,6 +175,16 @@ export const reparentInstanceMutable = (dropTarget.parentSelector[0]);const instance = instances.get(instanceId);++ // delect is target is one of own descendants+ // prevent reparenting to avoid infinite loop+ const instanceDescendants = findTreeInstanceIds(instances, instanceId);+ for (const instanceId of instanceDescendants) {+ if (dropTarget.parentSelector.includes(instanceId)) {+ return;+ }+ }+if (prevParent === undefined ||nextParent === undefined ||