Skip to content

Conversation

tom-un
Copy link
Collaborator

@tom-un tom-un commented Mar 7, 2020

Please select one of the following

  • I am removing an existing difference between facebook/react-native and microsoft/react-native 👍
  • I am cherry-picking a change from Facebook's react-native into microsoft/react-native 👍
  • I am making a fix / change for the macOS implementation of react-native
  • I am making a change required for Microsoft usage of react-native

Since the last merge from upstream to the fork two manual merge errors impacted macOS:

  • In RCTImageView.m the macOS version of the _imageView ivar was not being initialized breaking <Image> components.
  • In react-native-implementation.macos.js the ActionSheetIOS component was not being exposed. Although named ActionSheetIOS in the fork it creates NSMenu popups for macOS and UIAlertControllers for iOS.

Since iOS 13 the RCTKeyWindow() function is broken in apps that use UIScene's for multi window support. It also breaks RCTRedBox. If an app that uses UIScene's (like Office apps) show an RCTRedBox error message, the red box window is invisible. Then if a ActionSheetIOS presents a UIAlertController it is presented on the invisible Red Box windows making the action sheet or alert invisible. Cherry pick the upstream fix facebook#28147. Future merges into this fork from upstream will get the more comprehensive UIScene support that started with facebook#28058.

Focus areas to test

The Image test in RNTester was used to verify that components is restored. UIScene support was tested by manually integrating this branch into Office.

Microsoft Reviewers: Open in CodeFlow

tom-un added 2 commits March 5, 2020 21:38
Cherry pick facebook#28147 into fork to Make RCTKeyWindow multi-window aware and add UIScene support to RCTRedBox.
@tom-un tom-un requested review from HeyImChris and acoates-ms March 7, 2020 00:12
…in thread as the RCTRedBox can be dealloc'd on a background thread
@tom-un tom-un merged commit 8214368 into microsoft:master Mar 7, 2020
@tom-un tom-un deleted the tomun/imageview branch May 8, 2020 21:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants