You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Merge up to upstream's 0.74.5 release
## Summary:
Initial Merge Conflicts:
```
both modified: package.json
both modified: packages/react-native-test-renderer/package.json
both modified: packages/react-native/Libraries/AppDelegate/RCTAppDelegate.h
both modified: packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
both modified: packages/react-native/Libraries/Components/View/ReactNativeStyleAttributes.js
both modified: packages/react-native/Libraries/Image/RCTImageLoader.mm
both modified: packages/react-native/Libraries/StyleSheet/StyleSheetTypes.d.ts
both modified: packages/react-native/Libraries/StyleSheet/StyleSheetTypes.js
both modified: packages/react-native/Libraries/Text/React-RCTText.podspec
both modified: packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm
both modified: packages/react-native/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h
both modified: packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm
both modified: packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap
both modified: packages/react-native/React/Base/RCTConvert.h
both modified: packages/react-native/React/CoreModules/RCTDevSettings.mm
both modified: packages/react-native/React/CoreModules/RCTDeviceInfo.mm
both modified: packages/react-native/React/Modules/RCTUIManager.m
both added: packages/react-native/React/Views/RCTCursor.h
both modified: packages/react-native/React/Views/RCTView.h
both modified: packages/react-native/React/Views/RCTView.m
both modified: packages/react-native/React/Views/RCTViewManager.m
both modified: packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.cpp
both modified: packages/react-native/ReactCommon/react/renderer/components/view/primitives.h
both modified: packages/react-native/package.json
both modified: packages/react-native/template/package.json
both modified: packages/rn-tester/Podfile.lock
both modified: packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
both added: packages/rn-tester/js/examples/Cursor/CursorExample.js
both modified: packages/rn-tester/package.json
both modified: packages/virtualized-lists/package.json
deleted by them: scripts/releases-ci/prepare-package-for-release.js
both modified: scripts/releases-ci/publish-npm.js
both modified: yarn.lock
```
Followup fixes in other files:
```
modified: ../react-native/Libraries/AppDelegate/RCTRootViewFactory.h
modified: ../react-native/Libraries/AppDelegate/RCTRootViewFactory.mm
modified: ../react-native/React/Base/RCTConvert.mm
modified: ../react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
modified: ../react-native/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.mm
modified: ../react-native/React/Fabric/Mounting/RCTComponentViewProtocol.h
modified: ../react-native/ReactCommon/react/renderer/components/view/BaseViewProps.h
modified: ../react-native/ReactCommon/react/renderer/components/view/conversions.h
```
## Test Plan:
CI should pass
0 commit comments