Commit f0fbb0d

Browse files
gnoffgnoff
authored
[Fiber] fix useId tracking on replay (#35518)
When Fiber replays work after suspending and resolving in a microtask it stripped the Forked flag from Fibers because this flag type was not considered a Static flag. The Forked nature of a Fiber is not render dependent and should persist after unwinding work. By making this change the replay correctly generates the necessary tree context.
1 parent bb8a76c commit f0fbb0d

2 files changed

Lines changed: 158 additions & 2 deletions

File tree

‎packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js‎

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9478,4 +9478,159 @@ Unfortunately that previous paragraph wasn't quite long enough so I'll continue
94789478
</div>,
94799479
);
94809480
});
9481+
9482+
it('useId is consistent for siblings when component suspends with nested lazy',async()=>{
9483+
// Inner component uses useId
9484+
functionInnerComponent(){
9485+
constid=React.useId();
9486+
Scheduler.log('InnerComponent id: '+id);
9487+
return<spanid={id}>inner</span>;
9488+
}
9489+
9490+
// Outer component uses useId and renders a lazy inner
9491+
functionOuterComponent({innerElement}){
9492+
constid=React.useId();
9493+
Scheduler.log('OuterComponent id: '+id);
9494+
return<divid={id}>{innerElement}</div>;
9495+
}
9496+
9497+
// This sibling also has useId - its ID must be consistent with server
9498+
functionSibling(){
9499+
constid=React.useId();
9500+
Scheduler.log('Sibling id: '+id);
9501+
return<spanid={id}>sibling</span>;
9502+
}
9503+
9504+
// Create fresh lazy components for SERVER (resolve immediately)
9505+
constserverLazyInner=React.lazy(async()=>{
9506+
Scheduler.log('server lazy inner initializer');
9507+
return{default: <InnerComponent/>};
9508+
});
9509+
9510+
constserverLazyOuter=React.lazy(async()=>{
9511+
Scheduler.log('server lazy outer initializer');
9512+
return{
9513+
default: <OuterComponentkey="outer"innerElement={serverLazyInner}/>,
9514+
};
9515+
});
9516+
9517+
// Server render with lazy (resolves immediately)
9518+
awaitact(()=>{
9519+
const{pipe}=renderToPipeableStream(
9520+
<html>
9521+
<body>
9522+
<>{serverLazyOuter}</>
9523+
<>
9524+
<Sibling/>
9525+
</>
9526+
</body>
9527+
</html>,
9528+
);
9529+
pipe(writable);
9530+
});
9531+
9532+
expect(getVisibleChildren(document)).toEqual(
9533+
<html>
9534+
<head/>
9535+
<body>
9536+
<divid="_R_1_">
9537+
<spanid="_R_5_">inner</span>
9538+
</div>
9539+
<spanid="_R_2_">sibling</span>
9540+
</body>
9541+
</html>,
9542+
);
9543+
9544+
assertLog([
9545+
'server lazy outer initializer',
9546+
'Sibling id: _R_2_',
9547+
'OuterComponent id: _R_1_',
9548+
'server lazy inner initializer',
9549+
'InnerComponent id: _R_5_',
9550+
]);
9551+
9552+
// Create fresh lazy components for CLIENT
9553+
letresolveClientInner;
9554+
constclientLazyInner=React.lazy(()=>{
9555+
Scheduler.log('client lazy inner initializer');
9556+
constpayload={default: <InnerComponent/>};
9557+
constpromise=newPromise(r=>{
9558+
resolveClientInner=()=>{
9559+
promise.status='fulfilled';
9560+
promise.value=payload;
9561+
r(payload);
9562+
};
9563+
});
9564+
returnpromise;
9565+
});
9566+
9567+
letresolveClientOuter;
9568+
constclientLazyOuter=React.lazy(()=>{
9569+
Scheduler.log('client lazy outer initializer');
9570+
constpayload={
9571+
default: <OuterComponentinnerElement={clientLazyInner}/>,
9572+
};
9573+
constpromise=newPromise(r=>{
9574+
resolveClientOuter=()=>{
9575+
promise.status='fulfilled';
9576+
promise.value=payload;
9577+
r(payload);
9578+
};
9579+
});
9580+
returnpromise;
9581+
});
9582+
9583+
consthydrationErrors=[];
9584+
9585+
// Client hydrates with nested lazy components
9586+
letroot;
9587+
React.startTransition(()=>{
9588+
root=ReactDOMClient.hydrateRoot(
9589+
document,
9590+
<html>
9591+
<body>
9592+
<>{clientLazyOuter}</>
9593+
<>
9594+
<Sibling/>
9595+
</>
9596+
</body>
9597+
</html>,
9598+
{
9599+
onRecoverableError(error){
9600+
hydrationErrors.push(error.message);
9601+
},
9602+
},
9603+
);
9604+
});
9605+
9606+
// First suspension on outer lazy
9607+
awaitwaitFor(['client lazy outer initializer']);
9608+
resolveClientOuter();
9609+
9610+
// Second suspension on inner lazy
9611+
awaitwaitFor([
9612+
'OuterComponent id: _R_1_',
9613+
'client lazy inner initializer',
9614+
]);
9615+
resolveClientInner();
9616+
9617+
awaitwaitForAll(['InnerComponent id: _R_5_','Sibling id: _R_2_']);
9618+
9619+
// The IDs should match the server-generated IDs
9620+
expect(hydrationErrors).toEqual([]);
9621+
9622+
expect(getVisibleChildren(document)).toEqual(
9623+
<html>
9624+
<head/>
9625+
<body>
9626+
<divid="_R_1_">
9627+
<spanid="_R_5_">inner</span>
9628+
</div>
9629+
<spanid="_R_2_">sibling</span>
9630+
</body>
9631+
</html>,
9632+
);
9633+
9634+
root.unmount();
9635+
});
94819636
});

‎packages/react-reconciler/src/ReactFiberFlags.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ export const ShouldCapture = /* */ 0b0000000000000010000000000000
6262
exportconstForceUpdateForLegacySuspense=/* */0b0000000000000100000000000000000;
6363
exportconstDidPropagateContext=/* */0b0000000000001000000000000000000;
6464
exportconstNeedsPropagation=/* */0b0000000000010000000000000000000;
65-
exportconstForked=/* */0b0000000000100000000000000000000;
6665

