@lynx-js/react 0.119.0 → 0.121.0

package/runtime/lib/{renderToOpcodes → snapshot/renderToOpcodes}/hydrate.js

@@ -1,12 +1,12 @@
 // Copyright 2024 The Lynx Authors. All rights reserved.
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
-import { profileEnd, profileStart } from '../debug/profile.js';
+import { profileEnd, profileStart } from '../../shared/profile.js';
 import { componentAtIndexFactory, enqueueComponentFactory, gRecycleMap, gSignMap } from '../list/list.js';
 import { __pendingListUpdates } from '../list/pendingListUpdates.js';
 import { DynamicPartType } from '../snapshot/dynamicPartType.js';
 import { unref } from '../snapshot/ref.js';
-import { isEmptyObject } from '../utils.js';
+import { isEmptyObject } from '../../utils.js';
 const UNREACHABLE_ITEM_KEY_NOT_FOUND = 'UNREACHABLE_ITEM_KEY_NOT_FOUND';
 export function isEmptyDiffResult(diffResult) {
     const hasChanged = !isEmptyObject(diffResult.i)
@@ -205,11 +205,18 @@ export function hydrate(before, after, options) {
                 hydrate(v1, v2, options);
                 break;
             }
+            case DynamicPartType.SlotV2:
             case DynamicPartType.Children: {
-                const diffResult = diffArrayLepus(beforeChildNodes, afterChildNodes, (a, b) => a.type === b.type, (a, b) => {
+                let filteredBeforeChildNodes = beforeChildNodes;
+                let filteredAfterChildNodes = afterChildNodes;
+                if (type === DynamicPartType.SlotV2) {
+                    filteredBeforeChildNodes = beforeChildNodes.filter(v => v.__slotIndex === index);
+                    filteredAfterChildNodes = afterChildNodes.filter(v => v.__slotIndex === index);
+                }
+                const diffResult = diffArrayLepus(filteredBeforeChildNodes, filteredAfterChildNodes, (a, b) => a.type === b.type, (a, b) => {
                     hydrate(a, b, options);
                 }, false);
-                diffArrayAction(beforeChildNodes, diffResult, (node, target) => {
+                diffArrayAction(filteredBeforeChildNodes, diffResult, (node, target) => {
                     node.ensureElements();
                     __InsertElementBefore(before.__elements[elementIndex], node.__element_root, target?.__element_root);
                     return node;
@@ -221,14 +228,21 @@ export function hydrate(before, after, options) {
                 });
                 break;
             }
+            case DynamicPartType.ListSlotV2:
             case DynamicPartType.ListChildren: {
+                let filteredBeforeChildNodes = beforeChildNodes;
+                let filteredAfterChildNodes = afterChildNodes;
+                if (type === DynamicPartType.ListSlotV2) {
+                    filteredBeforeChildNodes = beforeChildNodes.filter(v => v.__slotIndex === index);
+                    filteredAfterChildNodes = afterChildNodes.filter(v => v.__slotIndex === index);
+                }
                 const removals = [];
                 const insertions = [];
                 const updateAction = [];
                 const listID = __GetElementUniqueID(before.__elements[elementIndex]);
                 const signMap = gSignMap[listID];
                 const recycleMap = gRecycleMap[listID];
-                const diffResult = diffArrayLepus(beforeChildNodes, afterChildNodes, (a, b) => a.type === b.type, (a, b, _oldIndex, newIndex) => {
+                const diffResult = diffArrayLepus(filteredBeforeChildNodes, filteredAfterChildNodes, (a, b) => a.type === b.type, (a, b, _oldIndex, newIndex) => {
                     if (JSON.stringify(a.__listItemPlatformInfo)
                         !== JSON.stringify(b.__listItemPlatformInfo)) {
                         updateAction.push({
@@ -300,7 +314,10 @@ export function hydrate(before, after, options) {
                 if (typeof __PROFILE__ !== 'undefined' && __PROFILE__) {
                     profileEnd();
                 }
+                break;
             }
+            default:
+                throw new Error('Unexpected slot type: ' + type);
         }
     });
 }

package/runtime/lib/snapshot/renderToOpcodes/hydrate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hydrate.js","sourceRoot":"","sources":["../../../src/snapshot/renderToOpcodes/hydrate.ts"],"names":[],"mappings":"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"}

package/runtime/lib/{renderToOpcodes → snapshot/renderToOpcodes}/index.js

@@ -9,7 +9,7 @@
 // @ts-nocheck
 import { Fragment, h, options, isValidElement } from 'preact';
 import { SnapshotInstance } from '../snapshot/snapshot.js';
-import { CHILDREN, COMMIT, COMPONENT, DIFF, DIFF2, DIFFED, DIRTY, NEXT_STATE, PARENT, RENDER, SKIP_EFFECTS, VNODE, HOOK, CHILD_DID_SUSPEND, } from './constants.js';
+import { CHILDREN, COMMIT, COMPONENT, DIFF, DIFF2, DIFFED, DIRTY, NEXT_STATE, PARENT, RENDER, SKIP_EFFECTS, VNODE, HOOK, CHILD_DID_SUSPEND, } from '../../shared/render-constants.js';
 /** @typedef {import('preact').VNode} VNode */
 const EMPTY_ARR = [];
 const isArray = /* @__PURE__ */ Array.isArray;
@@ -39,7 +39,7 @@ export function renderToString(vnode, context, into) {
     parent[CHILDREN] = [vnode];
     const opcodes = [];
     try {
-        _renderToString(vnode, context || EMPTY_OBJ, false, undefined, parent, opcodes, 0, into);
+        _renderToString(vnode, context || EMPTY_OBJ, 0, undefined, parent, opcodes, 0, into);
     }
     finally {
         // options._commit, we don't schedule any effects in this library right now,
@@ -96,14 +96,14 @@ function renderClassComponent(vnode, context) {
  * Recursively render VNodes to HTML.
  * @param {VNode|any} vnode
  * @param {any} context
- * @param {boolean} isSvgMode
+ * @param {number | true} slotIndex
  * @param {any} selectValue
  * @param {VNode} parent
  * @param {any[]} opcodes
  * @param {number} opcodesLength
  * @param {SnapshotInstance} into
  */
-function _renderToString(vnode, context, isSvgMode, selectValue, parent, opcodes, opcodesLength, into) {
+function _renderToString(vnode, context, slotIndex, selectValue, parent, opcodes, opcodesLength, into) {
     // Ignore non-rendered VNodes/values
     if (vnode == null || vnode === true || vnode === false || vnode === '') {
         return;
@@ -113,7 +113,7 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent, opcodes
     if (vnodeType !== 'object') {
         if (vnodeType === 'function')
             return;
-        renderToTextNode(into, vnode + '', opcodes);
+        renderToTextNode(into, vnode, opcodes, slotIndex);
         return;
     }
     // Recurse into children / Arrays
@@ -123,7 +123,7 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent, opcodes
             const child = vnode[i];
             if (child == null || typeof child === 'boolean')
                 continue;
-            _renderToString(child, context, isSvgMode, selectValue, parent, opcodes, 
+            _renderToString(child, context, slotIndex === true ? i : slotIndex, selectValue, parent, opcodes, 
             /* v8 ignore start */
             __ENABLE_SSR__ ? opcodes.length : 0, 
             /* v8 ignore end */
@@ -195,7 +195,7 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent, opcodes
         let lastChild = into.__lastChild;
         // Recurse into children before invoking the after-diff hook
         try {
-            _renderToString(rendered, context, isSvgMode, selectValue, vnode, opcodes, 
+            _renderToString(rendered, context, slotIndex, selectValue, vnode, opcodes, 
             /* v8 ignore start */
             __ENABLE_SSR__ ? opcodes.length : 0, 
             /* v8 ignore end */
@@ -216,7 +216,7 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent, opcodes
                     if (__ENABLE_SSR__) {
                         opcodes.length = opcodesLength;
                     }
-                    _renderToString(rendered, context, isSvgMode, selectValue, vnode, opcodes, 
+                    _renderToString(rendered, context, slotIndex, selectValue, vnode, opcodes, 
                     /* v8 ignore start */
                     __ENABLE_SSR__ ? opcodes.length : 0, 
                     /* v8 ignore end */
@@ -237,6 +237,7 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent, opcodes
         return;
     }
     let children;
+    let hasNamedChildren = false;
     // hack for runtime test
     if (process.env['NODE_ENV'] === 'test' && isValidElement(vnode) && typeof vnode.type === 'string') {
         vnode = Object.assign(new SnapshotInstance(type), vnode, { $$typeof: undefined });
@@ -246,8 +247,9 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent, opcodes
         vnode = new SnapshotInstance(type);
     }
     if (__ENABLE_SSR__) {
-        opcodes.push(__OpBegin, vnode);
+        opcodes.push(__OpBegin, vnode, slotIndex);
     }
+    vnode.__slotIndex = slotIndex;
     into.insertBefore(vnode);
     for (const name in props) {
         const v = props[name];
@@ -262,7 +264,14 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent, opcodes
             case '__self':
             case '__source':
                 continue;
-            default: { }
+            default: {
+                if (name.startsWith('$')) {
+                    children ??= [];
+                    children[+name.slice(1)] = v;
+                    hasNamedChildren = true;
+                    continue;
+                }
+            }
         }
         // write this attribute to the buffer
         if (v != null && v !== false && typeof v !== 'function') {
@@ -275,11 +284,22 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent, opcodes
     let childrenType = typeof children;
     if (childrenType === 'string' || childrenType === 'number') {
         // single text child
-        renderToTextNode(vnode, children, opcodes);
+        renderToTextNode(vnode, children, opcodes, slotIndex);
     }
     else if (children != null && children !== false && children !== true) {
         // recurse into this element VNode's children
-        _renderToString(children, context, false, selectValue, vnode, opcodes, 
+        let _slotIndex = slotIndex;
+        if (hasNamedChildren) {
+            // @ts-expect-error children must be an array
+            if (children.length === 1) {
+                children = children[0];
+                _slotIndex = 0;
+            }
+            else {
+                _slotIndex = true;
+            }
+        }
+        _renderToString(children, context, _slotIndex, selectValue, vnode, opcodes, 
         /* v8 ignore start */
         __ENABLE_SSR__ ? opcodes.length : 0, 
         /* v8 ignore end */
@@ -300,14 +320,15 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent, opcodes
 function doRender(props, state, context) {
     return this.constructor(props, context);
 }
-function renderToTextNode(into, text, opcodes) {
+function renderToTextNode(into, text, opcodes, slotIndex) {
     const textNode = new SnapshotInstance(null);
+    textNode.__slotIndex = slotIndex;
     textNode.setAttribute(0, text);
     into.insertBefore(textNode);
     if (__ENABLE_SSR__) {
         // We need store the just created SnapshotInstance, or it will be lost when we leave the function
         text = [textNode, text];
-        opcodes.push(__OpText, text);
+        opcodes.push(__OpText, text, slotIndex);
     }
 }
 export default renderToString;

package/runtime/lib/snapshot/renderToOpcodes/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/snapshot/renderToOpcodes/index.ts"],"names":[],"mappings":"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"}

package/runtime/lib/{renderToOpcodes → snapshot/renderToOpcodes}/opcodes.js

@@ -3,7 +3,7 @@
 // LICENSE file in the root directory of this source tree.
 import { hydrate } from './hydrate.js';
 import { componentAtIndexFactory, enqueueComponentFactory, gRecycleMap, gSignMap } from '../list/list.js';
-import { CHILDREN } from './constants.js';
+import { CHILDREN } from '../../shared/render-constants.js';
 import { SnapshotInstance } from '../snapshot/snapshot.js';
 const OpcodeBegin = 0;
 const OpcodeEnd = 1;
@@ -20,9 +20,10 @@ export function ssrHydrateByOpcodes(opcodes, into, refMap) {
                 const [type, __id, elements] = opcodes[i + 1];
                 top = new SnapshotInstance(type, __id);
                 top.__pendingElements = elements;
+                top.__slotIndex = opcodes[i + 2];
                 p.insertBefore(top);
                 stack.push(top);
-                i += 2;
+                i += 3;
                 break;
             }
             case OpcodeEnd: {
@@ -63,11 +64,12 @@ export function ssrHydrateByOpcodes(opcodes, into, refMap) {
             case OpcodeText: {
                 const [[type, __id, elements], text] = opcodes[i + 1];
                 const s = new SnapshotInstance(type, __id);
+                s.__slotIndex = opcodes[i + 2];
                 s.setAttribute(0, text);
                 top.insertBefore(s);
                 s.__elements = elements.map(({ ssrID }) => refMap[ssrID]);
                 s.__element_root = s.__elements[0];
-                i += 2;
+                i += 3;
                 break;
             }
         }

package/runtime/lib/snapshot/renderToOpcodes/opcodes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"opcodes.js","sourceRoot":"","sources":["../../../src/snapshot/renderToOpcodes/opcodes.ts"],"names":[],"mappings":"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"}

package/runtime/lib/snapshot/{backgroundSnapshot.d.ts → snapshot/backgroundSnapshot.d.ts}

@@ -15,9 +15,10 @@ export declare class BackgroundSnapshotInstance {
     type: string;
     constructor(type: string);
     __id: number;
-    __values: any[] | undefined;
+    __values: unknown[] | undefined;
     __snapshot_def: Snapshot;
     __extraProps?: Record<string, unknown> | undefined;
+    __slotIndex: number;
     private __parent;
     private __firstChild;
     private __lastChild;

package/runtime/lib/snapshot/{backgroundSnapshot.js → snapshot/backgroundSnapshot.js}

@@ -1,21 +1,23 @@
 // Copyright 2024 The Lynx Authors. All rights reserved.
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
-import { snapshotManager } from './definition.js';
+import { createRuntimeSnapshot, snapshotManager } from './definition.js';
 import { DynamicPartType } from './dynamicPartType.js';
-import { applyRef, clearQueuedRefs, queueRefAttrUpdate } from './ref.js';
+import { reconstructInstanceTree } from './reconstructInstanceTree.js';
+import { applyRef, clearQueuedRefs, getRefFromValue, queueRefAttrUpdate } from './ref.js';
 import { snapshotCreatorMap } from './snapshot.js';
 import { hydrationMap } from './snapshotInstanceHydrationMap.js';
 import { transformSpread } from './spread.js';
-import { traverseSnapshotInstance } from './utils.js';
-import { profileEnd, profileStart } from '../debug/profile.js';
+import { isCompiledSnapshot, traverseSnapshotInstance } from './utils.js';
+import { profileEnd, profileStart } from '../../shared/profile.js';
+import { isDirectOrDeepEqual } from '../../utils.js';
 import { clearSnapshotVNodeSource, getSnapshotVNodeSource, moveSnapshotVNodeSource } from '../debug/vnodeSource.js';
-import { processGestureBackground } from '../gesture/processGestureBagkround.js';
+import { prepareGestureForCommit } from '../gesture/processGestureBagkround.js';
 import { globalBackgroundSnapshotInstancesToRemove } from '../lifecycle/patch/globalState.js';
 import { SnapshotOperation, __globalSnapshotPatch, initGlobalSnapshotPatch, takeGlobalSnapshotPatch, } from '../lifecycle/patch/snapshotPatch.js';
 import { globalPipelineOptions } from '../lynx/performance.js';
+import { clearPendingPortalInsertBefore } from '../lynx/portalsPending.js';
 import { diffArrayAction, diffArrayLepus } from '../renderToOpcodes/hydrate.js';
-import { isDirectOrDeepEqual } from '../utils.js';
 import { onPostWorkletCtx } from '../worklet/ctx.js';
 /**
  * Background snapshot instance manager that manages all background snapshot instances.
@@ -62,6 +64,13 @@ export const backgroundSnapshotInstanceManager = {
         if (!ctx) {
             return null;
         }
+        /**
+         * 1. normal event
+         *  `${ctx.__id}:${expIndex}:${spreadKey}`
+         * 2. defer list event
+         *   ${ctx.__id}:__extraProps:onRecycleComponent`
+         *   ${ctx.__id}:__extraProps:onComponentAtIndex`
+         */
         const spreadKey = res[2];
         if (res[1] === '__extraProps') {
             if (spreadKey) {
@@ -79,6 +88,37 @@ export const backgroundSnapshotInstanceManager = {
         }
     },
 };
+function prepareWorkletForCommit(worklet) {
+    // Copy-on-commit: do not mutate the background-side worklet ctx.
+    // `_execId` is injected into the payload object that will be sent to the main thread.
+    return onPostWorkletCtx({ ...worklet });
+}
+function prepareSpreadForCommit(spread, oldSpread) {
+    let committed;
+    for (const key in spread) {
+        const v = spread[key];
+        if (key === '__lynx_timing_flag' && oldSpread?.[key] != v && globalPipelineOptions) {
+            globalPipelineOptions.needTimestamps = true;
+        }
+        if (!v || typeof v !== 'object') {
+            continue;
+        }
+        const valueRecord = v;
+        let committedValue;
+        if ('_wkltId' in valueRecord) {
+            committedValue = prepareWorkletForCommit(v);
+        }
+        else if ('__isGesture' in valueRecord) {
+            committedValue = prepareGestureForCommit(v);
+        }
+        else {
+            continue;
+        }
+        committed ??= { ...spread };
+        committed[key] = committedValue;
+    }
+    return committed ?? spread;
+}
 export class BackgroundSnapshotInstance {
     type;
     constructor(type) {
@@ -88,9 +128,13 @@ export class BackgroundSnapshotInstance {
             if (snapshotCreatorMap[type]) {
                 snapshotCreatorMap[type](type);
             }
-            else {
+            else if (isCompiledSnapshot(type)) {
                 throw new Error('BackgroundSnapshot not found: ' + type);
             }
+            else {
+                // add runtime snapshot to backgroundSnapshotInstanceManager
+                createRuntimeSnapshot(type);
+            }
         }
         this.__snapshot_def = snapshotManager.values.get(type);
         const id = this.__id = backgroundSnapshotInstanceManager.nextId += 1;
@@ -101,6 +145,7 @@ export class BackgroundSnapshotInstance {
     __values;
     __snapshot_def;
     __extraProps;
+    __slotIndex = 0;
     __parent = null;
     __firstChild = null;
     __lastChild = null;
@@ -131,7 +176,7 @@ export class BackgroundSnapshotInstance {
             reconstructInstanceTree([node], this.__id, beforeNode?.__id);
         }
         else {
-            __globalSnapshotPatch?.push(SnapshotOperation.InsertBefore, this.__id, node.__id, beforeNode?.__id);
+            __globalSnapshotPatch?.push(SnapshotOperation.InsertBefore, this.__id, node.__id, beforeNode?.__id, node.__slotIndex);
         }
         // If the node already has a parent, remove it from its current parent
         const p = node.__parent;
@@ -262,15 +307,11 @@ export class BackgroundSnapshotInstance {
             }
             else {
                 this.__snapshot_def.refAndSpreadIndexes?.forEach((index) => {
+                    // In first render, this.__values is undefined.
+                    // In next rerenders before hydration, this.__values is not undefined.
+                    const oldValue = this.__values?.[index];
                     const v = value[index];
-                    if (v && (typeof v === 'object' || typeof v === 'function')) {
-                        if ('__spread' in v && 'ref' in v) {
-                            queueRefAttrUpdate(null, v.ref, this.__id, index);
-                        }
-                        else if ('__ref' in v) {
-                            queueRefAttrUpdate(null, v, this.__id, index);
-                        }
-                    }
+                    queueRefAttrUpdate(getRefFromValue(oldValue), getRefFromValue(v), this.__id, index);
                 });
             }
             this.__values = value;
@@ -310,35 +351,34 @@ export class BackgroundSnapshotInstance {
                 // use __spread to cache the transform result for next diff
                 newValueObj['__spread'] = newSpread;
                 queueRefAttrUpdate(oldSpread && (oldValue.ref), newValueObj['ref'], this.__id, index);
-                if (needUpdate) {
-                    for (const key in newSpread) {
-                        const newSpreadValue = newSpread[key];
-                        if (!newSpreadValue) {
-                            continue;
-                        }
-                        if (newSpreadValue._wkltId) {
-                            newSpread[key] = onPostWorkletCtx(newSpreadValue);
-                        }
-                        else if (newSpreadValue.__isGesture) {
-                            processGestureBackground(newSpreadValue);
-                        }
-                        else if (key == '__lynx_timing_flag' && oldSpread?.[key] != newSpreadValue && globalPipelineOptions) {
-                            globalPipelineOptions.needTimestamps = true;
-                        }
-                    }
-                }
-                return { needUpdate, valueToCommit: newSpread };
+                return {
+                    needUpdate,
+                    valueToCommit: needUpdate ? prepareSpreadForCommit(newSpread, oldSpread) : newSpread,
+                };
             }
             if ('__ref' in newValueObj) {
                 queueRefAttrUpdate(oldValue, newValueObj, this.__id, index);
                 return { needUpdate: false, valueToCommit: 1 };
             }
             if ('_wkltId' in newValueObj) {
-                return { needUpdate: true, valueToCommit: onPostWorkletCtx(newValueObj) };
+                // Worklet ctx can be stable across rerenders (e.g. memoized by the user).
+                // In that case we should NOT re-register / re-send it, otherwise `_execId` churn
+                // will cause unnecessary patches.
+                const needUpdate = oldValue !== newValue;
+                return {
+                    needUpdate,
+                    valueToCommit: needUpdate ? prepareWorkletForCommit(newValueObj) : newValue,
+                };
             }
             if ('__isGesture' in newValueObj) {
-                processGestureBackground(newValueObj);
-                return { needUpdate: true, valueToCommit: newValue };
+                // Gestures are large objects; if the reference is stable, avoid reprocessing and patching.
+                const needUpdate = oldValue !== newValue;
+                return {
+                    needUpdate,
+                    valueToCommit: needUpdate
+                        ? prepareGestureForCommit(newValueObj)
+                        : newValue,
+                };
             }
             if ('__ltf' in newValueObj) {
                 // __lynx_timing_flag
@@ -371,37 +411,30 @@ export function hydrate(before, after) {
         const helper = (before, after) => {
             hydrationMap.set(after.__id, before.id);
             backgroundSnapshotInstanceManager.updateId(after.__id, before.id);
+            // handle value by index
             after.__values?.forEach((value, index) => {
-                const old = before.values[index];
+                // render with different root would cause different values length
+                const old = before.values?.[index];
                 if (value) {
                     if (typeof value === 'object') {
                         if ('__spread' in value) {
                             // `value.__spread` my contain event ids using snapshot ids before hydration. Remove it.
                             delete value.__spread;
                             const __spread = transformSpread(after, index, value);
-                            for (const key in __spread) {
-                                const v = __spread[key];
-                                if (v && typeof v === 'object') {
-                                    if ('_wkltId' in v) {
-                                        onPostWorkletCtx(v);
-                                    }
-                                    else if ('__isGesture' in v) {
-                                        processGestureBackground(v);
-                                    }
-                                }
-                            }
+                            // Cache a clean spread for future diffs. For the patch payload, create a committed copy
+                            // with runtime fields (e.g. `_execId`) injected.
                             after.__values[index]['__spread'] = __spread;
-                            value = __spread;
+                            value = prepareSpreadForCommit(__spread, old);
                         }
                         else if ('__ref' in value) {
                             // skip patch
                             value = old;
                         }
                         else if ('_wkltId' in value) {
-                            onPostWorkletCtx(value);
+                            value = prepareWorkletForCommit(value);
                         }
                         else if ('__isGesture' in value) {
-                            processGestureBackground(value);
+                            value = prepareGestureForCommit(value);
                         }
                     }
                     else if (typeof value === 'function') {
@@ -444,6 +477,7 @@ export function hydrate(before, after) {
                     }
                 }
             });
+            // handle extraProps as attributes and set by key
             if (after.__extraProps) {
                 for (const key in after.__extraProps) {
                     const value = after.__extraProps[key];
@@ -488,14 +522,22 @@ export function hydrate(before, after) {
                         helper(v1, v2);
                         break;
                     }
+                    case DynamicPartType.SlotV2:
+                    case DynamicPartType.ListSlotV2:
                     case DynamicPartType.Children:
                     case DynamicPartType.ListChildren: {
-                        const diffResult = diffArrayLepus(beforeChildNodes, afterChildNodes, (a, b) => a.type === b.type, (a, b) => {
+                        let filteredBeforeChildNodes = beforeChildNodes;
+                        let filteredAfterChildNodes = afterChildNodes;
+                        if (type === DynamicPartType.SlotV2 || type === DynamicPartType.ListSlotV2) {
+                            filteredBeforeChildNodes = beforeChildNodes.filter(v => (v.slotIndex ?? 0) === index);
+                            filteredAfterChildNodes = afterChildNodes.filter(v => v.__slotIndex === index);
+                        }
+                        const diffResult = diffArrayLepus(filteredBeforeChildNodes, filteredAfterChildNodes, (a, b) => a.type === b.type, (a, b) => {
                             helper(a, b);
                         }, 
                         // Should be `false` in hydrate as SerializedSnapshotInstance has no item-key
                         false);
-                        diffArrayAction(beforeChildNodes, diffResult, (node, target) => {
+                        diffArrayAction(filteredBeforeChildNodes, diffResult, (node, target) => {
                             if (shouldProfile) {
                                 profileStart('ReactLynx::BSI::reconstructInstanceTree', {
                                     args: {
@@ -547,24 +589,27 @@ export function hydrate(before, after) {
                                     },
                                 });
                                 try {
-                                    __globalSnapshotPatch.push(SnapshotOperation.InsertBefore, before.id, node.id, target?.id);
+                                    __globalSnapshotPatch.push(SnapshotOperation.InsertBefore, before.id, node.id, target?.id, node.slotIndex ?? 0);
                                 }
                                 finally {
                                     profileEnd();
                                 }
                             }
                             else {
-                                __globalSnapshotPatch.push(SnapshotOperation.InsertBefore, before.id, node.id, target?.id);
+                                __globalSnapshotPatch.push(SnapshotOperation.InsertBefore, before.id, node.id, target?.id, node.slotIndex ?? 0);
                             }
                         });
                         break;
                     }
+                    default:
+                        throw new Error('Unexpected slot type: ' + type);
                 }
             });
         };
         helper(before, after);
         // Hydration should not trigger ref updates. They were incorrectly triggered when using `setAttribute` to add values to the patch list.
         clearQueuedRefs();
+        clearPendingPortalInsertBefore();
         return takeGlobalSnapshotPatch();
     }
     finally {
@@ -573,21 +618,4 @@ export function hydrate(before, after) {
         }
     }
 }
-function reconstructInstanceTree(afters, parentId, targetId) {
-    for (const child of afters) {
-        const id = child.__id;
-        __globalSnapshotPatch?.push(SnapshotOperation.CreateElement, child.type, id);
-        const values = child.__values;
-        if (values) {
-            child.__values = undefined;
-            child.setAttribute('values', values);
-        }
-        const extraProps = child.__extraProps;
-        for (const key in extraProps) {
-            child.setAttribute(key, extraProps[key]);
-        }
-        reconstructInstanceTree(child.childNodes, id);
-        __globalSnapshotPatch?.push(SnapshotOperation.InsertBefore, parentId, id, targetId);
-    }
-}
 //# sourceMappingURL=backgroundSnapshot.js.map