From eeb8266988c73e48d8c9ce9e8f6450ec0e3f98a7 Mon Sep 17 00:00:00 2001 From: Nick Trescases Date: Mon, 11 Oct 2021 15:55:29 -0700 Subject: [PATCH 1/2] Remove deprecated/unused context param --- React/Base/RCTTouchHandler.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/React/Base/RCTTouchHandler.m b/React/Base/RCTTouchHandler.m index 74fe10cba34c5f..f6b23e9c5695db 100644 --- a/React/Base/RCTTouchHandler.m +++ b/React/Base/RCTTouchHandler.m @@ -483,7 +483,7 @@ - (void)mouseDown:(NSEvent *)event modifierFlags:[event modifierFlags] timestamp:[event timestamp] windowNumber:[event windowNumber] - context:[event context] + context:nil eventNumber:[event eventNumber] clickCount:[event clickCount] pressure:[event pressure]]; From 347af73dd8ff5a658aaf46791e3b580c5fcfb113 Mon Sep 17 00:00:00 2001 From: Nick Trescases Date: Tue, 12 Oct 2021 10:48:44 -0700 Subject: [PATCH 2/2] Update a few Mac deprecated APIs --- React/Base/macOS/RCTPlatformDisplayLink.m | 12 ++++++------ React/Views/RCTActivityIndicatorView.m | 4 ++-- React/Views/RCTProgressViewManager.m | 6 +++--- React/Views/RCTSlider.m | 2 +- React/Views/RCTSwitch.m | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/React/Base/macOS/RCTPlatformDisplayLink.m b/React/Base/macOS/RCTPlatformDisplayLink.m index ff51cdceb16744..8e8ebfc45e917b 100644 --- a/React/Base/macOS/RCTPlatformDisplayLink.m +++ b/React/Base/macOS/RCTPlatformDisplayLink.m @@ -15,7 +15,7 @@ #import #import -#import +#import @interface RCTPlatformDisplayLink () @@ -30,7 +30,7 @@ @implementation RCTPlatformDisplayLink __weak id _target; NSRunLoop *_runLoop; NSMutableArray *_modes; - OSSpinLock _lock; // OS_SPINLOCK_INIT == 0 + os_unfair_lock _lock; // OS_UNFAIR_LOCK_INIT == 0 } + (RCTPlatformDisplayLink *)displayLinkWithTarget:(id)target selector:(SEL)sel @@ -47,7 +47,7 @@ static CVReturn RCTPlatformDisplayLinkCallBack(__unused CVDisplayLinkRef display RCTPlatformDisplayLink *rctDisplayLink = (__bridge RCTPlatformDisplayLink*)displayLinkContext; // Lock and check for invalidation prior to calling out to the runloop - OSSpinLockLock(&rctDisplayLink->_lock); + os_unfair_lock_lock(&rctDisplayLink->_lock); if (rctDisplayLink->_runLoop != nil) { CFRunLoopRef cfRunLoop = [rctDisplayLink->_runLoop getCFRunLoop]; CFRunLoopPerformBlock(cfRunLoop, kCFRunLoopDefaultMode, ^{ @@ -55,7 +55,7 @@ static CVReturn RCTPlatformDisplayLinkCallBack(__unused CVDisplayLinkRef display }); CFRunLoopWakeUp(cfRunLoop); } - OSSpinLockUnlock(&rctDisplayLink->_lock); + os_unfair_lock_unlock(&rctDisplayLink->_lock); } return kCVReturnSuccess; } @@ -98,10 +98,10 @@ - (void)removeFromRunLoop:(__unused NSRunLoop *)runloop forMode:(NSRunLoopMode)m - (void)invalidate { if (_runLoop != nil) { - OSSpinLockLock(&_lock); + os_unfair_lock_lock(&_lock); _runLoop = nil; _modes = nil; - OSSpinLockUnlock(&_lock); + os_unfair_lock_unlock(&_lock); // CVDisplayLinkStop attempts to acquire a mutex possibly held during the callback's invocation. // Stop the display link outside of the lock to avoid deadlocking here. diff --git a/React/Views/RCTActivityIndicatorView.m b/React/Views/RCTActivityIndicatorView.m index 0305458737e8f6..4b4a8bbf7bf710 100644 --- a/React/Views/RCTActivityIndicatorView.m +++ b/React/Views/RCTActivityIndicatorView.m @@ -23,7 +23,7 @@ - (instancetype)initWithFrame:(CGRect)frame { if ((self = [super initWithFrame:frame])) { self.displayedWhenStopped = NO; - self.style = NSProgressIndicatorSpinningStyle; + self.style = NSProgressIndicatorStyleSpinning; } return self; } @@ -82,7 +82,7 @@ - (void)updateLayer [super updateLayer]; if (_color != nil) { CGFloat r, g, b, a; - [[_color colorUsingColorSpaceName:NSCalibratedRGBColorSpace] getRed:&r green:&g blue:&b alpha:&a]; + [[_color colorUsingColorSpace:[NSColorSpace genericRGBColorSpace]] getRed:&r green:&g blue:&b alpha:&a]; CIFilter *colorPoly = [CIFilter filterWithName:@"CIColorPolynomial"]; [colorPoly setDefaults]; diff --git a/React/Views/RCTProgressViewManager.m b/React/Views/RCTProgressViewManager.m index dd802c059a5b6e..d732342940aaa4 100644 --- a/React/Views/RCTProgressViewManager.m +++ b/React/Views/RCTProgressViewManager.m @@ -14,9 +14,9 @@ @implementation RCTConvert (RCTProgressViewManager) #if TARGET_OS_OSX // [TODO(macOS GH#774) RCT_ENUM_CONVERTER(NSProgressIndicatorStyle, (@{ - @"default": @(NSProgressIndicatorBarStyle), - @"bar": @(NSProgressIndicatorBarStyle), -}), NSProgressIndicatorBarStyle, integerValue) + @"default": @(NSProgressIndicatorStyleBar), + @"bar": @(NSProgressIndicatorStyleBar), +}), NSProgressIndicatorStyleBar, integerValue) #else // ]TODO(macOS GH#774) RCT_ENUM_CONVERTER( UIProgressViewStyle, diff --git a/React/Views/RCTSlider.m b/React/Views/RCTSlider.m index cb11a7a28673c4..7c5b1f655386b5 100644 --- a/React/Views/RCTSlider.m +++ b/React/Views/RCTSlider.m @@ -126,7 +126,7 @@ @implementation RCTSlider { - (instancetype)initWithFrame:(NSRect)frameRect { if (self = [super initWithFrame:frameRect]) { - self.cell.controlSize = NSRegularControlSize; + self.cell.controlSize = NSControlSizeRegular; ((RCTSliderCell*)self.cell).delegate = self; } return self; diff --git a/React/Views/RCTSwitch.m b/React/Views/RCTSwitch.m index 2bbb711b0b9827..056f8066090bcc 100644 --- a/React/Views/RCTSwitch.m +++ b/React/Views/RCTSwitch.m @@ -19,7 +19,7 @@ @implementation RCTSwitch - (instancetype)initWithFrame:(CGRect)frame { if ((self = [super initWithFrame:frame])) { - self.buttonType = NSSwitchButton; + self.buttonType = NSButtonTypeSwitch; self.title = @""; // default is "Button" } return self; @@ -34,7 +34,7 @@ - (void)setOn:(BOOL)on animated:(BOOL)animated } #else // [TODO(macOS GH#774) - (void)setOn:(BOOL)on animated:(BOOL)animated { - self.state = on ? NSOnState : NSOffState; + self.state = on ? NSControlStateValueOn : NSControlStateValueOff; } #endif // ]TODO(macOS GH#774) @@ -42,12 +42,12 @@ - (void)setOn:(BOOL)on animated:(BOOL)animated { - (BOOL)on { - return self.state == NSOnState; + return self.state == NSControlStateValueOn; } - (void)setOn:(BOOL)on { - self.state = on ? NSOnState : NSOffState; + self.state = on ? NSControlStateValueOn : NSControlStateValueOff; } #endif // ]TODO(macOS GH#774)