6766
// Static tags describe aspects of a fiber that are not specific to a render,
6867
// e.g. a fiber uses a passive effect (even if there are no updates on this particular render).
6968
// This enables us to defer more work in the unmount case,
7069
// since we can defer traversing the tree during layout to look for Passive effects,
7170
// and instead rely on the static flag as a signal that there may be cleanup work.
71+
exportconstForked=/* */0b0000000000100000000000000000000;
7272
exportconstSnapshotStatic=/* */0b0000000001000000000000000000000;
7373
exportconstLayoutStatic=/* */0b0000000010000000000000000000000;
7474
exportconstRefStatic=LayoutStatic;
@@ -142,4 +142,5 @@ export const StaticMask =
142142
MaySuspendCommit|
143143
ViewTransitionStatic|
144144
ViewTransitionNamedStatic|
145-
PortalStatic;
145+
PortalStatic|
146+
Forked;

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit f0fbb0d
Browse files
gnoffgnoff
authored
[Fiber] fix useId tracking on replay (#35518)
When Fiber replays work after suspending and resolving in a microtask it
stripped the Forked flag from Fibers because this flag type was not
considered a Static flag. The Forked nature of a Fiber is not render
dependent and should persist after unwinding work. By making this change
the replay correctly generates the necessary tree context.
1 parent bb8a76c commit f0fbb0d
2 files changed
Lines changed: 158 additions & 2 deletions
File tree
‎packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js‎
Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9478,4 +9478,159 @@ Unfortunately that previous paragraph wasn't quite long enough so I'll continue
94789478
</div>,
94799479
);
94809480
});
9481+
9482+
it('useId is consistent for siblings when component suspends with nested lazy',async()=>{
9483+
// Inner component uses useId
9484+
functionInnerComponent(){
9485+
constid=React.useId();
9486+
Scheduler.log('InnerComponent id: '+id);
9487+
return<spanid={id}>inner</span>;
9488+
}
9489+
9490+
// Outer component uses useId and renders a lazy inner
9491+
functionOuterComponent({innerElement}){
9492+
constid=React.useId();
9493+
Scheduler.log('OuterComponent id: '+id);
9494+
return<divid={id}>{innerElement}</div>;
9495+
}
9496+
9497+
// This sibling also has useId - its ID must be consistent with server
9498+
functionSibling(){
9499+
constid=React.useId();
9500+
Scheduler.log('Sibling id: '+id);
9501+
return<spanid={id}>sibling</span>;
9502+
}
9503+
9504+
// Create fresh lazy components for SERVER (resolve immediately)
9505+
constserverLazyInner=React.lazy(async()=>{
9506+
Scheduler.log('server lazy inner initializer');
9507+
return{default: <InnerComponent/>};
9508+
});
9509+
9510+
constserverLazyOuter=React.lazy(async()=>{
9511+
Scheduler.log('server lazy outer initializer');
9512+
return{
9513+
default: <OuterComponentkey="outer"innerElement={serverLazyInner}/>,
9514+
};
9515+
});
9516+
9517+
// Server render with lazy (resolves immediately)
9518+
awaitact(()=>{
9519+
const{pipe}=renderToPipeableStream(
9520+
<html>
9521+
<body>
9522+
<>{serverLazyOuter}</>
9523+
<>
9524+
<Sibling/>
9525+
</>
9526+
</body>
9527+
</html>,
9528+
);
9529+
pipe(writable);
9530+
});
9531+
9532+
expect(getVisibleChildren(document)).toEqual(
9533+
<html>
9534+
<head/>
9535+
<body>
9536+
<divid="_R_1_">
9537+
<spanid="_R_5_">inner</span>
9538+
</div>
9539+
<spanid="_R_2_">sibling</span>
9540+
</body>
9541+
</html>,
9542+
);
9543+
9544+
assertLog([
9545+
'server lazy outer initializer',
9546+
'Sibling id: _R_2_',
9547+
'OuterComponent id: _R_1_',
9548+
'server lazy inner initializer',
9549+
'InnerComponent id: _R_5_',
9550+
]);
9551+
9552+
// Create fresh lazy components for CLIENT
9553+
letresolveClientInner;
9554+
constclientLazyInner=React.lazy(()=>{
9555+
Scheduler.log('client lazy inner initializer');
9556+
constpayload={default: <InnerComponent/>};
9557+
constpromise=newPromise(r=>{
9558+
resolveClientInner=()=>{
9559+
promise.status='fulfilled';
9560+
promise.value=payload;
9561+
r(payload);
9562+
};
9563+
});
9564+
returnpromise;
9565+
});
9566+
9567+
letresolveClientOuter;
9568+
constclientLazyOuter=React.lazy(()=>{
9569+
Scheduler.log('client lazy outer initializer');
9570+
constpayload={
9571+
default: <OuterComponentinnerElement={clientLazyInner}/>,
9572+
};
9573+
constpromise=newPromise(r=>{
9574+
resolveClientOuter=()=>{
9575+
promise.status='fulfilled';
9576+
promise.value=payload;
9577+
r(payload);
9578+
};
9579+
});
9580+
returnpromise;
9581+
});
9582+
9583+
consthydrationErrors=[];
9584+
9585+
// Client hydrates with nested lazy components
9586+
letroot;
9587+
React.startTransition(()=>{
9588+
root=ReactDOMClient.hydrateRoot(
9589+
document,
9590+
<html>
9591+
<body>
9592+
<>{clientLazyOuter}</>
9593+
<>
9594+
<Sibling/>
9595+
</>
9596+
</body>
9597+
</html>,
9598+
{
9599+
onRecoverableError(error){
9600+
hydrationErrors.push(error.message);
9601+
},
9602+
},
9603+
);
9604+
});
9605+
9606+
// First suspension on outer lazy
9607+
awaitwaitFor(['client lazy outer initializer']);
9608+
resolveClientOuter();
9609+
9610+
// Second suspension on inner lazy
9611+
awaitwaitFor([
9612+
'OuterComponent id: _R_1_',
9613+
'client lazy inner initializer',
9614+
]);
9615+
resolveClientInner();
9616+
9617+
awaitwaitForAll(['InnerComponent id: _R_5_','Sibling id: _R_2_']);
9618+
9619+
// The IDs should match the server-generated IDs
9620+
expect(hydrationErrors).toEqual([]);
9621+
9622+
expect(getVisibleChildren(document)).toEqual(
9623+
<html>
9624+
<head/>
9625+
<body>
9626+
<divid="_R_1_">
9627+
<spanid="_R_5_">inner</span>
9628+
</div>
9629+
<spanid="_R_2_">sibling</span>
9630+
</body>
9631+
</html>,
9632+
);
9633+
9634+
root.unmount();
9635+
});
94819636
});
‎packages/react-reconciler/src/ReactFiberFlags.js‎
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ export const ShouldCapture = /* */ 0b0000000000000010000000000000
6262
exportconstForceUpdateForLegacySuspense=/* */0b0000000000000100000000000000000;
6363
exportconstDidPropagateContext=/* */0b0000000000001000000000000000000;
6464
exportconstNeedsPropagation=/* */0b0000000000010000000000000000000;
65-
exportconstForked=/* */0b0000000000100000000000000000000;
6665

