Merge 9f3bf27bd1 into 2bdeda85b8

4 weeks ago · 3848a0346a
2 changed files with 27 additions and 0 deletions
--- a/packages/core/src/dom_components/model/Components.ts
+++ b/packages/core/src/dom_components/model/Components.ts
@ -72,6 +72,8 @@ const getComponentsFromDefs = (
          result = all[id] as any;
          const { onAttributes, onStyle } = updateOptions;
          const component = result as unknown as Component;
+          // Detach the reused model from its old container so re-inserting it updates `collection`/`parent`
+          component.collection?.remove(component, { silent: true } as any);
          const htmlImportOpts = { ...opts, parsedImportSource: 'html' as const };
          tagName && component.set({ tagName }, { ...htmlImportOpts, silent: true });

--- a/packages/core/test/specs/dom_components/model/Component.ts
+++ b/packages/core/test/specs/dom_components/model/Component.ts
@ -595,6 +595,31 @@ describe('Component', () => {
    );
  });

+  test('resetFromString re-parents a reused component when its wrapper is removed', () => {
+    const wrapper = dcomp.getWrapper()!;
+    wrapper.components().resetFromString(`<div id="i5y6"><p id="i8sd">Insert your text here</p></div>`);
+
+    const div = wrapper.components().at(0);
+    const paragraph = div.components().at(0);
+    expect(div.getId()).toBe('i5y6');
+    expect(paragraph.getId()).toBe('i8sd');
+    expect(paragraph.parent()).toBe(div);
+
+    // Remove the wrapping div, promoting the reused <p> to a direct child of the wrapper.
+    wrapper.components().resetFromString(`<p id="i8sd">Insert your text here</p>`);
+
+    const allById = dcomp.allById();
+    // The same <p> model instance is reused, not rebuilt.
+    expect(wrapper.components().at(0)).toBe(paragraph);
+    expect(allById['i8sd']).toBe(paragraph);
+    // The removed div is gone from the global registry.
+    expect(allById['i5y6']).toBeUndefined();
+    // The reused <p> reports the wrapper as its parent, not the removed div.
+    expect(paragraph.parent()).toBe(wrapper);
+    expect(paragraph.collection).toBe(wrapper.components());
+    expect(em.getHtml()).toBe('<body><p id="i8sd">Insert your text here</p></body>');
+  });
+
  test('Ability to stop/change propagation chain', () => {
    obj.append({
      removable: false,