Store instance handles in an internal map behind flag (#35053)

We already append `randomKey` to each handle name to prevent external
libraries from accessing and relying on these internals. But more
libraries recently have been getting around this by simply iterating
over the element properties and using a `startsWith` check.
This flag allows us to experiment with moving these handles to an
internal map.
This PR starts with the two most common internals, the props object and
the fiber. We can consider moving additional properties such as the
container root and others depending on perf results.

Author: jackpope

packages/react-dom-bindings/src/client/ReactDOMComponentTree.js

@@ -38,6 +38,8 @@ import {getParentHydrationBoundary} from './ReactFiberConfigDOM';
 
 import{enableScopeAPI}from'shared/ReactFeatureFlags';
 
+import{enableInternalInstanceMap}from'shared/ReactFeatureFlags';
+
 constrandomKey=Math.random().toString(36).slice(2);
 constinternalInstanceKey='__reactFiber$'+randomKey;
 constinternalPropsKey='__reactProps$'+randomKey;
@@ -49,7 +51,32 @@ const internalRootNodeResourcesKey = '__reactResources$' + randomKey;
 constinternalHoistableMarker='__reactMarker$'+randomKey;
 constinternalScrollTimer='__reactScroll$'+randomKey;
 
+typeInstanceUnion=
+|Instance
+|TextInstance
+|SuspenseInstance
+|ActivityInstance
+|ReactScopeInstance
+|Container;
+
+constPossiblyWeakMap=typeofWeakMap==='function' ? WeakMap : Map;
+constinternalInstanceMap:
+|WeakMap<InstanceUnion,Fiber>
+|Map<InstanceUnion,Fiber>=newPossiblyWeakMap();
+constinternalPropsMap:
+|WeakMap<InstanceUnion,Props>
+|Map<InstanceUnion,Props>=newPossiblyWeakMap();
+
 exportfunctiondetachDeletedInstance(node: Instance): void{
+if(enableInternalInstanceMap){
+internalInstanceMap.delete(node);
+internalPropsMap.delete(node);
+delete(node: any)[internalEventHandlersKey];
+delete(node: any)[internalEventHandlerListenersKey];
+delete(node: any)[internalEventHandlesSetKey];
+delete(node: any)[internalRootNodeResourcesKey];
+return;
+}
 // TODO: This function is only called on host components. I don't think all of
 // these fields are relevant.
 delete(node: any)[internalInstanceKey];
@@ -68,6 +95,10 @@ export function precacheFiberNode(
 |ActivityInstance
 |ReactScopeInstance,
 ): void{
+if(enableInternalInstanceMap){
+internalInstanceMap.set(node,hostInst);
+return;
+}
 (node: any)[internalInstanceKey]=hostInst;
 }
 
@@ -95,7 +126,12 @@ export function isContainerMarkedAsRoot(node: Container): boolean {
 // HostRoot back. To get to the HostRoot, you need to pass a child of it.
 // The same thing applies to Suspense and Activity boundaries.
 export functiongetClosestInstanceFromNode(targetNode: Node): null|Fiber{
-lettargetInst=(targetNode: any)[internalInstanceKey];
+lettargetInst: void|Fiber;
+if(enableInternalInstanceMap){
+targetInst=internalInstanceMap.get(((targetNode: any): InstanceUnion));
+}else{
+targetInst=(targetNode: any)[internalInstanceKey];
+}
 if(targetInst){
 // Don't return HostRoot, SuspenseComponent or ActivityComponent here.
 returntargetInst;
@@ -112,9 +148,15 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
 // itself because the fibers are conceptually between the container
 // node and the first child. It isn't surrounding the container node.
 // If it's not a container, we check if it's an instance.
-targetInst=
-(parentNode: any)[internalContainerInstanceKey]||
-(parentNode: any)[internalInstanceKey];
+if(enableInternalInstanceMap){
+targetInst=
+(parentNode: any)[internalContainerInstanceKey]||
+internalInstanceMap.get(((parentNode: any): InstanceUnion));
+}else{
+targetInst=
+(parentNode: any)[internalContainerInstanceKey]||
+(parentNode: any)[internalInstanceKey];
+}
 if(targetInst){
 // Since this wasn't the direct target of the event, we might have
 // stepped past dehydrated DOM nodes to get here. However they could
@@ -147,8 +189,10 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
 // have had an internalInstanceKey on it.
 // Let's get the fiber associated with the SuspenseComponent
 // as the deepest instance.
-// $FlowFixMe[prop-missing]
-consttargetFiber=hydrationInstance[internalInstanceKey];
+consttargetFiber=enableInternalInstanceMap
+ ? internalInstanceMap.get(hydrationInstance)
+ : // $FlowFixMe[prop-missing]
+hydrationInstance[internalInstanceKey];
 if(targetFiber){
 returntargetFiber;
 }
@@ -175,9 +219,16 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
  * instance, or null if the node was not rendered by this React.
  */
 export functiongetInstanceFromNode(node: Node): Fiber|null{
-constinst=
-(node: any)[internalInstanceKey]||
-(node: any)[internalContainerInstanceKey];
+letinst: void|null|Fiber;
+if(enableInternalInstanceMap){
+inst=
+internalInstanceMap.get(((node: any): InstanceUnion))||
+(node: any)[internalContainerInstanceKey];
+}else{
+inst=
+(node: any)[internalInstanceKey]||
+(node: any)[internalContainerInstanceKey];
+}
 if(inst){
 consttag=inst.tag;
 if(
@@ -226,16 +277,24 @@ export function getFiberCurrentPropsFromNode(
 |TextInstance
 |SuspenseInstance
 |ActivityInstance,
-): Props{
+): Props|null{
+if(enableInternalInstanceMap){
+returninternalPropsMap.get(node)||null;
+}
 return(node: any)[internalPropsKey]||null;
 }
 
 exportfunctionupdateFiberProps(node: Instance,props: Props): void{
+if(enableInternalInstanceMap){
+internalPropsMap.set(node,props);
+return;
+}
 (node: any)[internalPropsKey]=props;
 }
 
 exportfunctiongetEventListenerSet(node: EventTarget): Set<string>{
-let elementListenerSet =(node: any)[internalEventHandlersKey];
+letelementListenerSet: Set<string>|void;
+elementListenerSet=(node: any)[internalEventHandlersKey];
 if(elementListenerSet===undefined){
  elementListenerSet =(node: any)[internalEventHandlersKey]=newSet();
 }
@@ -246,6 +305,9 @@ export function getFiberFromScopeInstance(
  scope: ReactScopeInstance,
 ): null | Fiber {
 if(enableScopeAPI){
+if(enableInternalInstanceMap){
+returninternalInstanceMap.get(((scope: any): InstanceUnion))||null;
+}
 return(scope: any)[internalInstanceKey]||null;
 }
  return null;
@@ -318,6 +380,12 @@ export function clearScrollEndTimer(node: EventTarget): void {
 }
 
 export function isOwnedInstance(node: Node): boolean {
+if(enableInternalInstanceMap){
+return!!(
+(node: any)[internalHoistableMarker]||
+internalInstanceMap.has((node: any))
+);
+}
  return !!(
  (node: any)[internalHoistableMarker] || (node: any)[internalInstanceKey]
  );

packages/shared/ReactFeatureFlags.js

@@ -147,6 +147,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=true;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // -----------------------------------------------------------------------------
 // Ready for next major.
 //

packages/shared/forks/ReactFeatureFlags.native-fb.js

@@ -84,6 +84,7 @@ export const enableComponentPerformanceTrack: boolean =
 __PROFILE__&&dynamicFlags.enableComponentPerformanceTrack;
 exportconstenablePerformanceIssueReporting: boolean=
 enableComponentPerformanceTrack;
+exportconstenableInternalInstanceMap: boolean=false;
 
 // Flow magic to verify the exports of this file match the original version.
 ((((null: any): ExportsType): FeatureFlagsType): ExportsType);

packages/shared/forks/ReactFeatureFlags.native-oss.js

@@ -76,6 +76,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=false;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // Profiling Only
 exportconstenableProfilerTimer: boolean=__PROFILE__;
 exportconstenableProfilerCommitHooks: boolean=__PROFILE__;

packages/shared/forks/ReactFeatureFlags.test-renderer.js

@@ -77,6 +77,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=true;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // TODO: This must be in sync with the main ReactFeatureFlags file because
 // the Test Renderer's value must be the same as the one used by the
 // react package.

packages/shared/forks/ReactFeatureFlags.test-renderer.www.js

@@ -85,5 +85,7 @@ export const enableFragmentRefsScrollIntoView: boolean = false;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 exportconstownerStackLimit=1e4;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // Flow magic to verify the exports of this file match the original version.
 ((((null: any): ExportsType): FeatureFlagsType): ExportsType);

packages/shared/forks/ReactFeatureFlags.www-dynamic.js

@@ -38,6 +38,8 @@ export const enableFragmentRefs: boolean = __VARIANT__;
 exportconstenableFragmentRefsScrollIntoView: boolean=__VARIANT__;
 exportconstenableAsyncDebugInfo: boolean=__VARIANT__;
 
+exportconstenableInternalInstanceMap: boolean=__VARIANT__;
+
 // TODO: These flags are hard-coded to the default values used in open source.
 // Update the tests so that they pass in either mode, then set these
 // to __VARIANT__.

packages/shared/forks/ReactFeatureFlags.www.js

@@ -35,6 +35,7 @@ export const {
  enableFragmentRefs,
  enableFragmentRefsScrollIntoView,
  enableAsyncDebugInfo,
+ enableInternalInstanceMap,
 }=dynamicFeatureFlags;
 
 // On WWW, __EXPERIMENTAL__ is used for a new modern build.

packages/react-dom-bindings/src/client/ReactDOMComponentTree.js

@@ -38,6 +38,8 @@ import {getParentHydrationBoundary} from './ReactFiberConfigDOM';
 
 import{enableScopeAPI}from'shared/ReactFeatureFlags';
 
+import{enableInternalInstanceMap}from'shared/ReactFeatureFlags';
+
 constrandomKey=Math.random().toString(36).slice(2);
 constinternalInstanceKey='__reactFiber$'+randomKey;
 constinternalPropsKey='__reactProps$'+randomKey;
@@ -49,7 +51,32 @@ const internalRootNodeResourcesKey = '__reactResources$' + randomKey;
 constinternalHoistableMarker='__reactMarker$'+randomKey;
 constinternalScrollTimer='__reactScroll$'+randomKey;
 
+typeInstanceUnion=
+|Instance
+|TextInstance
+|SuspenseInstance
+|ActivityInstance
+|ReactScopeInstance
+|Container;
+
+constPossiblyWeakMap=typeofWeakMap==='function' ? WeakMap : Map;
+constinternalInstanceMap:
+|WeakMap<InstanceUnion,Fiber>
+|Map<InstanceUnion,Fiber>=newPossiblyWeakMap();
+constinternalPropsMap:
+|WeakMap<InstanceUnion,Props>
+|Map<InstanceUnion,Props>=newPossiblyWeakMap();
+
 exportfunctiondetachDeletedInstance(node: Instance): void{
+if(enableInternalInstanceMap){
+internalInstanceMap.delete(node);
+internalPropsMap.delete(node);
+delete(node: any)[internalEventHandlersKey];
+delete(node: any)[internalEventHandlerListenersKey];
+delete(node: any)[internalEventHandlesSetKey];
+delete(node: any)[internalRootNodeResourcesKey];
+return;
+}
 // TODO: This function is only called on host components. I don't think all of
 // these fields are relevant.
 delete(node: any)[internalInstanceKey];
@@ -68,6 +95,10 @@ export function precacheFiberNode(
 |ActivityInstance
 |ReactScopeInstance,
 ): void{
+if(enableInternalInstanceMap){
+internalInstanceMap.set(node,hostInst);
+return;
+}
 (node: any)[internalInstanceKey]=hostInst;
 }
 
@@ -95,7 +126,12 @@ export function isContainerMarkedAsRoot(node: Container): boolean {
 // HostRoot back. To get to the HostRoot, you need to pass a child of it.
 // The same thing applies to Suspense and Activity boundaries.
 export functiongetClosestInstanceFromNode(targetNode: Node): null|Fiber{
-lettargetInst=(targetNode: any)[internalInstanceKey];
+lettargetInst: void|Fiber;
+if(enableInternalInstanceMap){
+targetInst=internalInstanceMap.get(((targetNode: any): InstanceUnion));
+}else{
+targetInst=(targetNode: any)[internalInstanceKey];
+}
 if(targetInst){
 // Don't return HostRoot, SuspenseComponent or ActivityComponent here.
 returntargetInst;
@@ -112,9 +148,15 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
 // itself because the fibers are conceptually between the container
 // node and the first child. It isn't surrounding the container node.
 // If it's not a container, we check if it's an instance.
-targetInst=
-(parentNode: any)[internalContainerInstanceKey]||
-(parentNode: any)[internalInstanceKey];
+if(enableInternalInstanceMap){
+targetInst=
+(parentNode: any)[internalContainerInstanceKey]||
+internalInstanceMap.get(((parentNode: any): InstanceUnion));
+}else{
+targetInst=
+(parentNode: any)[internalContainerInstanceKey]||
+(parentNode: any)[internalInstanceKey];
+}
 if(targetInst){
 // Since this wasn't the direct target of the event, we might have
 // stepped past dehydrated DOM nodes to get here. However they could
@@ -147,8 +189,10 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
 // have had an internalInstanceKey on it.
 // Let's get the fiber associated with the SuspenseComponent
 // as the deepest instance.
-// $FlowFixMe[prop-missing]
-consttargetFiber=hydrationInstance[internalInstanceKey];
+consttargetFiber=enableInternalInstanceMap
+ ? internalInstanceMap.get(hydrationInstance)
+ : // $FlowFixMe[prop-missing]
+hydrationInstance[internalInstanceKey];
 if(targetFiber){
 returntargetFiber;
 }
@@ -175,9 +219,16 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
  * instance, or null if the node was not rendered by this React.
  */
 export functiongetInstanceFromNode(node: Node): Fiber|null{
-constinst=
-(node: any)[internalInstanceKey]||
-(node: any)[internalContainerInstanceKey];
+letinst: void|null|Fiber;
+if(enableInternalInstanceMap){
+inst=
+internalInstanceMap.get(((node: any): InstanceUnion))||
+(node: any)[internalContainerInstanceKey];
+}else{
+inst=
+(node: any)[internalInstanceKey]||
+(node: any)[internalContainerInstanceKey];
+}
 if(inst){
 consttag=inst.tag;
 if(
@@ -226,16 +277,24 @@ export function getFiberCurrentPropsFromNode(
 |TextInstance
 |SuspenseInstance
 |ActivityInstance,
-): Props{
+): Props|null{
+if(enableInternalInstanceMap){
+returninternalPropsMap.get(node)||null;
+}
 return(node: any)[internalPropsKey]||null;
 }
 
 exportfunctionupdateFiberProps(node: Instance,props: Props): void{
+if(enableInternalInstanceMap){
+internalPropsMap.set(node,props);
+return;
+}
 (node: any)[internalPropsKey]=props;
 }
 
 exportfunctiongetEventListenerSet(node: EventTarget): Set<string>{
-let elementListenerSet =(node: any)[internalEventHandlersKey];
+letelementListenerSet: Set<string>|void;
+elementListenerSet=(node: any)[internalEventHandlersKey];
 if(elementListenerSet===undefined){
  elementListenerSet =(node: any)[internalEventHandlersKey]=newSet();
 }
@@ -246,6 +305,9 @@ export function getFiberFromScopeInstance(
  scope: ReactScopeInstance,
 ): null | Fiber {
 if(enableScopeAPI){
+if(enableInternalInstanceMap){
+returninternalInstanceMap.get(((scope: any): InstanceUnion))||null;
+}
 return(scope: any)[internalInstanceKey]||null;
 }
  return null;
@@ -318,6 +380,12 @@ export function clearScrollEndTimer(node: EventTarget): void {
 }
 
 export function isOwnedInstance(node: Node): boolean {
+if(enableInternalInstanceMap){
+return!!(
+(node: any)[internalHoistableMarker]||
+internalInstanceMap.has((node: any))
+);
+}
  return !!(
  (node: any)[internalHoistableMarker] || (node: any)[internalInstanceKey]
  );

packages/shared/ReactFeatureFlags.js

@@ -147,6 +147,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=true;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // -----------------------------------------------------------------------------
 // Ready for next major.
 //

packages/shared/forks/ReactFeatureFlags.native-fb.js

@@ -84,6 +84,7 @@ export const enableComponentPerformanceTrack: boolean =
 __PROFILE__&&dynamicFlags.enableComponentPerformanceTrack;
 exportconstenablePerformanceIssueReporting: boolean=
 enableComponentPerformanceTrack;
+exportconstenableInternalInstanceMap: boolean=false;
 
 // Flow magic to verify the exports of this file match the original version.
 ((((null: any): ExportsType): FeatureFlagsType): ExportsType);

packages/shared/forks/ReactFeatureFlags.native-oss.js

@@ -76,6 +76,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=false;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // Profiling Only
 exportconstenableProfilerTimer: boolean=__PROFILE__;
 exportconstenableProfilerCommitHooks: boolean=__PROFILE__;

packages/shared/forks/ReactFeatureFlags.test-renderer.js

@@ -77,6 +77,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=true;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // TODO: This must be in sync with the main ReactFeatureFlags file because
 // the Test Renderer's value must be the same as the one used by the
 // react package.

packages/shared/forks/ReactFeatureFlags.test-renderer.www.js

@@ -85,5 +85,7 @@ export const enableFragmentRefsScrollIntoView: boolean = false;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 exportconstownerStackLimit=1e4;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // Flow magic to verify the exports of this file match the original version.
 ((((null: any): ExportsType): FeatureFlagsType): ExportsType);

packages/shared/forks/ReactFeatureFlags.www-dynamic.js

@@ -38,6 +38,8 @@ export const enableFragmentRefs: boolean = __VARIANT__;
 exportconstenableFragmentRefsScrollIntoView: boolean=__VARIANT__;
 exportconstenableAsyncDebugInfo: boolean=__VARIANT__;
 
+exportconstenableInternalInstanceMap: boolean=__VARIANT__;
+
 // TODO: These flags are hard-coded to the default values used in open source.
 // Update the tests so that they pass in either mode, then set these
 // to __VARIANT__.

packages/shared/forks/ReactFeatureFlags.www.js

@@ -35,6 +35,7 @@ export const {
  enableFragmentRefs,
  enableFragmentRefsScrollIntoView,
  enableAsyncDebugInfo,
+ enableInternalInstanceMap,
 }=dynamicFeatureFlags;
 
 // On WWW, __EXPERIMENTAL__ is used for a new modern build.

packages/react-dom-bindings/src/client/ReactDOMComponentTree.js

@@ -38,6 +38,8 @@ import {getParentHydrationBoundary} from './ReactFiberConfigDOM';
 
 import{enableScopeAPI}from'shared/ReactFeatureFlags';
 
+import{enableInternalInstanceMap}from'shared/ReactFeatureFlags';
+
 constrandomKey=Math.random().toString(36).slice(2);
 constinternalInstanceKey='__reactFiber$'+randomKey;
 constinternalPropsKey='__reactProps$'+randomKey;
@@ -49,7 +51,32 @@ const internalRootNodeResourcesKey = '__reactResources$' + randomKey;
 constinternalHoistableMarker='__reactMarker$'+randomKey;
 constinternalScrollTimer='__reactScroll$'+randomKey;
 
+typeInstanceUnion=
+|Instance
+|TextInstance
+|SuspenseInstance
+|ActivityInstance
+|ReactScopeInstance
+|Container;
+
+constPossiblyWeakMap=typeofWeakMap==='function' ? WeakMap : Map;
+constinternalInstanceMap:
+|WeakMap<InstanceUnion,Fiber>
+|Map<InstanceUnion,Fiber>=newPossiblyWeakMap();
+constinternalPropsMap:
+|WeakMap<InstanceUnion,Props>
+|Map<InstanceUnion,Props>=newPossiblyWeakMap();
+
 exportfunctiondetachDeletedInstance(node: Instance): void{
+if(enableInternalInstanceMap){
+internalInstanceMap.delete(node);
+internalPropsMap.delete(node);
+delete(node: any)[internalEventHandlersKey];
+delete(node: any)[internalEventHandlerListenersKey];
+delete(node: any)[internalEventHandlesSetKey];
+delete(node: any)[internalRootNodeResourcesKey];
+return;
+}
 // TODO: This function is only called on host components. I don't think all of
 // these fields are relevant.
 delete(node: any)[internalInstanceKey];
@@ -68,6 +95,10 @@ export function precacheFiberNode(
 |ActivityInstance
 |ReactScopeInstance,
 ): void{
+if(enableInternalInstanceMap){
+internalInstanceMap.set(node,hostInst);
+return;
+}
 (node: any)[internalInstanceKey]=hostInst;
 }
 
@@ -95,7 +126,12 @@ export function isContainerMarkedAsRoot(node: Container): boolean {
 // HostRoot back. To get to the HostRoot, you need to pass a child of it.
 // The same thing applies to Suspense and Activity boundaries.
 export functiongetClosestInstanceFromNode(targetNode: Node): null|Fiber{
-lettargetInst=(targetNode: any)[internalInstanceKey];
+lettargetInst: void|Fiber;
+if(enableInternalInstanceMap){
+targetInst=internalInstanceMap.get(((targetNode: any): InstanceUnion));
+}else{
+targetInst=(targetNode: any)[internalInstanceKey];
+}
 if(targetInst){
 // Don't return HostRoot, SuspenseComponent or ActivityComponent here.
 returntargetInst;
@@ -112,9 +148,15 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
 // itself because the fibers are conceptually between the container
 // node and the first child. It isn't surrounding the container node.
 // If it's not a container, we check if it's an instance.
-targetInst=
-(parentNode: any)[internalContainerInstanceKey]||
-(parentNode: any)[internalInstanceKey];
+if(enableInternalInstanceMap){
+targetInst=
+(parentNode: any)[internalContainerInstanceKey]||
+internalInstanceMap.get(((parentNode: any): InstanceUnion));
+}else{
+targetInst=
+(parentNode: any)[internalContainerInstanceKey]||
+(parentNode: any)[internalInstanceKey];
+}
 if(targetInst){
 // Since this wasn't the direct target of the event, we might have
 // stepped past dehydrated DOM nodes to get here. However they could
@@ -147,8 +189,10 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
 // have had an internalInstanceKey on it.
 // Let's get the fiber associated with the SuspenseComponent
 // as the deepest instance.
-// $FlowFixMe[prop-missing]
-consttargetFiber=hydrationInstance[internalInstanceKey];
+consttargetFiber=enableInternalInstanceMap
+ ? internalInstanceMap.get(hydrationInstance)
+ : // $FlowFixMe[prop-missing]
+hydrationInstance[internalInstanceKey];
 if(targetFiber){
 returntargetFiber;
 }
@@ -175,9 +219,16 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
  * instance, or null if the node was not rendered by this React.
  */
 export functiongetInstanceFromNode(node: Node): Fiber|null{
-constinst=
-(node: any)[internalInstanceKey]||
-(node: any)[internalContainerInstanceKey];
+letinst: void|null|Fiber;
+if(enableInternalInstanceMap){
+inst=
+internalInstanceMap.get(((node: any): InstanceUnion))||
+(node: any)[internalContainerInstanceKey];
+}else{
+inst=
+(node: any)[internalInstanceKey]||
+(node: any)[internalContainerInstanceKey];
+}
 if(inst){
 consttag=inst.tag;
 if(
@@ -226,16 +277,24 @@ export function getFiberCurrentPropsFromNode(
 |TextInstance
 |SuspenseInstance
 |ActivityInstance,
-): Props{
+): Props|null{
+if(enableInternalInstanceMap){
+returninternalPropsMap.get(node)||null;
+}
 return(node: any)[internalPropsKey]||null;
 }
 
 exportfunctionupdateFiberProps(node: Instance,props: Props): void{
+if(enableInternalInstanceMap){
+internalPropsMap.set(node,props);
+return;
+}
 (node: any)[internalPropsKey]=props;
 }
 
 exportfunctiongetEventListenerSet(node: EventTarget): Set<string>{
-let elementListenerSet =(node: any)[internalEventHandlersKey];
+letelementListenerSet: Set<string>|void;
+elementListenerSet=(node: any)[internalEventHandlersKey];
 if(elementListenerSet===undefined){
  elementListenerSet =(node: any)[internalEventHandlersKey]=newSet();
 }
@@ -246,6 +305,9 @@ export function getFiberFromScopeInstance(
  scope: ReactScopeInstance,
 ): null | Fiber {
 if(enableScopeAPI){
+if(enableInternalInstanceMap){
+returninternalInstanceMap.get(((scope: any): InstanceUnion))||null;
+}
 return(scope: any)[internalInstanceKey]||null;
 }
  return null;
@@ -318,6 +380,12 @@ export function clearScrollEndTimer(node: EventTarget): void {
 }
 
 export function isOwnedInstance(node: Node): boolean {
+if(enableInternalInstanceMap){
+return!!(
+(node: any)[internalHoistableMarker]||
+internalInstanceMap.has((node: any))
+);
+}
  return !!(
  (node: any)[internalHoistableMarker] || (node: any)[internalInstanceKey]
  );

packages/shared/ReactFeatureFlags.js

@@ -147,6 +147,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=true;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // -----------------------------------------------------------------------------
 // Ready for next major.
 //

packages/shared/forks/ReactFeatureFlags.native-fb.js

@@ -84,6 +84,7 @@ export const enableComponentPerformanceTrack: boolean =
 __PROFILE__&&dynamicFlags.enableComponentPerformanceTrack;
 exportconstenablePerformanceIssueReporting: boolean=
 enableComponentPerformanceTrack;
+exportconstenableInternalInstanceMap: boolean=false;
 
 // Flow magic to verify the exports of this file match the original version.
 ((((null: any): ExportsType): FeatureFlagsType): ExportsType);

packages/shared/forks/ReactFeatureFlags.native-oss.js

@@ -76,6 +76,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=false;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // Profiling Only
 exportconstenableProfilerTimer: boolean=__PROFILE__;
 exportconstenableProfilerCommitHooks: boolean=__PROFILE__;

packages/shared/forks/ReactFeatureFlags.test-renderer.js

@@ -77,6 +77,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=true;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // TODO: This must be in sync with the main ReactFeatureFlags file because
 // the Test Renderer's value must be the same as the one used by the
 // react package.

packages/shared/forks/ReactFeatureFlags.test-renderer.www.js

@@ -85,5 +85,7 @@ export const enableFragmentRefsScrollIntoView: boolean = false;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 exportconstownerStackLimit=1e4;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // Flow magic to verify the exports of this file match the original version.
 ((((null: any): ExportsType): FeatureFlagsType): ExportsType);

packages/shared/forks/ReactFeatureFlags.www-dynamic.js

@@ -38,6 +38,8 @@ export const enableFragmentRefs: boolean = __VARIANT__;
 exportconstenableFragmentRefsScrollIntoView: boolean=__VARIANT__;
 exportconstenableAsyncDebugInfo: boolean=__VARIANT__;
 
+exportconstenableInternalInstanceMap: boolean=__VARIANT__;
+
 // TODO: These flags are hard-coded to the default values used in open source.
 // Update the tests so that they pass in either mode, then set these
 // to __VARIANT__.

packages/shared/forks/ReactFeatureFlags.www.js

@@ -35,6 +35,7 @@ export const {
  enableFragmentRefs,
  enableFragmentRefsScrollIntoView,
  enableAsyncDebugInfo,
+ enableInternalInstanceMap,
 }=dynamicFeatureFlags;
 
 // On WWW, __EXPERIMENTAL__ is used for a new modern build.

packages/react-dom-bindings/src/client/ReactDOMComponentTree.js

@@ -38,6 +38,8 @@ import {getParentHydrationBoundary} from './ReactFiberConfigDOM';
 
 import{enableScopeAPI}from'shared/ReactFeatureFlags';
 
+import{enableInternalInstanceMap}from'shared/ReactFeatureFlags';
+
 constrandomKey=Math.random().toString(36).slice(2);
 constinternalInstanceKey='__reactFiber$'+randomKey;
 constinternalPropsKey='__reactProps$'+randomKey;
@@ -49,7 +51,32 @@ const internalRootNodeResourcesKey = '__reactResources$' + randomKey;
 constinternalHoistableMarker='__reactMarker$'+randomKey;
 constinternalScrollTimer='__reactScroll$'+randomKey;
 
+typeInstanceUnion=
+|Instance
+|TextInstance
+|SuspenseInstance
+|ActivityInstance
+|ReactScopeInstance
+|Container;
+
+constPossiblyWeakMap=typeofWeakMap==='function' ? WeakMap : Map;
+constinternalInstanceMap:
+|WeakMap<InstanceUnion,Fiber>
+|Map<InstanceUnion,Fiber>=newPossiblyWeakMap();
+constinternalPropsMap:
+|WeakMap<InstanceUnion,Props>
+|Map<InstanceUnion,Props>=newPossiblyWeakMap();
+
 exportfunctiondetachDeletedInstance(node: Instance): void{
+if(enableInternalInstanceMap){
+internalInstanceMap.delete(node);
+internalPropsMap.delete(node);
+delete(node: any)[internalEventHandlersKey];
+delete(node: any)[internalEventHandlerListenersKey];
+delete(node: any)[internalEventHandlesSetKey];
+delete(node: any)[internalRootNodeResourcesKey];
+return;
+}
 // TODO: This function is only called on host components. I don't think all of
 // these fields are relevant.
 delete(node: any)[internalInstanceKey];
@@ -68,6 +95,10 @@ export function precacheFiberNode(
 |ActivityInstance
 |ReactScopeInstance,
 ): void{
+if(enableInternalInstanceMap){
+internalInstanceMap.set(node,hostInst);
+return;
+}
 (node: any)[internalInstanceKey]=hostInst;
 }
 
@@ -95,7 +126,12 @@ export function isContainerMarkedAsRoot(node: Container): boolean {
 // HostRoot back. To get to the HostRoot, you need to pass a child of it.
 // The same thing applies to Suspense and Activity boundaries.
 export functiongetClosestInstanceFromNode(targetNode: Node): null|Fiber{
-lettargetInst=(targetNode: any)[internalInstanceKey];
+lettargetInst: void|Fiber;
+if(enableInternalInstanceMap){
+targetInst=internalInstanceMap.get(((targetNode: any): InstanceUnion));
+}else{
+targetInst=(targetNode: any)[internalInstanceKey];
+}
 if(targetInst){
 // Don't return HostRoot, SuspenseComponent or ActivityComponent here.
 returntargetInst;
@@ -112,9 +148,15 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
 // itself because the fibers are conceptually between the container
 // node and the first child. It isn't surrounding the container node.
 // If it's not a container, we check if it's an instance.
-targetInst=
-(parentNode: any)[internalContainerInstanceKey]||
-(parentNode: any)[internalInstanceKey];
+if(enableInternalInstanceMap){
+targetInst=
+(parentNode: any)[internalContainerInstanceKey]||
+internalInstanceMap.get(((parentNode: any): InstanceUnion));
+}else{
+targetInst=
+(parentNode: any)[internalContainerInstanceKey]||
+(parentNode: any)[internalInstanceKey];
+}
 if(targetInst){
 // Since this wasn't the direct target of the event, we might have
 // stepped past dehydrated DOM nodes to get here. However they could
@@ -147,8 +189,10 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
 // have had an internalInstanceKey on it.
 // Let's get the fiber associated with the SuspenseComponent
 // as the deepest instance.
-// $FlowFixMe[prop-missing]
-consttargetFiber=hydrationInstance[internalInstanceKey];
+consttargetFiber=enableInternalInstanceMap
+ ? internalInstanceMap.get(hydrationInstance)
+ : // $FlowFixMe[prop-missing]
+hydrationInstance[internalInstanceKey];
 if(targetFiber){
 returntargetFiber;
 }
@@ -175,9 +219,16 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
  * instance, or null if the node was not rendered by this React.
  */
 export functiongetInstanceFromNode(node: Node): Fiber|null{
-constinst=
-(node: any)[internalInstanceKey]||
-(node: any)[internalContainerInstanceKey];
+letinst: void|null|Fiber;
+if(enableInternalInstanceMap){
+inst=
+internalInstanceMap.get(((node: any): InstanceUnion))||
+(node: any)[internalContainerInstanceKey];
+}else{
+inst=
+(node: any)[internalInstanceKey]||
+(node: any)[internalContainerInstanceKey];
+}
 if(inst){
 consttag=inst.tag;
 if(
@@ -226,16 +277,24 @@ export function getFiberCurrentPropsFromNode(
 |TextInstance
 |SuspenseInstance
 |ActivityInstance,
-): Props{
+): Props|null{
+if(enableInternalInstanceMap){
+returninternalPropsMap.get(node)||null;
+}
 return(node: any)[internalPropsKey]||null;
 }
 
 exportfunctionupdateFiberProps(node: Instance,props: Props): void{
+if(enableInternalInstanceMap){
+internalPropsMap.set(node,props);
+return;
+}
 (node: any)[internalPropsKey]=props;
 }
 
 exportfunctiongetEventListenerSet(node: EventTarget): Set<string>{
-let elementListenerSet =(node: any)[internalEventHandlersKey];
+letelementListenerSet: Set<string>|void;
+elementListenerSet=(node: any)[internalEventHandlersKey];
 if(elementListenerSet===undefined){
  elementListenerSet =(node: any)[internalEventHandlersKey]=newSet();
 }
@@ -246,6 +305,9 @@ export function getFiberFromScopeInstance(
  scope: ReactScopeInstance,
 ): null | Fiber {
 if(enableScopeAPI){
+if(enableInternalInstanceMap){
+returninternalInstanceMap.get(((scope: any): InstanceUnion))||null;
+}
 return(scope: any)[internalInstanceKey]||null;
 }
  return null;
@@ -318,6 +380,12 @@ export function clearScrollEndTimer(node: EventTarget): void {
 }
 
 export function isOwnedInstance(node: Node): boolean {
+if(enableInternalInstanceMap){
+return!!(
+(node: any)[internalHoistableMarker]||
+internalInstanceMap.has((node: any))
+);
+}
  return !!(
  (node: any)[internalHoistableMarker] || (node: any)[internalInstanceKey]
  );

packages/shared/ReactFeatureFlags.js

@@ -147,6 +147,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=true;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // -----------------------------------------------------------------------------
 // Ready for next major.
 //

packages/shared/forks/ReactFeatureFlags.native-fb.js

@@ -84,6 +84,7 @@ export const enableComponentPerformanceTrack: boolean =
 __PROFILE__&&dynamicFlags.enableComponentPerformanceTrack;
 exportconstenablePerformanceIssueReporting: boolean=
 enableComponentPerformanceTrack;
+exportconstenableInternalInstanceMap: boolean=false;
 
 // Flow magic to verify the exports of this file match the original version.
 ((((null: any): ExportsType): FeatureFlagsType): ExportsType);

packages/shared/forks/ReactFeatureFlags.native-oss.js

@@ -76,6 +76,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=false;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // Profiling Only
 exportconstenableProfilerTimer: boolean=__PROFILE__;
 exportconstenableProfilerCommitHooks: boolean=__PROFILE__;

packages/shared/forks/ReactFeatureFlags.test-renderer.js

@@ -77,6 +77,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=true;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // TODO: This must be in sync with the main ReactFeatureFlags file because
 // the Test Renderer's value must be the same as the one used by the
 // react package.

packages/shared/forks/ReactFeatureFlags.test-renderer.www.js

@@ -85,5 +85,7 @@ export const enableFragmentRefsScrollIntoView: boolean = false;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 exportconstownerStackLimit=1e4;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // Flow magic to verify the exports of this file match the original version.
 ((((null: any): ExportsType): FeatureFlagsType): ExportsType);

packages/shared/forks/ReactFeatureFlags.www-dynamic.js

@@ -38,6 +38,8 @@ export const enableFragmentRefs: boolean = __VARIANT__;
 exportconstenableFragmentRefsScrollIntoView: boolean=__VARIANT__;
 exportconstenableAsyncDebugInfo: boolean=__VARIANT__;
 
+exportconstenableInternalInstanceMap: boolean=__VARIANT__;
+
 // TODO: These flags are hard-coded to the default values used in open source.
 // Update the tests so that they pass in either mode, then set these
 // to __VARIANT__.

packages/shared/forks/ReactFeatureFlags.www.js

@@ -35,6 +35,7 @@ export const {
  enableFragmentRefs,
  enableFragmentRefsScrollIntoView,
  enableAsyncDebugInfo,
+ enableInternalInstanceMap,
 }=dynamicFeatureFlags;
 
 // On WWW, __EXPERIMENTAL__ is used for a new modern build.

packages/react-dom-bindings/src/client/ReactDOMComponentTree.js

@@ -38,6 +38,8 @@ import {getParentHydrationBoundary} from './ReactFiberConfigDOM';
 
 import{enableScopeAPI}from'shared/ReactFeatureFlags';
 
+import{enableInternalInstanceMap}from'shared/ReactFeatureFlags';
+
 constrandomKey=Math.random().toString(36).slice(2);
 constinternalInstanceKey='__reactFiber$'+randomKey;
 constinternalPropsKey='__reactProps$'+randomKey;
@@ -49,7 +51,32 @@ const internalRootNodeResourcesKey = '__reactResources$' + randomKey;
 constinternalHoistableMarker='__reactMarker$'+randomKey;
 constinternalScrollTimer='__reactScroll$'+randomKey;
 
+typeInstanceUnion=
+|Instance
+|TextInstance
+|SuspenseInstance
+|ActivityInstance
+|ReactScopeInstance
+|Container;
+
+constPossiblyWeakMap=typeofWeakMap==='function' ? WeakMap : Map;
+constinternalInstanceMap:
+|WeakMap<InstanceUnion,Fiber>
+|Map<InstanceUnion,Fiber>=newPossiblyWeakMap();
+constinternalPropsMap:
+|WeakMap<InstanceUnion,Props>
+|Map<InstanceUnion,Props>=newPossiblyWeakMap();
+
 exportfunctiondetachDeletedInstance(node: Instance): void{
+if(enableInternalInstanceMap){
+internalInstanceMap.delete(node);
+internalPropsMap.delete(node);
+delete(node: any)[internalEventHandlersKey];
+delete(node: any)[internalEventHandlerListenersKey];
+delete(node: any)[internalEventHandlesSetKey];
+delete(node: any)[internalRootNodeResourcesKey];
+return;
+}
 // TODO: This function is only called on host components. I don't think all of
 // these fields are relevant.
 delete(node: any)[internalInstanceKey];
@@ -68,6 +95,10 @@ export function precacheFiberNode(
 |ActivityInstance
 |ReactScopeInstance,
 ): void{
+if(enableInternalInstanceMap){
+internalInstanceMap.set(node,hostInst);
+return;
+}
 (node: any)[internalInstanceKey]=hostInst;
 }
 
@@ -95,7 +126,12 @@ export function isContainerMarkedAsRoot(node: Container): boolean {
 // HostRoot back. To get to the HostRoot, you need to pass a child of it.
 // The same thing applies to Suspense and Activity boundaries.
 export functiongetClosestInstanceFromNode(targetNode: Node): null|Fiber{
-lettargetInst=(targetNode: any)[internalInstanceKey];
+lettargetInst: void|Fiber;
+if(enableInternalInstanceMap){
+targetInst=internalInstanceMap.get(((targetNode: any): InstanceUnion));
+}else{
+targetInst=(targetNode: any)[internalInstanceKey];
+}
 if(targetInst){
 // Don't return HostRoot, SuspenseComponent or ActivityComponent here.
 returntargetInst;
@@ -112,9 +148,15 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
 // itself because the fibers are conceptually between the container
 // node and the first child. It isn't surrounding the container node.
 // If it's not a container, we check if it's an instance.
-targetInst=
-(parentNode: any)[internalContainerInstanceKey]||
-(parentNode: any)[internalInstanceKey];
+if(enableInternalInstanceMap){
+targetInst=
+(parentNode: any)[internalContainerInstanceKey]||
+internalInstanceMap.get(((parentNode: any): InstanceUnion));
+}else{
+targetInst=
+(parentNode: any)[internalContainerInstanceKey]||
+(parentNode: any)[internalInstanceKey];
+}
 if(targetInst){
 // Since this wasn't the direct target of the event, we might have
 // stepped past dehydrated DOM nodes to get here. However they could
@@ -147,8 +189,10 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
 // have had an internalInstanceKey on it.
 // Let's get the fiber associated with the SuspenseComponent
 // as the deepest instance.
-// $FlowFixMe[prop-missing]
-consttargetFiber=hydrationInstance[internalInstanceKey];
+consttargetFiber=enableInternalInstanceMap
+ ? internalInstanceMap.get(hydrationInstance)
+ : // $FlowFixMe[prop-missing]
+hydrationInstance[internalInstanceKey];
 if(targetFiber){
 returntargetFiber;
 }
@@ -175,9 +219,16 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
  * instance, or null if the node was not rendered by this React.
  */
 export functiongetInstanceFromNode(node: Node): Fiber|null{
-constinst=
-(node: any)[internalInstanceKey]||
-(node: any)[internalContainerInstanceKey];
+letinst: void|null|Fiber;
+if(enableInternalInstanceMap){
+inst=
+internalInstanceMap.get(((node: any): InstanceUnion))||
+(node: any)[internalContainerInstanceKey];
+}else{
+inst=
+(node: any)[internalInstanceKey]||
+(node: any)[internalContainerInstanceKey];
+}
 if(inst){
 consttag=inst.tag;
 if(
@@ -226,16 +277,24 @@ export function getFiberCurrentPropsFromNode(
 |TextInstance
 |SuspenseInstance
 |ActivityInstance,
-): Props{
+): Props|null{
+if(enableInternalInstanceMap){
+returninternalPropsMap.get(node)||null;
+}
 return(node: any)[internalPropsKey]||null;
 }
 
 exportfunctionupdateFiberProps(node: Instance,props: Props): void{
+if(enableInternalInstanceMap){
+internalPropsMap.set(node,props);
+return;
+}
 (node: any)[internalPropsKey]=props;
 }
 
 exportfunctiongetEventListenerSet(node: EventTarget): Set<string>{
-let elementListenerSet =(node: any)[internalEventHandlersKey];
+letelementListenerSet: Set<string>|void;
+elementListenerSet=(node: any)[internalEventHandlersKey];
 if(elementListenerSet===undefined){
  elementListenerSet =(node: any)[internalEventHandlersKey]=newSet();
 }
@@ -246,6 +305,9 @@ export function getFiberFromScopeInstance(
  scope: ReactScopeInstance,
 ): null | Fiber {
 if(enableScopeAPI){
+if(enableInternalInstanceMap){
+returninternalInstanceMap.get(((scope: any): InstanceUnion))||null;
+}
 return(scope: any)[internalInstanceKey]||null;
 }
  return null;
@@ -318,6 +380,12 @@ export function clearScrollEndTimer(node: EventTarget): void {
 }
 
 export function isOwnedInstance(node: Node): boolean {
+if(enableInternalInstanceMap){
+return!!(
+(node: any)[internalHoistableMarker]||
+internalInstanceMap.has((node: any))
+);
+}
  return !!(
  (node: any)[internalHoistableMarker] || (node: any)[internalInstanceKey]
  );

packages/shared/ReactFeatureFlags.js

@@ -147,6 +147,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=true;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // -----------------------------------------------------------------------------
 // Ready for next major.
 //

packages/shared/forks/ReactFeatureFlags.native-fb.js

@@ -84,6 +84,7 @@ export const enableComponentPerformanceTrack: boolean =
 __PROFILE__&&dynamicFlags.enableComponentPerformanceTrack;
 exportconstenablePerformanceIssueReporting: boolean=
 enableComponentPerformanceTrack;
+exportconstenableInternalInstanceMap: boolean=false;
 
 // Flow magic to verify the exports of this file match the original version.
 ((((null: any): ExportsType): FeatureFlagsType): ExportsType);

packages/shared/forks/ReactFeatureFlags.native-oss.js

@@ -76,6 +76,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=false;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // Profiling Only
 exportconstenableProfilerTimer: boolean=__PROFILE__;
 exportconstenableProfilerCommitHooks: boolean=__PROFILE__;

packages/shared/forks/ReactFeatureFlags.test-renderer.js

@@ -77,6 +77,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=true;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // TODO: This must be in sync with the main ReactFeatureFlags file because
 // the Test Renderer's value must be the same as the one used by the
 // react package.

packages/shared/forks/ReactFeatureFlags.test-renderer.www.js

@@ -85,5 +85,7 @@ export const enableFragmentRefsScrollIntoView: boolean = false;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 exportconstownerStackLimit=1e4;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // Flow magic to verify the exports of this file match the original version.
 ((((null: any): ExportsType): FeatureFlagsType): ExportsType);

packages/shared/forks/ReactFeatureFlags.www-dynamic.js

@@ -38,6 +38,8 @@ export const enableFragmentRefs: boolean = __VARIANT__;
 exportconstenableFragmentRefsScrollIntoView: boolean=__VARIANT__;
 exportconstenableAsyncDebugInfo: boolean=__VARIANT__;
 
+exportconstenableInternalInstanceMap: boolean=__VARIANT__;
+
 // TODO: These flags are hard-coded to the default values used in open source.
 // Update the tests so that they pass in either mode, then set these
 // to __VARIANT__.

packages/shared/forks/ReactFeatureFlags.www.js

@@ -35,6 +35,7 @@ export const {
  enableFragmentRefs,
  enableFragmentRefsScrollIntoView,
  enableAsyncDebugInfo,
+ enableInternalInstanceMap,
 }=dynamicFeatureFlags;
 
 // On WWW, __EXPERIMENTAL__ is used for a new modern build.

packages/react-dom-bindings/src/client/ReactDOMComponentTree.js

@@ -38,6 +38,8 @@ import {getParentHydrationBoundary} from './ReactFiberConfigDOM';
 
 import{enableScopeAPI}from'shared/ReactFeatureFlags';
 
+import{enableInternalInstanceMap}from'shared/ReactFeatureFlags';
+
 constrandomKey=Math.random().toString(36).slice(2);
 constinternalInstanceKey='__reactFiber$'+randomKey;
 constinternalPropsKey='__reactProps$'+randomKey;
@@ -49,7 +51,32 @@ const internalRootNodeResourcesKey = '__reactResources$' + randomKey;
 constinternalHoistableMarker='__reactMarker$'+randomKey;
 constinternalScrollTimer='__reactScroll$'+randomKey;
 
+typeInstanceUnion=
+|Instance
+|TextInstance
+|SuspenseInstance
+|ActivityInstance
+|ReactScopeInstance
+|Container;
+
+constPossiblyWeakMap=typeofWeakMap==='function' ? WeakMap : Map;
+constinternalInstanceMap:
+|WeakMap<InstanceUnion,Fiber>
+|Map<InstanceUnion,Fiber>=newPossiblyWeakMap();
+constinternalPropsMap:
+|WeakMap<InstanceUnion,Props>
+|Map<InstanceUnion,Props>=newPossiblyWeakMap();
+
 exportfunctiondetachDeletedInstance(node: Instance): void{
+if(enableInternalInstanceMap){
+internalInstanceMap.delete(node);
+internalPropsMap.delete(node);
+delete(node: any)[internalEventHandlersKey];
+delete(node: any)[internalEventHandlerListenersKey];
+delete(node: any)[internalEventHandlesSetKey];
+delete(node: any)[internalRootNodeResourcesKey];
+return;
+}
 // TODO: This function is only called on host components. I don't think all of
 // these fields are relevant.
 delete(node: any)[internalInstanceKey];
@@ -68,6 +95,10 @@ export function precacheFiberNode(
 |ActivityInstance
 |ReactScopeInstance,
 ): void{
+if(enableInternalInstanceMap){
+internalInstanceMap.set(node,hostInst);
+return;
+}
 (node: any)[internalInstanceKey]=hostInst;
 }
 
@@ -95,7 +126,12 @@ export function isContainerMarkedAsRoot(node: Container): boolean {
 // HostRoot back. To get to the HostRoot, you need to pass a child of it.
 // The same thing applies to Suspense and Activity boundaries.
 export functiongetClosestInstanceFromNode(targetNode: Node): null|Fiber{
-lettargetInst=(targetNode: any)[internalInstanceKey];
+lettargetInst: void|Fiber;
+if(enableInternalInstanceMap){
+targetInst=internalInstanceMap.get(((targetNode: any): InstanceUnion));
+}else{
+targetInst=(targetNode: any)[internalInstanceKey];
+}
 if(targetInst){
 // Don't return HostRoot, SuspenseComponent or ActivityComponent here.
 returntargetInst;
@@ -112,9 +148,15 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
 // itself because the fibers are conceptually between the container
 // node and the first child. It isn't surrounding the container node.
 // If it's not a container, we check if it's an instance.
-targetInst=
-(parentNode: any)[internalContainerInstanceKey]||
-(parentNode: any)[internalInstanceKey];
+if(enableInternalInstanceMap){
+targetInst=
+(parentNode: any)[internalContainerInstanceKey]||
+internalInstanceMap.get(((parentNode: any): InstanceUnion));
+}else{
+targetInst=
+(parentNode: any)[internalContainerInstanceKey]||
+(parentNode: any)[internalInstanceKey];
+}
 if(targetInst){
 // Since this wasn't the direct target of the event, we might have
 // stepped past dehydrated DOM nodes to get here. However they could
@@ -147,8 +189,10 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
 // have had an internalInstanceKey on it.
 // Let's get the fiber associated with the SuspenseComponent
 // as the deepest instance.
-// $FlowFixMe[prop-missing]
-consttargetFiber=hydrationInstance[internalInstanceKey];
+consttargetFiber=enableInternalInstanceMap
+ ? internalInstanceMap.get(hydrationInstance)
+ : // $FlowFixMe[prop-missing]
+hydrationInstance[internalInstanceKey];
 if(targetFiber){
 returntargetFiber;
 }
@@ -175,9 +219,16 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
  * instance, or null if the node was not rendered by this React.
  */
 export functiongetInstanceFromNode(node: Node): Fiber|null{
-constinst=
-(node: any)[internalInstanceKey]||
-(node: any)[internalContainerInstanceKey];
+letinst: void|null|Fiber;
+if(enableInternalInstanceMap){
+inst=
+internalInstanceMap.get(((node: any): InstanceUnion))||
+(node: any)[internalContainerInstanceKey];
+}else{
+inst=
+(node: any)[internalInstanceKey]||
+(node: any)[internalContainerInstanceKey];
+}
 if(inst){
 consttag=inst.tag;
 if(
@@ -226,16 +277,24 @@ export function getFiberCurrentPropsFromNode(
 |TextInstance
 |SuspenseInstance
 |ActivityInstance,
-): Props{
+): Props|null{
+if(enableInternalInstanceMap){
+returninternalPropsMap.get(node)||null;
+}
 return(node: any)[internalPropsKey]||null;
 }
 
 exportfunctionupdateFiberProps(node: Instance,props: Props): void{
+if(enableInternalInstanceMap){
+internalPropsMap.set(node,props);
+return;
+}
 (node: any)[internalPropsKey]=props;
 }
 
 exportfunctiongetEventListenerSet(node: EventTarget): Set<string>{
-let elementListenerSet =(node: any)[internalEventHandlersKey];
+letelementListenerSet: Set<string>|void;
+elementListenerSet=(node: any)[internalEventHandlersKey];
 if(elementListenerSet===undefined){
  elementListenerSet =(node: any)[internalEventHandlersKey]=newSet();
 }
@@ -246,6 +305,9 @@ export function getFiberFromScopeInstance(
  scope: ReactScopeInstance,
 ): null | Fiber {
 if(enableScopeAPI){
+if(enableInternalInstanceMap){
+returninternalInstanceMap.get(((scope: any): InstanceUnion))||null;
+}
 return(scope: any)[internalInstanceKey]||null;
 }
  return null;
@@ -318,6 +380,12 @@ export function clearScrollEndTimer(node: EventTarget): void {
 }
 
 export function isOwnedInstance(node: Node): boolean {
+if(enableInternalInstanceMap){
+return!!(
+(node: any)[internalHoistableMarker]||
+internalInstanceMap.has((node: any))
+);
+}
  return !!(
  (node: any)[internalHoistableMarker] || (node: any)[internalInstanceKey]
  );

packages/shared/ReactFeatureFlags.js

@@ -147,6 +147,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=true;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // -----------------------------------------------------------------------------
 // Ready for next major.
 //

packages/shared/forks/ReactFeatureFlags.native-fb.js

@@ -84,6 +84,7 @@ export const enableComponentPerformanceTrack: boolean =
 __PROFILE__&&dynamicFlags.enableComponentPerformanceTrack;
 exportconstenablePerformanceIssueReporting: boolean=
 enableComponentPerformanceTrack;
+exportconstenableInternalInstanceMap: boolean=false;
 
 // Flow magic to verify the exports of this file match the original version.
 ((((null: any): ExportsType): FeatureFlagsType): ExportsType);

packages/shared/forks/ReactFeatureFlags.native-oss.js

@@ -76,6 +76,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=false;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // Profiling Only
 exportconstenableProfilerTimer: boolean=__PROFILE__;
 exportconstenableProfilerCommitHooks: boolean=__PROFILE__;

packages/shared/forks/ReactFeatureFlags.test-renderer.js

@@ -77,6 +77,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=true;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // TODO: This must be in sync with the main ReactFeatureFlags file because
 // the Test Renderer's value must be the same as the one used by the
 // react package.

packages/shared/forks/ReactFeatureFlags.test-renderer.www.js

@@ -85,5 +85,7 @@ export const enableFragmentRefsScrollIntoView: boolean = false;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 exportconstownerStackLimit=1e4;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // Flow magic to verify the exports of this file match the original version.
 ((((null: any): ExportsType): FeatureFlagsType): ExportsType);

packages/shared/forks/ReactFeatureFlags.www-dynamic.js

@@ -38,6 +38,8 @@ export const enableFragmentRefs: boolean = __VARIANT__;
 exportconstenableFragmentRefsScrollIntoView: boolean=__VARIANT__;
 exportconstenableAsyncDebugInfo: boolean=__VARIANT__;
 
+exportconstenableInternalInstanceMap: boolean=__VARIANT__;
+
 // TODO: These flags are hard-coded to the default values used in open source.
 // Update the tests so that they pass in either mode, then set these
 // to __VARIANT__.

packages/shared/forks/ReactFeatureFlags.www.js

@@ -35,6 +35,7 @@ export const {
  enableFragmentRefs,
  enableFragmentRefsScrollIntoView,
  enableAsyncDebugInfo,
+ enableInternalInstanceMap,
 }=dynamicFeatureFlags;
 
 // On WWW, __EXPERIMENTAL__ is used for a new modern build.

packages/react-dom-bindings/src/client/ReactDOMComponentTree.js

@@ -38,6 +38,8 @@ import {getParentHydrationBoundary} from './ReactFiberConfigDOM';
 
 import{enableScopeAPI}from'shared/ReactFeatureFlags';
 
+import{enableInternalInstanceMap}from'shared/ReactFeatureFlags';
+
 constrandomKey=Math.random().toString(36).slice(2);
 constinternalInstanceKey='__reactFiber$'+randomKey;
 constinternalPropsKey='__reactProps$'+randomKey;
@@ -49,7 +51,32 @@ const internalRootNodeResourcesKey = '__reactResources$' + randomKey;
 constinternalHoistableMarker='__reactMarker$'+randomKey;
 constinternalScrollTimer='__reactScroll$'+randomKey;
 
+typeInstanceUnion=
+|Instance
+|TextInstance
+|SuspenseInstance
+|ActivityInstance
+|ReactScopeInstance
+|Container;
+
+constPossiblyWeakMap=typeofWeakMap==='function' ? WeakMap : Map;
+constinternalInstanceMap:
+|WeakMap<InstanceUnion,Fiber>
+|Map<InstanceUnion,Fiber>=newPossiblyWeakMap();
+constinternalPropsMap:
+|WeakMap<InstanceUnion,Props>
+|Map<InstanceUnion,Props>=newPossiblyWeakMap();
+
 exportfunctiondetachDeletedInstance(node: Instance): void{
+if(enableInternalInstanceMap){
+internalInstanceMap.delete(node);
+internalPropsMap.delete(node);
+delete(node: any)[internalEventHandlersKey];
+delete(node: any)[internalEventHandlerListenersKey];
+delete(node: any)[internalEventHandlesSetKey];
+delete(node: any)[internalRootNodeResourcesKey];
+return;
+}
 // TODO: This function is only called on host components. I don't think all of
 // these fields are relevant.
 delete(node: any)[internalInstanceKey];
@@ -68,6 +95,10 @@ export function precacheFiberNode(
 |ActivityInstance
 |ReactScopeInstance,
 ): void{
+if(enableInternalInstanceMap){
+internalInstanceMap.set(node,hostInst);
+return;
+}
 (node: any)[internalInstanceKey]=hostInst;
 }
 
@@ -95,7 +126,12 @@ export function isContainerMarkedAsRoot(node: Container): boolean {
 // HostRoot back. To get to the HostRoot, you need to pass a child of it.
 // The same thing applies to Suspense and Activity boundaries.
 export functiongetClosestInstanceFromNode(targetNode: Node): null|Fiber{
-lettargetInst=(targetNode: any)[internalInstanceKey];
+lettargetInst: void|Fiber;
+if(enableInternalInstanceMap){
+targetInst=internalInstanceMap.get(((targetNode: any): InstanceUnion));
+}else{
+targetInst=(targetNode: any)[internalInstanceKey];
+}
 if(targetInst){
 // Don't return HostRoot, SuspenseComponent or ActivityComponent here.
 returntargetInst;
@@ -112,9 +148,15 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
 // itself because the fibers are conceptually between the container
 // node and the first child. It isn't surrounding the container node.
 // If it's not a container, we check if it's an instance.
-targetInst=
-(parentNode: any)[internalContainerInstanceKey]||
-(parentNode: any)[internalInstanceKey];
+if(enableInternalInstanceMap){
+targetInst=
+(parentNode: any)[internalContainerInstanceKey]||
+internalInstanceMap.get(((parentNode: any): InstanceUnion));
+}else{
+targetInst=
+(parentNode: any)[internalContainerInstanceKey]||
+(parentNode: any)[internalInstanceKey];
+}
 if(targetInst){
 // Since this wasn't the direct target of the event, we might have
 // stepped past dehydrated DOM nodes to get here. However they could
@@ -147,8 +189,10 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
 // have had an internalInstanceKey on it.
 // Let's get the fiber associated with the SuspenseComponent
 // as the deepest instance.
-// $FlowFixMe[prop-missing]
-consttargetFiber=hydrationInstance[internalInstanceKey];
+consttargetFiber=enableInternalInstanceMap
+ ? internalInstanceMap.get(hydrationInstance)
+ : // $FlowFixMe[prop-missing]
+hydrationInstance[internalInstanceKey];
 if(targetFiber){
 returntargetFiber;
 }
@@ -175,9 +219,16 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
  * instance, or null if the node was not rendered by this React.
  */
 export functiongetInstanceFromNode(node: Node): Fiber|null{
-constinst=
-(node: any)[internalInstanceKey]||
-(node: any)[internalContainerInstanceKey];
+letinst: void|null|Fiber;
+if(enableInternalInstanceMap){
+inst=
+internalInstanceMap.get(((node: any): InstanceUnion))||
+(node: any)[internalContainerInstanceKey];
+}else{
+inst=
+(node: any)[internalInstanceKey]||
+(node: any)[internalContainerInstanceKey];
+}
 if(inst){
 consttag=inst.tag;
 if(
@@ -226,16 +277,24 @@ export function getFiberCurrentPropsFromNode(
 |TextInstance
 |SuspenseInstance
 |ActivityInstance,
-): Props{
+): Props|null{
+if(enableInternalInstanceMap){
+returninternalPropsMap.get(node)||null;
+}
 return(node: any)[internalPropsKey]||null;
 }
 
 exportfunctionupdateFiberProps(node: Instance,props: Props): void{
+if(enableInternalInstanceMap){
+internalPropsMap.set(node,props);
+return;
+}
 (node: any)[internalPropsKey]=props;
 }
 
 exportfunctiongetEventListenerSet(node: EventTarget): Set<string>{
-let elementListenerSet =(node: any)[internalEventHandlersKey];
+letelementListenerSet: Set<string>|void;
+elementListenerSet=(node: any)[internalEventHandlersKey];
 if(elementListenerSet===undefined){
  elementListenerSet =(node: any)[internalEventHandlersKey]=newSet();
 }
@@ -246,6 +305,9 @@ export function getFiberFromScopeInstance(
  scope: ReactScopeInstance,
 ): null | Fiber {
 if(enableScopeAPI){
+if(enableInternalInstanceMap){
+returninternalInstanceMap.get(((scope: any): InstanceUnion))||null;
+}
 return(scope: any)[internalInstanceKey]||null;
 }
  return null;
@@ -318,6 +380,12 @@ export function clearScrollEndTimer(node: EventTarget): void {
 }
 
 export function isOwnedInstance(node: Node): boolean {
+if(enableInternalInstanceMap){
+return!!(
+(node: any)[internalHoistableMarker]||
+internalInstanceMap.has((node: any))
+);
+}
  return !!(
  (node: any)[internalHoistableMarker] || (node: any)[internalInstanceKey]
  );

packages/shared/ReactFeatureFlags.js

@@ -147,6 +147,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=true;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // -----------------------------------------------------------------------------
 // Ready for next major.
 //

packages/shared/forks/ReactFeatureFlags.native-fb.js

@@ -84,6 +84,7 @@ export const enableComponentPerformanceTrack: boolean =
 __PROFILE__&&dynamicFlags.enableComponentPerformanceTrack;
 exportconstenablePerformanceIssueReporting: boolean=
 enableComponentPerformanceTrack;
+exportconstenableInternalInstanceMap: boolean=false;
 
 // Flow magic to verify the exports of this file match the original version.
 ((((null: any): ExportsType): FeatureFlagsType): ExportsType);

packages/shared/forks/ReactFeatureFlags.native-oss.js

@@ -76,6 +76,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=false;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // Profiling Only
 exportconstenableProfilerTimer: boolean=__PROFILE__;
 exportconstenableProfilerCommitHooks: boolean=__PROFILE__;

packages/shared/forks/ReactFeatureFlags.test-renderer.js

@@ -77,6 +77,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=true;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // TODO: This must be in sync with the main ReactFeatureFlags file because
 // the Test Renderer's value must be the same as the one used by the
 // react package.

packages/shared/forks/ReactFeatureFlags.test-renderer.www.js

@@ -85,5 +85,7 @@ export const enableFragmentRefsScrollIntoView: boolean = false;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 exportconstownerStackLimit=1e4;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // Flow magic to verify the exports of this file match the original version.
 ((((null: any): ExportsType): FeatureFlagsType): ExportsType);

packages/shared/forks/ReactFeatureFlags.www-dynamic.js

@@ -38,6 +38,8 @@ export const enableFragmentRefs: boolean = __VARIANT__;
 exportconstenableFragmentRefsScrollIntoView: boolean=__VARIANT__;
 exportconstenableAsyncDebugInfo: boolean=__VARIANT__;
 
+exportconstenableInternalInstanceMap: boolean=__VARIANT__;
+
 // TODO: These flags are hard-coded to the default values used in open source.
 // Update the tests so that they pass in either mode, then set these
 // to __VARIANT__.

packages/shared/forks/ReactFeatureFlags.www.js

@@ -35,6 +35,7 @@ export const {
  enableFragmentRefs,
  enableFragmentRefsScrollIntoView,
  enableAsyncDebugInfo,
+ enableInternalInstanceMap,
 }=dynamicFeatureFlags;
 
 // On WWW, __EXPERIMENTAL__ is used for a new modern build.

packages/react-dom-bindings/src/client/ReactDOMComponentTree.js

@@ -38,6 +38,8 @@ import {getParentHydrationBoundary} from './ReactFiberConfigDOM';
 
 import{enableScopeAPI}from'shared/ReactFeatureFlags';
 
+import{enableInternalInstanceMap}from'shared/ReactFeatureFlags';
+
 constrandomKey=Math.random().toString(36).slice(2);
 constinternalInstanceKey='__reactFiber$'+randomKey;
 constinternalPropsKey='__reactProps$'+randomKey;
@@ -49,7 +51,32 @@ const internalRootNodeResourcesKey = '__reactResources$' + randomKey;
 constinternalHoistableMarker='__reactMarker$'+randomKey;
 constinternalScrollTimer='__reactScroll$'+randomKey;
 
+typeInstanceUnion=
+|Instance
+|TextInstance
+|SuspenseInstance
+|ActivityInstance
+|ReactScopeInstance
+|Container;
+
+constPossiblyWeakMap=typeofWeakMap==='function' ? WeakMap : Map;
+constinternalInstanceMap:
+|WeakMap<InstanceUnion,Fiber>
+|Map<InstanceUnion,Fiber>=newPossiblyWeakMap();
+constinternalPropsMap:
+|WeakMap<InstanceUnion,Props>
+|Map<InstanceUnion,Props>=newPossiblyWeakMap();
+
 exportfunctiondetachDeletedInstance(node: Instance): void{
+if(enableInternalInstanceMap){
+internalInstanceMap.delete(node);
+internalPropsMap.delete(node);
+delete(node: any)[internalEventHandlersKey];
+delete(node: any)[internalEventHandlerListenersKey];
+delete(node: any)[internalEventHandlesSetKey];
+delete(node: any)[internalRootNodeResourcesKey];
+return;
+}
 // TODO: This function is only called on host components. I don't think all of
 // these fields are relevant.
 delete(node: any)[internalInstanceKey];
@@ -68,6 +95,10 @@ export function precacheFiberNode(
 |ActivityInstance
 |ReactScopeInstance,
 ): void{
+if(enableInternalInstanceMap){
+internalInstanceMap.set(node,hostInst);
+return;
+}
 (node: any)[internalInstanceKey]=hostInst;
 }
 
@@ -95,7 +126,12 @@ export function isContainerMarkedAsRoot(node: Container): boolean {
 // HostRoot back. To get to the HostRoot, you need to pass a child of it.
 // The same thing applies to Suspense and Activity boundaries.
 export functiongetClosestInstanceFromNode(targetNode: Node): null|Fiber{
-lettargetInst=(targetNode: any)[internalInstanceKey];
+lettargetInst: void|Fiber;
+if(enableInternalInstanceMap){
+targetInst=internalInstanceMap.get(((targetNode: any): InstanceUnion));
+}else{
+targetInst=(targetNode: any)[internalInstanceKey];
+}
 if(targetInst){
 // Don't return HostRoot, SuspenseComponent or ActivityComponent here.
 returntargetInst;
@@ -112,9 +148,15 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
 // itself because the fibers are conceptually between the container
 // node and the first child. It isn't surrounding the container node.
 // If it's not a container, we check if it's an instance.
-targetInst=
-(parentNode: any)[internalContainerInstanceKey]||
-(parentNode: any)[internalInstanceKey];
+if(enableInternalInstanceMap){
+targetInst=
+(parentNode: any)[internalContainerInstanceKey]||
+internalInstanceMap.get(((parentNode: any): InstanceUnion));
+}else{
+targetInst=
+(parentNode: any)[internalContainerInstanceKey]||
+(parentNode: any)[internalInstanceKey];
+}
 if(targetInst){
 // Since this wasn't the direct target of the event, we might have
 // stepped past dehydrated DOM nodes to get here. However they could
@@ -147,8 +189,10 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
 // have had an internalInstanceKey on it.
 // Let's get the fiber associated with the SuspenseComponent
 // as the deepest instance.
-// $FlowFixMe[prop-missing]
-consttargetFiber=hydrationInstance[internalInstanceKey];
+consttargetFiber=enableInternalInstanceMap
+ ? internalInstanceMap.get(hydrationInstance)
+ : // $FlowFixMe[prop-missing]
+hydrationInstance[internalInstanceKey];
 if(targetFiber){
 returntargetFiber;
 }
@@ -175,9 +219,16 @@ export function getClosestInstanceFromNode(targetNode: Node): null | Fiber {
  * instance, or null if the node was not rendered by this React.
  */
 export functiongetInstanceFromNode(node: Node): Fiber|null{
-constinst=
-(node: any)[internalInstanceKey]||
-(node: any)[internalContainerInstanceKey];
+letinst: void|null|Fiber;
+if(enableInternalInstanceMap){
+inst=
+internalInstanceMap.get(((node: any): InstanceUnion))||
+(node: any)[internalContainerInstanceKey];
+}else{
+inst=
+(node: any)[internalInstanceKey]||
+(node: any)[internalContainerInstanceKey];
+}
 if(inst){
 consttag=inst.tag;
 if(
@@ -226,16 +277,24 @@ export function getFiberCurrentPropsFromNode(
 |TextInstance
 |SuspenseInstance
 |ActivityInstance,
-): Props{
+): Props|null{
+if(enableInternalInstanceMap){
+returninternalPropsMap.get(node)||null;
+}
 return(node: any)[internalPropsKey]||null;
 }
 
 exportfunctionupdateFiberProps(node: Instance,props: Props): void{
+if(enableInternalInstanceMap){
+internalPropsMap.set(node,props);
+return;
+}
 (node: any)[internalPropsKey]=props;
 }
 
 exportfunctiongetEventListenerSet(node: EventTarget): Set<string>{
-let elementListenerSet =(node: any)[internalEventHandlersKey];
+letelementListenerSet: Set<string>|void;
+elementListenerSet=(node: any)[internalEventHandlersKey];
 if(elementListenerSet===undefined){
  elementListenerSet =(node: any)[internalEventHandlersKey]=newSet();
 }
@@ -246,6 +305,9 @@ export function getFiberFromScopeInstance(
  scope: ReactScopeInstance,
 ): null | Fiber {
 if(enableScopeAPI){
+if(enableInternalInstanceMap){
+returninternalInstanceMap.get(((scope: any): InstanceUnion))||null;
+}
 return(scope: any)[internalInstanceKey]||null;
 }
  return null;
@@ -318,6 +380,12 @@ export function clearScrollEndTimer(node: EventTarget): void {
 }
 
 export function isOwnedInstance(node: Node): boolean {
+if(enableInternalInstanceMap){
+return!!(
+(node: any)[internalHoistableMarker]||
+internalInstanceMap.has((node: any))
+);
+}
  return !!(
  (node: any)[internalHoistableMarker] || (node: any)[internalInstanceKey]
  );

packages/shared/ReactFeatureFlags.js

@@ -147,6 +147,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=true;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // -----------------------------------------------------------------------------
 // Ready for next major.
 //

packages/shared/forks/ReactFeatureFlags.native-fb.js

@@ -84,6 +84,7 @@ export const enableComponentPerformanceTrack: boolean =
 __PROFILE__&&dynamicFlags.enableComponentPerformanceTrack;
 exportconstenablePerformanceIssueReporting: boolean=
 enableComponentPerformanceTrack;
+exportconstenableInternalInstanceMap: boolean=false;
 
 // Flow magic to verify the exports of this file match the original version.
 ((((null: any): ExportsType): FeatureFlagsType): ExportsType);

packages/shared/forks/ReactFeatureFlags.native-oss.js

@@ -76,6 +76,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=false;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // Profiling Only
 exportconstenableProfilerTimer: boolean=__PROFILE__;
 exportconstenableProfilerCommitHooks: boolean=__PROFILE__;

packages/shared/forks/ReactFeatureFlags.test-renderer.js

@@ -77,6 +77,8 @@ export const enableFragmentRefs: boolean = true;
 exportconstenableFragmentRefsScrollIntoView: boolean=true;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // TODO: This must be in sync with the main ReactFeatureFlags file because
 // the Test Renderer's value must be the same as the one used by the
 // react package.

packages/shared/forks/ReactFeatureFlags.test-renderer.www.js

@@ -85,5 +85,7 @@ export const enableFragmentRefsScrollIntoView: boolean = false;
 exportconstenableFragmentRefsInstanceHandles: boolean=false;
 exportconstownerStackLimit=1e4;
 
+exportconstenableInternalInstanceMap: boolean=false;
+
 // Flow magic to verify the exports of this file match the original version.
 ((((null: any): ExportsType): FeatureFlagsType): ExportsType);

packages/shared/forks/ReactFeatureFlags.www-dynamic.js

@@ -38,6 +38,8 @@ export const enableFragmentRefs: boolean = __VARIANT__;
 exportconstenableFragmentRefsScrollIntoView: boolean=__VARIANT__;
 exportconstenableAsyncDebugInfo: boolean=__VARIANT__;
 
+exportconstenableInternalInstanceMap: boolean=__VARIANT__;
+
 // TODO: These flags are hard-coded to the default values used in open source.
 // Update the tests so that they pass in either mode, then set these
 // to __VARIANT__.

packages/shared/forks/ReactFeatureFlags.www.js

@@ -35,6 +35,7 @@ export const {
  enableFragmentRefs,
  enableFragmentRefsScrollIntoView,
  enableAsyncDebugInfo,
+ enableInternalInstanceMap,
 }=dynamicFeatureFlags;
 
 // On WWW, __EXPERIMENTAL__ is used for a new modern build.