Browse Source

chore(runtime-vapor): refactor createKeyedFragment for improved insertion handling (#14005)

edison 6 months ago
parent
commit
07b45474b2
1 changed files with 21 additions and 1 deletions
  1. 21 1
      packages/runtime-vapor/src/apiCreateFragment.ts

+ 21 - 1
packages/runtime-vapor/src/apiCreateFragment.ts

@@ -1,11 +1,31 @@
-import type { Block, BlockFn } from './block'
+import { type Block, type BlockFn, insert } from './block'
+import { advanceHydrationNode, isHydrating } from './dom/hydration'
 import { DynamicFragment } from './fragment'
+import {
+  insertionAnchor,
+  insertionParent,
+  isLastInsertion,
+  resetInsertionState,
+} from './insertionState'
 import { renderEffect } from './renderEffect'
 
 export function createKeyedFragment(key: () => any, render: BlockFn): Block {
+  const _insertionParent = insertionParent
+  const _insertionAnchor = insertionAnchor
+  const _isLastInsertion = isLastInsertion
+  if (!isHydrating) resetInsertionState()
+
   const frag = __DEV__ ? new DynamicFragment('keyed') : new DynamicFragment()
   renderEffect(() => {
     frag.update(render, key())
   })
+
+  if (!isHydrating) {
+    if (_insertionParent) insert(frag, _insertionParent, _insertionAnchor)
+  } else {
+    if (_isLastInsertion) {
+      advanceHydrationNode(_insertionParent!)
+    }
+  }
   return frag
 }