Skip to content

Commit 014138d

Browse files
eps1loneps1lon
authored
[DevTools] Fix a crash when rendering a new class Component when simulating errored state (#35985)
1 parent 4610359 commit 014138d

3 files changed

Lines changed: 111 additions & 2 deletions

File tree

‎packages/react-devtools-shared/src/__tests__/storeForceError-test.js‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
/**
2+
* Copyright (c) Meta Platforms, Inc. and affiliates.
3+
*
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
6+
*
7+
* @flow
8+
*/
9+
10+
importtypeStorefrom'react-devtools-shared/src/devtools/store';
11+
12+
import{getVersionedRenderImplementation}from'./utils';
13+
14+
describe('Store forcing errors',()=>{
15+
letReact;
16+
letagent;
17+
let store: Store;
18+
letutils;
19+
letactAsync;
20+
21+
beforeEach(()=>{
22+
agent=global.agent;
23+
store=global.store;
24+
store.collapseNodesByDefault=false;
25+
store.componentFilters=[];
26+
store.recordChangeDescriptions=true;
27+
28+
React=require('react');
29+
utils=require('./utils');
30+
31+
actAsync=utils.actAsync;
32+
});
33+
34+
const{render}=getVersionedRenderImplementation();
35+
36+
// @reactVersion >= 18.0
37+
it('resets forced error and fallback states when filters are changed',async()=>{
38+
classAnyClassComponentextendsReact.Component{
39+
render(){
40+
returnthis.props.children;
41+
}
42+
}
43+
44+
classErrorBoundaryextendsReact.Component{
45+
state={hasError: false};
46+
47+
staticgetDerivedStateFromError(){
48+
return{hasError: true};
49+
}
50+
51+
render(){
52+
if(this.state.hasError){
53+
return(
54+
<AnyClassComponentkey="fallback">
55+
<divkey="did-error"/>
56+
</AnyClassComponent>
57+
);
58+
}
59+
returnthis.props.children;
60+
}
61+
}
62+
63+
functionApp(){
64+
return(
65+
<ErrorBoundarykey="content">
66+
<divkey="error-content"/>
67+
</ErrorBoundary>
68+
);
69+
}
70+
71+
awaitactAsync(async()=>{
72+
render(<App/>);
73+
});
74+
constrendererID=utils.getRendererID();
75+
awaitactAsync(()=>{
76+
agent.overrideError({
77+
id: store.getElementIDAtIndex(2),
78+
rendererID,
79+
forceError: true,
80+
});
81+
});
82+
83+
expect(store).toMatchInlineSnapshot(`
84+
[root]
85+
▾ <App>
86+
▾ <ErrorBoundary key="content">
87+
▾ <AnyClassComponent key="fallback">
88+
<div key="did-error">
89+
`);
90+
91+
awaitactAsync(()=>{
92+
agent.overrideError({
93+
id: store.getElementIDAtIndex(2),
94+
rendererID,
95+
forceError: false,
96+
});
97+
});
98+
99+
expect(store).toMatchInlineSnapshot(`
100+
[root]
101+
▾ <App>
102+
▾ <ErrorBoundary key="content">
103+
<div key="error-content">
104+
`);
105+
});
106+
});

‎packages/react-devtools-shared/src/backend/fiber/renderer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7898,7 +7898,7 @@ export function attach(
78987898
// Map of Fiber and its force error status: true (error), false (toggled off)
78997899
const forceErrorForFibers = new Map<Fiber, boolean>();
79007900
7901-
function shouldErrorFiberAccordingToMap(fiber: any): boolean {
7901+
function shouldErrorFiberAccordingToMap(fiber: any): boolean | null {
79027902
if (typeof setErrorHandler !== 'function') {
79037903
throw new Error(
79047904
'Expected overrideError() to not get called for earlier React versions.',
@@ -7934,7 +7934,7 @@ export function attach(
79347934
}
79357935
}
79367936
if (status === undefined) {
7937-
return false;
7937+
return null;
79387938
}
79397939
return status;
79407940
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,6 +1584,9 @@ function updateClassComponent(
15841584
// This is used by DevTools to force a boundary to error.
15851585
switch(shouldError(workInProgress)){
15861586
casefalse: {
1587+
// We previously simulated an error on this boundary
1588+
// so the instance must have been constructed in a previous
1589+
// commit.
15871590
constinstance=workInProgress.stateNode;
15881591
constctor=workInProgress.type;
15891592
// TODO This way of resetting the error boundary state is a hack.

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[DevTools] Fix a crash when rendering a new class Component when simu… · react/react@014138d · GitHub
Skip to content
Commit 014138d
Browse files
eps1loneps1lon
authored
[DevTools] Fix a crash when rendering a new class Component when simulating errored state (#35985)
1 parent 4610359 commit 014138d
3 files changed
Lines changed: 111 additions & 2 deletions
File tree
‎packages/react-devtools-shared/src/__tests__/storeForceError-test.js‎
Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @flow
8+
 */
9+
10+
importtypeStorefrom'react-devtools-shared/src/devtools/store';
11+
12+
import{getVersionedRenderImplementation}from'./utils';
13+
14+
describe('Store forcing errors',()=>{
15+
letReact;
16+
letagent;
17+
 let store: Store;
18+
letutils;
19+
letactAsync;
20+
21+
beforeEach(()=>{
22+
agent=global.agent;
23+
store=global.store;
24+
store.collapseNodesByDefault=false;
25+
store.componentFilters=[];
26+
store.recordChangeDescriptions=true;
27+
28+
React=require('react');
29+
utils=require('./utils');
30+
31+
actAsync=utils.actAsync;
32+
});
33+
34+
const{render}=getVersionedRenderImplementation();
35+
36+
// @reactVersion >= 18.0
37+
it('resets forced error and fallback states when filters are changed',async()=>{
38+
classAnyClassComponentextendsReact.Component{
39+
render(){
40+
returnthis.props.children;
41+
}
42+
}
43+
44+
classErrorBoundaryextendsReact.Component{
45+
state={hasError: false};
46+
47+
staticgetDerivedStateFromError(){
48+
return{hasError: true};
49+
}
50+
51+
render(){
52+
if(this.state.hasError){
53+
return(
54+
<AnyClassComponentkey="fallback">
55+
<divkey="did-error"/>
56+
</AnyClassComponent>
57+
);
58+
}
59+
returnthis.props.children;
60+
}
61+
}
62+
63+
functionApp(){
64+
return(
65+
<ErrorBoundarykey="content">
66+
<divkey="error-content"/>
67+
</ErrorBoundary>
68+
);
69+
}
70+
71+
awaitactAsync(async()=>{
72+
render(<App/>);
73+
});
74+
constrendererID=utils.getRendererID();
75+
awaitactAsync(()=>{
76+
agent.overrideError({
77+
id: store.getElementIDAtIndex(2),
78+
 rendererID,
79+
forceError: true,
80+
});
81+
});
82+
83+
expect(store).toMatchInlineSnapshot(`
84+
 [root]
85+
 ▾ <App>
86+
 ▾ <ErrorBoundary key="content">
87+
 ▾ <AnyClassComponent key="fallback">
88+
 <div key="did-error">
89+
 `);
90+
91+
awaitactAsync(()=>{
92+
agent.overrideError({
93+
id: store.getElementIDAtIndex(2),
94+
 rendererID,
95+
forceError: false,
96+
});
97+
});
98+
99+
expect(store).toMatchInlineSnapshot(`
100+
 [root]
101+
 ▾ <App>
102+
 ▾ <ErrorBoundary key="content">
103+
 <div key="error-content">
104+
 `);
105+
});
106+
});
‎packages/react-devtools-shared/src/backend/fiber/renderer.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7898,7 +7898,7 @@ export function attach(
78987898
 // Map of Fiber and its force error status: true (error), false (toggled off)
78997899
 const forceErrorForFibers = new Map<Fiber, boolean>();
79007900
7901-
 function shouldErrorFiberAccordingToMap(fiber: any): boolean {
7901+
 function shouldErrorFiberAccordingToMap(fiber: any): boolean | null {
79027902
 if (typeof setErrorHandler !== 'function') {
79037903
 throw new Error(
79047904
 'Expected overrideError() to not get called for earlier React versions.',
@@ -7934,7 +7934,7 @@ export function attach(
79347934
 }
79357935
 }
79367936
 if (status === undefined) {
7937-
 return false;
7937+
 return null;
79387938
 }
79397939
 return status;
79407940
 }
‎packages/react-reconciler/src/ReactFiberBeginWork.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,6 +1584,9 @@ function updateClassComponent(
15841584
// This is used by DevTools to force a boundary to error.
15851585
switch(shouldError(workInProgress)){
15861586
casefalse: {
1587+
// We previously simulated an error on this boundary
1588+
// so the instance must have been constructed in a previous
1589+
// commit.
15871590
constinstance=workInProgress.stateNode;
15881591
constctor=workInProgress.type;
15891592
// TODO This way of resetting the error boundary state is a hack.
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[DevTools] Fix a crash when rendering a new class Component when simu… · react/react@014138d · GitHub
Skip to content
Commit 014138d
Browse files
eps1loneps1lon
authored
[DevTools] Fix a crash when rendering a new class Component when simulating errored state (#35985)
1 parent 4610359 commit 014138d
3 files changed
Lines changed: 111 additions & 2 deletions
File tree
‎packages/react-devtools-shared/src/__tests__/storeForceError-test.js‎
Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @flow
8+
 */
9+
10+
importtypeStorefrom'react-devtools-shared/src/devtools/store';
11+
12+
import{getVersionedRenderImplementation}from'./utils';
13+
14+
describe('Store forcing errors',()=>{
15+
letReact;
16+
letagent;
17+
 let store: Store;
18+
letutils;
19+
letactAsync;
20+
21+
beforeEach(()=>{
22+
agent=global.agent;
23+
store=global.store;
24+
store.collapseNodesByDefault=false;
25+
store.componentFilters=[];
26+
store.recordChangeDescriptions=true;
27+
28+
React=require('react');
29+
utils=require('./utils');
30+
31+
actAsync=utils.actAsync;
32+
});
33+
34+
const{render}=getVersionedRenderImplementation();
35+
36+
// @reactVersion >= 18.0
37+
it('resets forced error and fallback states when filters are changed',async()=>{
38+
classAnyClassComponentextendsReact.Component{
39+
render(){
40+
returnthis.props.children;
41+
}
42+
}
43+
44+
classErrorBoundaryextendsReact.Component{
45+
state={hasError: false};
46+
47+
staticgetDerivedStateFromError(){
48+
return{hasError: true};
49+
}
50+
51+
render(){
52+
if(this.state.hasError){
53+
return(
54+
<AnyClassComponentkey="fallback">
55+
<divkey="did-error"/>
56+
</AnyClassComponent>
57+
);
58+
}
59+
returnthis.props.children;
60+
}
61+
}
62+
63+
functionApp(){
64+
return(
65+
<ErrorBoundarykey="content">
66+
<divkey="error-content"/>
67+
</ErrorBoundary>
68+
);
69+
}
70+
71+
awaitactAsync(async()=>{
72+
render(<App/>);
73+
});
74+
constrendererID=utils.getRendererID();
75+
awaitactAsync(()=>{
76+
agent.overrideError({
77+
id: store.getElementIDAtIndex(2),
78+
 rendererID,
79+
forceError: true,
80+
});
81+
});
82+
83+
expect(store).toMatchInlineSnapshot(`
84+
 [root]
85+
 ▾ <App>
86+
 ▾ <ErrorBoundary key="content">
87+
 ▾ <AnyClassComponent key="fallback">
88+
 <div key="did-error">
89+
 `);
90+
91+
awaitactAsync(()=>{
92+
agent.overrideError({
93+
id: store.getElementIDAtIndex(2),
94+
 rendererID,
95+
forceError: false,
96+
});
97+
});
98+
99+
expect(store).toMatchInlineSnapshot(`
100+
 [root]
101+
 ▾ <App>
102+
 ▾ <ErrorBoundary key="content">
103+
 <div key="error-content">
104+
 `);
105+
});
106+
});
‎packages/react-devtools-shared/src/backend/fiber/renderer.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7898,7 +7898,7 @@ export function attach(
78987898
 // Map of Fiber and its force error status: true (error), false (toggled off)
78997899
 const forceErrorForFibers = new Map<Fiber, boolean>();
79007900
7901-
 function shouldErrorFiberAccordingToMap(fiber: any): boolean {
7901+
 function shouldErrorFiberAccordingToMap(fiber: any): boolean | null {
79027902
 if (typeof setErrorHandler !== 'function') {
79037903
 throw new Error(
79047904
 'Expected overrideError() to not get called for earlier React versions.',
@@ -7934,7 +7934,7 @@ export function attach(
79347934
 }
79357935
 }
79367936
 if (status === undefined) {
7937-
 return false;
7937+
 return null;
79387938
 }
79397939
 return status;
79407940
 }
‎packages/react-reconciler/src/ReactFiberBeginWork.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,6 +1584,9 @@ function updateClassComponent(
15841584
// This is used by DevTools to force a boundary to error.
15851585
switch(shouldError(workInProgress)){
15861586
casefalse: {
1587+
// We previously simulated an error on this boundary
1588+
// so the instance must have been constructed in a previous
1589+
// commit.
15871590
constinstance=workInProgress.stateNode;
15881591
constctor=workInProgress.type;
15891592
// TODO This way of resetting the error boundary state is a hack.
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[DevTools] Fix a crash when rendering a new class Component when simu… · react/react@014138d · GitHub
Skip to content
Commit 014138d
Browse files
eps1loneps1lon
authored
[DevTools] Fix a crash when rendering a new class Component when simulating errored state (#35985)
1 parent 4610359 commit 014138d
3 files changed
Lines changed: 111 additions & 2 deletions
File tree
‎packages/react-devtools-shared/src/__tests__/storeForceError-test.js‎
Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @flow
8+
 */
9+
10+
importtypeStorefrom'react-devtools-shared/src/devtools/store';
11+
12+
import{getVersionedRenderImplementation}from'./utils';
13+
14+
describe('Store forcing errors',()=>{
15+
letReact;
16+
letagent;
17+
 let store: Store;
18+
letutils;
19+
letactAsync;
20+
21+
beforeEach(()=>{
22+
agent=global.agent;
23+
store=global.store;
24+
store.collapseNodesByDefault=false;
25+
store.componentFilters=[];
26+
store.recordChangeDescriptions=true;
27+
28+
React=require('react');
29+
utils=require('./utils');
30+
31+
actAsync=utils.actAsync;
32+
});
33+
34+
const{render}=getVersionedRenderImplementation();
35+
36+
// @reactVersion >= 18.0
37+
it('resets forced error and fallback states when filters are changed',async()=>{
38+
classAnyClassComponentextendsReact.Component{
39+
render(){
40+
returnthis.props.children;
41+
}
42+
}
43+
44+
classErrorBoundaryextendsReact.Component{
45+
state={hasError: false};
46+
47+
staticgetDerivedStateFromError(){
48+
return{hasError: true};
49+
}
50+
51+
render(){
52+
if(this.state.hasError){
53+
return(
54+
<AnyClassComponentkey="fallback">
55+
<divkey="did-error"/>
56+
</AnyClassComponent>
57+
);
58+
}
59+
returnthis.props.children;
60+
}
61+
}
62+
63+
functionApp(){
64+
return(
65+
<ErrorBoundarykey="content">
66+
<divkey="error-content"/>
67+
</ErrorBoundary>
68+
);
69+
}
70+
71+
awaitactAsync(async()=>{
72+
render(<App/>);
73+
});
74+
constrendererID=utils.getRendererID();
75+
awaitactAsync(()=>{
76+
agent.overrideError({
77+
id: store.getElementIDAtIndex(2),
78+
 rendererID,
79+
forceError: true,
80+
});
81+
});
82+
83+
expect(store).toMatchInlineSnapshot(`
84+
 [root]
85+
 ▾ <App>
86+
 ▾ <ErrorBoundary key="content">
87+
 ▾ <AnyClassComponent key="fallback">
88+
 <div key="did-error">
89+
 `);
90+
91+
awaitactAsync(()=>{
92+
agent.overrideError({
93+
id: store.getElementIDAtIndex(2),
94+
 rendererID,
95+
forceError: false,
96+
});
97+
});
98+
99+
expect(store).toMatchInlineSnapshot(`
100+
 [root]
101+
 ▾ <App>
102+
 ▾ <ErrorBoundary key="content">
103+
 <div key="error-content">
104+
 `);
105+
});
106+
});
‎packages/react-devtools-shared/src/backend/fiber/renderer.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7898,7 +7898,7 @@ export function attach(
78987898
 // Map of Fiber and its force error status: true (error), false (toggled off)
78997899
 const forceErrorForFibers = new Map<Fiber, boolean>();
79007900
7901-
 function shouldErrorFiberAccordingToMap(fiber: any): boolean {
7901+
 function shouldErrorFiberAccordingToMap(fiber: any): boolean | null {
79027902
 if (typeof setErrorHandler !== 'function') {
79037903
 throw new Error(
79047904
 'Expected overrideError() to not get called for earlier React versions.',
@@ -7934,7 +7934,7 @@ export function attach(
79347934
 }
79357935
 }
79367936
 if (status === undefined) {
7937-
 return false;
7937+
 return null;
79387938
 }
79397939
 return status;
79407940
 }
‎packages/react-reconciler/src/ReactFiberBeginWork.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,6 +1584,9 @@ function updateClassComponent(
15841584
// This is used by DevTools to force a boundary to error.
15851585
switch(shouldError(workInProgress)){
15861586
casefalse: {
1587+
// We previously simulated an error on this boundary
1588+
// so the instance must have been constructed in a previous
1589+
// commit.
15871590
constinstance=workInProgress.stateNode;
15881591
constctor=workInProgress.type;
15891592
// TODO This way of resetting the error boundary state is a hack.
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[DevTools] Fix a crash when rendering a new class Component when simu… · react/react@014138d · GitHub
Skip to content
Commit 014138d
Browse files
eps1loneps1lon
authored
[DevTools] Fix a crash when rendering a new class Component when simulating errored state (#35985)
1 parent 4610359 commit 014138d
3 files changed
Lines changed: 111 additions & 2 deletions
File tree
‎packages/react-devtools-shared/src/__tests__/storeForceError-test.js‎
Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @flow
8+
 */
9+
10+
importtypeStorefrom'react-devtools-shared/src/devtools/store';
11+
12+
import{getVersionedRenderImplementation}from'./utils';
13+
14+
describe('Store forcing errors',()=>{
15+
letReact;
16+
letagent;
17+
 let store: Store;
18+
letutils;
19+
letactAsync;
20+
21+
beforeEach(()=>{
22+
agent=global.agent;
23+
store=global.store;
24+
store.collapseNodesByDefault=false;
25+
store.componentFilters=[];
26+
store.recordChangeDescriptions=true;
27+
28+
React=require('react');
29+
utils=require('./utils');
30+
31+
actAsync=utils.actAsync;
32+
});
33+
34+
const{render}=getVersionedRenderImplementation();
35+
36+
// @reactVersion >= 18.0
37+
it('resets forced error and fallback states when filters are changed',async()=>{
38+
classAnyClassComponentextendsReact.Component{
39+
render(){
40+
returnthis.props.children;
41+
}
42+
}
43+
44+
classErrorBoundaryextendsReact.Component{
45+
state={hasError: false};
46+
47+
staticgetDerivedStateFromError(){
48+
return{hasError: true};
49+
}
50+
51+
render(){
52+
if(this.state.hasError){
53+
return(
54+
<AnyClassComponentkey="fallback">
55+
<divkey="did-error"/>
56+
</AnyClassComponent>
57+
);
58+
}
59+
returnthis.props.children;
60+
}
61+
}
62+
63+
functionApp(){
64+
return(
65+
<ErrorBoundarykey="content">
66+
<divkey="error-content"/>
67+
</ErrorBoundary>
68+
);
69+
}
70+
71+
awaitactAsync(async()=>{
72+
render(<App/>);
73+
});
74+
constrendererID=utils.getRendererID();
75+
awaitactAsync(()=>{
76+
agent.overrideError({
77+
id: store.getElementIDAtIndex(2),
78+
 rendererID,
79+
forceError: true,
80+
});
81+
});
82+
83+
expect(store).toMatchInlineSnapshot(`
84+
 [root]
85+
 ▾ <App>
86+
 ▾ <ErrorBoundary key="content">
87+
 ▾ <AnyClassComponent key="fallback">
88+
 <div key="did-error">
89+
 `);
90+
91+
awaitactAsync(()=>{
92+
agent.overrideError({
93+
id: store.getElementIDAtIndex(2),
94+
 rendererID,
95+
forceError: false,
96+
});
97+
});
98+
99+
expect(store).toMatchInlineSnapshot(`
100+
 [root]
101+
 ▾ <App>
102+
 ▾ <ErrorBoundary key="content">
103+
 <div key="error-content">
104+
 `);
105+
});
106+
});
‎packages/react-devtools-shared/src/backend/fiber/renderer.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7898,7 +7898,7 @@ export function attach(
78987898
 // Map of Fiber and its force error status: true (error), false (toggled off)
78997899
 const forceErrorForFibers = new Map<Fiber, boolean>();
79007900
7901-
 function shouldErrorFiberAccordingToMap(fiber: any): boolean {
7901+
 function shouldErrorFiberAccordingToMap(fiber: any): boolean | null {
79027902
 if (typeof setErrorHandler !== 'function') {
79037903
 throw new Error(
79047904
 'Expected overrideError() to not get called for earlier React versions.',
@@ -7934,7 +7934,7 @@ export function attach(
79347934
 }
79357935
 }
79367936
 if (status === undefined) {
7937-
 return false;
7937+
 return null;
79387938
 }
79397939
 return status;
79407940
 }
‎packages/react-reconciler/src/ReactFiberBeginWork.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,6 +1584,9 @@ function updateClassComponent(
15841584
// This is used by DevTools to force a boundary to error.
15851585
switch(shouldError(workInProgress)){
15861586
casefalse: {
1587+
// We previously simulated an error on this boundary
1588+
// so the instance must have been constructed in a previous
1589+
// commit.
15871590
constinstance=workInProgress.stateNode;
15881591
constctor=workInProgress.type;
15891592
// TODO This way of resetting the error boundary state is a hack.
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[DevTools] Fix a crash when rendering a new class Component when simu… · react/react@014138d · GitHub
Skip to content
Commit 014138d
Browse files
eps1loneps1lon
authored
[DevTools] Fix a crash when rendering a new class Component when simulating errored state (#35985)
1 parent 4610359 commit 014138d
3 files changed
Lines changed: 111 additions & 2 deletions
File tree
‎packages/react-devtools-shared/src/__tests__/storeForceError-test.js‎
Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @flow
8+
 */
9+
10+
importtypeStorefrom'react-devtools-shared/src/devtools/store';
11+
12+
import{getVersionedRenderImplementation}from'./utils';
13+
14+
describe('Store forcing errors',()=>{
15+
letReact;
16+
letagent;
17+
 let store: Store;
18+
letutils;
19+
letactAsync;
20+
21+
beforeEach(()=>{
22+
agent=global.agent;
23+
store=global.store;
24+
store.collapseNodesByDefault=false;
25+
store.componentFilters=[];
26+
store.recordChangeDescriptions=true;
27+
28+
React=require('react');
29+
utils=require('./utils');
30+
31+
actAsync=utils.actAsync;
32+
});
33+
34+
const{render}=getVersionedRenderImplementation();
35+
36+
// @reactVersion >= 18.0
37+
it('resets forced error and fallback states when filters are changed',async()=>{
38+
classAnyClassComponentextendsReact.Component{
39+
render(){
40+
returnthis.props.children;
41+
}
42+
}
43+
44+
classErrorBoundaryextendsReact.Component{
45+
state={hasError: false};
46+
47+
staticgetDerivedStateFromError(){
48+
return{hasError: true};
49+
}
50+
51+
render(){
52+
if(this.state.hasError){
53+
return(
54+
<AnyClassComponentkey="fallback">
55+
<divkey="did-error"/>
56+
</AnyClassComponent>
57+
);
58+
}
59+
returnthis.props.children;
60+
}
61+
}
62+
63+
functionApp(){
64+
return(
65+
<ErrorBoundarykey="content">
66+
<divkey="error-content"/>
67+
</ErrorBoundary>
68+
);
69+
}
70+
71+
awaitactAsync(async()=>{
72+
render(<App/>);
73+
});
74+
constrendererID=utils.getRendererID();
75+
awaitactAsync(()=>{
76+
agent.overrideError({
77+
id: store.getElementIDAtIndex(2),
78+
 rendererID,
79+
forceError: true,
80+
});
81+
});
82+
83+
expect(store).toMatchInlineSnapshot(`
84+
 [root]
85+
 ▾ <App>
86+
 ▾ <ErrorBoundary key="content">
87+
 ▾ <AnyClassComponent key="fallback">
88+
 <div key="did-error">
89+
 `);
90+
91+
awaitactAsync(()=>{
92+
agent.overrideError({
93+
id: store.getElementIDAtIndex(2),
94+
 rendererID,
95+
forceError: false,
96+
});
97+
});
98+
99+
expect(store).toMatchInlineSnapshot(`
100+
 [root]
101+
 ▾ <App>
102+
 ▾ <ErrorBoundary key="content">
103+
 <div key="error-content">
104+
 `);
105+
});
106+
});
‎packages/react-devtools-shared/src/backend/fiber/renderer.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7898,7 +7898,7 @@ export function attach(
78987898
 // Map of Fiber and its force error status: true (error), false (toggled off)
78997899
 const forceErrorForFibers = new Map<Fiber, boolean>();
79007900
7901-
 function shouldErrorFiberAccordingToMap(fiber: any): boolean {
7901+
 function shouldErrorFiberAccordingToMap(fiber: any): boolean | null {
79027902
 if (typeof setErrorHandler !== 'function') {
79037903
 throw new Error(
79047904
 'Expected overrideError() to not get called for earlier React versions.',
@@ -7934,7 +7934,7 @@ export function attach(
79347934
 }
79357935
 }
79367936
 if (status === undefined) {
7937-
 return false;
7937+
 return null;
79387938
 }
79397939
 return status;
79407940
 }
‎packages/react-reconciler/src/ReactFiberBeginWork.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,6 +1584,9 @@ function updateClassComponent(
15841584
// This is used by DevTools to force a boundary to error.
15851585
switch(shouldError(workInProgress)){
15861586
casefalse: {
1587+
// We previously simulated an error on this boundary
1588+
// so the instance must have been constructed in a previous
1589+
// commit.
15871590
constinstance=workInProgress.stateNode;
15881591
constctor=workInProgress.type;
15891592
// TODO This way of resetting the error boundary state is a hack.
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[DevTools] Fix a crash when rendering a new class Component when simu… · react/react@014138d · GitHub
Skip to content
Commit 014138d
Browse files
eps1loneps1lon
authored
[DevTools] Fix a crash when rendering a new class Component when simulating errored state (#35985)
1 parent 4610359 commit 014138d
3 files changed
Lines changed: 111 additions & 2 deletions
File tree
‎packages/react-devtools-shared/src/__tests__/storeForceError-test.js‎
Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @flow
8+
 */
9+
10+
importtypeStorefrom'react-devtools-shared/src/devtools/store';
11+
12+
import{getVersionedRenderImplementation}from'./utils';
13+
14+
describe('Store forcing errors',()=>{
15+
letReact;
16+
letagent;
17+
 let store: Store;
18+
letutils;
19+
letactAsync;
20+
21+
beforeEach(()=>{
22+
agent=global.agent;
23+
store=global.store;
24+
store.collapseNodesByDefault=false;
25+
store.componentFilters=[];
26+
store.recordChangeDescriptions=true;
27+
28+
React=require('react');
29+
utils=require('./utils');
30+
31+
actAsync=utils.actAsync;
32+
});
33+
34+
const{render}=getVersionedRenderImplementation();
35+
36+
// @reactVersion >= 18.0
37+
it('resets forced error and fallback states when filters are changed',async()=>{
38+
classAnyClassComponentextendsReact.Component{
39+
render(){
40+
returnthis.props.children;
41+
}
42+
}
43+
44+
classErrorBoundaryextendsReact.Component{
45+
state={hasError: false};
46+
47+
staticgetDerivedStateFromError(){
48+
return{hasError: true};
49+
}
50+
51+
render(){
52+
if(this.state.hasError){
53+
return(
54+
<AnyClassComponentkey="fallback">
55+
<divkey="did-error"/>
56+
</AnyClassComponent>
57+
);
58+
}
59+
returnthis.props.children;
60+
}
61+
}
62+
63+
functionApp(){
64+
return(
65+
<ErrorBoundarykey="content">
66+
<divkey="error-content"/>
67+
</ErrorBoundary>
68+
);
69+
}
70+
71+
awaitactAsync(async()=>{
72+
render(<App/>);
73+
});
74+
constrendererID=utils.getRendererID();
75+
awaitactAsync(()=>{
76+
agent.overrideError({
77+
id: store.getElementIDAtIndex(2),
78+
 rendererID,
79+
forceError: true,
80+
});
81+
});
82+
83+
expect(store).toMatchInlineSnapshot(`
84+
 [root]
85+
 ▾ <App>
86+
 ▾ <ErrorBoundary key="content">
87+
 ▾ <AnyClassComponent key="fallback">
88+
 <div key="did-error">
89+
 `);
90+
91+
awaitactAsync(()=>{
92+
agent.overrideError({
93+
id: store.getElementIDAtIndex(2),
94+
 rendererID,
95+
forceError: false,
96+
});
97+
});
98+
99+
expect(store).toMatchInlineSnapshot(`
100+
 [root]
101+
 ▾ <App>
102+
 ▾ <ErrorBoundary key="content">
103+
 <div key="error-content">
104+
 `);
105+
});
106+
});
‎packages/react-devtools-shared/src/backend/fiber/renderer.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7898,7 +7898,7 @@ export function attach(
78987898
 // Map of Fiber and its force error status: true (error), false (toggled off)
78997899
 const forceErrorForFibers = new Map<Fiber, boolean>();
79007900
7901-
 function shouldErrorFiberAccordingToMap(fiber: any): boolean {
7901+
 function shouldErrorFiberAccordingToMap(fiber: any): boolean | null {
79027902
 if (typeof setErrorHandler !== 'function') {
79037903
 throw new Error(
79047904
 'Expected overrideError() to not get called for earlier React versions.',
@@ -7934,7 +7934,7 @@ export function attach(
79347934
 }
79357935
 }
79367936
 if (status === undefined) {
7937-
 return false;
7937+
 return null;
79387938
 }
79397939
 return status;
79407940
 }
‎packages/react-reconciler/src/ReactFiberBeginWork.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,6 +1584,9 @@ function updateClassComponent(
15841584
// This is used by DevTools to force a boundary to error.
15851585
switch(shouldError(workInProgress)){
15861586
casefalse: {
1587+
// We previously simulated an error on this boundary
1588+
// so the instance must have been constructed in a previous
1589+
// commit.
15871590
constinstance=workInProgress.stateNode;
15881591
constctor=workInProgress.type;
15891592
// TODO This way of resetting the error boundary state is a hack.
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[DevTools] Fix a crash when rendering a new class Component when simu… · react/react@014138d · GitHub
Skip to content
Commit 014138d
Browse files
eps1loneps1lon
authored
[DevTools] Fix a crash when rendering a new class Component when simulating errored state (#35985)
1 parent 4610359 commit 014138d
3 files changed
Lines changed: 111 additions & 2 deletions
File tree
‎packages/react-devtools-shared/src/__tests__/storeForceError-test.js‎
Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
/**
2+
 * Copyright (c) Meta Platforms, Inc. and affiliates.
3+
 *
4+
 * This source code is licensed under the MIT license found in the
5+
 * LICENSE file in the root directory of this source tree.
6+
 *
7+
 * @flow
8+
 */
9+
10+
importtypeStorefrom'react-devtools-shared/src/devtools/store';
11+
12+
import{getVersionedRenderImplementation}from'./utils';
13+
14+
describe('Store forcing errors',()=>{
15+
letReact;
16+
letagent;
17+
 let store: Store;
18+
letutils;
19+
letactAsync;
20+
21+
beforeEach(()=>{
22+
agent=global.agent;
23+
store=global.store;
24+
store.collapseNodesByDefault=false;
25+
store.componentFilters=[];
26+
store.recordChangeDescriptions=true;
27+
28+
React=require('react');
29+
utils=require('./utils');
30+
31+
actAsync=utils.actAsync;
32+
});
33+
34+
const{render}=getVersionedRenderImplementation();
35+
36+
// @reactVersion >= 18.0
37+
it('resets forced error and fallback states when filters are changed',async()=>{
38+
classAnyClassComponentextendsReact.Component{
39+
render(){
40+
returnthis.props.children;
41+
}
42+
}
43+
44+
classErrorBoundaryextendsReact.Component{
45+
state={hasError: false};
46+
47+
staticgetDerivedStateFromError(){
48+
return{hasError: true};
49+
}
50+
51+
render(){
52+
if(this.state.hasError){
53+
return(
54+
<AnyClassComponentkey="fallback">
55+
<divkey="did-error"/>
56+
</AnyClassComponent>
57+
);
58+
}
59+
returnthis.props.children;
60+
}
61+
}
62+
63+
functionApp(){
64+
return(
65+
<ErrorBoundarykey="content">
66+
<divkey="error-content"/>
67+
</ErrorBoundary>
68+
);
69+
}
70+
71+
awaitactAsync(async()=>{
72+
render(<App/>);
73+
});
74+
constrendererID=utils.getRendererID();
75+
awaitactAsync(()=>{
76+
agent.overrideError({
77+
id: store.getElementIDAtIndex(2),
78+
 rendererID,
79+
forceError: true,
80+
});
81+
});
82+
83+
expect(store).toMatchInlineSnapshot(`
84+
 [root]
85+
 ▾ <App>
86+
 ▾ <ErrorBoundary key="content">
87+
 ▾ <AnyClassComponent key="fallback">
88+
 <div key="did-error">
89+
 `);
90+
91+
awaitactAsync(()=>{
92+
agent.overrideError({
93+
id: store.getElementIDAtIndex(2),
94+
 rendererID,
95+
forceError: false,
96+
});
97+
});
98+
99+
expect(store).toMatchInlineSnapshot(`
100+
 [root]
101+
 ▾ <App>
102+
 ▾ <ErrorBoundary key="content">
103+
 <div key="error-content">
104+
 `);
105+
});
106+
});
‎packages/react-devtools-shared/src/backend/fiber/renderer.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7898,7 +7898,7 @@ export function attach(
78987898
 // Map of Fiber and its force error status: true (error), false (toggled off)
78997899
 const forceErrorForFibers = new Map<Fiber, boolean>();
79007900
7901-
 function shouldErrorFiberAccordingToMap(fiber: any): boolean {
7901+
 function shouldErrorFiberAccordingToMap(fiber: any): boolean | null {
79027902
 if (typeof setErrorHandler !== 'function') {
79037903
 throw new Error(
79047904
 'Expected overrideError() to not get called for earlier React versions.',
@@ -7934,7 +7934,7 @@ export function attach(
79347934
 }
79357935
 }
79367936
 if (status === undefined) {
7937-
 return false;
7937+
 return null;
79387938
 }
79397939
 return status;
79407940
 }
‎packages/react-reconciler/src/ReactFiberBeginWork.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,6 +1584,9 @@ function updateClassComponent(
15841584
// This is used by DevTools to force a boundary to error.
15851585
switch(shouldError(workInProgress)){
15861586
casefalse: {
1587+
// We previously simulated an error on this boundary
1588+
// so the instance must have been constructed in a previous
1589+
// commit.
15871590
constinstance=workInProgress.stateNode;
15881591
constctor=workInProgress.type;
15891592
// TODO This way of resetting the error boundary state is a hack.
0 commit comments
Comments
 (0)