hide hostcontexttype by exposing a getter for ancestorInfo.resourceFo…

…rmOnly
facebook · Oct 22, 2022 · a066705 · a066705
1 parent 0fb69cf
commit a066705
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/packages/react-dom-bindings/src/client/ReactDOMFloatClient.js b/packages/react-dom-bindings/src/client/ReactDOMFloatClient.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import type {Instance, Container, HostContextDev} from './ReactDOMHostConfig';
+import type {Instance, Container} from './ReactDOMHostConfig';
 
 import ReactDOMSharedInternals from 'shared/ReactDOMSharedInternals.js';
 const {Dispatcher} = ReactDOMSharedInternals;
@@ -33,6 +33,7 @@ import {
   getCurrentRootHostContainer,
   getHostContext,
 } from 'react-reconciler/src/ReactFiberHostContext';
+import {getResourceFormOnly} from './validateDOMNesting';
 
 // The resource types we support. currently they match the form for the as argument.
 // In the future this may need to change, especially when modules / scripts are supported
@@ -1336,8 +1337,8 @@ function insertResourceInstanceBefore(
 export function isHostResourceType(type: string, props: Props): boolean {
   let resourceFormOnly: boolean;
   if (__DEV__) {
-    const hostContextDev: HostContextDev = (getHostContext(): any);
-    resourceFormOnly = (hostContextDev.ancestorInfo: any).resourceFormOnly;
+    const hostContext = getHostContext();
+    resourceFormOnly = getResourceFormOnly(hostContext);
   }
   switch (type) {
     case 'meta':

diff --git a/packages/react-dom-bindings/src/client/ReactDOMHostConfig.js b/packages/react-dom-bindings/src/client/ReactDOMHostConfig.js
@@ -133,7 +133,7 @@ export interface SuspenseInstance extends Comment {
 }
 export type HydratableInstance = Instance | TextInstance | SuspenseInstance;
 export type PublicInstance = Element | Text;
-export type HostContextDev = {
+type HostContextDev = {
   namespace: string,
   ancestorInfo: mixed,
   ...

diff --git a/packages/react-dom-bindings/src/client/validateDOMNesting.js b/packages/react-dom-bindings/src/client/validateDOMNesting.js
@@ -7,6 +7,7 @@
 
 let validateDOMNesting = () => {};
 let updatedAncestorInfo = () => {};
+let getResourceFormOnly = () => false;
 
 if (__DEV__) {
   // This validation code was written based on the HTML5 parsing spec:
@@ -478,6 +479,10 @@ if (__DEV__) {
       );
     }
   };
+
+  getResourceFormOnly = hostContextDev => {
+    return hostContextDev.ancestorInfo.resourceFormOnly;
+  };
 }
 
-export {updatedAncestorInfo, validateDOMNesting};
+export {updatedAncestorInfo, validateDOMNesting, getResourceFormOnly};