6766
// Static tags describe aspects of a fiber that are not specific to a render,
6867
// e.g. a fiber uses a passive effect (even if there are no updates on this particular render).
6968
// This enables us to defer more work in the unmount case,
7069
// since we can defer traversing the tree during layout to look for Passive effects,
7170
// and instead rely on the static flag as a signal that there may be cleanup work.
71+
exportconstForked=/* */0b0000000000100000000000000000000;
7272
exportconstSnapshotStatic=/* */0b0000000001000000000000000000000;
7373
exportconstLayoutStatic=/* */0b0000000010000000000000000000000;
7474
exportconstRefStatic=LayoutStatic;
@@ -142,4 +142,5 @@ export const StaticMask =
142142
MaySuspendCommit|
143143
ViewTransitionStatic|
144144
ViewTransitionNamedStatic|
145-
PortalStatic;
145+
PortalStatic|
146+
Forked;
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit f0fbb0d
Browse files
gnoffgnoff
authored
[Fiber] fix useId tracking on replay (#35518)
When Fiber replays work after suspending and resolving in a microtask it
stripped the Forked flag from Fibers because this flag type was not
considered a Static flag. The Forked nature of a Fiber is not render
dependent and should persist after unwinding work. By making this change
the replay correctly generates the necessary tree context.
1 parent bb8a76c commit f0fbb0d
2 files changed
Lines changed: 158 additions & 2 deletions
File tree
‎packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js‎
Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9478,4 +9478,159 @@ Unfortunately that previous paragraph wasn't quite long enough so I'll continue
94789478
</div>,
94799479
);
94809480
});
9481+
9482+
it('useId is consistent for siblings when component suspends with nested lazy',async()=>{
9483+
// Inner component uses useId
9484+
functionInnerComponent(){
9485+
constid=React.useId();
9486+
Scheduler.log('InnerComponent id: '+id);
9487+
return<spanid={id}>inner</span>;
9488+
}
9489+
9490+
// Outer component uses useId and renders a lazy inner
9491+
functionOuterComponent({innerElement}){
9492+
constid=React.useId();
9493+
Scheduler.log('OuterComponent id: '+id);
9494+
return<divid={id}>{innerElement}</div>;
9495+
}
9496+
9497+
// This sibling also has useId - its ID must be consistent with server
9498+
functionSibling(){
9499+
constid=React.useId();
9500+
Scheduler.log('Sibling id: '+id);
9501+
return<spanid={id}>sibling</span>;
9502+
}
9503+
9504+
// Create fresh lazy components for SERVER (resolve immediately)
9505+
constserverLazyInner=React.lazy(async()=>{
9506+
Scheduler.log('server lazy inner initializer');
9507+
return{default: <InnerComponent/>};
9508+
});
9509+
9510+
constserverLazyOuter=React.lazy(async()=>{
9511+
Scheduler.log('server lazy outer initializer');
9512+
return{
9513+
default: <OuterComponentkey="outer"innerElement={serverLazyInner}/>,
9514+
};
9515+
});
9516+
9517+
// Server render with lazy (resolves immediately)
9518+
awaitact(()=>{
9519+
const{pipe}=renderToPipeableStream(
9520+
<html>
9521+
<body>
9522+
<>{serverLazyOuter}</>
9523+
<>
9524+
<Sibling/>
9525+
</>
9526+
</body>
9527+
</html>,
9528+
);
9529+
pipe(writable);
9530+
});
9531+
9532+
expect(getVisibleChildren(document)).toEqual(
9533+
<html>
9534+
<head/>
9535+
<body>
9536+
<divid="_R_1_">
9537+
<spanid="_R_5_">inner</span>
9538+
</div>
9539+
<spanid="_R_2_">sibling</span>
9540+
</body>
9541+
</html>,
9542+
);
9543+
9544+
assertLog([
9545+
'server lazy outer initializer',
9546+
'Sibling id: _R_2_',
9547+
'OuterComponent id: _R_1_',
9548+
'server lazy inner initializer',
9549+
'InnerComponent id: _R_5_',
9550+
]);
9551+
9552+
// Create fresh lazy components for CLIENT
9553+
letresolveClientInner;
9554+
constclientLazyInner=React.lazy(()=>{
9555+
Scheduler.log('client lazy inner initializer');
9556+
constpayload={default: <InnerComponent/>};
9557+
constpromise=newPromise(r=>{
9558+
resolveClientInner=()=>{
9559+
promise.status='fulfilled';
9560+
promise.value=payload;
9561+
r(payload);
9562+
};
9563+
});
9564+
returnpromise;
9565+
});
9566+
9567+
letresolveClientOuter;
9568+
constclientLazyOuter=React.lazy(()=>{
9569+
Scheduler.log('client lazy outer initializer');
9570+
constpayload={
9571+
default: <OuterComponentinnerElement={clientLazyInner}/>,
9572+
};
9573+
constpromise=newPromise(r=>{
9574+
resolveClientOuter=()=>{
9575+
promise.status='fulfilled';
9576+
promise.value=payload;
9577+
r(payload);
9578+
};
9579+
});
9580+
returnpromise;
9581+
});
9582+
9583+
consthydrationErrors=[];
9584+
9585+
// Client hydrates with nested lazy components
9586+
letroot;
9587+
React.startTransition(()=>{
9588+
root=ReactDOMClient.hydrateRoot(
9589+
document,
9590+
<html>
9591+
<body>
9592+
<>{clientLazyOuter}</>
9593+
<>
9594+
<Sibling/>
9595+
</>
9596+
</body>
9597+
</html>,
9598+
{
9599+
onRecoverableError(error){
9600+
hydrationErrors.push(error.message);
9601+
},
9602+
},
9603+
);
9604+
});
9605+
9606+
// First suspension on outer lazy
9607+
awaitwaitFor(['client lazy outer initializer']);
9608+
resolveClientOuter();
9609+
9610+
// Second suspension on inner lazy
9611+
awaitwaitFor([
9612+
'OuterComponent id: _R_1_',
9613+
'client lazy inner initializer',
9614+
]);
9615+
resolveClientInner();
9616+
9617+
awaitwaitForAll(['InnerComponent id: _R_5_','Sibling id: _R_2_']);
9618+
9619+
// The IDs should match the server-generated IDs
9620+
expect(hydrationErrors).toEqual([]);
9621+
9622+
expect(getVisibleChildren(document)).toEqual(
9623+
<html>
9624+
<head/>
9625+
<body>
9626+
<divid="_R_1_">
9627+
<spanid="_R_5_">inner</span>
9628+
</div>
9629+
<spanid="_R_2_">sibling</span>
9630+
</body>
9631+
</html>,
9632+
);
9633+
9634+
root.unmount();
9635+
});
94819636
});
‎packages/react-reconciler/src/ReactFiberFlags.js‎
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ export const ShouldCapture = /* */ 0b0000000000000010000000000000
6262
exportconstForceUpdateForLegacySuspense=/* */0b0000000000000100000000000000000;
6363
exportconstDidPropagateContext=/* */0b0000000000001000000000000000000;
6464
exportconstNeedsPropagation=/* */0b0000000000010000000000000000000;
65-
exportconstForked=/* */0b0000000000100000000000000000000;
6665

