Skip to content

fix(macos): guard iOS-only methods in RCTViewComponentView.mm so the file compiles on macOS #2962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tvinhas wants to merge 1 commit into
base: 0.83-merge
Choose a base branch
from
Open

fix(macos): guard iOS-only methods in RCTViewComponentView.mm so the file compiles on macOS #2962

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ - (RCTPlatformView *)betterHitTest:(CGPoint)point withEvent:(UIEvent *)event //

BOOL isPointInside = [self pointInside:point withEvent:event];

UIView *currentContainerView = self.currentContainerView;
RCTPlatformView *currentContainerView = self.currentContainerView; // [macOS]

BOOL clipsToBounds = false;

Expand Down Expand Up @@ -1045,8 +1045,18 @@ - (BOOL)styleWouldClipOverflowInk
// `blur` applied, we need to wrap it in a SwiftUI view to render the effect.
// In this case, `effectiveContentView` will be the content view inside the
// SwiftUI wrapper.
- (UIView *)effectiveContentView
//
// macOS: SwiftUI-filter wrapping isn't yet ported (the wrapper assumes
// UIKit's `UIView` / `RCTSwiftUIContainerViewWrapper` UIKit surface), so
// the macOS path short-circuits to `return self`. When the SwiftUI port
// lands for AppKit, gate the body on `enableSwiftUIBasedFilters()` &&
// !TARGET_OS_OSX. Return type is `RCTPlatformView*` so the macOS caller
// at currentContainerView compiles. [macOS]
- (RCTPlatformView *)effectiveContentView // [macOS]
{
#if TARGET_OS_OSX // [macOS
return self;
#else // macOS]
if (!ReactNativeFeatureFlags::enableSwiftUIBasedFilters()) {
return self;
}
Expand Down Expand Up @@ -1089,14 +1099,15 @@ - (UIView *)effectiveContentView
}

return effectiveContentView;
#endif // [macOS]
}

// This UIView is the UIView that holds all subviews. It is sometimes not self
// because we want to render "overflow ink" that extends beyond the bounds of
// the view and is not affected by clipping.
- (RCTUIView *)currentContainerView // [macOS]
{
UIView *effectiveContentView = self.effectiveContentView;
RCTPlatformView *effectiveContentView = self.effectiveContentView; // [macOS]

if (_useCustomContainerView) {
if (!_containerView) {
Expand Down Expand Up @@ -1357,7 +1368,7 @@ - (void)invalidateLayer
if (primitive.type == FilterType::DropShadow) {
if (_swiftUIWrapper != nullptr && std::holds_alternative<DropShadowParams>(primitive.parameters)) {
const auto &dropShadowParams = std::get<DropShadowParams>(primitive.parameters);
UIColor *shadowColor = RCTUIColorFromSharedColor(dropShadowParams.color);
RCTUIColor *shadowColor = RCTUIColorFromSharedColor(dropShadowParams.color); // [macOS]
[_swiftUIWrapper updateDropShadow:@(dropShadowParams.standardDeviation)
x:@(dropShadowParams.offsetX)
y:@(dropShadowParams.offsetY)
Expand Down Expand Up @@ -2409,6 +2420,17 @@ - (BOOL)styleNeedsSwiftUIContainer
return NO;
}

#if !TARGET_OS_OSX // [macOS]
// The block below is iOS-specific: SwiftUI-filter wrapping
// (`transferVisualPropertiesFromView:`), `UIResponder` overrides
// (`canBecomeFirstResponder`, `focus`, `blur`, `becomeFirstResponder`,
// `resignFirstResponder`) and the `handleCommand:` shim that forwards into
// them. The macOS branch above (between `#if TARGET_OS_OSX` at line 1846
// and `#endif // macOS]` at line 2381) provides AppKit-flavored equivalents
// for `focus`, `blur`, and the responder methods; SwiftUI-filter wrapping is
// not yet ported to macOS (see `effectiveContentView` above, which short-
// circuits on macOS). Without this guard the iOS code below is a duplicate
// declaration on the macOS compile and uses unknown type `UIView`. [macOS]
- (void)transferVisualPropertiesFromView:(UIView *)sourceView toView:(UIView *)destinationView
{
// shadow
Expand Down Expand Up @@ -2512,6 +2534,7 @@ - (BOOL)resignFirstResponder

return YES;
}
#endif // [macOS]

@end

Expand Down