mirror of
https://github.com/facebook/react.git
synced 2025-11-01 09:12:30 +00:00
Remove unnecessary (and incorrect) code for compatibility with Paper in the Fabric version of GlobalResponderHandler (#26290)
## Summary
I'm working on a refactor of the definition of `Instance` in Fabric and
I came across this code that seemed to be for compatibility with Paper,
but that it would actually throw an error in that case.
In Paper, `stateNode` is an instance of `ReactNativeFiberHostComponent`,
which doesn't have a `canonical` field. We try to access nested
properties in that field in a couple of places here, which would throw a
type error (cannot read property `_nativeTag` of `undefined`) if we
actually happened to pass a reference to a Paper state node.
In this line:
```javascript
const isFabric = !!(
fromOrToStateNode && fromOrToStateNode.canonical._internalInstanceHandle
);
```
If it wasn't Fabric, `fromOrToStateNode.canonical` would be undefined,
and we don't check for that before accessing
`fromOrToStateNode.canonical._internalInstanceHandle`. This means that
we actually never use this logic in Paper or we would've seen the error.
## How did you test this change?
Existing tests.
DiffTrain build for [06460b6fb5](https://github.com/facebook/react/commit/06460b6fb51e99cfab840424a9514651488b2e99)
This commit is contained in:
@@ -1 +1 @@
|
||||
e64a8f4035024ce749bcbcf93b2618e66200a7f7
|
||||
06460b6fb51e99cfab840424a9514651488b2e99
|
||||
|
||||
@@ -1 +1 @@
|
||||
e64a8f4035024ce749bcbcf93b2618e66200a7f7
|
||||
06460b6fb51e99cfab840424a9514651488b2e99
|
||||
|
||||
@@ -27,7 +27,7 @@ if (
|
||||
}
|
||||
"use strict";
|
||||
|
||||
var ReactVersion = "18.3.0-www-classic-e64a8f403-20230303";
|
||||
var ReactVersion = "18.3.0-www-classic-06460b6fb-20230303";
|
||||
|
||||
// ATTENTION
|
||||
// When adding new symbols to this file,
|
||||
|
||||
@@ -27,7 +27,7 @@ if (
|
||||
}
|
||||
"use strict";
|
||||
|
||||
var ReactVersion = "18.3.0-www-modern-e64a8f403-20230303";
|
||||
var ReactVersion = "18.3.0-www-modern-06460b6fb-20230303";
|
||||
|
||||
// ATTENTION
|
||||
// When adding new symbols to this file,
|
||||
|
||||
@@ -646,4 +646,4 @@ exports.useSyncExternalStore = function (
|
||||
);
|
||||
};
|
||||
exports.useTransition = useTransition;
|
||||
exports.version = "18.3.0-www-classic-e64a8f403-20230303";
|
||||
exports.version = "18.3.0-www-classic-06460b6fb-20230303";
|
||||
|
||||
@@ -638,4 +638,4 @@ exports.useSyncExternalStore = function (
|
||||
);
|
||||
};
|
||||
exports.useTransition = useTransition;
|
||||
exports.version = "18.3.0-www-modern-e64a8f403-20230303";
|
||||
exports.version = "18.3.0-www-modern-06460b6fb-20230303";
|
||||
|
||||
@@ -657,7 +657,7 @@ exports.useSyncExternalStore = function (
|
||||
);
|
||||
};
|
||||
exports.useTransition = useTransition;
|
||||
exports.version = "18.3.0-www-classic-e64a8f403-20230303";
|
||||
exports.version = "18.3.0-www-classic-06460b6fb-20230303";
|
||||
|
||||
/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
|
||||
if (
|
||||
|
||||
@@ -649,7 +649,7 @@ exports.useSyncExternalStore = function (
|
||||
);
|
||||
};
|
||||
exports.useTransition = useTransition;
|
||||
exports.version = "18.3.0-www-modern-e64a8f403-20230303";
|
||||
exports.version = "18.3.0-www-modern-06460b6fb-20230303";
|
||||
|
||||
/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
|
||||
if (
|
||||
|
||||
@@ -69,7 +69,7 @@ function _assertThisInitialized(self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
var ReactVersion = "18.3.0-www-classic-e64a8f403-20230303";
|
||||
var ReactVersion = "18.3.0-www-classic-06460b6fb-20230303";
|
||||
|
||||
var LegacyRoot = 0;
|
||||
var ConcurrentRoot = 1;
|
||||
|
||||
@@ -69,7 +69,7 @@ function _assertThisInitialized(self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
var ReactVersion = "18.3.0-www-modern-e64a8f403-20230303";
|
||||
var ReactVersion = "18.3.0-www-modern-06460b6fb-20230303";
|
||||
|
||||
var LegacyRoot = 0;
|
||||
var ConcurrentRoot = 1;
|
||||
|
||||
@@ -9780,7 +9780,7 @@ var slice = Array.prototype.slice,
|
||||
return null;
|
||||
},
|
||||
bundleType: 0,
|
||||
version: "18.3.0-www-classic-e64a8f403-20230303",
|
||||
version: "18.3.0-www-classic-06460b6fb-20230303",
|
||||
rendererPackageName: "react-art"
|
||||
};
|
||||
var internals$jscomp$inline_1300 = {
|
||||
@@ -9811,7 +9811,7 @@ var internals$jscomp$inline_1300 = {
|
||||
scheduleRoot: null,
|
||||
setRefreshHandler: null,
|
||||
getCurrentFiber: null,
|
||||
reconcilerVersion: "18.3.0-next-e64a8f403-20230303"
|
||||
reconcilerVersion: "18.3.0-next-06460b6fb-20230303"
|
||||
};
|
||||
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
|
||||
var hook$jscomp$inline_1301 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
|
||||
|
||||
@@ -9445,7 +9445,7 @@ var slice = Array.prototype.slice,
|
||||
return null;
|
||||
},
|
||||
bundleType: 0,
|
||||
version: "18.3.0-www-modern-e64a8f403-20230303",
|
||||
version: "18.3.0-www-modern-06460b6fb-20230303",
|
||||
rendererPackageName: "react-art"
|
||||
};
|
||||
var internals$jscomp$inline_1280 = {
|
||||
@@ -9476,7 +9476,7 @@ var internals$jscomp$inline_1280 = {
|
||||
scheduleRoot: null,
|
||||
setRefreshHandler: null,
|
||||
getCurrentFiber: null,
|
||||
reconcilerVersion: "18.3.0-next-e64a8f403-20230303"
|
||||
reconcilerVersion: "18.3.0-next-06460b6fb-20230303"
|
||||
};
|
||||
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
|
||||
var hook$jscomp$inline_1281 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
|
||||
|
||||
@@ -42108,7 +42108,7 @@ function createFiberRoot(
|
||||
return root;
|
||||
}
|
||||
|
||||
var ReactVersion = "18.3.0-www-classic-e64a8f403-20230303";
|
||||
var ReactVersion = "18.3.0-www-classic-06460b6fb-20230303";
|
||||
|
||||
function createPortal$1(
|
||||
children,
|
||||
|
||||
@@ -41712,7 +41712,7 @@ function createFiberRoot(
|
||||
return root;
|
||||
}
|
||||
|
||||
var ReactVersion = "18.3.0-www-modern-e64a8f403-20230303";
|
||||
var ReactVersion = "18.3.0-www-modern-06460b6fb-20230303";
|
||||
|
||||
function createPortal$1(
|
||||
children,
|
||||
|
||||
@@ -15490,7 +15490,7 @@ Internals.Events = [
|
||||
var devToolsConfig$jscomp$inline_1741 = {
|
||||
findFiberByHostInstance: getClosestInstanceFromNode,
|
||||
bundleType: 0,
|
||||
version: "18.3.0-www-classic-e64a8f403-20230303",
|
||||
version: "18.3.0-www-classic-06460b6fb-20230303",
|
||||
rendererPackageName: "react-dom"
|
||||
};
|
||||
var internals$jscomp$inline_2108 = {
|
||||
@@ -15520,7 +15520,7 @@ var internals$jscomp$inline_2108 = {
|
||||
scheduleRoot: null,
|
||||
setRefreshHandler: null,
|
||||
getCurrentFiber: null,
|
||||
reconcilerVersion: "18.3.0-next-e64a8f403-20230303"
|
||||
reconcilerVersion: "18.3.0-next-06460b6fb-20230303"
|
||||
};
|
||||
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
|
||||
var hook$jscomp$inline_2109 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
|
||||
@@ -15776,4 +15776,4 @@ exports.unstable_renderSubtreeIntoContainer = function (
|
||||
);
|
||||
};
|
||||
exports.unstable_runWithPriority = runWithPriority;
|
||||
exports.version = "18.3.0-next-e64a8f403-20230303";
|
||||
exports.version = "18.3.0-next-06460b6fb-20230303";
|
||||
|
||||
@@ -15019,7 +15019,7 @@ Internals.Events = [
|
||||
var devToolsConfig$jscomp$inline_1700 = {
|
||||
findFiberByHostInstance: getClosestInstanceFromNode,
|
||||
bundleType: 0,
|
||||
version: "18.3.0-www-modern-e64a8f403-20230303",
|
||||
version: "18.3.0-www-modern-06460b6fb-20230303",
|
||||
rendererPackageName: "react-dom"
|
||||
};
|
||||
var internals$jscomp$inline_2072 = {
|
||||
@@ -15050,7 +15050,7 @@ var internals$jscomp$inline_2072 = {
|
||||
scheduleRoot: null,
|
||||
setRefreshHandler: null,
|
||||
getCurrentFiber: null,
|
||||
reconcilerVersion: "18.3.0-next-e64a8f403-20230303"
|
||||
reconcilerVersion: "18.3.0-next-06460b6fb-20230303"
|
||||
};
|
||||
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
|
||||
var hook$jscomp$inline_2073 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
|
||||
@@ -15235,4 +15235,4 @@ exports.unstable_flushControlled = function (fn) {
|
||||
}
|
||||
};
|
||||
exports.unstable_runWithPriority = runWithPriority;
|
||||
exports.version = "18.3.0-next-e64a8f403-20230303";
|
||||
exports.version = "18.3.0-next-06460b6fb-20230303";
|
||||
|
||||
@@ -16267,7 +16267,7 @@ Internals.Events = [
|
||||
var devToolsConfig$jscomp$inline_1821 = {
|
||||
findFiberByHostInstance: getClosestInstanceFromNode,
|
||||
bundleType: 0,
|
||||
version: "18.3.0-www-classic-e64a8f403-20230303",
|
||||
version: "18.3.0-www-classic-06460b6fb-20230303",
|
||||
rendererPackageName: "react-dom"
|
||||
};
|
||||
(function (internals) {
|
||||
@@ -16311,7 +16311,7 @@ var devToolsConfig$jscomp$inline_1821 = {
|
||||
scheduleRoot: null,
|
||||
setRefreshHandler: null,
|
||||
getCurrentFiber: null,
|
||||
reconcilerVersion: "18.3.0-next-e64a8f403-20230303"
|
||||
reconcilerVersion: "18.3.0-next-06460b6fb-20230303"
|
||||
});
|
||||
assign(Internals, {
|
||||
ReactBrowserEventEmitter: {
|
||||
@@ -16554,7 +16554,7 @@ exports.unstable_renderSubtreeIntoContainer = function (
|
||||
);
|
||||
};
|
||||
exports.unstable_runWithPriority = runWithPriority;
|
||||
exports.version = "18.3.0-next-e64a8f403-20230303";
|
||||
exports.version = "18.3.0-next-06460b6fb-20230303";
|
||||
|
||||
/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
|
||||
if (
|
||||
|
||||
@@ -15786,7 +15786,7 @@ Internals.Events = [
|
||||
var devToolsConfig$jscomp$inline_1780 = {
|
||||
findFiberByHostInstance: getClosestInstanceFromNode,
|
||||
bundleType: 0,
|
||||
version: "18.3.0-www-modern-e64a8f403-20230303",
|
||||
version: "18.3.0-www-modern-06460b6fb-20230303",
|
||||
rendererPackageName: "react-dom"
|
||||
};
|
||||
(function (internals) {
|
||||
@@ -15831,7 +15831,7 @@ var devToolsConfig$jscomp$inline_1780 = {
|
||||
scheduleRoot: null,
|
||||
setRefreshHandler: null,
|
||||
getCurrentFiber: null,
|
||||
reconcilerVersion: "18.3.0-next-e64a8f403-20230303"
|
||||
reconcilerVersion: "18.3.0-next-06460b6fb-20230303"
|
||||
});
|
||||
exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = Internals;
|
||||
exports.createPortal = function (children, container) {
|
||||
@@ -16003,7 +16003,7 @@ exports.unstable_flushControlled = function (fn) {
|
||||
}
|
||||
};
|
||||
exports.unstable_runWithPriority = runWithPriority;
|
||||
exports.version = "18.3.0-next-e64a8f403-20230303";
|
||||
exports.version = "18.3.0-next-06460b6fb-20230303";
|
||||
|
||||
/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
|
||||
if (
|
||||
|
||||
@@ -19,7 +19,7 @@ if (__DEV__) {
|
||||
var React = require("react");
|
||||
var ReactDOM = require("react-dom");
|
||||
|
||||
var ReactVersion = "18.3.0-www-classic-e64a8f403-20230303";
|
||||
var ReactVersion = "18.3.0-www-classic-06460b6fb-20230303";
|
||||
|
||||
// This refers to a WWW module.
|
||||
var warningWWW = require("warning");
|
||||
|
||||
@@ -19,7 +19,7 @@ if (__DEV__) {
|
||||
var React = require("react");
|
||||
var ReactDOM = require("react-dom");
|
||||
|
||||
var ReactVersion = "18.3.0-www-modern-e64a8f403-20230303";
|
||||
var ReactVersion = "18.3.0-www-modern-06460b6fb-20230303";
|
||||
|
||||
// This refers to a WWW module.
|
||||
var warningWWW = require("warning");
|
||||
|
||||
@@ -3771,4 +3771,4 @@ exports.renderToString = function (children, options) {
|
||||
'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server'
|
||||
);
|
||||
};
|
||||
exports.version = "18.3.0-www-classic-e64a8f403-20230303";
|
||||
exports.version = "18.3.0-www-classic-06460b6fb-20230303";
|
||||
|
||||
@@ -3669,4 +3669,4 @@ exports.renderToString = function (children, options) {
|
||||
'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server'
|
||||
);
|
||||
};
|
||||
exports.version = "18.3.0-www-modern-e64a8f403-20230303";
|
||||
exports.version = "18.3.0-www-modern-06460b6fb-20230303";
|
||||
|
||||
@@ -31237,7 +31237,7 @@ function createFiberRoot(
|
||||
return root;
|
||||
}
|
||||
|
||||
var ReactVersion = "18.3.0-www-classic-e64a8f403-20230303";
|
||||
var ReactVersion = "18.3.0-www-classic-06460b6fb-20230303";
|
||||
|
||||
function createPortal$1(
|
||||
children,
|
||||
|
||||
@@ -37728,7 +37728,7 @@ function createFiberRoot(
|
||||
return root;
|
||||
}
|
||||
|
||||
var ReactVersion = "18.3.0-www-modern-e64a8f403-20230303";
|
||||
var ReactVersion = "18.3.0-www-modern-06460b6fb-20230303";
|
||||
|
||||
function createPortal$1(
|
||||
children,
|
||||
|
||||
@@ -11521,7 +11521,7 @@ Internals.Events = [
|
||||
var devToolsConfig$jscomp$inline_1535 = {
|
||||
findFiberByHostInstance: getClosestInstanceFromNode,
|
||||
bundleType: 0,
|
||||
version: "18.3.0-www-classic-e64a8f403-20230303",
|
||||
version: "18.3.0-www-classic-06460b6fb-20230303",
|
||||
rendererPackageName: "react-dom"
|
||||
};
|
||||
var internals$jscomp$inline_2058 = {
|
||||
@@ -11551,7 +11551,7 @@ var internals$jscomp$inline_2058 = {
|
||||
scheduleRoot: null,
|
||||
setRefreshHandler: null,
|
||||
getCurrentFiber: null,
|
||||
reconcilerVersion: "18.3.0-next-e64a8f403-20230303"
|
||||
reconcilerVersion: "18.3.0-next-06460b6fb-20230303"
|
||||
};
|
||||
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
|
||||
var hook$jscomp$inline_2059 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
|
||||
@@ -14782,4 +14782,4 @@ exports.unstable_renderSubtreeIntoContainer = function (
|
||||
);
|
||||
};
|
||||
exports.unstable_runWithPriority = runWithPriority;
|
||||
exports.version = "18.3.0-next-e64a8f403-20230303";
|
||||
exports.version = "18.3.0-next-06460b6fb-20230303";
|
||||
|
||||
@@ -13881,7 +13881,7 @@ Internals.Events = [
|
||||
var devToolsConfig$jscomp$inline_1652 = {
|
||||
findFiberByHostInstance: getClosestInstanceFromNode,
|
||||
bundleType: 0,
|
||||
version: "18.3.0-www-modern-e64a8f403-20230303",
|
||||
version: "18.3.0-www-modern-06460b6fb-20230303",
|
||||
rendererPackageName: "react-dom"
|
||||
};
|
||||
var internals$jscomp$inline_2032 = {
|
||||
@@ -13912,7 +13912,7 @@ var internals$jscomp$inline_2032 = {
|
||||
scheduleRoot: null,
|
||||
setRefreshHandler: null,
|
||||
getCurrentFiber: null,
|
||||
reconcilerVersion: "18.3.0-next-e64a8f403-20230303"
|
||||
reconcilerVersion: "18.3.0-next-06460b6fb-20230303"
|
||||
};
|
||||
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
|
||||
var hook$jscomp$inline_2033 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
|
||||
@@ -14240,4 +14240,4 @@ exports.unstable_flushControlled = function (fn) {
|
||||
}
|
||||
};
|
||||
exports.unstable_runWithPriority = runWithPriority;
|
||||
exports.version = "18.3.0-next-e64a8f403-20230303";
|
||||
exports.version = "18.3.0-next-06460b6fb-20230303";
|
||||
|
||||
@@ -23753,7 +23753,7 @@ function createFiberRoot(
|
||||
return root;
|
||||
}
|
||||
|
||||
var ReactVersion = "18.3.0-www-classic-e64a8f403-20230303";
|
||||
var ReactVersion = "18.3.0-www-classic-06460b6fb-20230303";
|
||||
|
||||
// Might add PROFILE later.
|
||||
|
||||
|
||||
@@ -23753,7 +23753,7 @@ function createFiberRoot(
|
||||
return root;
|
||||
}
|
||||
|
||||
var ReactVersion = "18.3.0-www-modern-e64a8f403-20230303";
|
||||
var ReactVersion = "18.3.0-www-modern-06460b6fb-20230303";
|
||||
|
||||
// Might add PROFILE later.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user