6766
// Static tags describe aspects of a fiber that are not specific to a render,
6867
// e.g. a fiber uses a passive effect (even if there are no updates on this particular render).
6968
// This enables us to defer more work in the unmount case,
7069
// since we can defer traversing the tree during layout to look for Passive effects,
7170
// and instead rely on the static flag as a signal that there may be cleanup work.
71+
exportconstForked=/* */0b0000000000100000000000000000000;
7272
exportconstSnapshotStatic=/* */0b0000000001000000000000000000000;
7373
exportconstLayoutStatic=/* */0b0000000010000000000000000000000;
7474
exportconstRefStatic=LayoutStatic;
@@ -142,4 +142,5 @@ export const StaticMask =
142142
MaySuspendCommit|
143143
ViewTransitionStatic|
144144
ViewTransitionNamedStatic|
145-
PortalStatic;
145+
PortalStatic|
146+
Forked;
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit f0fbb0d
Browse files
gnoffgnoff
authored
[Fiber] fix useId tracking on replay (#35518)
When Fiber replays work after suspending and resolving in a microtask it
stripped the Forked flag from Fibers because this flag type was not
considered a Static flag. The Forked nature of a Fiber is not render
dependent and should persist after unwinding work. By making this change
the replay correctly generates the necessary tree context.
1 parent bb8a76c commit f0fbb0d
2 files changed
Lines changed: 158 additions & 2 deletions
File tree
‎packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js‎
Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9478,4 +9478,159 @@ Unfortunately that previous paragraph wasn't quite long enough so I'll continue
94789478
</div>,
94799479
);
94809480
});
9481+
9482+
it('useId is consistent for siblings when component suspends with nested lazy',async()=>{
9483+
// Inner component uses useId
9484+
functionInnerComponent(){
9485+
constid=React.useId();
9486+
Scheduler.log('InnerComponent id: '+id);
9487+
return<spanid={id}>inner</span>;
9488+
}
9489+
9490+
// Outer component uses useId and renders a lazy inner
9491+
functionOuterComponent({innerElement}){
9492+
constid=React.useId();
9493+
Scheduler.log('OuterComponent id: '+id);
9494+
return<divid={id}>{innerElement}</div>;
9495+
}
9496+
9497+
// This sibling also has useId - its ID must be consistent with server
9498+
functionSibling(){
9499+
constid=React.useId();
9500+
Scheduler.log('Sibling id: '+id);
9501+
return<spanid={id}>sibling</span>;
9502+
}
9503+
9504+
// Create fresh lazy components for SERVER (resolve immediately)
9505+
constserverLazyInner=React.lazy(async()=>{
9506+
Scheduler.log('server lazy inner initializer');
9507+
return{default: <InnerComponent/>};
9508+
});
9509+
9510+
constserverLazyOuter=React.lazy(async()=>{
9511+
Scheduler.log('server lazy outer initializer');
9512+
return{
9513+
default: <OuterComponentkey="outer"innerElement={serverLazyInner}/>,
9514+
};
9515+
});
9516+
9517+
// Server render with lazy (resolves immediately)
9518+
awaitact(()=>{
9519+
const{pipe}=renderToPipeableStream(
9520+
<html>
9521+
<body>
9522+
<>{serverLazyOuter}</>
9523+
<>
9524+
<Sibling/>
9525+
</>
9526+
</body>
9527+
</html>,
9528+
);
9529+
pipe(writable);
9530+
});
9531+
9532+
expect(getVisibleChildren(document)).toEqual(
9533+
<html>
9534+
<head/>
9535+
<body>
9536+
<divid="_R_1_">
9537+
<spanid="_R_5_">inner</span>
9538+
</div>
9539+
<spanid="_R_2_">sibling</span>
9540+
</body>
9541+
</html>,
9542+
);
9543+
9544+
assertLog([
9545+
'server lazy outer initializer',
9546+
'Sibling id: _R_2_',
9547+
'OuterComponent id: _R_1_',
9548+
'server lazy inner initializer',
9549+
'InnerComponent id: _R_5_',
9550+
]);
9551+
9552+
// Create fresh lazy components for CLIENT
9553+
letresolveClientInner;
9554+
constclientLazyInner=React.lazy(()=>{
9555+
Scheduler.log('client lazy inner initializer');
9556+
constpayload={default: <InnerComponent/>};
9557+
constpromise=newPromise(r=>{
9558+
resolveClientInner=()=>{
9559+
promise.status='fulfilled';
9560+
promise.value=payload;
9561+
r(payload);
9562+
};
9563+
});
9564+
returnpromise;
9565+
});
9566+
9567+
letresolveClientOuter;
9568+
constclientLazyOuter=React.lazy(()=>{
9569+
Scheduler.log('client lazy outer initializer');
9570+
constpayload={
9571+
default: <OuterComponentinnerElement={clientLazyInner}/>,
9572+
};
9573+
constpromise=newPromise(r=>{
9574+
resolveClientOuter=()=>{
9575+
promise.status='fulfilled';
9576+
promise.value=payload;
9577+
r(payload);
9578+
};
9579+
});
9580+
returnpromise;
9581+
});
9582+
9583+
consthydrationErrors=[];
9584+
9585+
// Client hydrates with nested lazy components
9586+
letroot;
9587+
React.startTransition(()=>{
9588+
root=ReactDOMClient.hydrateRoot(
9589+
document,
9590+
<html>
9591+
<body>
9592+
<>{clientLazyOuter}</>
9593+
<>
9594+
<Sibling/>
9595+
</>
9596+
</body>
9597+
</html>,
9598+
{
9599+
onRecoverableError(error){
9600+
hydrationErrors.push(error.message);
9601+
},
9602+
},
9603+
);
9604+
});
9605+
9606+
// First suspension on outer lazy
9607+
awaitwaitFor(['client lazy outer initializer']);
9608+
resolveClientOuter();
9609+
9610+
// Second suspension on inner lazy
9611+
awaitwaitFor([
9612+
'OuterComponent id: _R_1_',
9613+
'client lazy inner initializer',
9614+
]);
9615+
resolveClientInner();
9616+
9617+
awaitwaitForAll(['InnerComponent id: _R_5_','Sibling id: _R_2_']);
9618+
9619+
// The IDs should match the server-generated IDs
9620+
expect(hydrationErrors).toEqual([]);
9621+
9622+
expect(getVisibleChildren(document)).toEqual(
9623+
<html>
9624+
<head/>
9625+
<body>
9626+
<divid="_R_1_">
9627+
<spanid="_R_5_">inner</span>
9628+
</div>
9629+
<spanid="_R_2_">sibling</span>
9630+
</body>
9631+
</html>,
9632+
);
9633+
9634+
root.unmount();
9635+
});
94819636
});
‎packages/react-reconciler/src/ReactFiberFlags.js‎
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ export const ShouldCapture = /* */ 0b0000000000000010000000000000
6262
exportconstForceUpdateForLegacySuspense=/* */0b0000000000000100000000000000000;
6363
exportconstDidPropagateContext=/* */0b0000000000001000000000000000000;
6464
exportconstNeedsPropagation=/* */0b0000000000010000000000000000000;
65-
exportconstForked=/* */0b0000000000100000000000000000000;
6665

