react-native-windows 0.0.0-canary.685 → 0.0.0-canary.686

package/Libraries/ReactNative/BridgelessUIManager.js

@@ -13,27 +13,45 @@
 import type {RootTag} from '../Types/RootTagTypes';
 
 import {unstable_hasComponent} from '../NativeComponent/NativeComponentRegistryUnstable';
+import ReactNativeFeatureFlags from './ReactNativeFeatureFlags';
+
+let cachedConstants = null;
 
 const errorMessageForMethod = (methodName: string): string =>
   "[ReactNative Architecture][JS] '" +
   methodName +
   "' is not available in the new React Native architecture.";
 
+function getCachedConstants(): Object {
+  if (!cachedConstants) {
+    cachedConstants = global.RN$LegacyInterop_UIManager_getConstants();
+  }
+  return cachedConstants;
+}
+
 module.exports = {
   getViewManagerConfig: (viewManagerName: string): mixed => {
-    console.error(
-      errorMessageForMethod('getViewManagerConfig') +
-        'Use hasViewManagerConfig instead. viewManagerName: ' +
-        viewManagerName,
-    );
-    return null;
+    if (ReactNativeFeatureFlags.enableNativeViewConfigsInBridgelessMode) {
+      return getCachedConstants()[viewManagerName];
+    } else {
+      console.error(
+        errorMessageForMethod('getViewManagerConfig') +
+          'Use hasViewManagerConfig instead. viewManagerName: ' +
+          viewManagerName,
+      );
+      return null;
+    }
   },
   hasViewManagerConfig: (viewManagerName: string): boolean => {
     return unstable_hasComponent(viewManagerName);
   },
   getConstants: (): Object => {
-    console.error(errorMessageForMethod('getConstants'));
-    return {};
+    if (ReactNativeFeatureFlags.enableNativeViewConfigsInBridgelessMode) {
+      return getCachedConstants();
+    } else {
+      console.error(errorMessageForMethod('getConstants'));
+      return null;
+    }
   },
   getConstantsForViewManager: (viewManagerName: string): Object => {
     console.error(errorMessageForMethod('getConstantsForViewManager'));

package/Libraries/ReactNative/ReactNativeFeatureFlags.js

@@ -49,6 +49,14 @@ export type FeatureFlags = {|
    * Enables use of AnimatedObject for animating transform values.
    */
   shouldUseAnimatedObjectForTransform: () => boolean,
+  /**
+   * Enables use of setNativeProps in JS driven animations.
+   */
+  shouldUseSetNativePropsInFabric: () => boolean,
+  /**
+   * Enables native view configs in brdgeless mode.
+   */
+  enableNativeViewConfigsInBridgelessMode: () => boolean,
 |};
 
 const ReactNativeFeatureFlags: FeatureFlags = {
@@ -60,6 +68,8 @@ const ReactNativeFeatureFlags: FeatureFlags = {
   isGlobalWebPerformanceLoggerEnabled: () => false,
   enableAccessToHostTreeInFabric: () => false,
   shouldUseAnimatedObjectForTransform: () => false,
+  shouldUseSetNativePropsInFabric: () => false,
+  enableNativeViewConfigsInBridgelessMode: () => false,
 };
 
 module.exports = ReactNativeFeatureFlags;

package/Libraries/ReactNative/UIManager.js

@@ -180,6 +180,14 @@ const UIManager = {
     commandName: number | string,
     commandArgs: any[],
   ) {
+    // Sometimes, libraries directly pass in the output of `findNodeHandle` to
+    // this function without checking if it's null. This guards against that
+    // case. We throw early here in Javascript so we can get a JS stacktrace
+    // instead of a harder-to-debug native Java or Objective-C stacktrace.
+    if (typeof reactTag !== 'number') {
+      throw new Error('dispatchViewManagerCommand: found null reactTag');
+    }
+
     if (isFabricReactTag(reactTag)) {
       const FabricUIManager = nullthrows(getFabricUIManager());
       const shadowNode =

package/Libraries/Share/Share.d.ts

@@ -27,17 +27,11 @@ export type ShareOptions = {
   anchor?: number | undefined;
 };
 
-export type ShareSharedAction = {
-  action: 'sharedAction';
-  activityType?: string | undefined;
+export type ShareAction = {
+  action: 'sharedAction' | 'dismissedAction';
+  activityType?: string | null | undefined;
 };
 
-export type ShareDismissedAction = {
-  action: 'dismissedAction';
-};
-
-export type ShareAction = ShareSharedAction | ShareDismissedAction;
-
 export interface ShareStatic {
   /**
    * Open a dialog to share text content.

package/Libraries/StyleSheet/StyleSheetTypes.d.ts

@@ -173,23 +173,27 @@ interface MatrixTransform {
   matrix: AnimatableNumericValue[];
 }
 
+type MaximumOneOf<T, K extends keyof T = keyof T> = K extends keyof T
+  ? {[P in K]: T[K]} & {[P in Exclude<keyof T, K>]?: never}
+  : never;
+
 export interface TransformsStyle {
   transform?:
-    | (
-        | PerpectiveTransform
-        | RotateTransform
-        | RotateXTransform
-        | RotateYTransform
-        | RotateZTransform
-        | ScaleTransform
-        | ScaleXTransform
-        | ScaleYTransform
-        | TranslateXTransform
-        | TranslateYTransform
-        | SkewXTransform
-        | SkewYTransform
-        | MatrixTransform
-      )[]
+    | MaximumOneOf<
+        PerpectiveTransform &
+          RotateTransform &
+          RotateXTransform &
+          RotateYTransform &
+          RotateZTransform &
+          ScaleTransform &
+          ScaleXTransform &
+          ScaleYTransform &
+          TranslateXTransform &
+          TranslateYTransform &
+          SkewXTransform &
+          SkewYTransform &
+          MatrixTransform
+      >[]
     | string
     | undefined;
   /**

package/Libraries/Utilities/NativePlatformConstantsAndroid.js

@@ -15,6 +15,7 @@ import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 export interface Spec extends TurboModule {
   +getConstants: () => {|
     isTesting: boolean,
+    isDisableAnimations?: boolean,
     reactNativeVersion: {|
       major: number,
       minor: number,

package/Libraries/Utilities/NativePlatformConstantsIOS.js

@@ -15,6 +15,7 @@ import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 export interface Spec extends TurboModule {
   +getConstants: () => {|
     isTesting: boolean,
+    isDisableAnimations?: boolean,
     reactNativeVersion: {|
       major: number,
       minor: number,

package/Libraries/Utilities/NativePlatformConstantsWin.js

@@ -13,6 +13,7 @@ import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 export interface Spec extends TurboModule {
   +getConstants: () => {|
     isTesting: boolean,
+    isDisableAnimations?: boolean,
     reactNativeVersion: {|
       major: number,
       minor: number,

package/Libraries/Utilities/Platform.android.js

@@ -28,6 +28,7 @@ const Platform = {
   // $FlowFixMe[unsafe-getters-setters]
   get constants(): {|
     isTesting: boolean,
+    isDisableAnimations?: boolean,
     reactNativeVersion: {|
       major: number,
       minor: number,
@@ -61,6 +62,11 @@ const Platform = {
     return false;
   },
   // $FlowFixMe[unsafe-getters-setters]
+  get isDisableAnimations(): boolean {
+    // $FlowFixMe[object-this-reference]
+    return this.constants.isDisableAnimations ?? this.isTesting;
+  },
+  // $FlowFixMe[unsafe-getters-setters]
   get isTV(): boolean {
     // $FlowFixMe[object-this-reference]
     return this.constants.uiMode === 'tv';

package/Libraries/Utilities/Platform.d.ts

@@ -19,6 +19,7 @@ export type PlatformOSType =
   | 'native';
 type PlatformConstants = {
   isTesting: boolean;
+  isDisableAnimations?: boolean | undefined;
   reactNativeVersion: {
     major: number;
     minor: number;

package/Libraries/Utilities/Platform.ios.js

@@ -30,6 +30,7 @@ const Platform = {
     forceTouchAvailable: boolean,
     interfaceIdiom: string,
     isTesting: boolean,
+    isDisableAnimations?: boolean,
     osVersion: string,
     reactNativeVersion: {|
       major: number,
@@ -65,6 +66,11 @@ const Platform = {
     }
     return false;
   },
+  // $FlowFixMe[unsafe-getters-setters]
+  get isDisableAnimations(): boolean {
+    // $FlowFixMe[object-this-reference]
+    return this.constants.isDisableAnimations ?? this.isTesting;
+  },
   select: <T>(spec: PlatformSelectSpec<T>): T =>
     // $FlowFixMe[incompatible-return]
     'ios' in spec ? spec.ios : 'native' in spec ? spec.native : spec.default,

package/Libraries/Utilities/Platform.windows.js

@@ -26,6 +26,7 @@ const Platform = {
   // $FlowFixMe[unsafe-getters-setters]
   get constants(): {|
     isTesting: boolean,
+    isDisableAnimations?: boolean,
     reactNativeVersion: {|
       major: number,
       minor: number,
@@ -51,6 +52,11 @@ const Platform = {
     return false;
   },
   // $FlowFixMe[unsafe-getters-setters]
+  get isDisableAnimations(): boolean {
+    // $FlowFixMe[object-this-reference]
+    return this.constants.isDisableAnimations ?? this.isTesting;
+  },
+  // $FlowFixMe[unsafe-getters-setters]
   get isTV(): boolean {
     // $FlowFixMe[object-this-reference]
     return false;

package/Libraries/vendor/emitter/EventEmitter.js

@@ -15,13 +15,13 @@ export interface EventSubscription {
 export interface IEventEmitter<TEventToArgsMap: {...}> {
   addListener<TEvent: $Keys<TEventToArgsMap>>(
     eventType: TEvent,
-    listener: (...args: $ElementType<TEventToArgsMap, TEvent>) => mixed,
+    listener: (...args: TEventToArgsMap[TEvent]) => mixed,
     context?: mixed,
   ): EventSubscription;
 
   emit<TEvent: $Keys<TEventToArgsMap>>(
     eventType: TEvent,
-    ...args: $ElementType<TEventToArgsMap, TEvent>
+    ...args: TEventToArgsMap[TEvent]
   ): void;
 
   removeAllListeners<TEvent: $Keys<TEventToArgsMap>>(eventType?: ?TEvent): void;
@@ -71,7 +71,7 @@ export default class EventEmitter<TEventToArgsMap: {...}>
    */
   addListener<TEvent: $Keys<TEventToArgsMap>>(
     eventType: TEvent,
-    listener: (...args: $ElementType<TEventToArgsMap, TEvent>) => mixed,
+    listener: (...args: TEventToArgsMap[TEvent]) => mixed,
     context: mixed,
   ): EventSubscription {
     if (typeof listener !== 'function') {
@@ -79,11 +79,12 @@ export default class EventEmitter<TEventToArgsMap: {...}>
         'EventEmitter.addListener(...): 2nd argument must be a function.',
       );
     }
-    const registrations = allocate<_, _, TEventToArgsMap[TEvent]>(
-      this._registry,
-      eventType,
-    );
-    const registration: Registration<$ElementType<TEventToArgsMap, TEvent>> = {
+    const registrations = allocate<
+      TEventToArgsMap,
+      TEvent,
+      TEventToArgsMap[TEvent],
+    >(this._registry, eventType);
+    const registration: Registration<TEventToArgsMap[TEvent]> = {
       context,
       listener,
       remove(): void {
@@ -103,11 +104,10 @@ export default class EventEmitter<TEventToArgsMap: {...}>
    */
   emit<TEvent: $Keys<TEventToArgsMap>>(
     eventType: TEvent,
-    ...args: $ElementType<TEventToArgsMap, TEvent>
+    ...args: TEventToArgsMap[TEvent]
   ): void {
-    const registrations: ?Set<
-      Registration<$ElementType<TEventToArgsMap, TEvent>>,
-    > = this._registry[eventType];
+    const registrations: ?Set<Registration<TEventToArgsMap[TEvent]>> =
+      this._registry[eventType];
     if (registrations != null) {
       for (const registration of [...registrations]) {
         registration.listener.apply(registration.context, args);
@@ -140,7 +140,7 @@ export default class EventEmitter<TEventToArgsMap: {...}>
 function allocate<
   TEventToArgsMap: {...},
   TEvent: $Keys<TEventToArgsMap>,
-  TEventArgs: $ElementType<TEventToArgsMap, TEvent>,
+  TEventArgs: TEventToArgsMap[TEvent],
 >(
   registry: Registry<TEventToArgsMap>,
   eventType: TEvent,

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.0.0-canary.685</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.0.0-canary.686</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>0</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>true</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>a1b2fc1f681ba2652a3f3eb6650174d39625b15f</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>1f6d2a9ab892a5ab2ffb9652d4ee41ff6a04b2b6</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/ReactCommon/TEMP_UntilReactCommonUpdate/jsi/jsi/test/testlib.cpp

@@ -478,6 +478,20 @@ TEST_P(JSITest, ArrayTest) {
   Array alpha2 = Array(rt, 1);
   alpha2 = std::move(alpha);
   EXPECT_EQ(alpha2.size(rt), 4);
+
+  // Test getting/setting an element that is an accessor.
+  auto arrWithAccessor =
+      eval(
+          "Object.defineProperty([], '0', {set(){ throw 72 }, get(){ return 45 }});")
+          .getObject(rt)
+          .getArray(rt);
+  try {
+    arrWithAccessor.setValueAtIndex(rt, 0, 1);
+    FAIL() << "Expected exception";
+  } catch (const JSError& err) {
+    EXPECT_EQ(err.value().getNumber(), 72);
+  }
+  EXPECT_EQ(arrWithAccessor.getValueAtIndex(rt, 0).getNumber(), 45);
 }
 
 TEST_P(JSITest, FunctionTest) {

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/view/TouchEventEmitter.cpp

@@ -58,43 +58,6 @@ static jsi::Value touchEventPayload(
   return object;
 }
 
-static jsi::Value pointerEventPayload(
-    jsi::Runtime &runtime,
-    PointerEvent const &event) {
-  auto object = jsi::Object(runtime);
-  object.setProperty(runtime, "pointerId", event.pointerId);
-  object.setProperty(runtime, "pressure", event.pressure);
-  object.setProperty(runtime, "pointerType", event.pointerType);
-  object.setProperty(runtime, "clientX", event.clientPoint.x);
-  object.setProperty(runtime, "clientY", event.clientPoint.y);
-  // x/y are an alias to clientX/Y
-  object.setProperty(runtime, "x", event.clientPoint.x);
-  object.setProperty(runtime, "y", event.clientPoint.y);
-  // since RN doesn't have a scrollable root, pageX/Y will always equal
-  // clientX/Y
-  object.setProperty(runtime, "pageX", event.clientPoint.x);
-  object.setProperty(runtime, "pageY", event.clientPoint.y);
-  object.setProperty(runtime, "screenX", event.screenPoint.x);
-  object.setProperty(runtime, "screenY", event.screenPoint.y);
-  object.setProperty(runtime, "offsetX", event.offsetPoint.x);
-  object.setProperty(runtime, "offsetY", event.offsetPoint.y);
-  object.setProperty(runtime, "width", event.width);
-  object.setProperty(runtime, "height", event.height);
-  object.setProperty(runtime, "tiltX", event.tiltX);
-  object.setProperty(runtime, "tiltY", event.tiltY);
-  object.setProperty(runtime, "detail", event.detail);
-  object.setProperty(runtime, "buttons", event.buttons);
-  object.setProperty(runtime, "tangentialPressure", event.tangentialPressure);
-  object.setProperty(runtime, "twist", event.twist);
-  object.setProperty(runtime, "ctrlKey", event.ctrlKey);
-  object.setProperty(runtime, "shiftKey", event.shiftKey);
-  object.setProperty(runtime, "altKey", event.altKey);
-  object.setProperty(runtime, "metaKey", event.metaKey);
-  object.setProperty(runtime, "isPrimary", event.isPrimary);
-  object.setProperty(runtime, "button", event.button);
-  return object;
-}
-
 void TouchEventEmitter::dispatchTouchEvent(
     std::string type,
     TouchEvent const &event,
@@ -116,9 +79,7 @@ void TouchEventEmitter::dispatchPointerEvent(
     RawEvent::Category category) const {
   dispatchEvent(
       std::move(type),
-      [event](jsi::Runtime &runtime) {
-        return pointerEventPayload(runtime, event);
-      },
+      std::make_shared<PointerEvent>(event),
       priority,
       category);
 }
@@ -178,9 +139,7 @@ void TouchEventEmitter::onPointerDown(const PointerEvent &event) const {
 }
 
 void TouchEventEmitter::onPointerMove(const PointerEvent &event) const {
-  dispatchUniqueEvent("pointerMove", [event](jsi::Runtime &runtime) {
-    return pointerEventPayload(runtime, event);
-  });
+  dispatchUniqueEvent("pointerMove", std::make_shared<PointerEvent>(event));
 }
 
 void TouchEventEmitter::onPointerUp(const PointerEvent &event) const {

package/Shared/Shared.vcxitems

@@ -440,6 +440,7 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\text\TextShadowNode.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\text\RawTextShadowNode.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\view\AccessibilityProps.cpp" DisableSpecificWarnings="4018;%(DisableSpecificWarnings)" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\view\PointerEvent.cpp" DisableSpecificWarnings="4018;%(DisableSpecificWarnings)" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\view\TouchEventEmitter.cpp" DisableSpecificWarnings="4018;%(DisableSpecificWarnings)" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\view\ViewEventEmitter.cpp" DisableSpecificWarnings="4018;%(DisableSpecificWarnings)" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\view\ViewProps.cpp" DisableSpecificWarnings="4459;4715;%(DisableSpecificWarnings)" />
@@ -448,6 +449,7 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\view\YogaStylableProps.cpp" DisableSpecificWarnings="4715;%(DisableSpecificWarnings)" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\core\BatchedEventQueue.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\core\ComponentDescriptor.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\core\ValueFactoryEventPayload.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\utils\CoreFeatures.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\core\DynamicPropsUtilities.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\core\EventBeat.cpp" />
@@ -504,6 +506,7 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\templateprocessor\UITemplateProcessor.cpp" DisableSpecificWarnings="4244;%(DisableSpecificWarnings)" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\textlayoutmanager\TextMeasureCache.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\uimanager\bindingUtils.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\uimanager\PointerEventsProcessor.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\uimanager\SurfaceRegistryBinding.cpp" DisableSpecificWarnings="4715;%(DisableSpecificWarnings)" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\uimanager\UIManager.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\uimanager\UIManagerBinding.cpp" DisableSpecificWarnings="4389;4715;%(DisableSpecificWarnings)" />

package/codegen/NativePlatformConstantsAndroidSpec.g.h

@@ -29,6 +29,8 @@ REACT_STRUCT(PlatformConstantsAndroidSpec_Constants)
 struct PlatformConstantsAndroidSpec_Constants {
     REACT_FIELD(isTesting)
     bool isTesting;
+    REACT_FIELD(isDisableAnimations)
+    std::optional<bool> isDisableAnimations;
     REACT_FIELD(reactNativeVersion)
     PlatformConstantsAndroidSpec_Constants_reactNativeVersion reactNativeVersion;
     REACT_FIELD(Version)

package/codegen/NativePlatformConstantsIOSSpec.g.h

@@ -29,6 +29,8 @@ REACT_STRUCT(PlatformConstantsIOSSpec_Constants)
 struct PlatformConstantsIOSSpec_Constants {
     REACT_FIELD(isTesting)
     bool isTesting;
+    REACT_FIELD(isDisableAnimations)
+    std::optional<bool> isDisableAnimations;
     REACT_FIELD(reactNativeVersion)
     PlatformConstantsIOSSpec_Constants_reactNativeVersion reactNativeVersion;
     REACT_FIELD(forceTouchAvailable)

package/codegen/NativePlatformConstantsWinSpec.g.h

@@ -29,6 +29,8 @@ REACT_STRUCT(PlatformConstantsWinSpec_Constants)
 struct PlatformConstantsWinSpec_Constants {
     REACT_FIELD(isTesting)
     bool isTesting;
+    REACT_FIELD(isDisableAnimations)
+    std::optional<bool> isDisableAnimations;
     REACT_FIELD(reactNativeVersion)
     PlatformConstantsWinSpec_Constants_reactNativeVersion reactNativeVersion;
     REACT_FIELD(osVersion)