Skip to content

[Fabric] Shim RCTFabricModalHostViewControllerDelegate #1671

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

Merged
merged 3 commits into from
Jan 24, 2023
Merged

[Fabric] Shim RCTFabricModalHostViewControllerDelegate #1671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc2e0dd
[Fabric] Shim RCTFabricModalHostViewControllerDelegate
Jan 20, 2023
fed36ac
whitespace
Jan 21, 2023
f3f496a
Fix bad merge
Jan 21, 2023
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
2 changes: 2 additions & 0 deletions React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

@property (nonatomic, weak) id<RCTFabricModalHostViewControllerDelegate> delegate;

#if !TARGET_OS_OSX // [macOS]
@property (nonatomic, assign) UIInterfaceOrientationMask supportedInterfaceOrientations;
#endif // [macOS]

@end
2 changes: 2 additions & 0 deletions React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ - (instancetype)init
return self;
}

#if !TARGET_OS_OSX // [macOS]
- (void)viewDidLayoutSubviews
{
[super viewDidLayoutSubviews];
Expand Down Expand Up @@ -81,5 +82,6 @@ - (UIInterfaceOrientationMask)supportedInterfaceOrientations
return _supportedInterfaceOrientations;
}
#endif // RCT_DEV
#endif // [macOS]

@end
6 changes: 4 additions & 2 deletions React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@ - (BOOL)canBecomeFirstResponder
return paragraphProps.isSelectable;
}

#if !TARGET_OS_OSX // [macOS]
- (BOOL)canPerformAction:(SEL)action withSender:(id)sender
{
auto const &paragraphProps = *std::static_pointer_cast<ParagraphProps const>(_props);
Expand All @@ -277,9 +276,12 @@ - (BOOL)canPerformAction:(SEL)action withSender:(id)sender
return YES;
}

#if !TARGET_OS_OSX // [macOS]
return [self.nextResponder canPerformAction:action withSender:sender];
#else // [macOS
return NO;
#endif // macOS]
}
#endif // [macOS]

- (void)copy:(id)sender
{
Expand Down