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
fix: Preserve shared Slot content on delete (#5872)
Oleg Isonen1c043a870a3f
diff --git a/packages/project-build/src/runtime/instances.test.ts b/packages/project-build/src/runtime/instances.test.tsindex a95964335b..7f3f5cadd7 100644--- a/packages/project-build/src/runtime/instances.test.ts+++ b/packages/project-build/src/runtime/instances.test.ts@@ -332,6 +332,30 @@ test("collects multiple requested roots even when one root references another",collectExclusiveInstanceIds(instances, ["first-root", "second-root"])).toEqual(new Set(["first-root", "second-root", "child"]));});++test("collects shared descendants when all owners are requested", () => {+ const instances = new Map<Instance["id"], Instance>([+ [+ "first-root",+ createInstance("first-root", [{ type: "id", value: "shared-child" }]),+ ],+ [+ "second-root",+ createInstance("second-root", [{ type: "id", value: "shared-child" }]),+ ],+ [+ "shared-child",+ createInstance("shared-child", [{ type: "id", value: "shared-leaf" }]),+ ],+ ["shared-leaf", createInstance("shared-leaf")],+ ]);++ expect(+ collectExclusiveInstanceIds(instances, ["first-root", "second-root"])+ ).toEqual(+ new Set(["first-root", "shared-child", "shared-leaf", "second-root"])+ );+});const createCloneInstance = (id: Instance["id"],children: Instance["children"] = []@@ -2391,6 +2415,59 @@ test("creates instance delete payload with cleanup", () => {expect(result.payload.every(({ patches }) => patches.length > 0)).toBe(true);});+test("preserves shared Slot content when deleting one copied Slot", () => {+ const instances = new Map([+ [+ "parent",+ createInstance("parent", elementComponent, [+ { type: "id", value: "slot" },+ { type: "id", value: "slot-copy" },+ ]),+ ],+ [+ "slot",+ createInstance("slot", "Slot", [+ { type: "id", value: "shared-fragment" },+ ]),+ ],+ [+ "slot-copy",+ createInstance("slot-copy", "Slot", [+ { type: "id", value: "shared-fragment" },+ ]),+ ],+ [+ "shared-fragment",+ createInstance("shared-fragment", elementComponent, [+ { type: "id", value: "content" },+ ]),+ ],+ ["content", createInstance("content", elementComponent)],+ ]);++ const result = createInstanceDeletePayload({+ instances,+ instanceIds: ["slot"],+ props: [],+ dataSources: [],+ styleSources: [],+ styleSourceSelections: [],+ styles: [],+ });++ expect(result.errors).toEqual([]);+ expect(result.instanceIds).toEqual(["slot"]);+ expect(result.payload).toEqual([+ {+ namespace: "instances",+ patches: [+ { op: "remove", path: ["parent", "children", 0] },+ { op: "remove", path: ["slot"] },+ ],+ },+ ]);+});+test("omits empty instance cleanup namespaces", () => {expect(createInstanceDeletePayload({diff --git a/packages/project-build/src/runtime/instances.ts b/packages/project-build/src/runtime/instances.tsindex c236440298..5af58dbb54 100644--- a/packages/project-build/src/runtime/instances.ts+++ b/packages/project-build/src/runtime/instances.ts@@ -678,45 +678,45 @@ export const collectExclusiveInstanceIds = (rootInstanceIds: Iterable<Instance["id"]>) => {const roots = new Set(rootInstanceIds);- const referenceCounts = new Map<Instance["id"], number>();- for (const instance of instances.values()) {- for (const child of instance.children) {- if (child.type !== "id") {- continue;- }- referenceCounts.set(- child.value,- (referenceCounts.get(child.value) ?? 0) + 1- );+ const candidateIds = new Set<Instance["id"]>();+ for (const rootInstanceId of roots) {+ for (const instanceId of collectInstanceIds(instances, rootInstanceId)) {+ candidateIds.add(instanceId);}}- const instanceIds = new Set<Instance["id"]>();- const visit = (instanceId: Instance["id"]) => {- if (instanceIds.has(instanceId)) {++ const preservedIds = new Set<Instance["id"]>();+ const preserve = (instanceId: Instance["id"]) => {+ if (roots.has(instanceId) || preservedIds.has(instanceId)) {return;}const instance = instances.get(instanceId);if (instance === undefined) {return;}- instanceIds.add(instanceId);+ preservedIds.add(instanceId);for (const child of instance.children) {- if (child.type !== "id") {- continue;- }- if (- roots.has(child.value) === false &&- (referenceCounts.get(child.value) ?? 0) > 1- ) {- continue;+ if (child.type === "id") {+ preserve(child.value);}- visit(child.value);}};- for (const rootInstanceId of roots) {- visit(rootInstanceId);++ for (const instance of instances.values()) {+ if (candidateIds.has(instance.id)) {+ continue;+ }+ for (const child of instance.children) {+ if (child.type === "id" && candidateIds.has(child.value)) {+ preserve(child.value);+ }+ }}- return instanceIds;++ for (const preservedId of preservedIds) {+ candidateIds.delete(preservedId);+ }+ return candidateIds;};export const cloneInstanceWithNewIds = ({@@ -1158,6 +1158,7 @@ export const createInstanceDeletePayload = ({styles: Iterable<StyleDecl>;}) => {const parentRemovalPatches = [];+ const deleteRootIds = new Set<Instance["id"]>();const deletedInstanceIds = new Set<Instance["id"]>();const errors: Array<| { type: "page-root"; instanceId: Instance["id"] }@@ -1187,9 +1188,14 @@ export const createInstanceDeletePayload = ({number,],});- for (const descendantId of collectInstanceIds(instances, instanceId)) {- deletedInstanceIds.add(descendantId);- }+ deleteRootIds.add(instanceId);+ }++ for (const descendantId of collectExclusiveInstanceIds(+ instances,+ deleteRootIds+ )) {+ deletedInstanceIds.add(descendantId);}const payload = createInstanceCleanupPayload({