Commit de68d2f

Browse files
gnoffgnoff
authored
Register Suspense retry handlers in commit phase (#31667)
To avoid GC pressure and accidentally hanging onto old trees Suspense boundary retries are now implemented in the commit phase. I used the Callback flag which was previously only used to schedule callbacks for Class components. This isn't quite semantically equivalent but it's unused and seemingly compatible.
1 parent 16d2bbb commit de68d2f

3 files changed

Lines changed: 43 additions & 19 deletions

File tree

‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,20 +1310,28 @@ export function registerSuspenseInstanceRetry(
13101310
callback: ()=>void,
13111311
){
13121312
const ownerDocument =instance.ownerDocument;
1313-
if(ownerDocument.readyState!==DOCUMENT_READY_STATE_COMPLETE){
1314-
ownerDocument.addEventListener(
1315-
'DOMContentLoaded',
1316-
()=>{
1317-
if(instance.data===SUSPENSE_PENDING_START_DATA){
1318-
callback();
1319-
}
1320-
},
1321-
{
1322-
once: true,
1323-
},
1324-
);
1313+
if(
1314+
// The Fizz runtime must have put this boundary into client render or complete
1315+
// state after the render finished but before it committed. We need to call the
1316+
// callback now rather than wait
1317+
instance.data!==SUSPENSE_PENDING_START_DATA||
1318+
// The boundary is still in pending status but the document has finished loading
1319+
// before we could register the event handler that would have scheduled the retry
1320+
// on load so we call teh callback now.
1321+
ownerDocument.readyState===DOCUMENT_READY_STATE_COMPLETE
1322+
){
1323+
callback();
1324+
}else{
1325+
// We're still in pending status and the document is still loading so we attach
1326+
// a listener to the document load even and expose the retry on the instance for
1327+
// the Fizz runtime to trigger if it ends up resolving this boundary
1328+
constlistener=()=>{
1329+
callback();
1330+
ownerDocument.removeEventListener('DOMContentLoaded',listener);
1331+
};
1332+
ownerDocument.addEventListener('DOMContentLoaded',listener);
1333+
instance._reactRetry=listener;
13251334
}
1326-
instance._reactRetry=callback;
13271335
}
13281336

13291337
exportfunctioncanHydrateFormStateMarker(

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ import {
7979
PerformedWork,
8080
Placement,
8181
Hydrating,
82+
Callback,
8283
ContentReset,
8384
DidCapture,
8485
Update,
@@ -166,7 +167,6 @@ import {
166167
isSuspenseInstancePending,
167168
isSuspenseInstanceFallback,
168169
getSuspenseInstanceFallbackErrorDetails,
169-
registerSuspenseInstanceRetry,
170170
supportsHydration,
171171
supportsResources,
172172
supportsSingletons,
@@ -256,7 +256,6 @@ import {
256256
isFunctionClassComponent,
257257
}from'./ReactFiber';
258258
import{
259-
retryDehydratedSuspenseBoundary,
260259
scheduleUpdateOnFiber,
261260
renderDidSuspendDelayIfPossible,
262261
markSkippedUpdateLanes,
@@ -2816,12 +2815,10 @@ function updateDehydratedSuspenseComponent(
28162815
// on the client than if we just leave it alone. If the server times out or errors
28172816
// these should update this boundary to the permanent Fallback state instead.
28182817
// Mark it as having captured (i.e. suspended).
2819-
workInProgress.flags|=DidCapture;
2818+
// Also Mark it as requiring retry.
2819+
workInProgress.flags|=DidCapture|Callback;
28202820
// Leave the child in place. I.e. the dehydrated fragment.
28212821
workInProgress.child=current.child;
2822-
// Register a callback to retry this boundary once the server has sent the result.
2823-
constretry=retryDehydratedSuspenseBoundary.bind(null,current);
2824-
registerSuspenseInstanceRetry(suspenseInstance,retry);
28252822
returnnull;
28262823
}else{
28272824
// This is the first attempt.

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ import {
142142
suspendInstance,
143143
suspendResource,
144144
resetFormInstance,
145+
registerSuspenseInstanceRetry,
145146
}from'./ReactFiberConfig';
146147
import{
147148
captureCommitPhaseError,
@@ -154,6 +155,7 @@ import {
154155
addMarkerProgressCallbackToPendingTransition,
155156
addMarkerIncompleteCallbackToPendingTransition,
156157
addMarkerCompleteCallbackToPendingTransition,
158+
retryDehydratedSuspenseBoundary,
157159
}from'./ReactFiberWorkLoop';
158160
import{
159161
HasEffectasHookHasEffect,
@@ -526,6 +528,23 @@ function commitLayoutEffectOnFiber(
526528
if(flags&Update){
527529
commitSuspenseHydrationCallbacks(finishedRoot,finishedWork);
528530
}
531+
if(flags&Callback){
532+
// This Boundary is in fallback and has a dehydrated Suspense instance.
533+
// We could in theory assume the dehydrated state but we recheck it for
534+
// certainty.
535+
constfinishedState: SuspenseState|null=finishedWork.memoizedState;
536+
if(finishedState!==null){
537+
constdehydrated=finishedState.dehydrated;
538+
if(dehydrated!==null){
539+
// Register a callback to retry this boundary once the server has sent the result.
540+
constretry=retryDehydratedSuspenseBoundary.bind(
541+
null,
542+
finishedWork,
543+
);
544+
registerSuspenseInstanceRetry(dehydrated,retry);
545+
}
546+
}
547+
}
529548
break;
530549
}
531550
caseOffscreenComponent: {

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 de68d2f
Browse files
gnoffgnoff
authored
Register Suspense retry handlers in commit phase (#31667)
To avoid GC pressure and accidentally hanging onto old trees Suspense
boundary retries are now implemented in the commit phase. I used the
Callback flag which was previously only used to schedule callbacks for
Class components. This isn't quite semantically equivalent but it's
unused and seemingly compatible.
1 parent 16d2bbb commit de68d2f
3 files changed
Lines changed: 43 additions & 19 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,20 +1310,28 @@ export function registerSuspenseInstanceRetry(
13101310
callback: ()=>void,
13111311
){
13121312
const ownerDocument =instance.ownerDocument;
1313-
if(ownerDocument.readyState!==DOCUMENT_READY_STATE_COMPLETE){
1314-
ownerDocument.addEventListener(
1315-
'DOMContentLoaded',
1316-
()=>{
1317-
if(instance.data===SUSPENSE_PENDING_START_DATA){
1318-
callback();
1319-
}
1320-
},
1321-
{
1322-
once: true,
1323-
},
1324-
);
1313+
if(
1314+
// The Fizz runtime must have put this boundary into client render or complete
1315+
// state after the render finished but before it committed. We need to call the
1316+
// callback now rather than wait
1317+
instance.data!==SUSPENSE_PENDING_START_DATA||
1318+
// The boundary is still in pending status but the document has finished loading
1319+
// before we could register the event handler that would have scheduled the retry
1320+
// on load so we call teh callback now.
1321+
ownerDocument.readyState===DOCUMENT_READY_STATE_COMPLETE
1322+
){
1323+
callback();
1324+
}else{
1325+
// We're still in pending status and the document is still loading so we attach
1326+
// a listener to the document load even and expose the retry on the instance for
1327+
// the Fizz runtime to trigger if it ends up resolving this boundary
1328+
constlistener=()=>{
1329+
callback();
1330+
ownerDocument.removeEventListener('DOMContentLoaded',listener);
1331+
};
1332+
ownerDocument.addEventListener('DOMContentLoaded',listener);
1333+
instance._reactRetry=listener;
13251334
}
1326-
instance._reactRetry=callback;
13271335
}
13281336

13291337
exportfunctioncanHydrateFormStateMarker(
‎packages/react-reconciler/src/ReactFiberBeginWork.js‎
Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ import {
7979
PerformedWork,
8080
Placement,
8181
Hydrating,
82+
Callback,
8283
ContentReset,
8384
DidCapture,
8485
Update,
@@ -166,7 +167,6 @@ import {
166167
isSuspenseInstancePending,
167168
isSuspenseInstanceFallback,
168169
getSuspenseInstanceFallbackErrorDetails,
169-
registerSuspenseInstanceRetry,
170170
supportsHydration,
171171
supportsResources,
172172
supportsSingletons,
@@ -256,7 +256,6 @@ import {
256256
isFunctionClassComponent,
257257
}from'./ReactFiber';
258258
import{
259-
retryDehydratedSuspenseBoundary,
260259
scheduleUpdateOnFiber,
261260
renderDidSuspendDelayIfPossible,
262261
markSkippedUpdateLanes,
@@ -2816,12 +2815,10 @@ function updateDehydratedSuspenseComponent(
28162815
// on the client than if we just leave it alone. If the server times out or errors
28172816
// these should update this boundary to the permanent Fallback state instead.
28182817
// Mark it as having captured (i.e. suspended).
2819-
workInProgress.flags|=DidCapture;
2818+
// Also Mark it as requiring retry.
2819+
workInProgress.flags|=DidCapture|Callback;
28202820
// Leave the child in place. I.e. the dehydrated fragment.
28212821
workInProgress.child=current.child;
2822-
// Register a callback to retry this boundary once the server has sent the result.
2823-
constretry=retryDehydratedSuspenseBoundary.bind(null,current);
2824-
registerSuspenseInstanceRetry(suspenseInstance,retry);
28252822
returnnull;
28262823
}else{
28272824
// This is the first attempt.
‎packages/react-reconciler/src/ReactFiberCommitWork.js‎
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ import {
142142
suspendInstance,
143143
suspendResource,
144144
resetFormInstance,
145+
registerSuspenseInstanceRetry,
145146
}from'./ReactFiberConfig';
146147
import{
147148
captureCommitPhaseError,
@@ -154,6 +155,7 @@ import {
154155
addMarkerProgressCallbackToPendingTransition,
155156
addMarkerIncompleteCallbackToPendingTransition,
156157
addMarkerCompleteCallbackToPendingTransition,
158+
retryDehydratedSuspenseBoundary,
157159
}from'./ReactFiberWorkLoop';
158160
import{
159161
HasEffectasHookHasEffect,
@@ -526,6 +528,23 @@ function commitLayoutEffectOnFiber(
526528
if(flags&Update){
527529
commitSuspenseHydrationCallbacks(finishedRoot,finishedWork);
528530
}
531+
if(flags&Callback){
532+
// This Boundary is in fallback and has a dehydrated Suspense instance.
533+
// We could in theory assume the dehydrated state but we recheck it for
534+
// certainty.
535+
constfinishedState: SuspenseState|null=finishedWork.memoizedState;
536+
if(finishedState!==null){
537+
constdehydrated=finishedState.dehydrated;
538+
if(dehydrated!==null){
539+
// Register a callback to retry this boundary once the server has sent the result.
540+
constretry=retryDehydratedSuspenseBoundary.bind(
541+
null,
542+
finishedWork,
543+
);
544+
registerSuspenseInstanceRetry(dehydrated,retry);
545+
}
546+
}
547+
}
529548
break;
530549
}
531550
caseOffscreenComponent: {
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 de68d2f
Browse files
gnoffgnoff
authored
Register Suspense retry handlers in commit phase (#31667)
To avoid GC pressure and accidentally hanging onto old trees Suspense
boundary retries are now implemented in the commit phase. I used the
Callback flag which was previously only used to schedule callbacks for
Class components. This isn't quite semantically equivalent but it's
unused and seemingly compatible.
1 parent 16d2bbb commit de68d2f
3 files changed
Lines changed: 43 additions & 19 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,20 +1310,28 @@ export function registerSuspenseInstanceRetry(
13101310
callback: ()=>void,
13111311
){
13121312
const ownerDocument =instance.ownerDocument;
1313-
if(ownerDocument.readyState!==DOCUMENT_READY_STATE_COMPLETE){
1314-
ownerDocument.addEventListener(
1315-
'DOMContentLoaded',
1316-
()=>{
1317-
if(instance.data===SUSPENSE_PENDING_START_DATA){
1318-
callback();
1319-
}
1320-
},
1321-
{
1322-
once: true,
1323-
},
1324-
);
1313+
if(
1314+
// The Fizz runtime must have put this boundary into client render or complete
1315+
// state after the render finished but before it committed. We need to call the
1316+
// callback now rather than wait
1317+
instance.data!==SUSPENSE_PENDING_START_DATA||
1318+
// The boundary is still in pending status but the document has finished loading
1319+
// before we could register the event handler that would have scheduled the retry
1320+
// on load so we call teh callback now.
1321+
ownerDocument.readyState===DOCUMENT_READY_STATE_COMPLETE
1322+
){
1323+
callback();
1324+
}else{
1325+
// We're still in pending status and the document is still loading so we attach
1326+
// a listener to the document load even and expose the retry on the instance for
1327+
// the Fizz runtime to trigger if it ends up resolving this boundary
1328+
constlistener=()=>{
1329+
callback();
1330+
ownerDocument.removeEventListener('DOMContentLoaded',listener);
1331+
};
1332+
ownerDocument.addEventListener('DOMContentLoaded',listener);
1333+
instance._reactRetry=listener;
13251334
}
1326-
instance._reactRetry=callback;
13271335
}
13281336

13291337
exportfunctioncanHydrateFormStateMarker(
‎packages/react-reconciler/src/ReactFiberBeginWork.js‎
Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ import {
7979
PerformedWork,
8080
Placement,
8181
Hydrating,
82+
Callback,
8283
ContentReset,
8384
DidCapture,
8485
Update,
@@ -166,7 +167,6 @@ import {
166167
isSuspenseInstancePending,
167168
isSuspenseInstanceFallback,
168169
getSuspenseInstanceFallbackErrorDetails,
169-
registerSuspenseInstanceRetry,
170170
supportsHydration,
171171
supportsResources,
172172
supportsSingletons,
@@ -256,7 +256,6 @@ import {
256256
isFunctionClassComponent,
257257
}from'./ReactFiber';
258258
import{
259-
retryDehydratedSuspenseBoundary,
260259
scheduleUpdateOnFiber,
261260
renderDidSuspendDelayIfPossible,
262261
markSkippedUpdateLanes,
@@ -2816,12 +2815,10 @@ function updateDehydratedSuspenseComponent(
28162815
// on the client than if we just leave it alone. If the server times out or errors
28172816
// these should update this boundary to the permanent Fallback state instead.
28182817
// Mark it as having captured (i.e. suspended).
2819-
workInProgress.flags|=DidCapture;
2818+
// Also Mark it as requiring retry.
2819+
workInProgress.flags|=DidCapture|Callback;
28202820
// Leave the child in place. I.e. the dehydrated fragment.
28212821
workInProgress.child=current.child;
2822-
// Register a callback to retry this boundary once the server has sent the result.
2823-
constretry=retryDehydratedSuspenseBoundary.bind(null,current);
2824-
registerSuspenseInstanceRetry(suspenseInstance,retry);
28252822
returnnull;
28262823
}else{
28272824
// This is the first attempt.
‎packages/react-reconciler/src/ReactFiberCommitWork.js‎
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ import {
142142
suspendInstance,
143143
suspendResource,
144144
resetFormInstance,
145+
registerSuspenseInstanceRetry,
145146
}from'./ReactFiberConfig';
146147
import{
147148
captureCommitPhaseError,
@@ -154,6 +155,7 @@ import {
154155
addMarkerProgressCallbackToPendingTransition,
155156
addMarkerIncompleteCallbackToPendingTransition,
156157
addMarkerCompleteCallbackToPendingTransition,
158+
retryDehydratedSuspenseBoundary,
157159
}from'./ReactFiberWorkLoop';
158160
import{
159161
HasEffectasHookHasEffect,
@@ -526,6 +528,23 @@ function commitLayoutEffectOnFiber(
526528
if(flags&Update){
527529
commitSuspenseHydrationCallbacks(finishedRoot,finishedWork);
528530
}
531+
if(flags&Callback){
532+
// This Boundary is in fallback and has a dehydrated Suspense instance.
533+
// We could in theory assume the dehydrated state but we recheck it for
534+
// certainty.
535+
constfinishedState: SuspenseState|null=finishedWork.memoizedState;
536+
if(finishedState!==null){
537+
constdehydrated=finishedState.dehydrated;
538+
if(dehydrated!==null){
539+
// Register a callback to retry this boundary once the server has sent the result.
540+
constretry=retryDehydratedSuspenseBoundary.bind(
541+
null,
542+
finishedWork,
543+
);
544+
registerSuspenseInstanceRetry(dehydrated,retry);
545+
}
546+
}
547+
}
529548
break;
530549
}
531550
caseOffscreenComponent: {
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 de68d2f
Browse files
gnoffgnoff
authored
Register Suspense retry handlers in commit phase (#31667)
To avoid GC pressure and accidentally hanging onto old trees Suspense
boundary retries are now implemented in the commit phase. I used the
Callback flag which was previously only used to schedule callbacks for
Class components. This isn't quite semantically equivalent but it's
unused and seemingly compatible.
1 parent 16d2bbb commit de68d2f
3 files changed
Lines changed: 43 additions & 19 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,20 +1310,28 @@ export function registerSuspenseInstanceRetry(
13101310
callback: ()=>void,
13111311
){
13121312
const ownerDocument =instance.ownerDocument;
1313-
if(ownerDocument.readyState!==DOCUMENT_READY_STATE_COMPLETE){
1314-
ownerDocument.addEventListener(
1315-
'DOMContentLoaded',
1316-
()=>{
1317-
if(instance.data===SUSPENSE_PENDING_START_DATA){
1318-
callback();
1319-
}
1320-
},
1321-
{
1322-
once: true,
1323-
},
1324-
);
1313+
if(
1314+
// The Fizz runtime must have put this boundary into client render or complete
1315+
// state after the render finished but before it committed. We need to call the
1316+
// callback now rather than wait
1317+
instance.data!==SUSPENSE_PENDING_START_DATA||
1318+
// The boundary is still in pending status but the document has finished loading
1319+
// before we could register the event handler that would have scheduled the retry
1320+
// on load so we call teh callback now.
1321+
ownerDocument.readyState===DOCUMENT_READY_STATE_COMPLETE
1322+
){
1323+
callback();
1324+
}else{
1325+
// We're still in pending status and the document is still loading so we attach
1326+
// a listener to the document load even and expose the retry on the instance for
1327+
// the Fizz runtime to trigger if it ends up resolving this boundary
1328+
constlistener=()=>{
1329+
callback();
1330+
ownerDocument.removeEventListener('DOMContentLoaded',listener);
1331+
};
1332+
ownerDocument.addEventListener('DOMContentLoaded',listener);
1333+
instance._reactRetry=listener;
13251334
}
1326-
instance._reactRetry=callback;
13271335
}
13281336

13291337
exportfunctioncanHydrateFormStateMarker(
‎packages/react-reconciler/src/ReactFiberBeginWork.js‎
Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ import {
7979
PerformedWork,
8080
Placement,
8181
Hydrating,
82+
Callback,
8283
ContentReset,
8384
DidCapture,
8485
Update,
@@ -166,7 +167,6 @@ import {
166167
isSuspenseInstancePending,
167168
isSuspenseInstanceFallback,
168169
getSuspenseInstanceFallbackErrorDetails,
169-
registerSuspenseInstanceRetry,
170170
supportsHydration,
171171
supportsResources,
172172
supportsSingletons,
@@ -256,7 +256,6 @@ import {
256256
isFunctionClassComponent,
257257
}from'./ReactFiber';
258258
import{
259-
retryDehydratedSuspenseBoundary,
260259
scheduleUpdateOnFiber,
261260
renderDidSuspendDelayIfPossible,
262261
markSkippedUpdateLanes,
@@ -2816,12 +2815,10 @@ function updateDehydratedSuspenseComponent(
28162815
// on the client than if we just leave it alone. If the server times out or errors
28172816
// these should update this boundary to the permanent Fallback state instead.
28182817
// Mark it as having captured (i.e. suspended).
2819-
workInProgress.flags|=DidCapture;
2818+
// Also Mark it as requiring retry.
2819+
workInProgress.flags|=DidCapture|Callback;
28202820
// Leave the child in place. I.e. the dehydrated fragment.
28212821
workInProgress.child=current.child;
2822-
// Register a callback to retry this boundary once the server has sent the result.
2823-
constretry=retryDehydratedSuspenseBoundary.bind(null,current);
2824-
registerSuspenseInstanceRetry(suspenseInstance,retry);
28252822
returnnull;
28262823
}else{
28272824
// This is the first attempt.
‎packages/react-reconciler/src/ReactFiberCommitWork.js‎
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ import {
142142
suspendInstance,
143143
suspendResource,
144144
resetFormInstance,
145+
registerSuspenseInstanceRetry,
145146
}from'./ReactFiberConfig';
146147
import{
147148
captureCommitPhaseError,
@@ -154,6 +155,7 @@ import {
154155
addMarkerProgressCallbackToPendingTransition,
155156
addMarkerIncompleteCallbackToPendingTransition,
156157
addMarkerCompleteCallbackToPendingTransition,
158+
retryDehydratedSuspenseBoundary,
157159
}from'./ReactFiberWorkLoop';
158160
import{
159161
HasEffectasHookHasEffect,
@@ -526,6 +528,23 @@ function commitLayoutEffectOnFiber(
526528
if(flags&Update){
527529
commitSuspenseHydrationCallbacks(finishedRoot,finishedWork);
528530
}
531+
if(flags&Callback){
532+
// This Boundary is in fallback and has a dehydrated Suspense instance.
533+
// We could in theory assume the dehydrated state but we recheck it for
534+
// certainty.
535+
constfinishedState: SuspenseState|null=finishedWork.memoizedState;
536+
if(finishedState!==null){
537+
constdehydrated=finishedState.dehydrated;
538+
if(dehydrated!==null){
539+
// Register a callback to retry this boundary once the server has sent the result.
540+
constretry=retryDehydratedSuspenseBoundary.bind(
541+
null,
542+
finishedWork,
543+
);
544+
registerSuspenseInstanceRetry(dehydrated,retry);
545+
}
546+
}
547+
}
529548
break;
530549
}
531550
caseOffscreenComponent: {
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 de68d2f
Browse files
gnoffgnoff
authored
Register Suspense retry handlers in commit phase (#31667)
To avoid GC pressure and accidentally hanging onto old trees Suspense
boundary retries are now implemented in the commit phase. I used the
Callback flag which was previously only used to schedule callbacks for
Class components. This isn't quite semantically equivalent but it's
unused and seemingly compatible.
1 parent 16d2bbb commit de68d2f
3 files changed
Lines changed: 43 additions & 19 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,20 +1310,28 @@ export function registerSuspenseInstanceRetry(
13101310
callback: ()=>void,
13111311
){
13121312
const ownerDocument =instance.ownerDocument;
1313-
if(ownerDocument.readyState!==DOCUMENT_READY_STATE_COMPLETE){
1314-
ownerDocument.addEventListener(
1315-
'DOMContentLoaded',
1316-
()=>{
1317-
if(instance.data===SUSPENSE_PENDING_START_DATA){
1318-
callback();
1319-
}
1320-
},
1321-
{
1322-
once: true,
1323-
},
1324-
);
1313+
if(
1314+
// The Fizz runtime must have put this boundary into client render or complete
1315+
// state after the render finished but before it committed. We need to call the
1316+
// callback now rather than wait
1317+
instance.data!==SUSPENSE_PENDING_START_DATA||
1318+
// The boundary is still in pending status but the document has finished loading
1319+
// before we could register the event handler that would have scheduled the retry
1320+
// on load so we call teh callback now.
1321+
ownerDocument.readyState===DOCUMENT_READY_STATE_COMPLETE
1322+
){
1323+
callback();
1324+
}else{
1325+
// We're still in pending status and the document is still loading so we attach
1326+
// a listener to the document load even and expose the retry on the instance for
1327+
// the Fizz runtime to trigger if it ends up resolving this boundary
1328+
constlistener=()=>{
1329+
callback();
1330+
ownerDocument.removeEventListener('DOMContentLoaded',listener);
1331+
};
1332+
ownerDocument.addEventListener('DOMContentLoaded',listener);
1333+
instance._reactRetry=listener;
13251334
}
1326-
instance._reactRetry=callback;
13271335
}
13281336

13291337
exportfunctioncanHydrateFormStateMarker(
‎packages/react-reconciler/src/ReactFiberBeginWork.js‎
Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ import {
7979
PerformedWork,
8080
Placement,
8181
Hydrating,
82+
Callback,
8283
ContentReset,
8384
DidCapture,
8485
Update,
@@ -166,7 +167,6 @@ import {
166167
isSuspenseInstancePending,
167168
isSuspenseInstanceFallback,
168169
getSuspenseInstanceFallbackErrorDetails,
169-
registerSuspenseInstanceRetry,
170170
supportsHydration,
171171
supportsResources,
172172
supportsSingletons,
@@ -256,7 +256,6 @@ import {
256256
isFunctionClassComponent,
257257
}from'./ReactFiber';
258258
import{
259-
retryDehydratedSuspenseBoundary,
260259
scheduleUpdateOnFiber,
261260
renderDidSuspendDelayIfPossible,
262261
markSkippedUpdateLanes,
@@ -2816,12 +2815,10 @@ function updateDehydratedSuspenseComponent(
28162815
// on the client than if we just leave it alone. If the server times out or errors
28172816
// these should update this boundary to the permanent Fallback state instead.
28182817
// Mark it as having captured (i.e. suspended).
2819-
workInProgress.flags|=DidCapture;
2818+
// Also Mark it as requiring retry.
2819+
workInProgress.flags|=DidCapture|Callback;
28202820
// Leave the child in place. I.e. the dehydrated fragment.
28212821
workInProgress.child=current.child;
2822-
// Register a callback to retry this boundary once the server has sent the result.
2823-
constretry=retryDehydratedSuspenseBoundary.bind(null,current);
2824-
registerSuspenseInstanceRetry(suspenseInstance,retry);
28252822
returnnull;
28262823
}else{
28272824
// This is the first attempt.
‎packages/react-reconciler/src/ReactFiberCommitWork.js‎
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ import {
142142
suspendInstance,
143143
suspendResource,
144144
resetFormInstance,
145+
registerSuspenseInstanceRetry,
145146
}from'./ReactFiberConfig';
146147
import{
147148
captureCommitPhaseError,
@@ -154,6 +155,7 @@ import {
154155
addMarkerProgressCallbackToPendingTransition,
155156
addMarkerIncompleteCallbackToPendingTransition,
156157
addMarkerCompleteCallbackToPendingTransition,
158+
retryDehydratedSuspenseBoundary,
157159
}from'./ReactFiberWorkLoop';
158160
import{
159161
HasEffectasHookHasEffect,
@@ -526,6 +528,23 @@ function commitLayoutEffectOnFiber(
526528
if(flags&Update){
527529
commitSuspenseHydrationCallbacks(finishedRoot,finishedWork);
528530
}
531+
if(flags&Callback){
532+
// This Boundary is in fallback and has a dehydrated Suspense instance.
533+
// We could in theory assume the dehydrated state but we recheck it for
534+
// certainty.
535+
constfinishedState: SuspenseState|null=finishedWork.memoizedState;
536+
if(finishedState!==null){
537+
constdehydrated=finishedState.dehydrated;
538+
if(dehydrated!==null){
539+
// Register a callback to retry this boundary once the server has sent the result.
540+
constretry=retryDehydratedSuspenseBoundary.bind(
541+
null,
542+
finishedWork,
543+
);
544+
registerSuspenseInstanceRetry(dehydrated,retry);
545+
}
546+
}
547+
}
529548
break;
530549
}
531550
caseOffscreenComponent: {
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 de68d2f
Browse files
gnoffgnoff
authored
Register Suspense retry handlers in commit phase (#31667)
To avoid GC pressure and accidentally hanging onto old trees Suspense
boundary retries are now implemented in the commit phase. I used the
Callback flag which was previously only used to schedule callbacks for
Class components. This isn't quite semantically equivalent but it's
unused and seemingly compatible.
1 parent 16d2bbb commit de68d2f
3 files changed
Lines changed: 43 additions & 19 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,20 +1310,28 @@ export function registerSuspenseInstanceRetry(
13101310
callback: ()=>void,
13111311
){
13121312
const ownerDocument =instance.ownerDocument;
1313-
if(ownerDocument.readyState!==DOCUMENT_READY_STATE_COMPLETE){
1314-
ownerDocument.addEventListener(
1315-
'DOMContentLoaded',
1316-
()=>{
1317-
if(instance.data===SUSPENSE_PENDING_START_DATA){
1318-
callback();
1319-
}
1320-
},
1321-
{
1322-
once: true,
1323-
},
1324-
);
1313+
if(
1314+
// The Fizz runtime must have put this boundary into client render or complete
1315+
// state after the render finished but before it committed. We need to call the
1316+
// callback now rather than wait
1317+
instance.data!==SUSPENSE_PENDING_START_DATA||
1318+
// The boundary is still in pending status but the document has finished loading
1319+
// before we could register the event handler that would have scheduled the retry
1320+
// on load so we call teh callback now.
1321+
ownerDocument.readyState===DOCUMENT_READY_STATE_COMPLETE
1322+
){
1323+
callback();
1324+
}else{
1325+
// We're still in pending status and the document is still loading so we attach
1326+
// a listener to the document load even and expose the retry on the instance for
1327+
// the Fizz runtime to trigger if it ends up resolving this boundary
1328+
constlistener=()=>{
1329+
callback();
1330+
ownerDocument.removeEventListener('DOMContentLoaded',listener);
1331+
};
1332+
ownerDocument.addEventListener('DOMContentLoaded',listener);
1333+
instance._reactRetry=listener;
13251334
}
1326-
instance._reactRetry=callback;
13271335
}
13281336

13291337
exportfunctioncanHydrateFormStateMarker(
‎packages/react-reconciler/src/ReactFiberBeginWork.js‎
Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ import {
7979
PerformedWork,
8080
Placement,
8181
Hydrating,
82+
Callback,
8283
ContentReset,
8384
DidCapture,
8485
Update,
@@ -166,7 +167,6 @@ import {
166167
isSuspenseInstancePending,
167168
isSuspenseInstanceFallback,
168169
getSuspenseInstanceFallbackErrorDetails,
169-
registerSuspenseInstanceRetry,
170170
supportsHydration,
171171
supportsResources,
172172
supportsSingletons,
@@ -256,7 +256,6 @@ import {
256256
isFunctionClassComponent,
257257
}from'./ReactFiber';
258258
import{
259-
retryDehydratedSuspenseBoundary,
260259
scheduleUpdateOnFiber,
261260
renderDidSuspendDelayIfPossible,
262261
markSkippedUpdateLanes,
@@ -2816,12 +2815,10 @@ function updateDehydratedSuspenseComponent(
28162815
// on the client than if we just leave it alone. If the server times out or errors
28172816
// these should update this boundary to the permanent Fallback state instead.
28182817
// Mark it as having captured (i.e. suspended).
2819-
workInProgress.flags|=DidCapture;
2818+
// Also Mark it as requiring retry.
2819+
workInProgress.flags|=DidCapture|Callback;
28202820
// Leave the child in place. I.e. the dehydrated fragment.
28212821
workInProgress.child=current.child;
2822-
// Register a callback to retry this boundary once the server has sent the result.
2823-
constretry=retryDehydratedSuspenseBoundary.bind(null,current);
2824-
registerSuspenseInstanceRetry(suspenseInstance,retry);
28252822
returnnull;
28262823
}else{
28272824
// This is the first attempt.
‎packages/react-reconciler/src/ReactFiberCommitWork.js‎
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ import {
142142
suspendInstance,
143143
suspendResource,
144144
resetFormInstance,
145+
registerSuspenseInstanceRetry,
145146
}from'./ReactFiberConfig';
146147
import{
147148
captureCommitPhaseError,
@@ -154,6 +155,7 @@ import {
154155
addMarkerProgressCallbackToPendingTransition,
155156
addMarkerIncompleteCallbackToPendingTransition,
156157
addMarkerCompleteCallbackToPendingTransition,
158+
retryDehydratedSuspenseBoundary,
157159
}from'./ReactFiberWorkLoop';
158160
import{
159161
HasEffectasHookHasEffect,
@@ -526,6 +528,23 @@ function commitLayoutEffectOnFiber(
526528
if(flags&Update){
527529
commitSuspenseHydrationCallbacks(finishedRoot,finishedWork);
528530
}
531+
if(flags&Callback){
532+
// This Boundary is in fallback and has a dehydrated Suspense instance.
533+
// We could in theory assume the dehydrated state but we recheck it for
534+
// certainty.
535+
constfinishedState: SuspenseState|null=finishedWork.memoizedState;
536+
if(finishedState!==null){
537+
constdehydrated=finishedState.dehydrated;
538+
if(dehydrated!==null){
539+
// Register a callback to retry this boundary once the server has sent the result.
540+
constretry=retryDehydratedSuspenseBoundary.bind(
541+
null,
542+
finishedWork,
543+
);
544+
registerSuspenseInstanceRetry(dehydrated,retry);
545+
}
546+
}
547+
}
529548
break;
530549
}
531550
caseOffscreenComponent: {
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 de68d2f
Browse files
gnoffgnoff
authored
Register Suspense retry handlers in commit phase (#31667)
To avoid GC pressure and accidentally hanging onto old trees Suspense
boundary retries are now implemented in the commit phase. I used the
Callback flag which was previously only used to schedule callbacks for
Class components. This isn't quite semantically equivalent but it's
unused and seemingly compatible.
1 parent 16d2bbb commit de68d2f
3 files changed
Lines changed: 43 additions & 19 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,20 +1310,28 @@ export function registerSuspenseInstanceRetry(
13101310
callback: ()=>void,
13111311
){
13121312
const ownerDocument =instance.ownerDocument;
1313-
if(ownerDocument.readyState!==DOCUMENT_READY_STATE_COMPLETE){
1314-
ownerDocument.addEventListener(
1315-
'DOMContentLoaded',
1316-
()=>{
1317-
if(instance.data===SUSPENSE_PENDING_START_DATA){
1318-
callback();
1319-
}
1320-
},
1321-
{
1322-
once: true,
1323-
},
1324-
);
1313+
if(
1314+
// The Fizz runtime must have put this boundary into client render or complete
1315+
// state after the render finished but before it committed. We need to call the
1316+
// callback now rather than wait
1317+
instance.data!==SUSPENSE_PENDING_START_DATA||
1318+
// The boundary is still in pending status but the document has finished loading
1319+
// before we could register the event handler that would have scheduled the retry
1320+
// on load so we call teh callback now.
1321+
ownerDocument.readyState===DOCUMENT_READY_STATE_COMPLETE
1322+
){
1323+
callback();
1324+
}else{
1325+
// We're still in pending status and the document is still loading so we attach
1326+
// a listener to the document load even and expose the retry on the instance for
1327+
// the Fizz runtime to trigger if it ends up resolving this boundary
1328+
constlistener=()=>{
1329+
callback();
1330+
ownerDocument.removeEventListener('DOMContentLoaded',listener);
1331+
};
1332+
ownerDocument.addEventListener('DOMContentLoaded',listener);
1333+
instance._reactRetry=listener;
13251334
}
1326-
instance._reactRetry=callback;
13271335
}
13281336

13291337
exportfunctioncanHydrateFormStateMarker(
‎packages/react-reconciler/src/ReactFiberBeginWork.js‎
Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ import {
7979
PerformedWork,
8080
Placement,
8181
Hydrating,
82+
Callback,
8283
ContentReset,
8384
DidCapture,
8485
Update,
@@ -166,7 +167,6 @@ import {
166167
isSuspenseInstancePending,
167168
isSuspenseInstanceFallback,
168169
getSuspenseInstanceFallbackErrorDetails,
169-
registerSuspenseInstanceRetry,
170170
supportsHydration,
171171
supportsResources,
172172
supportsSingletons,
@@ -256,7 +256,6 @@ import {
256256
isFunctionClassComponent,
257257
}from'./ReactFiber';
258258
import{
259-
retryDehydratedSuspenseBoundary,
260259
scheduleUpdateOnFiber,
261260
renderDidSuspendDelayIfPossible,
262261
markSkippedUpdateLanes,
@@ -2816,12 +2815,10 @@ function updateDehydratedSuspenseComponent(
28162815
// on the client than if we just leave it alone. If the server times out or errors
28172816
// these should update this boundary to the permanent Fallback state instead.
28182817
// Mark it as having captured (i.e. suspended).
2819-
workInProgress.flags|=DidCapture;
2818+
// Also Mark it as requiring retry.
2819+
workInProgress.flags|=DidCapture|Callback;
28202820
// Leave the child in place. I.e. the dehydrated fragment.
28212821
workInProgress.child=current.child;
2822-
// Register a callback to retry this boundary once the server has sent the result.
2823-
constretry=retryDehydratedSuspenseBoundary.bind(null,current);
2824-
registerSuspenseInstanceRetry(suspenseInstance,retry);
28252822
returnnull;
28262823
}else{
28272824
// This is the first attempt.
‎packages/react-reconciler/src/ReactFiberCommitWork.js‎
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ import {
142142
suspendInstance,
143143
suspendResource,
144144
resetFormInstance,
145+
registerSuspenseInstanceRetry,
145146
}from'./ReactFiberConfig';
146147
import{
147148
captureCommitPhaseError,
@@ -154,6 +155,7 @@ import {
154155
addMarkerProgressCallbackToPendingTransition,
155156
addMarkerIncompleteCallbackToPendingTransition,
156157
addMarkerCompleteCallbackToPendingTransition,
158+
retryDehydratedSuspenseBoundary,
157159
}from'./ReactFiberWorkLoop';
158160
import{
159161
HasEffectasHookHasEffect,
@@ -526,6 +528,23 @@ function commitLayoutEffectOnFiber(
526528
if(flags&Update){
527529
commitSuspenseHydrationCallbacks(finishedRoot,finishedWork);
528530
}
531+
if(flags&Callback){
532+
// This Boundary is in fallback and has a dehydrated Suspense instance.
533+
// We could in theory assume the dehydrated state but we recheck it for
534+
// certainty.
535+
constfinishedState: SuspenseState|null=finishedWork.memoizedState;
536+
if(finishedState!==null){
537+
constdehydrated=finishedState.dehydrated;
538+
if(dehydrated!==null){
539+
// Register a callback to retry this boundary once the server has sent the result.
540+
constretry=retryDehydratedSuspenseBoundary.bind(
541+
null,
542+
finishedWork,
543+
);
544+
registerSuspenseInstanceRetry(dehydrated,retry);
545+
}
546+
}
547+
}
529548
break;
530549
}
531550
caseOffscreenComponent: {
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 de68d2f
Browse files
gnoffgnoff
authored
Register Suspense retry handlers in commit phase (#31667)
To avoid GC pressure and accidentally hanging onto old trees Suspense
boundary retries are now implemented in the commit phase. I used the
Callback flag which was previously only used to schedule callbacks for
Class components. This isn't quite semantically equivalent but it's
unused and seemingly compatible.
1 parent 16d2bbb commit de68d2f
3 files changed
Lines changed: 43 additions & 19 deletions
File tree
‎packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js‎
Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,20 +1310,28 @@ export function registerSuspenseInstanceRetry(
13101310
callback: ()=>void,
13111311
){
13121312
const ownerDocument =instance.ownerDocument;
1313-
if(ownerDocument.readyState!==DOCUMENT_READY_STATE_COMPLETE){
1314-
ownerDocument.addEventListener(
1315-
'DOMContentLoaded',
1316-
()=>{
1317-
if(instance.data===SUSPENSE_PENDING_START_DATA){
1318-
callback();
1319-
}
1320-
},
1321-
{
1322-
once: true,
1323-
},
1324-
);
1313+
if(
1314+
// The Fizz runtime must have put this boundary into client render or complete
1315+
// state after the render finished but before it committed. We need to call the
1316+
// callback now rather than wait
1317+
instance.data!==SUSPENSE_PENDING_START_DATA||
1318+
// The boundary is still in pending status but the document has finished loading
1319+
// before we could register the event handler that would have scheduled the retry
1320+
// on load so we call teh callback now.
1321+
ownerDocument.readyState===DOCUMENT_READY_STATE_COMPLETE
1322+
){
1323+
callback();
1324+
}else{
1325+
// We're still in pending status and the document is still loading so we attach
1326+
// a listener to the document load even and expose the retry on the instance for
1327+
// the Fizz runtime to trigger if it ends up resolving this boundary
1328+
constlistener=()=>{
1329+
callback();
1330+
ownerDocument.removeEventListener('DOMContentLoaded',listener);
1331+
};
1332+
ownerDocument.addEventListener('DOMContentLoaded',listener);
1333+
instance._reactRetry=listener;
13251334
}
1326-
instance._reactRetry=callback;
13271335
}
13281336

13291337
exportfunctioncanHydrateFormStateMarker(
‎packages/react-reconciler/src/ReactFiberBeginWork.js‎
Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ import {
7979
PerformedWork,
8080
Placement,
8181
Hydrating,
82+
Callback,
8283
ContentReset,
8384
DidCapture,
8485
Update,
@@ -166,7 +167,6 @@ import {
166167
isSuspenseInstancePending,
167168
isSuspenseInstanceFallback,
168169
getSuspenseInstanceFallbackErrorDetails,
169-
registerSuspenseInstanceRetry,
170170
supportsHydration,
171171
supportsResources,
172172
supportsSingletons,
@@ -256,7 +256,6 @@ import {
256256
isFunctionClassComponent,
257257
}from'./ReactFiber';
258258
import{
259-
retryDehydratedSuspenseBoundary,
260259
scheduleUpdateOnFiber,
261260
renderDidSuspendDelayIfPossible,
262261
markSkippedUpdateLanes,
@@ -2816,12 +2815,10 @@ function updateDehydratedSuspenseComponent(
28162815
// on the client than if we just leave it alone. If the server times out or errors
28172816
// these should update this boundary to the permanent Fallback state instead.
28182817
// Mark it as having captured (i.e. suspended).
2819-
workInProgress.flags|=DidCapture;
2818+
// Also Mark it as requiring retry.
2819+
workInProgress.flags|=DidCapture|Callback;
28202820
// Leave the child in place. I.e. the dehydrated fragment.
28212821
workInProgress.child=current.child;
2822-
// Register a callback to retry this boundary once the server has sent the result.
2823-
constretry=retryDehydratedSuspenseBoundary.bind(null,current);
2824-
registerSuspenseInstanceRetry(suspenseInstance,retry);
28252822
returnnull;
28262823
}else{
28272824
// This is the first attempt.
‎packages/react-reconciler/src/ReactFiberCommitWork.js‎
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ import {
142142
suspendInstance,
143143
suspendResource,
144144
resetFormInstance,
145+
registerSuspenseInstanceRetry,
145146
}from'./ReactFiberConfig';
146147
import{
147148
captureCommitPhaseError,
@@ -154,6 +155,7 @@ import {
154155
addMarkerProgressCallbackToPendingTransition,
155156
addMarkerIncompleteCallbackToPendingTransition,
156157
addMarkerCompleteCallbackToPendingTransition,
158+
retryDehydratedSuspenseBoundary,
157159
}from'./ReactFiberWorkLoop';
158160
import{
159161
HasEffectasHookHasEffect,
@@ -526,6 +528,23 @@ function commitLayoutEffectOnFiber(
526528
if(flags&Update){
527529
commitSuspenseHydrationCallbacks(finishedRoot,finishedWork);
528530
}
531+
if(flags&Callback){
532+
// This Boundary is in fallback and has a dehydrated Suspense instance.
533+
// We could in theory assume the dehydrated state but we recheck it for
534+
// certainty.
535+
constfinishedState: SuspenseState|null=finishedWork.memoizedState;
536+
if(finishedState!==null){
537+
constdehydrated=finishedState.dehydrated;
538+
if(dehydrated!==null){
539+
// Register a callback to retry this boundary once the server has sent the result.
540+
constretry=retryDehydratedSuspenseBoundary.bind(
541+
null,
542+
finishedWork,
543+
);
544+
registerSuspenseInstanceRetry(dehydrated,retry);
545+
}
546+
}
547+
}
529548
break;
530549
}
531550
caseOffscreenComponent: {
0 commit comments
Comments
 (0)