Skip to content

[Fabric] Convert UISwitch to RCTSwitch shim #1527

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 8 commits into from
Dec 9, 2022
Merged

[Fabric] Convert UISwitch to RCTSwitch shim #1527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9ea1f9f
[Fabric] Replace UIKit with RCTUIKit
Nov 22, 2022
2d27e1c
[Fabric] Convert UISwitch to RCTSwitch shim
Nov 29, 2022
62b8708
Merge remote-tracking branch 'microsoft/main' into fabric/rctswitch-s…
Nov 30, 2022
46756a1
Add macOS tags
Nov 30, 2022
97d2d40
Merge remote-tracking branch 'microsoft/main' into fabric/rctswitch-s…
Dec 7, 2022
66ca26a
Merge remote-tracking branch 'microsoft/main' into fabric/rctswitch-s…
Dec 8, 2022
a7e7751
Shim RCUISwitch
Dec 9, 2022
45dd0f7
Merge remote-tracking branch 'microsoft/main' into fabric/rctswitch-s…
Dec 9, 2022
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
9 changes: 9 additions & 0 deletions React/Base/RCTUIKit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,3 +479,12 @@ NS_INLINE CGRect CGRectValue(NSValue *value)
@interface RCTUISlider : NSSlider
@end
#endif // ]TODO(macOS GH#774)

// RCTUISwitch

#if !TARGET_OS_OSX // [TODO(macOS GH#774)
#define RCTUISwitch UISwitch
#else
@interface RCTUISwitch : NSSwitch
@end
#endif // ]TODO(macOS GH#774)
6 changes: 3 additions & 3 deletions React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ @interface RCTSwitchComponentView () <RCTSwitchViewProtocol>
@end

@implementation RCTSwitchComponentView {
UISwitch *_switchView;
RCTUISwitch *_switchView; // TODO(macOS GH#774)
BOOL _isInitialValueSet;
}

Expand All @@ -32,7 +32,7 @@ - (instancetype)initWithFrame:(CGRect)frame
static const auto defaultProps = std::make_shared<const SwitchProps>();
_props = defaultProps;

_switchView = [[UISwitch alloc] initWithFrame:self.bounds];
_switchView = [[RCTUISwitch alloc] initWithFrame:self.bounds]; // TODO(macOS GH#774)

[_switchView addTarget:self action:@selector(onChange:) forControlEvents:UIControlEventValueChanged];

Expand Down Expand Up @@ -90,7 +90,7 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
[super updateProps:props oldProps:oldProps];
}

- (void)onChange:(UISwitch *)sender
- (void)onChange:(RCTUISwitch *)sender // TODO(macOS GH#774)
{
const auto &props = *std::static_pointer_cast<const SwitchProps>(_props);
if (props.value == sender.on) {
Expand Down