6766
// Static tags describe aspects of a fiber that are not specific to a render,
6867
// e.g. a fiber uses a passive effect (even if there are no updates on this particular render).
6968
// This enables us to defer more work in the unmount case,
7069
// since we can defer traversing the tree during layout to look for Passive effects,
7170
// and instead rely on the static flag as a signal that there may be cleanup work.
71+
exportconstForked=/* */0b0000000000100000000000000000000;
7272
exportconstSnapshotStatic=/* */0b0000000001000000000000000000000;
7373
exportconstLayoutStatic=/* */0b0000000010000000000000000000000;
7474
exportconstRefStatic=LayoutStatic;
@@ -142,4 +142,5 @@ export const StaticMask =
142142
MaySuspendCommit|
143143
ViewTransitionStatic|
144144
ViewTransitionNamedStatic|
145-
PortalStatic;
145+
PortalStatic|
146+
Forked;
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit f0fbb0d
Browse files
gnoffgnoff
authored
[Fiber] fix useId tracking on replay (#35518)
When Fiber replays work after suspending and resolving in a microtask it
stripped the Forked flag from Fibers because this flag type was not
considered a Static flag. The Forked nature of a Fiber is not render
dependent and should persist after unwinding work. By making this change
the replay correctly generates the necessary tree context.
1 parent bb8a76c commit f0fbb0d
2 files changed
Lines changed: 158 additions & 2 deletions
File tree
‎packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js‎
Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9478,4 +9478,159 @@ Unfortunately that previous paragraph wasn't quite long enough so I'll continue
94789478
</div>,
94799479
);
94809480
});
9481+
9482+
it('useId is consistent for siblings when component suspends with nested lazy',async()=>{
9483+
// Inner component uses useId
9484+
functionInnerComponent(){
9485+
constid=React.useId();
9486+
Scheduler.log('InnerComponent id: '+id);
9487+
return<spanid={id}>inner</span>;
9488+
}
9489+
9490+
// Outer component uses useId and renders a lazy inner
9491+
functionOuterComponent({innerElement}){
9492+
constid=React.useId();
9493+
Scheduler.log('OuterComponent id: '+id);
9494+
return<divid={id}>{innerElement}</div>;
9495+
}
9496+
9497+
// This sibling also has useId - its ID must be consistent with server
9498+
functionSibling(){
9499+
constid=React.useId();
9500+
Scheduler.log('Sibling id: '+id);
9501+
return<spanid={id}>sibling</span>;
9502+
}
9503+
9504+
// Create fresh lazy components for SERVER (resolve immediately)
9505+
constserverLazyInner=React.lazy(async()=>{
9506+
Scheduler.log('server lazy inner initializer');
9507+
return{default: <InnerComponent/>};
9508+
});
9509+
9510+
constserverLazyOuter=React.lazy(async()=>{
9511+
Scheduler.log('server lazy outer initializer');
9512+
return{
9513+
default: <OuterComponentkey="outer"innerElement={serverLazyInner}/>,
9514+
};
9515+
});
9516+
9517+
// Server render with lazy (resolves immediately)
9518+
awaitact(()=>{
9519+
const{pipe}=renderToPipeableStream(
9520+
<html>
9521+
<body>
9522+
<>{serverLazyOuter}</>
9523+
<>
9524+
<Sibling/>
9525+
</>
9526+
</body>
9527+
</html>,
9528+
);
9529+
pipe(writable);
9530+
});
9531+
9532+
expect(getVisibleChildren(document)).toEqual(
9533+
<html>
9534+
<head/>
9535+
<body>
9536+
<divid="_R_1_">
9537+
<spanid="_R_5_">inner</span>
9538+
</div>
9539+
<spanid="_R_2_">sibling</span>
9540+
</body>
9541+
</html>,
9542+
);
9543+
9544+
assertLog([
9545+
'server lazy outer initializer',
9546+
'Sibling id: _R_2_',
9547+
'OuterComponent id: _R_1_',
9548+
'server lazy inner initializer',
9549+
'InnerComponent id: _R_5_',
9550+
]);
9551+
9552+
// Create fresh lazy components for CLIENT
9553+
letresolveClientInner;
9554+
constclientLazyInner=React.lazy(()=>{
9555+
Scheduler.log('client lazy inner initializer');
9556+
constpayload={default: <InnerComponent/>};
9557+
constpromise=newPromise(r=>{
9558+
resolveClientInner=()=>{
9559+
promise.status='fulfilled';
9560+
promise.value=payload;
9561+
r(payload);
9562+
};
9563+
});
9564+
returnpromise;
9565+
});
9566+
9567+
letresolveClientOuter;
9568+
constclientLazyOuter=React.lazy(()=>{
9569+
Scheduler.log('client lazy outer initializer');
9570+
constpayload={
9571+
default: <OuterComponentinnerElement={clientLazyInner}/>,
9572+
};
9573+
constpromise=newPromise(r=>{
9574+
resolveClientOuter=()=>{
9575+
promise.status='fulfilled';
9576+
promise.value=payload;
9577+
r(payload);
9578+
};
9579+
});
9580+
returnpromise;
9581+
});
9582+
9583+
consthydrationErrors=[];
9584+
9585+
// Client hydrates with nested lazy components
9586+
letroot;
9587+
React.startTransition(()=>{
9588+
root=ReactDOMClient.hydrateRoot(
9589+
document,
9590+
<html>
9591+
<body>
9592+
<>{clientLazyOuter}</>
9593+
<>
9594+
<Sibling/>
9595+
</>
9596+
</body>
9597+
</html>,
9598+
{
9599+
onRecoverableError(error){
9600+
hydrationErrors.push(error.message);
9601+
},
9602+
},
9603+
);
9604+
});
9605+
9606+
// First suspension on outer lazy
9607+
awaitwaitFor(['client lazy outer initializer']);
9608+
resolveClientOuter();
9609+
9610+
// Second suspension on inner lazy
9611+
awaitwaitFor([
9612+
'OuterComponent id: _R_1_',
9613+
'client lazy inner initializer',
9614+
]);
9615+
resolveClientInner();
9616+
9617+
awaitwaitForAll(['InnerComponent id: _R_5_','Sibling id: _R_2_']);
9618+
9619+
// The IDs should match the server-generated IDs
9620+
expect(hydrationErrors).toEqual([]);
9621+
9622+
expect(getVisibleChildren(document)).toEqual(
9623+
<html>
9624+
<head/>
9625+
<body>
9626+
<divid="_R_1_">
9627+
<spanid="_R_5_">inner</span>
9628+
</div>
9629+
<spanid="_R_2_">sibling</span>
9630+
</body>
9631+
</html>,
9632+
);
9633+
9634+
root.unmount();
9635+
});
94819636
});
‎packages/react-reconciler/src/ReactFiberFlags.js‎
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ export const ShouldCapture = /* */ 0b0000000000000010000000000000
6262
exportconstForceUpdateForLegacySuspense=/* */0b0000000000000100000000000000000;
6363
exportconstDidPropagateContext=/* */0b0000000000001000000000000000000;
6464
exportconstNeedsPropagation=/* */0b0000000000010000000000000000000;
65-
exportconstForked=/* */0b0000000000100000000000000000000;
6665

6766
// Static tags describe aspects of a fiber that are not specific to a render,
6867
// e.g. a fiber uses a passive effect (even if there are no updates on this particular render).
6968
// This enables us to defer more work in the unmount case,
7069
// since we can defer traversing the tree during layout to look for Passive effects,
7170
// and instead rely on the static flag as a signal that there may be cleanup work.
71+
exportconstForked=/* */0b0000000000100000000000000000000;
7272
exportconstSnapshotStatic=/* */0b0000000001000000000000000000000;
7373
exportconstLayoutStatic=/* */0b0000000010000000000000000000000;
7474
exportconstRefStatic=LayoutStatic;
@@ -142,4 +142,5 @@ export const StaticMask =
142142
MaySuspendCommit|
143143
ViewTransitionStatic|
144144
ViewTransitionNamedStatic|
145-
PortalStatic;
145+
PortalStatic|
146+
Forked;
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit f0fbb0d
Browse files
gnoffgnoff
authored
[Fiber] fix useId tracking on replay (#35518)
When Fiber replays work after suspending and resolving in a microtask it
stripped the Forked flag from Fibers because this flag type was not
considered a Static flag. The Forked nature of a Fiber is not render
dependent and should persist after unwinding work. By making this change
the replay correctly generates the necessary tree context.
1 parent bb8a76c commit f0fbb0d
2 files changed
Lines changed: 158 additions & 2 deletions
File tree
‎packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js‎
Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9478,4 +9478,159 @@ Unfortunately that previous paragraph wasn't quite long enough so I'll continue
94789478
</div>,
94799479
);
94809480
});
9481+
9482+
it('useId is consistent for siblings when component suspends with nested lazy',async()=>{
9483+
// Inner component uses useId
9484+
functionInnerComponent(){
9485+
constid=React.useId();
9486+
Scheduler.log('InnerComponent id: '+id);
9487+
return<spanid={id}>inner</span>;
9488+
}
9489+
9490+
// Outer component uses useId and renders a lazy inner
9491+
functionOuterComponent({innerElement}){
9492+
constid=React.useId();
9493+
Scheduler.log('OuterComponent id: '+id);
9494+
return<divid={id}>{innerElement}</div>;
9495+
}
9496+
9497+
// This sibling also has useId - its ID must be consistent with server
9498+
functionSibling(){
9499+
constid=React.useId();
9500+
Scheduler.log('Sibling id: '+id);
9501+
return<spanid={id}>sibling</span>;
9502+
}
9503+
9504+
// Create fresh lazy components for SERVER (resolve immediately)
9505+
constserverLazyInner=React.lazy(async()=>{
9506+
Scheduler.log('server lazy inner initializer');
9507+
return{default: <InnerComponent/>};
9508+
});
9509+
9510+
constserverLazyOuter=React.lazy(async()=>{
9511+
Scheduler.log('server lazy outer initializer');
9512+
return{
9513+
default: <OuterComponentkey="outer"innerElement={serverLazyInner}/>,
9514+
};
9515+
});
9516+
9517+
// Server render with lazy (resolves immediately)
9518+
awaitact(()=>{
9519+
const{pipe}=renderToPipeableStream(
9520+
<html>
9521+
<body>
9522+
<>{serverLazyOuter}</>
9523+
<>
9524+
<Sibling/>
9525+
</>
9526+
</body>
9527+
</html>,
9528+
);
9529+
pipe(writable);
9530+
});
9531+
9532+
expect(getVisibleChildren(document)).toEqual(
9533+
<html>
9534+
<head/>
9535+
<body>
9536+
<divid="_R_1_">
9537+
<spanid="_R_5_">inner</span>
9538+
</div>
9539+
<spanid="_R_2_">sibling</span>
9540+
</body>
9541+
</html>,
9542+
);
9543+
9544+
assertLog([
9545+
'server lazy outer initializer',
9546+
'Sibling id: _R_2_',
9547+
'OuterComponent id: _R_1_',
9548+
'server lazy inner initializer',
9549+
'InnerComponent id: _R_5_',
9550+
]);
9551+
9552+
// Create fresh lazy components for CLIENT
9553+
letresolveClientInner;
9554+
constclientLazyInner=React.lazy(()=>{
9555+
Scheduler.log('client lazy inner initializer');
9556+
constpayload={default: <InnerComponent/>};
9557+
constpromise=newPromise(r=>{
9558+
resolveClientInner=()=>{
9559+
promise.status='fulfilled';
9560+
promise.value=payload;
9561+
r(payload);
9562+
};
9563+
});
9564+
returnpromise;
9565+
});
9566+
9567+
letresolveClientOuter;
9568+
constclientLazyOuter=React.lazy(()=>{
9569+
Scheduler.log('client lazy outer initializer');
9570+
constpayload={
9571+
default: <OuterComponentinnerElement={clientLazyInner}/>,
9572+
};
9573+
constpromise=newPromise(r=>{
9574+
resolveClientOuter=()=>{
9575+
promise.status='fulfilled';
9576+
promise.value=payload;
9577+
r(payload);
9578+
};
9579+
});
9580+
returnpromise;
9581+
});
9582+
9583+
consthydrationErrors=[];
9584+
9585+
// Client hydrates with nested lazy components
9586+
letroot;
9587+
React.startTransition(()=>{
9588+
root=ReactDOMClient.hydrateRoot(
9589+
document,
9590+
<html>
9591+
<body>
9592+
<>{clientLazyOuter}</>
9593+
<>
9594+
<Sibling/>
9595+
</>
9596+
</body>
9597+
</html>,
9598+
{
9599+
onRecoverableError(error){
9600+
hydrationErrors.push(error.message);
9601+
},
9602+
},
9603+
);
9604+
});
9605+
9606+
// First suspension on outer lazy
9607+
awaitwaitFor(['client lazy outer initializer']);
9608+
resolveClientOuter();
9609+
9610+
// Second suspension on inner lazy
9611+
awaitwaitFor([
9612+
'OuterComponent id: _R_1_',
9613+
'client lazy inner initializer',
9614+
]);
9615+
resolveClientInner();
9616+
9617+
awaitwaitForAll(['InnerComponent id: _R_5_','Sibling id: _R_2_']);
9618+
9619+
// The IDs should match the server-generated IDs
9620+
expect(hydrationErrors).toEqual([]);
9621+
9622+
expect(getVisibleChildren(document)).toEqual(
9623+
<html>
9624+
<head/>
9625+
<body>
9626+
<divid="_R_1_">
9627+
<spanid="_R_5_">inner</span>
9628+
</div>
9629+
<spanid="_R_2_">sibling</span>
9630+
</body>
9631+
</html>,
9632+
);
9633+
9634+
root.unmount();
9635+
});
94819636
});
‎packages/react-reconciler/src/ReactFiberFlags.js‎
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ export const ShouldCapture = /* */ 0b0000000000000010000000000000
6262
exportconstForceUpdateForLegacySuspense=/* */0b0000000000000100000000000000000;
6363
exportconstDidPropagateContext=/* */0b0000000000001000000000000000000;
6464
exportconstNeedsPropagation=/* */0b0000000000010000000000000000000;
65-
exportconstForked=/* */0b0000000000100000000000000000000;
6665

