Skip to content

Conversation

Saadnajmi
Copy link
Collaborator

Please select one of the following

  • I am removing an existing difference between facebook/react-native and microsoft/react-native-macos 👍
  • I am cherry-picking a change from Facebook's react-native into microsoft/react-native-macos 👍
  • 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

Summary

This came up while resolving conflicts in the 0.71 merge.
Move a typedef associated with UIImage to the macOS part of RCTUIKit. Once done, we can remove a #if !TARGET_OS_OSX if/else block, since #import <React/RCTUIKit.h> will bring in either Appkit or UIKit based on the platform.

Changelog

[macOS] [Changed] - Move typdef from RCTImageView -> RCTUIKit

Test Plan

CI should pass

@Saadnajmi Saadnajmi added this to the 0.71 milestone Jan 4, 2023
@Saadnajmi Saadnajmi requested a review from a team as a code owner January 4, 2023 18:38
@analysis-bot
Copy link

Platform Engine Arch Size (bytes) Diff
ios - universal n/a --

Base commit: 2217ea4
Branch: main

@Saadnajmi Saadnajmi merged commit 4ce83a6 into microsoft:main Jan 5, 2023
@Saadnajmi Saadnajmi deleted the imageview branch January 15, 2023 23:46
@Saadnajmi Saadnajmi self-assigned this Jan 16, 2023
shwanton pushed a commit to shwanton/react-native-macos that referenced this pull request Feb 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants