Revert "fix: split committed/active blocks at micromark-event level instead of DOM lastElementChild"

This reverts commit 55d1cc9.

Author: OEvgeny

packages/bundle/src/markdown/createStreamingRenderer.ts

@@ -198,24 +198,19 @@ export default function createStreamingRenderer(
         } else {
           // New block boundary in tail: commit newly-finished blocks, replace active.
           const newActiveOffsetInTail = tailBlocks[tailBlocks.length - 1].startOffset;
-
-          activeBlockStartOffset += newActiveOffsetInTail;
-
-          // Split at the micromark-event level so that blocks which compile to
-          // multiple sibling DOM nodes (e.g. htmlFlow) are kept whole.
           const committedTailEvents = tailEvents.filter(([, token]) => token.start.offset < newActiveOffsetInTail);
-          const activeTailEvents = tailEvents.filter(([, token]) => token.start.offset >= newActiveOffsetInTail);
-
           const committedTailHTML = compile(micromarkOptions)(committedTailEvents);
-          const activeTailHTML = compile(micromarkOptions)(activeTailEvents);
+
+          activeBlockStartOffset += newActiveOffsetInTail;
 
           const committedDoc = domParser.parseFromString(committedTailHTML, 'text/html');
           const committedFragment = committedDoc.createDocumentFragment();
 
           committedFragment.append(...Array.from(committedDoc.body.childNodes));
           betterLinkDocumentMod(committedFragment, createDecorate(emptyDefinitions, externalLinkAlt));
 
-          const activeDoc = domParser.parseFromString(activeTailHTML, 'text/html');
+          const remainingHTML = tailHTML.slice(committedTailHTML.length);
+          const activeDoc = domParser.parseFromString(remainingHTML, 'text/html');
           const activeFragment = activeDoc.createDocumentFragment();
 
           activeFragment.append(...Array.from(activeDoc.body.childNodes));
@@ -248,35 +243,27 @@ export default function createStreamingRenderer(
 
     // Full reparse path.
     const fullEvents = parseEvents(processedMarkdown);
-    const blocks = findTopLevelBlocks(fullEvents);
-
-    if (blocks.length >= 2) {
-      const lastBlock = blocks[blocks.length - 1];
-
-      activeBlockStartOffset = lastBlock.startOffset;
-
-      // Split at the micromark-event level so that blocks which compile to
-      // multiple sibling DOM nodes (e.g. htmlFlow) are kept whole.
-      const committedEvents = fullEvents.filter(([, token]) => token.start.offset < lastBlock.startOffset);
-      const activeEvents = fullEvents.filter(([, token]) => token.start.offset >= lastBlock.startOffset);
+    const rawHTML = compile(micromarkOptions)(fullEvents);
+    const parsedDocument = domParser.parseFromString(rawHTML, 'text/html');
+    const fragment = parsedDocument.createDocumentFragment();
 
-      const committedHTML = compile(micromarkOptions)(committedEvents);
-      const activeHTML = compile(micromarkOptions)(activeEvents);
+    fragment.append(...Array.from(parsedDocument.body.childNodes));
 
-      const committedDoc = domParser.parseFromString(committedHTML, 'text/html');
-      const committedFragment = committedDoc.createDocumentFragment();
+    const blocks = findTopLevelBlocks(fullEvents);
 
-      committedFragment.append(...Array.from(committedDoc.body.childNodes));
+    if (blocks.length >= 2) {
+      activeBlockStartOffset = blocks[blocks.length - 1].startOffset;
 
-      const activeDoc = domParser.parseFromString(activeHTML, 'text/html');
-      const activeFragment = activeDoc.createDocumentFragment();
+      const range = document.createRange();
 
-      activeFragment.append(...Array.from(activeDoc.body.childNodes));
+      range.setStartBefore(fragment.firstChild!);
+      range.setEndBefore(fragment.lastElementChild!);
 
+      const committedFragment = range.extractContents();
       const decorate = createDecorate(emptyDefinitions, externalLinkAlt);
 
       betterLinkDocumentMod(committedFragment, decorate);
-      betterLinkDocumentMod(activeFragment, decorate);
+      betterLinkDocumentMod(fragment, decorate);
 
       const wrapper = ensureWrapper(options.container, options.containerClassName);
 
@@ -285,7 +272,7 @@ export default function createStreamingRenderer(
       wrapper.replaceChildren(
         applyTransform(committedFragment, options.transformFragment),
         activeSentinel,
-        applyTransform(activeFragment, options.transformFragment)
+        applyTransform(fragment, options.transformFragment)
       );
 
       return;
@@ -295,12 +282,6 @@ export default function createStreamingRenderer(
     activeBlockStartOffset = 0;
     activeSentinel = null;
 
-    const rawHTML = compile(micromarkOptions)(fullEvents);
-    const parsedDocument = domParser.parseFromString(rawHTML, 'text/html');
-    const fragment = parsedDocument.createDocumentFragment();
-
-    fragment.append(...Array.from(parsedDocument.body.childNodes));
-
     betterLinkDocumentMod(fragment, createDecorate(emptyDefinitions, externalLinkAlt));
 
     const wrapper = ensureWrapper(options.container, options.containerClassName);