@office-iss/react-native-win32 0.0.0-canary.273 → 0.0.0-canary.275

package/Libraries/ReactNative/RendererImplementation.js

@@ -35,7 +35,7 @@ export function renderElement({
   useConcurrentRoot: boolean,
 }): void {
   if (useFabric) {
-    require('../Renderer/shims/ReactFabric').render(
+    require('../Renderer/shims/ReactFabric').default.render(
       element,
       rootTag,
       null,
@@ -47,7 +47,7 @@ export function renderElement({
       },
     );
   } else {
-    require('../Renderer/shims/ReactNative').render(
+    require('../Renderer/shims/ReactNative').default.render(
       element,
       rootTag,
       undefined,
@@ -63,7 +63,7 @@ export function renderElement({
 export function findHostInstance_DEPRECATED<TElementType: ElementType>(
   componentOrHandle: ?(ElementRef<TElementType> | number),
 ): ?HostInstance {
-  return require('../Renderer/shims/ReactNative').findHostInstance_DEPRECATED(
+  return require('../Renderer/shims/ReactNative').default.findHostInstance_DEPRECATED(
     componentOrHandle,
   );
 }
@@ -71,7 +71,7 @@ export function findHostInstance_DEPRECATED<TElementType: ElementType>(
 export function findNodeHandle<TElementType: ElementType>(
   componentOrHandle: ?(ElementRef<TElementType> | number),
 ): ?number {
-  return require('../Renderer/shims/ReactNative').findNodeHandle(
+  return require('../Renderer/shims/ReactNative').default.findNodeHandle(
     componentOrHandle,
   );
 }
@@ -84,13 +84,13 @@ export function dispatchCommand(
   if (global.RN$Bridgeless === true) {
     // Note: this function has the same implementation in the legacy and new renderer.
     // However, evaluating the old renderer comes with some side effects.
-    return require('../Renderer/shims/ReactFabric').dispatchCommand(
+    return require('../Renderer/shims/ReactFabric').default.dispatchCommand(
       handle,
       command,
       args,
     );
   } else {
-    return require('../Renderer/shims/ReactNative').dispatchCommand(
+    return require('../Renderer/shims/ReactNative').default.dispatchCommand(
       handle,
       command,
       args,
@@ -102,7 +102,7 @@ export function sendAccessibilityEvent(
   handle: HostInstance,
   eventType: string,
 ): void {
-  return require('../Renderer/shims/ReactNative').sendAccessibilityEvent(
+  return require('../Renderer/shims/ReactNative').default.sendAccessibilityEvent(
     handle,
     eventType,
   );
@@ -115,7 +115,7 @@ export function sendAccessibilityEvent(
 export function unmountComponentAtNodeAndRemoveContainer(rootTag: RootTag) {
   // $FlowExpectedError[incompatible-type] rootTag is an opaque type so we can't really cast it as is.
   const rootTagAsNumber: number = rootTag;
-  require('../Renderer/shims/ReactNative').unmountComponentAtNodeAndRemoveContainer(
+  require('../Renderer/shims/ReactNative').default.unmountComponentAtNodeAndRemoveContainer(
     rootTagAsNumber,
   );
 }
@@ -125,7 +125,7 @@ export function unstable_batchedUpdates<T>(
   bookkeeping: T,
 ): void {
   // This doesn't actually do anything when batching updates for a Fabric root.
-  return require('../Renderer/shims/ReactNative').unstable_batchedUpdates(
+  return require('../Renderer/shims/ReactNative').default.unstable_batchedUpdates(
     fn,
     bookkeeping,
   );
@@ -136,10 +136,10 @@ export function isProfilingRenderer(): boolean {
 }
 
 export function isChildPublicInstance(
-  parentInstance: ReactFabricHostComponent | HostComponent<mixed>,
-  childInstance: ReactFabricHostComponent | HostComponent<mixed>,
+  parentInstance: ReactFabricHostComponent | HostComponent<empty>,
+  childInstance: ReactFabricHostComponent | HostComponent<empty>,
 ): boolean {
-  return require('../Renderer/shims/ReactNative').isChildPublicInstance(
+  return require('../Renderer/shims/ReactNative').default.isChildPublicInstance(
     parentInstance,
     childInstance,
   );
@@ -149,7 +149,7 @@ export function getNodeFromInternalInstanceHandle(
   internalInstanceHandle: InternalInstanceHandle,
 ): ?Node {
   // This is only available in Fabric
-  return require('../Renderer/shims/ReactFabric').getNodeFromInternalInstanceHandle(
+  return require('../Renderer/shims/ReactFabric').default.getNodeFromInternalInstanceHandle(
     internalInstanceHandle,
   );
 }
@@ -158,7 +158,7 @@ export function getPublicInstanceFromInternalInstanceHandle(
   internalInstanceHandle: InternalInstanceHandle,
 ): mixed /*PublicInstance | PublicTextInstance | null*/ {
   // This is only available in Fabric
-  return require('../Renderer/shims/ReactFabric').getPublicInstanceFromInternalInstanceHandle(
+  return require('../Renderer/shims/ReactFabric').default.getPublicInstanceFromInternalInstanceHandle(
     internalInstanceHandle,
   );
 }

package/Libraries/ReactNative/getCachedComponentWithDebugName.js

@@ -8,11 +8,9 @@
  * @format
  */
 
-import type {AbstractComponent} from 'react';
-
 import * as React from 'react';
 
-type NoopComponent = AbstractComponent<{children: React.Node}>;
+type NoopComponent = component(children: React.Node);
 
 const cache: Map<
   string, // displayName

package/Libraries/ReactNative/renderApplication.js

@@ -23,10 +23,12 @@ import * as React from 'react';
 // require BackHandler so it sets the default handler that exits the app if no listeners respond
 import '../Utilities/BackHandler';
 
-type ActivityType = React.AbstractComponent<{
-  mode: 'visible' | 'hidden',
-  children: React.Node,
-}>;
+type ActivityType = component(
+  ...{
+    mode: 'visible' | 'hidden',
+    children: React.Node,
+  }
+);
 
 export default function renderApplication<Props: Object>(
   RootComponent: React.ComponentType<Props>,
@@ -39,7 +41,6 @@ export default function renderApplication<Props: Object>(
   isLogBox?: boolean,
   debugName?: string,
   displayMode?: ?DisplayModeType,
-  useConcurrentRoot?: boolean,
   useOffscreen?: boolean,
 ) {
   invariant(rootTag, 'Expect to have a valid rootTag, instead got ', rootTag);
@@ -85,12 +86,12 @@ export default function renderApplication<Props: Object>(
   }
 
   // We want to have concurrentRoot always enabled when you're on Fabric.
-  const useConcurrentRootOverride = fabric;
+  const useConcurrentRoot = Boolean(fabric);
 
   performanceLogger.startTimespan('renderApplication_React_render');
   performanceLogger.setExtra(
     'usedReactConcurrentRoot',
-    useConcurrentRootOverride ? '1' : '0',
+    useConcurrentRoot ? '1' : '0',
   );
   performanceLogger.setExtra('usedReactFabric', fabric ? '1' : '0');
   performanceLogger.setExtra(
@@ -101,7 +102,7 @@ export default function renderApplication<Props: Object>(
     element: renderable,
     rootTag,
     useFabric: Boolean(fabric),
-    useConcurrentRoot: Boolean(useConcurrentRootOverride),
+    useConcurrentRoot,
   });
   performanceLogger.stopTimespan('renderApplication_React_render');
 }

package/Libraries/ReactNative/requireNativeComponent.js

@@ -12,7 +12,8 @@
 
 import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
 
-const createReactNativeComponentClass = require('../Renderer/shims/createReactNativeComponentClass');
+const createReactNativeComponentClass =
+  require('../Renderer/shims/createReactNativeComponentClass').default;
 const getNativeComponentAttributes = require('./getNativeComponentAttributes');
 
 /**
@@ -24,7 +25,9 @@ const getNativeComponentAttributes = require('./getNativeComponentAttributes');
  *
  */
 
-const requireNativeComponent = <T>(uiViewClassName: string): HostComponent<T> =>
+const requireNativeComponent = <T: {...}>(
+  uiViewClassName: string,
+): HostComponent<T> =>
   ((createReactNativeComponentClass(uiViewClassName, () =>
     getNativeComponentAttributes(uiViewClassName),
   ): any): HostComponent<T>);