Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Partial React sync

Browse Source 
Summary: Includes only https://github.com/facebook/react/pull/15797.

Reviewed By: rickhanlonii

Differential Revision: D16030310

fbshipit-source-id: c9c52fcd4e170551054ac608f6f7afd6a85bb74e
This commit is contained in:
Dan Abramov
2019-06-27 08:21:29 -07:00
committed by Facebook Github Bot
parent 3ca19c0481
commit 615902eb78
12 changed files with 64 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/Renderer/implementations/ReactFabric-dev.fb.js
+2 -1
View File
@@ -15755,6 +15755,7 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
if (typeof getDerivedStateFromError === "function") {
var error = errorInfo.value;
update.payload = function() {
logError(fiber, errorInfo);
return getDerivedStateFromError(error);
};
}
@@ -15772,10 +15773,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
// TODO: Warn in strict mode if getDerivedStateFromError is
// not defined.
markLegacyErrorBoundaryAsFailed(this);
logError(fiber, errorInfo);
}
var error = errorInfo.value;
var stack = errorInfo.stack;
logError(fiber, errorInfo);
this.componentDidCatch(error, {
componentStack: stack !== null ? stack : ""
});
Libraries/Renderer/implementations/ReactFabric-dev.js
+2 -1
View File
@@ -15751,6 +15751,7 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
if (typeof getDerivedStateFromError === "function") {
var error = errorInfo.value;
update.payload = function() {
logError(fiber, errorInfo);
return getDerivedStateFromError(error);
};
}
@@ -15768,10 +15769,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
// TODO: Warn in strict mode if getDerivedStateFromError is
// not defined.
markLegacyErrorBoundaryAsFailed(this);
logError(fiber, errorInfo);
}
var error = errorInfo.value;
var stack = errorInfo.stack;
logError(fiber, errorInfo);
this.componentDidCatch(error, {
componentStack: stack !== null ? stack : ""
});
Libraries/Renderer/implementations/ReactFabric-prod.fb.js
+7 -7
View File
@@ -4609,9 +4609,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
expirationTime.tag = 3;
var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
if ("function" === typeof getDerivedStateFromError) {
var error$jscomp$0 = errorInfo.value;
var error = errorInfo.value;
expirationTime.payload = function() {
return getDerivedStateFromError(error$jscomp$0);
logError(fiber, errorInfo);
return getDerivedStateFromError(error);
};
}
var inst = fiber.stateNode;
@@ -4621,11 +4622,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
"function" !== typeof getDerivedStateFromError &&
(null === legacyErrorBoundariesThatAlreadyFailed
? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
: legacyErrorBoundariesThatAlreadyFailed.add(this));
var error = errorInfo.value,
stack = errorInfo.stack;
logError(fiber, errorInfo);
this.componentDidCatch(error, {
: legacyErrorBoundariesThatAlreadyFailed.add(this),
logError(fiber, errorInfo));
var stack = errorInfo.stack;
this.componentDidCatch(errorInfo.value, {
componentStack: null !== stack ? stack : ""
});
});
Libraries/Renderer/implementations/ReactFabric-prod.js
+7 -7
View File
@@ -4609,9 +4609,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
expirationTime.tag = 3;
var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
if ("function" === typeof getDerivedStateFromError) {
var error$jscomp$0 = errorInfo.value;
var error = errorInfo.value;
expirationTime.payload = function() {
return getDerivedStateFromError(error$jscomp$0);
logError(fiber, errorInfo);
return getDerivedStateFromError(error);
};
}
var inst = fiber.stateNode;
@@ -4621,11 +4622,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
"function" !== typeof getDerivedStateFromError &&
(null === legacyErrorBoundariesThatAlreadyFailed
? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
: legacyErrorBoundariesThatAlreadyFailed.add(this));
var error = errorInfo.value,
stack = errorInfo.stack;
logError(fiber, errorInfo);
this.componentDidCatch(error, {
: legacyErrorBoundariesThatAlreadyFailed.add(this),
logError(fiber, errorInfo));
var stack = errorInfo.stack;
this.componentDidCatch(errorInfo.value, {
componentStack: null !== stack ? stack : ""
});
});
Libraries/Renderer/implementations/ReactFabric-profiling.fb.js
+7 -7
View File
@@ -4831,9 +4831,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
expirationTime.tag = 3;
var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
if ("function" === typeof getDerivedStateFromError) {
var error$jscomp$0 = errorInfo.value;
var error = errorInfo.value;
expirationTime.payload = function() {
return getDerivedStateFromError(error$jscomp$0);
logError(fiber, errorInfo);
return getDerivedStateFromError(error);
};
}
var inst = fiber.stateNode;
@@ -4843,11 +4844,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
"function" !== typeof getDerivedStateFromError &&
(null === legacyErrorBoundariesThatAlreadyFailed
? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
: legacyErrorBoundariesThatAlreadyFailed.add(this));
var error = errorInfo.value,
stack = errorInfo.stack;
logError(fiber, errorInfo);
this.componentDidCatch(error, {
: legacyErrorBoundariesThatAlreadyFailed.add(this),
logError(fiber, errorInfo));
var stack = errorInfo.stack;
this.componentDidCatch(errorInfo.value, {
componentStack: null !== stack ? stack : ""
});
});
Libraries/Renderer/implementations/ReactFabric-profiling.js
+7 -7
View File
@@ -4831,9 +4831,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
expirationTime.tag = 3;
var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
if ("function" === typeof getDerivedStateFromError) {
var error$jscomp$0 = errorInfo.value;
var error = errorInfo.value;
expirationTime.payload = function() {
return getDerivedStateFromError(error$jscomp$0);
logError(fiber, errorInfo);
return getDerivedStateFromError(error);
};
}
var inst = fiber.stateNode;
@@ -4843,11 +4844,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
"function" !== typeof getDerivedStateFromError &&
(null === legacyErrorBoundariesThatAlreadyFailed
? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
: legacyErrorBoundariesThatAlreadyFailed.add(this));
var error = errorInfo.value,
stack = errorInfo.stack;
logError(fiber, errorInfo);
this.componentDidCatch(error, {
: legacyErrorBoundariesThatAlreadyFailed.add(this),
logError(fiber, errorInfo));
var stack = errorInfo.stack;
this.componentDidCatch(errorInfo.value, {
componentStack: null !== stack ? stack : ""
});
});
Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js
+2 -1
View File
@@ -16069,6 +16069,7 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
if (typeof getDerivedStateFromError === "function") {
var error = errorInfo.value;
update.payload = function() {
logError(fiber, errorInfo);
return getDerivedStateFromError(error);
};
}
@@ -16086,10 +16087,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
// TODO: Warn in strict mode if getDerivedStateFromError is
// not defined.
markLegacyErrorBoundaryAsFailed(this);
logError(fiber, errorInfo);
}
var error = errorInfo.value;
var stack = errorInfo.stack;
logError(fiber, errorInfo);
this.componentDidCatch(error, {
componentStack: stack !== null ? stack : ""
});
Libraries/Renderer/implementations/ReactNativeRenderer-dev.js
+2 -1
View File
@@ -16065,6 +16065,7 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
if (typeof getDerivedStateFromError === "function") {
var error = errorInfo.value;
update.payload = function() {
logError(fiber, errorInfo);
return getDerivedStateFromError(error);
};
}
@@ -16082,10 +16083,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
// TODO: Warn in strict mode if getDerivedStateFromError is
// not defined.
markLegacyErrorBoundaryAsFailed(this);
logError(fiber, errorInfo);
}
var error = errorInfo.value;
var stack = errorInfo.stack;
logError(fiber, errorInfo);
this.componentDidCatch(error, {
componentStack: stack !== null ? stack : ""
});
Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js
+7 -7
View File
@@ -4883,9 +4883,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
expirationTime.tag = 3;
var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
if ("function" === typeof getDerivedStateFromError) {
var error$jscomp$0 = errorInfo.value;
var error = errorInfo.value;
expirationTime.payload = function() {
return getDerivedStateFromError(error$jscomp$0);
logError(fiber, errorInfo);
return getDerivedStateFromError(error);
};
}
var inst = fiber.stateNode;
@@ -4895,11 +4896,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
"function" !== typeof getDerivedStateFromError &&
(null === legacyErrorBoundariesThatAlreadyFailed
? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
: legacyErrorBoundariesThatAlreadyFailed.add(this));
var error = errorInfo.value,
stack = errorInfo.stack;
logError(fiber, errorInfo);
this.componentDidCatch(error, {
: legacyErrorBoundariesThatAlreadyFailed.add(this),
logError(fiber, errorInfo));
var stack = errorInfo.stack;
this.componentDidCatch(errorInfo.value, {
componentStack: null !== stack ? stack : ""
});
});
Libraries/Renderer/implementations/ReactNativeRenderer-prod.js
+7 -7
View File
@@ -4883,9 +4883,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
expirationTime.tag = 3;
var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
if ("function" === typeof getDerivedStateFromError) {
var error$jscomp$0 = errorInfo.value;
var error = errorInfo.value;
expirationTime.payload = function() {
return getDerivedStateFromError(error$jscomp$0);
logError(fiber, errorInfo);
return getDerivedStateFromError(error);
};
}
var inst = fiber.stateNode;
@@ -4895,11 +4896,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
"function" !== typeof getDerivedStateFromError &&
(null === legacyErrorBoundariesThatAlreadyFailed
? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
: legacyErrorBoundariesThatAlreadyFailed.add(this));
var error = errorInfo.value,
stack = errorInfo.stack;
logError(fiber, errorInfo);
this.componentDidCatch(error, {
: legacyErrorBoundariesThatAlreadyFailed.add(this),
logError(fiber, errorInfo));
var stack = errorInfo.stack;
this.componentDidCatch(errorInfo.value, {
componentStack: null !== stack ? stack : ""
});
});
Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js
+7 -7
View File
@@ -5112,9 +5112,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
expirationTime.tag = 3;
var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
if ("function" === typeof getDerivedStateFromError) {
var error$jscomp$0 = errorInfo.value;
var error = errorInfo.value;
expirationTime.payload = function() {
return getDerivedStateFromError(error$jscomp$0);
logError(fiber, errorInfo);
return getDerivedStateFromError(error);
};
}
var inst = fiber.stateNode;
@@ -5124,11 +5125,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
"function" !== typeof getDerivedStateFromError &&
(null === legacyErrorBoundariesThatAlreadyFailed
? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
: legacyErrorBoundariesThatAlreadyFailed.add(this));
var error = errorInfo.value,
stack = errorInfo.stack;
logError(fiber, errorInfo);
this.componentDidCatch(error, {
: legacyErrorBoundariesThatAlreadyFailed.add(this),
logError(fiber, errorInfo));
var stack = errorInfo.stack;
this.componentDidCatch(errorInfo.value, {
componentStack: null !== stack ? stack : ""
});
});
Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js
+7 -7
View File
@@ -5112,9 +5112,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
expirationTime.tag = 3;
var getDerivedStateFromError = fiber.type.getDerivedStateFromError;
if ("function" === typeof getDerivedStateFromError) {
var error$jscomp$0 = errorInfo.value;
var error = errorInfo.value;
expirationTime.payload = function() {
return getDerivedStateFromError(error$jscomp$0);
logError(fiber, errorInfo);
return getDerivedStateFromError(error);
};
}
var inst = fiber.stateNode;
@@ -5124,11 +5125,10 @@ function createClassErrorUpdate(fiber, errorInfo, expirationTime) {
"function" !== typeof getDerivedStateFromError &&
(null === legacyErrorBoundariesThatAlreadyFailed
? (legacyErrorBoundariesThatAlreadyFailed = new Set([this]))
: legacyErrorBoundariesThatAlreadyFailed.add(this));
var error = errorInfo.value,
stack = errorInfo.stack;
logError(fiber, errorInfo);
this.componentDidCatch(error, {
: legacyErrorBoundariesThatAlreadyFailed.add(this),
logError(fiber, errorInfo));
var stack = errorInfo.stack;
this.componentDidCatch(errorInfo.value, {
componentStack: null !== stack ? stack : ""
});
});