react-native-windows 0.74.0-preview.1 → 0.74.0-preview.2

package/Libraries/Components/View/ReactNativeStyleAttributes.js

@@ -144,6 +144,7 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
   borderTopLeftRadius: true,
   borderTopRightRadius: true,
   borderTopStartRadius: true,
+  cursor: true,
   opacity: true,
   pointerEvents: true,
 

package/Libraries/Core/ReactNativeVersion.js

@@ -17,7 +17,7 @@ const version: $ReadOnly<{
   major: 0,
   minor: 74,
   patch: 0,
-  prerelease: 'rc.0',
+  prerelease: 'rc.6',
 };
 
 module.exports = {version};

package/Libraries/Core/registerCallableModule.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+type Module = Object;
+type RegisterCallableModule = (
+  name: string,
+  moduleOrFactory: Module | (() => Module),
+) => void;
+
+export const registerCallableModule: RegisterCallableModule;

package/Libraries/Lists/FlatList.js

@@ -308,7 +308,6 @@ export type Props<ItemT> = {
  * Also inherits [ScrollView Props](docs/scrollview.html#props), unless it is nested in another FlatList of same orientation.
  */
 class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
-  props: Props<ItemT>;
   /**
    * Scrolls to the end of the content. May be janky without `getItemLayout` prop.
    */

package/Libraries/LogBox/Data/parseLogBoxLog.js

@@ -192,7 +192,7 @@ export function parseComponentStack(message: string): ComponentStack {
       if (!s) {
         return null;
       }
-      const match = s.match(/(.*) \(at (.*\.js):([\d]+)\)/);
+      const match = s.match(/(.*) \(at (.*\.(?:js|jsx|ts|tsx)):([\d]+)\)/);
       if (!match) {
         return null;
       }

package/Libraries/ReactNative/AppContainer-dev.js

@@ -20,7 +20,6 @@ import View from '../Components/View/View';
 import DebuggingOverlay from '../Debugging/DebuggingOverlay';
 import useSubscribeToDebuggingOverlayRegistry from '../Debugging/useSubscribeToDebuggingOverlayRegistry';
 import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
-import ReactDevToolsOverlay from '../Inspector/ReactDevToolsOverlay';
 import LogBoxNotificationContainer from '../LogBox/LogBoxNotificationContainer';
 import StyleSheet from '../StyleSheet/StyleSheet';
 import {RootTagContext, createRootTag} from './RootTag';
@@ -64,6 +63,26 @@ const InspectorDeferred = ({
   );
 };
 
+type ReactDevToolsOverlayDeferredProps = {
+  inspectedViewRef: InspectedViewRef,
+  reactDevToolsAgent: ReactDevToolsAgent,
+};
+
+const ReactDevToolsOverlayDeferred = ({
+  inspectedViewRef,
+  reactDevToolsAgent,
+}: ReactDevToolsOverlayDeferredProps) => {
+  const ReactDevToolsOverlay =
+    require('../Inspector/ReactDevToolsOverlay').default;
+
+  return (
+    <ReactDevToolsOverlay
+      inspectedViewRef={inspectedViewRef}
+      reactDevToolsAgent={reactDevToolsAgent}
+    />
+  );
+};
+
 const AppContainer = ({
   children,
   fabric,
@@ -155,7 +174,7 @@ const AppContainer = ({
         <DebuggingOverlay ref={debuggingOverlayRef} />
 
         {reactDevToolsAgent != null && (
-          <ReactDevToolsOverlay
+          <ReactDevToolsOverlayDeferred
             inspectedViewRef={innerViewRef}
             reactDevToolsAgent={reactDevToolsAgent}
           />

package/Libraries/StyleSheet/StyleSheetTypes.d.ts

@@ -27,6 +27,8 @@ export type DimensionValue =
 type AnimatableNumericValue = number | Animated.AnimatedNode;
 type AnimatableStringValue = string | Animated.AnimatedNode;
 
+export type CursorValue = 'auto' | 'pointer';
+
 /**
  * Flex Prop Types
  * @see https://reactnative.dev/docs/flexbox
@@ -274,6 +276,7 @@ export interface ViewStyle extends FlexStyle, ShadowStyleIOS, TransformsStyle {
    * Controls whether the View can be the target of touch events.
    */
   pointerEvents?: 'box-none' | 'none' | 'box-only' | 'auto' | undefined;
+  cursor?: CursorValue | undefined;
 }
 
 export type FontVariant =
@@ -403,4 +406,5 @@ export interface ImageStyle extends FlexStyle, ShadowStyleIOS, TransformsStyle {
   tintColor?: ColorValue | undefined;
   opacity?: AnimatableNumericValue | undefined;
   objectFit?: 'cover' | 'contain' | 'fill' | 'scale-down' | undefined;
+  cursor?: CursorValue | undefined;
 }

package/Libraries/StyleSheet/StyleSheetTypes.js

@@ -37,6 +37,8 @@ export type EdgeInsetsValue = {
 export type DimensionValue = number | string | 'auto' | AnimatedNode | null;
 export type AnimatableNumericValue = number | AnimatedNode;
 
+export type CursorValue = 'auto' | 'pointer';
+
 /**
  * React Native's layout system is based on Flexbox and is powered both
  * on iOS and Android by an open source project called `Yoga`:
@@ -729,6 +731,7 @@ export type ____ViewStyle_InternalCore = $ReadOnly<{
   opacity?: AnimatableNumericValue,
   elevation?: number,
   pointerEvents?: 'auto' | 'none' | 'box-none' | 'box-only',
+  cursor?: CursorValue,
 }>;
 
 export type ____ViewStyle_Internal = $ReadOnly<{

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.74.0-preview.1</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.74.0-preview.2</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>74</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>d4a7dc9eb62a9677f872d81e3285343822f848d7</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>5f10e604924b47b0baa64825d8770be4e3a074b1</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/codegen/react/components/rnwcore/ComponentDescriptors.h

@@ -21,7 +21,6 @@ using AndroidDrawerLayoutComponentDescriptor = ConcreteComponentDescriptor<Andro
 using AndroidHorizontalScrollContentViewComponentDescriptor = ConcreteComponentDescriptor<AndroidHorizontalScrollContentViewShadowNode>;
 using AndroidSwipeRefreshLayoutComponentDescriptor = ConcreteComponentDescriptor<AndroidSwipeRefreshLayoutShadowNode>;
 using DebuggingOverlayComponentDescriptor = ConcreteComponentDescriptor<DebuggingOverlayShadowNode>;
-using AndroidPopupMenuComponentDescriptor = ConcreteComponentDescriptor<AndroidPopupMenuShadowNode>;
 using PullToRefreshViewComponentDescriptor = ConcreteComponentDescriptor<PullToRefreshViewShadowNode>;
 using SwitchComponentDescriptor = ConcreteComponentDescriptor<SwitchShadowNode>;
 using UnimplementedNativeViewComponentDescriptor = ConcreteComponentDescriptor<UnimplementedNativeViewShadowNode>;

package/codegen/react/components/rnwcore/EventEmitters.cpp

@@ -71,15 +71,6 @@ $payload.setProperty(runtime, "target", $event.target);
 
 
 
-void AndroidPopupMenuEventEmitter::onSelectionChange(OnSelectionChange $event) const {
-  dispatchEvent("selectionChange", [$event=std::move($event)](jsi::Runtime &runtime) {
-    auto $payload = jsi::Object(runtime);
-    $payload.setProperty(runtime, "item", $event.item);
-    return $payload;
-  });
-}
-
-
 
 void PullToRefreshViewEventEmitter::onRefresh(OnRefresh $event) const {
   dispatchEvent("refresh", [](jsi::Runtime &runtime) {

package/codegen/react/components/rnwcore/EventEmitters.h

@@ -79,15 +79,6 @@ class DebuggingOverlayEventEmitter : public ViewEventEmitter {
 
   
   
-};
-class AndroidPopupMenuEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  struct OnSelectionChange {
-      int item;
-    };
-  void onSelectionChange(OnSelectionChange value) const;
 };
 class AndroidProgressBarEventEmitter : public ViewEventEmitter {
  public:

package/codegen/react/components/rnwcore/Props.cpp

@@ -76,13 +76,6 @@ DebuggingOverlayProps::DebuggingOverlayProps(
     const RawProps &rawProps): ViewProps(context, sourceProps, rawProps)
 
     
-      {}
-AndroidPopupMenuProps::AndroidPopupMenuProps(
-    const PropsParserContext &context,
-    const AndroidPopupMenuProps &sourceProps,
-    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
-
-    menuItems(convertRawProp(context, rawProps, "menuItems", sourceProps.menuItems, {}))
       {}
 AndroidProgressBarProps::AndroidProgressBarProps(
     const PropsParserContext &context,

package/codegen/react/components/rnwcore/Props.h

@@ -178,16 +178,6 @@ class DebuggingOverlayProps final : public ViewProps {
   
 };
 
-class AndroidPopupMenuProps final : public ViewProps {
- public:
-  AndroidPopupMenuProps() = default;
-  AndroidPopupMenuProps(const PropsParserContext& context, const AndroidPopupMenuProps &sourceProps, const RawProps &rawProps);
-
-#pragma mark - Props
-
-  std::vector<std::string> menuItems{};
-};
-
 class AndroidProgressBarProps final : public ViewProps {
  public:
   AndroidProgressBarProps() = default;

package/codegen/react/components/rnwcore/ShadowNodes.cpp

@@ -17,7 +17,6 @@ extern const char AndroidDrawerLayoutComponentName[] = "AndroidDrawerLayout";
 extern const char AndroidHorizontalScrollContentViewComponentName[] = "AndroidHorizontalScrollContentView";
 extern const char AndroidSwipeRefreshLayoutComponentName[] = "AndroidSwipeRefreshLayout";
 extern const char DebuggingOverlayComponentName[] = "DebuggingOverlay";
-extern const char AndroidPopupMenuComponentName[] = "AndroidPopupMenu";
 extern const char PullToRefreshViewComponentName[] = "PullToRefreshView";
 extern const char SwitchComponentName[] = "Switch";
 extern const char UnimplementedNativeViewComponentName[] = "UnimplementedNativeView";

package/codegen/react/components/rnwcore/ShadowNodes.h

@@ -73,17 +73,6 @@ using DebuggingOverlayShadowNode = ConcreteViewShadowNode<
     DebuggingOverlayEventEmitter,
     DebuggingOverlayState>;
 
-JSI_EXPORT extern const char AndroidPopupMenuComponentName[];
-
-/*
- * `ShadowNode` for <AndroidPopupMenu> component.
- */
-using AndroidPopupMenuShadowNode = ConcreteViewShadowNode<
-    AndroidPopupMenuComponentName,
-    AndroidPopupMenuProps,
-    AndroidPopupMenuEventEmitter,
-    AndroidPopupMenuState>;
-
 JSI_EXPORT extern const char PullToRefreshViewComponentName[];
 
 /*

package/codegen/react/components/rnwcore/States.h

@@ -91,21 +91,6 @@ public:
 #endif
 };
 
-class AndroidPopupMenuState {
-public:
-  AndroidPopupMenuState() = default;
-
-#ifdef ANDROID
-  AndroidPopupMenuState(AndroidPopupMenuState const &previousState, folly::dynamic data){};
-  folly::dynamic getDynamic() const {
-    return {};
-  };
-  MapBuffer getMapBuffer() const {
-    return MapBufferBuilder::EMPTY();
-  };
-#endif
-};
-
 class PullToRefreshViewState {
 public:
   PullToRefreshViewState() = default;

package/index.js

@@ -27,7 +27,6 @@ import typeof Clipboard from './Libraries/Components/Clipboard/Clipboard';
 import typeof DrawerLayoutAndroid from './Libraries/Components/DrawerAndroid/DrawerLayoutAndroid';
 import typeof Keyboard from './Libraries/Components/Keyboard/Keyboard';
 import typeof KeyboardAvoidingView from './Libraries/Components/Keyboard/KeyboardAvoidingView';
-import typeof PopupMenuAndroid from './Libraries/Components/PopupMenuAndroid/PopupMenuAndroid';
 import typeof Pressable from './Libraries/Components/Pressable/Pressable';
 import typeof ProgressBarAndroid from './Libraries/Components/ProgressBarAndroid/ProgressBarAndroid';
 import typeof RefreshControl from './Libraries/Components/RefreshControl/RefreshControl';
@@ -135,10 +134,6 @@ module.exports = {
     return require('./Libraries/Components/Keyboard/KeyboardAvoidingView')
       .default;
   },
-  get PopupMenuAndroid(): PopupMenuAndroid {
-    return require('./Libraries/Components/PopupMenuAndroid/PopupMenuAndroid')
-      .default;
-  },
   get Modal(): Modal {
     return require('./Libraries/Modal/Modal');
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.74.0-preview.1",
+  "version": "0.74.0-preview.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -23,18 +23,18 @@
   "dependencies": {
     "@babel/runtime": "^7.0.0",
     "@jest/create-cache-key-function": "^29.6.3",
-    "@react-native-community/cli": "13.6.0",
-    "@react-native-community/cli-platform-android": "13.6.0",
-    "@react-native-community/cli-platform-ios": "13.6.0",
-    "@react-native-windows/cli": "0.74.0-preview.1",
+    "@react-native-community/cli": "13.6.4",
+    "@react-native-community/cli-platform-android": "13.6.4",
+    "@react-native-community/cli-platform-ios": "13.6.4",
+    "@react-native-windows/cli": "0.74.0-preview.2",
     "@react-native/assets": "1.0.0",
-    "@react-native/assets-registry": "0.74.0",
-    "@react-native/codegen": "0.74.1",
-    "@react-native/community-cli-plugin": "0.74.1",
-    "@react-native/gradle-plugin": "0.74.1",
-    "@react-native/js-polyfills": "0.74.0",
-    "@react-native/normalize-colors": "0.74.1",
-    "@react-native/virtualized-lists": "0.74.1",
+    "@react-native/assets-registry": "0.74.77",
+    "@react-native/codegen": "0.74.77",
+    "@react-native/community-cli-plugin": "0.74.77",
+    "@react-native/gradle-plugin": "0.74.77",
+    "@react-native/js-polyfills": "0.74.77",
+    "@react-native/normalize-colors": "0.74.77",
+    "@react-native/virtualized-lists": "0.74.77",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -65,7 +65,7 @@
   },
   "devDependencies": {
     "@react-native-windows/codegen": "0.74.0-preview.1",
-    "@react-native/metro-config": "0.74.1",
+    "@react-native/metro-config": "0.74.77",
     "@rnw-scripts/babel-react-native-config": "0.0.0",
     "@rnw-scripts/eslint-config": "1.2.9",
     "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.13",
@@ -81,14 +81,15 @@
     "just-scripts": "^1.3.3",
     "prettier": "2.8.8",
     "react": "18.2.0",
-    "react-native": "0.74.0-rc.0",
+    "react-native": "0.74.0-rc.6",
     "react-native-platform-override": "^1.9.25",
     "react-refresh": "^0.14.0",
     "typescript": "5.0.4"
   },
   "peerDependencies": {
+    "@types/react": "^18.2.6",
     "react": "18.2.0",
-    "react-native": "0.74.0-rc.0"
+    "react-native": "0.74.0-rc.6"
   },
   "beachball": {
     "defaultNpmTag": "preview",

package/types/index.d.ts

@@ -103,6 +103,7 @@ export * from '../Libraries/Components/View/View';
 export * from '../Libraries/Components/View/ViewAccessibility';
 export * from '../Libraries/Components/View/ViewPropTypes';
 export * from '../Libraries/Components/Button';
+export * from '../Libraries/Core/registerCallableModule';
 export * from '../Libraries/DevToolsSettings/DevToolsSettingsManager';
 export * from '../Libraries/EventEmitter/NativeEventEmitter';
 export * from '../Libraries/EventEmitter/RCTDeviceEventEmitter';

package/Libraries/Components/PopupMenuAndroid/PopupMenuAndroid.android.js

@@ -1,69 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow strict-local
- */
-
-import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
-import type {SyntheticEvent} from '../../Types/CoreEventTypes';
-import type {RefObject} from 'react';
-
-import PopupMenuAndroidNativeComponent, {
-  Commands,
-} from './PopupMenuAndroidNativeComponent';
-import nullthrows from 'nullthrows';
-import * as React from 'react';
-import {useCallback, useImperativeHandle, useRef} from 'react';
-
-type PopupMenuSelectionEvent = SyntheticEvent<
-  $ReadOnly<{
-    item: number,
-  }>,
->;
-
-export type PopupMenuAndroidInstance = {
-  +show: () => void,
-};
-
-type Props = {
-  menuItems: $ReadOnlyArray<string>,
-  onSelectionChange: number => void,
-  children: React.Node,
-  instanceRef: RefObject<?PopupMenuAndroidInstance>,
-};
-
-export default function PopupMenuAndroid({
-  menuItems,
-  onSelectionChange,
-  children,
-  instanceRef,
-}: Props): React.Node {
-  const nativeRef = useRef<React.ElementRef<HostComponent<mixed>> | null>(null);
-  const _onSelectionChange = useCallback(
-    (event: PopupMenuSelectionEvent) => {
-      onSelectionChange(event.nativeEvent.item);
-    },
-    [onSelectionChange],
-  );
-
-  useImperativeHandle(instanceRef, ItemViewabilityInstance => {
-    return {
-      show() {
-        Commands.show(nullthrows(nativeRef.current));
-      },
-    };
-  });
-
-  return (
-    <PopupMenuAndroidNativeComponent
-      ref={nativeRef}
-      onSelectionChange={_onSelectionChange}
-      menuItems={menuItems}>
-      {children}
-    </PopupMenuAndroidNativeComponent>
-  );
-}

package/Libraries/Components/PopupMenuAndroid/PopupMenuAndroid.d.ts

@@ -1,24 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-import type * as React from 'react';
-import {HostComponent} from '../../../types/public/ReactNativeTypes';
-
-type PopupMenuAndroidInstance = {
-  show: () => void;
-};
-
-type Props = {
-  menuItems: Array<string>;
-  onSelectionChange: (number) => void;
-  children: React.ReactNode | undefined;
-  instanceRef: React.ElementRef<HostComponent<PopupMenuAndroidInstance>>;
-};
-
-declare class PopupMenuAndroid extends React.Component<Props> {}

package/Libraries/Components/PopupMenuAndroid/PopupMenuAndroid.js

@@ -1,33 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow strict-local
- */
-
-import type {RefObject} from 'react';
-import type {Node} from 'react';
-
-import * as React from 'react';
-
-const UnimplementedView = require('../UnimplementedViews/UnimplementedView');
-
-export type PopupMenuAndroidInstance = {
-  +show: () => void,
-};
-
-type Props = {
-  menuItems: $ReadOnlyArray<string>,
-  onSelectionChange: number => void,
-  children: Node,
-  instanceRef: RefObject<?PopupMenuAndroidInstance>,
-};
-
-function PopupMenuAndroid(props: Props): Node {
-  return <UnimplementedView />;
-}
-
-export default PopupMenuAndroid;

package/Libraries/Components/PopupMenuAndroid/PopupMenuAndroidNativeComponent.js

@@ -1,13 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow strict-local
- */
-
-export * from '../../../src/private/specs/components/PopupMenuAndroidNativeComponent';
-import PopupMenuAndroidNativeComponent from '../../../src/private/specs/components/PopupMenuAndroidNativeComponent';
-export default PopupMenuAndroidNativeComponent;

package/src/private/specs/components/PopupMenuAndroidNativeComponent.js

@@ -1,47 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict-local
- * @format
- */
-
-import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes';
-import type {HostComponent} from '../../../../Libraries/Renderer/shims/ReactNativeTypes';
-import type {
-  DirectEventHandler,
-  Int32,
-} from '../../../../Libraries/Types/CodegenTypes';
-
-import codegenNativeCommands from '../../../../Libraries/Utilities/codegenNativeCommands';
-import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
-import * as React from 'react';
-
-type PopupMenuSelectionEvent = $ReadOnly<{
-  item: Int32,
-}>;
-
-type NativeProps = $ReadOnly<{
-  ...ViewProps,
-
-  //Props
-  menuItems?: ?$ReadOnlyArray<string>,
-
-  onSelectionChange?: DirectEventHandler<PopupMenuSelectionEvent>,
-}>;
-
-type ComponentType = HostComponent<NativeProps>;
-
-interface NativeCommands {
-  +show: (viewRef: React.ElementRef<ComponentType>) => void;
-}
-
-export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
-  supportedCommands: ['show'],
-});
-
-export default (codegenNativeComponent<NativeProps>(
-  'AndroidPopupMenu',
-): HostComponent<NativeProps>);