6766
// Static tags describe aspects of a fiber that are not specific to a render,
6867
// e.g. a fiber uses a passive effect (even if there are no updates on this particular render).
6968
// This enables us to defer more work in the unmount case,
7069
// since we can defer traversing the tree during layout to look for Passive effects,
7170
// and instead rely on the static flag as a signal that there may be cleanup work.
71+
exportconstForked=/* */0b0000000000100000000000000000000;
7272
exportconstSnapshotStatic=/* */0b0000000001000000000000000000000;
7373
exportconstLayoutStatic=/* */0b0000000010000000000000000000000;
7474
exportconstRefStatic=LayoutStatic;
@@ -142,4 +142,5 @@ export const StaticMask =
142142
MaySuspendCommit|
143143
ViewTransitionStatic|
144144
ViewTransitionNamedStatic|
145-
PortalStatic;
145+
PortalStatic|
146+
Forked;
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit f0fbb0d
Browse files
gnoffgnoff
authored
[Fiber] fix useId tracking on replay (#35518)
When Fiber replays work after suspending and resolving in a microtask it
stripped the Forked flag from Fibers because this flag type was not
considered a Static flag. The Forked nature of a Fiber is not render
dependent and should persist after unwinding work. By making this change
the replay correctly generates the necessary tree context.
1 parent bb8a76c commit f0fbb0d
2 files changed
Lines changed: 158 additions & 2 deletions
File tree
‎packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js‎
Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9478,4 +9478,159 @@ Unfortunately that previous paragraph wasn't quite long enough so I'll continue
94789478
</div>,
94799479
);
94809480
});
9481+
9482+
it('useId is consistent for siblings when component suspends with nested lazy',async()=>{
9483+
// Inner component uses useId
9484+
functionInnerComponent(){
9485+
constid=React.useId();
9486+
Scheduler.log('InnerComponent id: '+id);
9487+
return<spanid={id}>inner</span>;
9488+
}
9489+
9490+
// Outer component uses useId and renders a lazy inner
9491+
functionOuterComponent({innerElement}){
9492+
constid=React.useId();
9493+
Scheduler.log('OuterComponent id: '+id);
9494+
return<divid={id}>{innerElement}</div>;
9495+
}
9496+
9497+
// This sibling also has useId - its ID must be consistent with server
9498+
functionSibling(){
9499+
constid=React.useId();
9500+
Scheduler.log('Sibling id: '+id);
9501+
return<spanid={id}>sibling</span>;
9502+
}
9503+
9504+
// Create fresh lazy components for SERVER (resolve immediately)
9505+
constserverLazyInner=React.lazy(async()=>{
9506+
Scheduler.log('server lazy inner initializer');
9507+
return{default: <InnerComponent/>};
9508+
});
9509+
9510+
constserverLazyOuter=React.lazy(async()=>{
9511+
Scheduler.log('server lazy outer initializer');
9512+
return{
9513+
default: <OuterComponentkey="outer"innerElement={serverLazyInner}/>,
9514+
};
9515+
});
9516+
9517+
// Server render with lazy (resolves immediately)
9518+
awaitact(()=>{
9519+
const{pipe}=renderToPipeableStream(
9520+
<html>
9521+
<body>
9522+
<>{serverLazyOuter}</>
9523+
<>
9524+
<Sibling/>
9525+
</>
9526+
</body>
9527+
</html>,
9528+
);
9529+
pipe(writable);
9530+
});
9531+
9532+
expect(getVisibleChildren(document)).toEqual(
9533+
<html>
9534+
<head/>
9535+
<body>
9536+
<divid="_R_1_">
9537+
<spanid="_R_5_">inner</span>
9538+
</div>
9539+
<spanid="_R_2_">sibling</span>
9540+
</body>
9541+
</html>,
9542+
);
9543+
9544+
assertLog([
9545+
'server lazy outer initializer',
9546+
'Sibling id: _R_2_',
9547+
'OuterComponent id: _R_1_',
9548+
'server lazy inner initializer',
9549+
'InnerComponent id: _R_5_',
9550+
]);
9551+
9552+
// Create fresh lazy components for CLIENT
9553+
letresolveClientInner;
9554+
constclientLazyInner=React.lazy(()=>{
9555+
Scheduler.log('client lazy inner initializer');
9556+
constpayload={default: <InnerComponent/>};
9557+
constpromise=newPromise(r=>{
9558+
resolveClientInner=()=>{
9559+
promise.status='fulfilled';
9560+
promise.value=payload;
9561+
r(payload);
9562+
};
9563+
});
9564+
returnpromise;
9565+
});
9566+
9567+
letresolveClientOuter;
9568+
constclientLazyOuter=React.lazy(()=>{
9569+
Scheduler.log('client lazy outer initializer');
9570+
constpayload={
9571+
default: <OuterComponentinnerElement={clientLazyInner}/>,
9572+
};
9573+
constpromise=newPromise(r=>{
9574+
resolveClientOuter=()=>{
9575+
promise.status='fulfilled';
9576+
promise.value=payload;
9577+
r(payload);
9578+
};
9579+
});
9580+
returnpromise;
9581+
});
9582+
9583+
consthydrationErrors=[];
9584+
9585+
// Client hydrates with nested lazy components
9586+
letroot;
9587+
React.startTransition(()=>{
9588+
root=ReactDOMClient.hydrateRoot(
9589+
document,
9590+
<html>
9591+
<body>
9592+
<>{clientLazyOuter}</>
9593+
<>
9594+
<Sibling/>
9595+
</>
9596+
</body>
9597+
</html>,
9598+
{
9599+
onRecoverableError(error){
9600+
hydrationErrors.push(error.message);
9601+
},
9602+
},
9603+
);
9604+
});
9605+
9606+
// First suspension on outer lazy
9607+
awaitwaitFor(['client lazy outer initializer']);
9608+
resolveClientOuter();
9609+
9610+
// Second suspension on inner lazy
9611+
awaitwaitFor([
9612+
'OuterComponent id: _R_1_',
9613+
'client lazy inner initializer',
9614+
]);
9615+
resolveClientInner();
9616+
9617+
awaitwaitForAll(['InnerComponent id: _R_5_','Sibling id: _R_2_']);
9618+
9619+
// The IDs should match the server-generated IDs
9620+
expect(hydrationErrors).toEqual([]);
9621+
9622+
expect(getVisibleChildren(document)).toEqual(
9623+
<html>
9624+
<head/>
9625+
<body>
9626+
<divid="_R_1_">
9627+
<spanid="_R_5_">inner</span>
9628+
</div>
9629+
<spanid="_R_2_">sibling</span>
9630+
</body>
9631+
</html>,
9632+
);
9633+
9634+
root.unmount();
9635+
});
94819636
});
‎packages/react-reconciler/src/ReactFiberFlags.js‎
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ export const ShouldCapture = /* */ 0b0000000000000010000000000000
6262
exportconstForceUpdateForLegacySuspense=/* */0b0000000000000100000000000000000;
6363
exportconstDidPropagateContext=/* */0b0000000000001000000000000000000;
6464
exportconstNeedsPropagation=/* */0b0000000000010000000000000000000;
65-
exportconstForked=/* */0b0000000000100000000000000000000;
6665

6766
// Static tags describe aspects of a fiber that are not specific to a render,
6867
// e.g. a fiber uses a passive effect (even if there are no updates on this particular render).
6968
// This enables us to defer more work in the unmount case,
7069
// since we can defer traversing the tree during layout to look for Passive effects,
7170
// and instead rely on the static flag as a signal that there may be cleanup work.
71+
exportconstForked=/* */0b0000000000100000000000000000000;
7272
exportconstSnapshotStatic=/* */0b0000000001000000000000000000000;
7373
exportconstLayoutStatic=/* */0b0000000010000000000000000000000;
7474
exportconstRefStatic=LayoutStatic;
@@ -142,4 +142,5 @@ export const StaticMask =
142142
MaySuspendCommit|
143143
ViewTransitionStatic|
144144
ViewTransitionNamedStatic|
145-
PortalStatic;
145+
PortalStatic|
146+
Forked;
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit f0fbb0d
Browse files
gnoffgnoff
authored
[Fiber] fix useId tracking on replay (#35518)
When Fiber replays work after suspending and resolving in a microtask it
stripped the Forked flag from Fibers because this flag type was not
considered a Static flag. The Forked nature of a Fiber is not render
dependent and should persist after unwinding work. By making this change
the replay correctly generates the necessary tree context.
1 parent bb8a76c commit f0fbb0d
2 files changed
Lines changed: 158 additions & 2 deletions
File tree
‎packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js‎
Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9478,4 +9478,159 @@ Unfortunately that previous paragraph wasn't quite long enough so I'll continue
94789478
</div>,
94799479
);
94809480
});
9481+
9482+
it('useId is consistent for siblings when component suspends with nested lazy',async()=>{
9483+
// Inner component uses useId
9484+
functionInnerComponent(){
9485+
constid=React.useId();
9486+
Scheduler.log('InnerComponent id: '+id);
9487+
return<spanid={id}>inner</span>;
9488+
}
9489+
9490+
// Outer component uses useId and renders a lazy inner
9491+
functionOuterComponent({innerElement}){
9492+
constid=React.useId();
9493+
Scheduler.log('OuterComponent id: '+id);
9494+
return<divid={id}>{innerElement}</div>;
9495+
}
9496+
9497+
// This sibling also has useId - its ID must be consistent with server
9498+
functionSibling(){
9499+
constid=React.useId();
9500+
Scheduler.log('Sibling id: '+id);
9501+
return<spanid={id}>sibling</span>;
9502+
}
9503+
9504+
// Create fresh lazy components for SERVER (resolve immediately)
9505+
constserverLazyInner=React.lazy(async()=>{
9506+
Scheduler.log('server lazy inner initializer');
9507+
return{default: <InnerComponent/>};
9508+
});
9509+
9510+
constserverLazyOuter=React.lazy(async()=>{
9511+
Scheduler.log('server lazy outer initializer');
9512+
return{
9513+
default: <OuterComponentkey="outer"innerElement={serverLazyInner}/>,
9514+
};
9515+
});
9516+
9517+
// Server render with lazy (resolves immediately)
9518+
awaitact(()=>{
9519+
const{pipe}=renderToPipeableStream(
9520+
<html>
9521+
<body>
9522+
<>{serverLazyOuter}</>
9523+
<>
9524+
<Sibling/>
9525+
</>
9526+
</body>
9527+
</html>,
9528+
);
9529+
pipe(writable);
9530+
});
9531+
9532+
expect(getVisibleChildren(document)).toEqual(
9533+
<html>
9534+
<head/>
9535+
<body>
9536+
<divid="_R_1_">
9537+
<spanid="_R_5_">inner</span>
9538+
</div>
9539+
<spanid="_R_2_">sibling</span>
9540+
</body>
9541+
</html>,
9542+
);
9543+
9544+
assertLog([
9545+
'server lazy outer initializer',
9546+
'Sibling id: _R_2_',
9547+
'OuterComponent id: _R_1_',
9548+
'server lazy inner initializer',
9549+
'InnerComponent id: _R_5_',
9550+
]);
9551+
9552+
// Create fresh lazy components for CLIENT
9553+
letresolveClientInner;
9554+
constclientLazyInner=React.lazy(()=>{
9555+
Scheduler.log('client lazy inner initializer');
9556+
constpayload={default: <InnerComponent/>};
9557+
constpromise=newPromise(r=>{
9558+
resolveClientInner=()=>{
9559+
promise.status='fulfilled';
9560+
promise.value=payload;
9561+
r(payload);
9562+
};
9563+
});
9564+
returnpromise;
9565+
});
9566+
9567+
letresolveClientOuter;
9568+
constclientLazyOuter=React.lazy(()=>{
9569+
Scheduler.log('client lazy outer initializer');
9570+
constpayload={
9571+
default: <OuterComponentinnerElement={clientLazyInner}/>,
9572+
};
9573+
constpromise=newPromise(r=>{
9574+
resolveClientOuter=()=>{
9575+
promise.status='fulfilled';
9576+
promise.value=payload;
9577+
r(payload);
9578+
};
9579+
});
9580+
returnpromise;
9581+
});
9582+
9583+
consthydrationErrors=[];
9584+
9585+
// Client hydrates with nested lazy components
9586+
letroot;
9587+
React.startTransition(()=>{
9588+
root=ReactDOMClient.hydrateRoot(
9589+
document,
9590+
<html>
9591+
<body>
9592+
<>{clientLazyOuter}</>
9593+
<>
9594+
<Sibling/>
9595+
</>
9596+
</body>
9597+
</html>,
9598+
{
9599+
onRecoverableError(error){
9600+
hydrationErrors.push(error.message);
9601+
},
9602+
},
9603+
);
9604+
});
9605+
9606+
// First suspension on outer lazy
9607+
awaitwaitFor(['client lazy outer initializer']);
9608+
resolveClientOuter();
9609+
9610+
// Second suspension on inner lazy
9611+
awaitwaitFor([
9612+
'OuterComponent id: _R_1_',
9613+
'client lazy inner initializer',
9614+
]);
9615+
resolveClientInner();
9616+
9617+
awaitwaitForAll(['InnerComponent id: _R_5_','Sibling id: _R_2_']);
9618+
9619+
// The IDs should match the server-generated IDs
9620+
expect(hydrationErrors).toEqual([]);
9621+
9622+
expect(getVisibleChildren(document)).toEqual(
9623+
<html>
9624+
<head/>
9625+
<body>
9626+
<divid="_R_1_">
9627+
<spanid="_R_5_">inner</span>
9628+
</div>
9629+
<spanid="_R_2_">sibling</span>
9630+
</body>
9631+
</html>,
9632+
);
9633+
9634+
root.unmount();
9635+
});
94819636
});
‎packages/react-reconciler/src/ReactFiberFlags.js‎
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ export const ShouldCapture = /* */ 0b0000000000000010000000000000
6262
exportconstForceUpdateForLegacySuspense=/* */0b0000000000000100000000000000000;
6363
exportconstDidPropagateContext=/* */0b0000000000001000000000000000000;
6464
exportconstNeedsPropagation=/* */0b0000000000010000000000000000000;
65-
exportconstForked=/* */0b0000000000100000000000000000000;
6665

6766
// Static tags describe aspects of a fiber that are not specific to a render,
6867
// e.g. a fiber uses a passive effect (even if there are no updates on this particular render).
6968
// This enables us to defer more work in the unmount case,
7069
// since we can defer traversing the tree during layout to look for Passive effects,
7170
// and instead rely on the static flag as a signal that there may be cleanup work.
71+
exportconstForked=/* */0b0000000000100000000000000000000;
7272
exportconstSnapshotStatic=/* */0b0000000001000000000000000000000;
7373
exportconstLayoutStatic=/* */0b0000000010000000000000000000000;
7474
exportconstRefStatic=LayoutStatic;
@@ -142,4 +142,5 @@ export const StaticMask =
142142
MaySuspendCommit|
143143
ViewTransitionStatic|
144144
ViewTransitionNamedStatic|
145-
PortalStatic;
145+
PortalStatic|
146+
Forked;
0 commit comments
Comments
 (0)