From 6f008d6fc14a0c70f911453fea2eb50af3bb93a3 Mon Sep 17 00:00:00 2001 From: HeyImChris <48299693+HeyImChris@users.noreply.github.com> Date: Wed, 3 Feb 2021 14:18:46 -0800 Subject: [PATCH 1/4] Add nullability checks (#704) * Update RCTCxxBridge.mm * add nullability checks --- RNTester/Podfile.lock | 56 ++++++++++++++++----------------- React/Base/RCTJSInvokerModule.h | 2 +- React/Modules/RCTEventEmitter.h | 10 +++--- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index 2424c5004e5da3..ab4376909d1fc3 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -519,8 +519,8 @@ SPEC CHECKSUMS: CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f DoubleConversion: 56a44bcfd14ab2ff66f5a146b2e875eb4b69b19b - FBLazyVector: b3ff0841fe404f6d35d321bdd7e2971a101ba057 - FBReactNativeSpec: 4e08b13d0b49f20e96adf7e77ca546142ec2aafd + FBLazyVector: 7052b1143402396d305bca87b93912a92ab9f658 + FBReactNativeSpec: 9cc71ea1f039e0b4e1aa78d2cafe7f8004431121 Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3 @@ -533,34 +533,34 @@ SPEC CHECKSUMS: libevent: ee9265726a1fc599dea382964fa304378affaa5f OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 RCT-Folly: 1347093ffe75e152d846f7e45a3ef901b60021aa - RCTRequired: 5b6e3555bf3e4de31f5f9eec6765cb1e1c3f8588 - RCTTypeSafety: 433a5f0c42cffe0dce22d296be466b85134df89a - React: 76089aa2c64e9b8e68d800212aa8aeb29cfe6261 - React-ART: 222b1fab73ae6557fc5d574674edcc3188efb18d - React-callinvoker: ff08dfe52b3a0dc610a79a03e0f6c3e3f10e125c - React-Core: 81b5173e8855498a15a78e42aba1b699221f9b3e - React-CoreModules: 8ab2d55539bde7272ff41a15648c240577756647 - React-cxxreact: 698bc21b02495b901d09fb6925fb7e6520de0238 - React-jsi: a709fa4ff7117075b50ae4616a0866ae9bf6d0d5 - React-jsiexecutor: 3ff187bf23493fec692716a6641dc4a6fc5841ca - React-jsinspector: 551b5d3465e34674a0f77f9928bd400618ac0e61 - React-RCTActionSheet: 9ca162527c21bcff421a35e0e2673e0f5b9816dc - React-RCTAnimation: 649bca7ad18ce605f8c83cad39e24460133c2c7e - React-RCTBlob: ef322dcc9ff4e0432779c7c0bd0b1e538e454ef0 - React-RCTImage: aecac3315930fd44fe728eca2fd2239e7248f27d - React-RCTLinking: 4e894cb3edcac66b38b62728de5848023e044dc7 - React-RCTNetwork: 5aff7081f53f84c066e2fab498c663a3c874862b - React-RCTPushNotification: 9f7935165abe702411d378e3a4ce4576421328ce - React-RCTSettings: f12d385d733dc01db6b61b416dfb0a1876f15527 - React-RCTTest: 26f1ccd3a6de79722aadeb3abacbdcf245cf9ed6 - React-RCTText: 711cd763e14ff8718466a3b492c169b94ddc37ae - React-RCTVibration: 3b52dde3beeab10ca475e61a8016d38290019901 + RCTRequired: 21cb0123c813b395aba4436e18786eed8e9964d7 + RCTTypeSafety: 8dd1d97bbdeebd72eff9caec60baab7a60da19c7 + React: 9bdea7aab7b16e6006a13793757bb847164e50a0 + React-ART: fc6a2121a18ee07757e74f3ad08af8515c84a5ca + React-callinvoker: ec8eb81378a5afd25a4b33540b6f6613b69e322c + React-Core: 577132c3964b6bfc135a8a26d7cff6deb2d095d7 + React-CoreModules: d86c18192d9a3309d2d6ed2f51b615a85ec4e2ff + React-cxxreact: 8f11dbbc3981c4e1a75c563f67a923e0b9acef00 + React-jsi: fad59c093331f8ac8a1a4831599a277a5e709ed1 + React-jsiexecutor: fe2fe79101b11650d45b5b2b437f0d2d74a917a2 + React-jsinspector: f66631a327b51f5b9888bf94f1766868796c34d3 + React-RCTActionSheet: 1693829d61a2aab77629e443ee87168eaddd8a93 + React-RCTAnimation: 3d6995b7346b0ce380d9d1b1548fa6402e174875 + React-RCTBlob: a4ab9a02b6fe3e2177a1052eeebcbd68f7b08c10 + React-RCTImage: 6b311e583ac6865eb575c3617b8490fced70f340 + React-RCTLinking: 10ddfb7da728c5ae9b7a3aed9fa6c72255c265c0 + React-RCTNetwork: 60625519957d31ff17d452a62ed9e5685df719b4 + React-RCTPushNotification: e8089d7a5bcf1d63d5fed9db5b7a2ae5ff172774 + React-RCTSettings: 01080c727da6621d5506db3f23b5a8329c116e0c + React-RCTTest: eda8121aa1bf93b77182d00a361ecaa5e42e080e + React-RCTText: b6c32e44c1a966351ac67d60b1c2a6e3eb6e7949 + React-RCTVibration: 4514a04385da9a3f68eafeba1592abb0d2a94c5a React-TurboModuleCxx-RNW: 4da8eb44b10ab3c5bbab9fcb0a8ae415c20ea3c9 - React-TurboModuleCxx-WinRTPort: c7886867a28587fa55b5cc97f08a7e2acd30d842 - ReactCommon: 9ff853e68f82140864b99aa9094369d36c8d7b21 - Yoga: 620d1137a9da2515a80f96371b5485a9388d575f + React-TurboModuleCxx-WinRTPort: 342d6ea717f0792f21e82baef8d69bb79ae07bd8 + ReactCommon: 0102192eca32ab4ff3860aadfb2e576421fd060b + Yoga: 66378e7fe59400a26aa74fbd7d7329ea36314318 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 18ca7d3b0e7db79041574a8bb6200b9e1c2d5359 -COCOAPODS: 1.9.1 \ No newline at end of file +COCOAPODS: 1.9.1 diff --git a/React/Base/RCTJSInvokerModule.h b/React/Base/RCTJSInvokerModule.h index a0cbfbeacdc16a..ad16accd7e3ff4 100644 --- a/React/Base/RCTJSInvokerModule.h +++ b/React/Base/RCTJSInvokerModule.h @@ -11,6 +11,6 @@ */ @protocol RCTJSInvokerModule -@property (nonatomic, copy, nonnull) void (^invokeJS)(NSString *module, NSString *method, NSArray *args); +@property (nonatomic, copy, nonnull) void (^invokeJS)(NSString * _Nullable module, NSString * _Nullable method, NSArray * _Nullable args); // TODO(macOS ISS#2323203) @end diff --git a/React/Modules/RCTEventEmitter.h b/React/Modules/RCTEventEmitter.h index fef326cee037d1..45c6859b03fe25 100644 --- a/React/Modules/RCTEventEmitter.h +++ b/React/Modules/RCTEventEmitter.h @@ -14,21 +14,21 @@ */ @interface RCTEventEmitter : NSObject -@property (nonatomic, weak) RCTBridge *bridge; -@property (nonatomic, copy, nonnull) void (^invokeJS)(NSString *module, NSString *method, NSArray *args); +@property (nonatomic, weak) RCTBridge * _Nullable bridge; // TODO(macOS ISS#2323203) +@property (nonatomic, copy, nonnull) void (^invokeJS)(NSString * _Nullable module, NSString * _Nullable method, NSArray * _Nullable args); // TODO(macOS ISS#2323203) /** * Override this method to return an array of supported event names. Attempting * to observe or send an event that isn't included in this list will result in * an error. */ -- (NSArray *)supportedEvents; +- (NSArray *_Nullable)supportedEvents; // TODO(macOS ISS#2323203) /** * Send an event that does not relate to a specific view, e.g. a navigation * or data update notification. */ -- (void)sendEventWithName:(NSString *)name body:(id)body; +- (void)sendEventWithName:(NSString *_Nullable)name body:(id _Nullable )body; // TODO(macOS ISS#2323203) /** * These methods will be called when the first observer is added and when the @@ -38,7 +38,7 @@ - (void)startObserving; - (void)stopObserving; -- (void)addListener:(NSString *)eventName; +- (void)addListener:(NSString *_Nullable)eventName; // TODO(macOS ISS#2323203) - (void)removeListeners:(double)count; @end From 88c5cd4a1182a8fd7dcf9eada4030075ecb07623 Mon Sep 17 00:00:00 2001 From: Scott Kyle Date: Mon, 1 Mar 2021 13:37:02 -0800 Subject: [PATCH 2/4] Fix ability to call focus()/blur() on any view (#738) This fixes a regression from when we upgraded to 0.63 where we could no longer call `focus()` or `blur()` on any `View` (including `Text`). This regression was due to a change that dispatches these as commands (to be compatible with Fabric) instead of directly using `UIManager` to change focus. Only the `TextInput` supported these commands. --- React/Views/RCTViewManager.m | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m index 8a41562516976d..fbc4f8c0487ab5 100644 --- a/React/Views/RCTViewManager.m +++ b/React/Views/RCTViewManager.m @@ -124,6 +124,24 @@ - (RCTShadowView *)shadowView ]; } +#if TARGET_OS_OSX // [TODO(macOS ISS#2323203) +RCT_EXPORT_METHOD(focus : (nonnull NSNumber *)viewTag) +{ + [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary *viewRegistry) { + RCTUIView *view = viewRegistry[viewTag]; + [view reactFocus]; + }]; +} + +RCT_EXPORT_METHOD(blur : (nonnull NSNumber *)viewTag) +{ + [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary *viewRegistry) { + RCTUIView *view = viewRegistry[viewTag]; + [view reactBlur]; + }]; +} +#endif // ]TODO(macOS ISS#2323203) + #pragma mark - View properties #if TARGET_OS_TV From 766fd71f38b2b4a52825cf457a363da6121ca845 Mon Sep 17 00:00:00 2001 From: Chris Hogan Date: Tue, 2 Mar 2021 20:36:05 -0800 Subject: [PATCH 3/4] pod install --- RNTester/Podfile.lock | 475 +++++++++++++++++++++--------------------- 1 file changed, 237 insertions(+), 238 deletions(-) diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index 1403f4c889d109..8204463f08b516 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -3,14 +3,14 @@ PODS: - CocoaAsyncSocket (7.6.4) - CocoaLibEvent (1.0.0) - DoubleConversion (1.1.6) - - FBLazyVector (0.63.18) - - FBReactNativeSpec (0.63.18): - - RCT-Folly (= 2020.01.13.00) - - RCTRequired (= 0.63.18) - - RCTTypeSafety (= 0.63.18) - - React-Core (= 0.63.18) - - React-jsi (= 0.63.18) - - ReactCommon/turbomodule/core (= 0.63.18) + - FBLazyVector (0.63.20) + - FBReactNativeSpec (0.63.20): + - RCT-Folly (= 2020.01.13.00) + - RCTRequired (= 0.63.20) + - RCTTypeSafety (= 0.63.20) + - React-Core (= 0.63.20) + - React-jsi (= 0.63.20) + - ReactCommon/turbomodule/core (= 0.63.20) - Flipper (0.54.0): - Flipper-Folly (~> 2.2) - Flipper-RSocket (~> 1.1) @@ -81,292 +81,292 @@ PODS: - DoubleConversion - glog - libevent - - RCTRequired (0.63.18) - - RCTTypeSafety (0.63.18): - - FBLazyVector (= 0.63.18) - - RCT-Folly (= 2020.01.13.00) - - RCTRequired (= 0.63.18) - - React-Core (= 0.63.18) - - React (0.63.18): - - React-Core (= 0.63.18) - - React-Core/DevSupport (= 0.63.18) - - React-Core/RCTWebSocket (= 0.63.18) - - React-RCTActionSheet (= 0.63.18) - - React-RCTAnimation (= 0.63.18) - - React-RCTBlob (= 0.63.18) - - React-RCTImage (= 0.63.18) - - React-RCTLinking (= 0.63.18) - - React-RCTNetwork (= 0.63.18) - - React-RCTSettings (= 0.63.18) - - React-RCTText (= 0.63.18) - - React-RCTVibration (= 0.63.18) - - React-ART (0.63.18): - - React-Core/ARTHeaders (= 0.63.18) - - React-callinvoker (0.63.18) - - React-Core (0.63.18): + - RCTRequired (0.63.20) + - RCTTypeSafety (0.63.20): + - FBLazyVector (= 0.63.20) + - RCT-Folly (= 2020.01.13.00) + - RCTRequired (= 0.63.20) + - React-Core (= 0.63.20) + - React (0.63.20): + - React-Core (= 0.63.20) + - React-Core/DevSupport (= 0.63.20) + - React-Core/RCTWebSocket (= 0.63.20) + - React-RCTActionSheet (= 0.63.20) + - React-RCTAnimation (= 0.63.20) + - React-RCTBlob (= 0.63.20) + - React-RCTImage (= 0.63.20) + - React-RCTLinking (= 0.63.20) + - React-RCTNetwork (= 0.63.20) + - React-RCTSettings (= 0.63.20) + - React-RCTText (= 0.63.20) + - React-RCTVibration (= 0.63.20) + - React-ART (0.63.20): + - React-Core/ARTHeaders (= 0.63.20) + - React-callinvoker (0.63.20) + - React-Core (0.63.20): - glog - RCT-Folly (= 2020.01.13.00) - - React-Core/Default (= 0.63.18) - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - React-jsiexecutor (= 0.63.18) + - React-Core/Default (= 0.63.20) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - React-jsiexecutor (= 0.63.20) - Yoga - - React-Core/ARTHeaders (0.63.18): + - React-Core/ARTHeaders (0.63.20): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - React-jsiexecutor (= 0.63.18) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - React-jsiexecutor (= 0.63.20) - Yoga - - React-Core/CoreModulesHeaders (0.63.18): + - React-Core/CoreModulesHeaders (0.63.20): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - React-jsiexecutor (= 0.63.18) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - React-jsiexecutor (= 0.63.20) - Yoga - - React-Core/Default (0.63.18): + - React-Core/Default (0.63.20): - glog - RCT-Folly (= 2020.01.13.00) - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - React-jsiexecutor (= 0.63.18) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - React-jsiexecutor (= 0.63.20) - Yoga - - React-Core/DevSupport (0.63.18): + - React-Core/DevSupport (0.63.20): - glog - RCT-Folly (= 2020.01.13.00) - - React-Core/Default (= 0.63.18) - - React-Core/RCTWebSocket (= 0.63.18) - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - React-jsiexecutor (= 0.63.18) - - React-jsinspector (= 0.63.18) + - React-Core/Default (= 0.63.20) + - React-Core/RCTWebSocket (= 0.63.20) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - React-jsiexecutor (= 0.63.20) + - React-jsinspector (= 0.63.20) - Yoga - - React-Core/Hermes (0.63.18): + - React-Core/Hermes (0.63.20): - glog - hermes (~> 0.5.0) - RCT-Folly (= 2020.01.13.00) - RCT-Folly/Futures - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - React-jsiexecutor (= 0.63.18) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - React-jsiexecutor (= 0.63.20) - Yoga - - React-Core/RCTActionSheetHeaders (0.63.18): + - React-Core/RCTActionSheetHeaders (0.63.20): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - React-jsiexecutor (= 0.63.18) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - React-jsiexecutor (= 0.63.20) - Yoga - - React-Core/RCTAnimationHeaders (0.63.18): + - React-Core/RCTAnimationHeaders (0.63.20): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - React-jsiexecutor (= 0.63.18) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - React-jsiexecutor (= 0.63.20) - Yoga - - React-Core/RCTBlobHeaders (0.63.18): + - React-Core/RCTBlobHeaders (0.63.20): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - React-jsiexecutor (= 0.63.18) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - React-jsiexecutor (= 0.63.20) - Yoga - - React-Core/RCTImageHeaders (0.63.18): + - React-Core/RCTImageHeaders (0.63.20): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - React-jsiexecutor (= 0.63.18) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - React-jsiexecutor (= 0.63.20) - Yoga - - React-Core/RCTLinkingHeaders (0.63.18): + - React-Core/RCTLinkingHeaders (0.63.20): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - React-jsiexecutor (= 0.63.18) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - React-jsiexecutor (= 0.63.20) - Yoga - - React-Core/RCTNetworkHeaders (0.63.18): + - React-Core/RCTNetworkHeaders (0.63.20): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - React-jsiexecutor (= 0.63.18) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - React-jsiexecutor (= 0.63.20) - Yoga - - React-Core/RCTPushNotificationHeaders (0.63.18): + - React-Core/RCTPushNotificationHeaders (0.63.20): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - React-jsiexecutor (= 0.63.18) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - React-jsiexecutor (= 0.63.20) - Yoga - - React-Core/RCTSettingsHeaders (0.63.18): + - React-Core/RCTSettingsHeaders (0.63.20): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - React-jsiexecutor (= 0.63.18) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - React-jsiexecutor (= 0.63.20) - Yoga - - React-Core/RCTTextHeaders (0.63.18): + - React-Core/RCTTextHeaders (0.63.20): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - React-jsiexecutor (= 0.63.18) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - React-jsiexecutor (= 0.63.20) - Yoga - - React-Core/RCTVibrationHeaders (0.63.18): + - React-Core/RCTVibrationHeaders (0.63.20): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - React-jsiexecutor (= 0.63.18) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - React-jsiexecutor (= 0.63.20) - Yoga - - React-Core/RCTWebSocket (0.63.18): + - React-Core/RCTWebSocket (0.63.20): - glog - RCT-Folly (= 2020.01.13.00) - - React-Core/Default (= 0.63.18) - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - React-jsiexecutor (= 0.63.18) + - React-Core/Default (= 0.63.20) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - React-jsiexecutor (= 0.63.20) - Yoga - - React-CoreModules (0.63.18): - - FBReactNativeSpec (= 0.63.18) - - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.18) - - React-Core/CoreModulesHeaders (= 0.63.18) - - React-jsi (= 0.63.18) - - React-RCTImage (= 0.63.18) - - ReactCommon/turbomodule/core (= 0.63.18) - - React-cxxreact (0.63.18): + - React-CoreModules (0.63.20): + - FBReactNativeSpec (= 0.63.20) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.20) + - React-Core/CoreModulesHeaders (= 0.63.20) + - React-jsi (= 0.63.20) + - React-RCTImage (= 0.63.20) + - ReactCommon/turbomodule/core (= 0.63.20) + - React-cxxreact (0.63.20): - boost-for-react-native (= 1.63.0) - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-callinvoker (= 0.63.18) - - React-jsinspector (= 0.63.18) - - React-jsi (0.63.18): + - React-callinvoker (= 0.63.20) + - React-jsinspector (= 0.63.20) + - React-jsi (0.63.20): - boost-for-react-native (= 1.63.0) - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-jsi/Default (= 0.63.18) - - React-jsi/Default (0.63.18): + - React-jsi/Default (= 0.63.20) + - React-jsi/Default (0.63.20): - boost-for-react-native (= 1.63.0) - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-jsiexecutor (0.63.18): + - React-jsiexecutor (0.63.20): - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - React-jsinspector (0.63.18) - - React-RCTActionSheet (0.63.18): - - React-Core/RCTActionSheetHeaders (= 0.63.18) - - React-RCTAnimation (0.63.18): - - FBReactNativeSpec (= 0.63.18) - - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.18) - - React-Core/RCTAnimationHeaders (= 0.63.18) - - React-jsi (= 0.63.18) - - ReactCommon/turbomodule/core (= 0.63.18) - - React-RCTBlob (0.63.18): - - FBReactNativeSpec (= 0.63.18) - - RCT-Folly (= 2020.01.13.00) - - React-Core/RCTBlobHeaders (= 0.63.18) - - React-Core/RCTWebSocket (= 0.63.18) - - React-jsi (= 0.63.18) - - React-RCTNetwork (= 0.63.18) - - ReactCommon/turbomodule/core (= 0.63.18) - - React-RCTImage (0.63.18): - - FBReactNativeSpec (= 0.63.18) - - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.18) - - React-Core/RCTImageHeaders (= 0.63.18) - - React-jsi (= 0.63.18) - - React-RCTNetwork (= 0.63.18) - - ReactCommon/turbomodule/core (= 0.63.18) - - React-RCTLinking (0.63.18): - - FBReactNativeSpec (= 0.63.18) - - React-Core/RCTLinkingHeaders (= 0.63.18) - - React-jsi (= 0.63.18) - - ReactCommon/turbomodule/core (= 0.63.18) - - React-RCTNetwork (0.63.18): - - FBReactNativeSpec (= 0.63.18) - - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.18) - - React-Core/RCTNetworkHeaders (= 0.63.18) - - React-jsi (= 0.63.18) - - ReactCommon/turbomodule/core (= 0.63.18) - - React-RCTPushNotification (0.63.18): - - FBReactNativeSpec (= 0.63.18) - - RCTTypeSafety (= 0.63.18) - - React-Core/RCTPushNotificationHeaders (= 0.63.18) - - React-jsi (= 0.63.18) - - ReactCommon/turbomodule/core (= 0.63.18) - - React-RCTSettings (0.63.18): - - FBReactNativeSpec (= 0.63.18) - - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.18) - - React-Core/RCTSettingsHeaders (= 0.63.18) - - React-jsi (= 0.63.18) - - ReactCommon/turbomodule/core (= 0.63.18) - - React-RCTTest (0.63.18): - - RCT-Folly (= 2020.01.13.00) - - React-Core (= 0.63.18) - - React-CoreModules (= 0.63.18) - - React-jsi (= 0.63.18) - - ReactCommon/turbomodule/core (= 0.63.18) - - React-RCTText (0.63.18): - - React-Core/RCTTextHeaders (= 0.63.18) - - React-RCTVibration (0.63.18): - - FBReactNativeSpec (= 0.63.18) - - RCT-Folly (= 2020.01.13.00) - - React-Core/RCTVibrationHeaders (= 0.63.18) - - React-jsi (= 0.63.18) - - ReactCommon/turbomodule/core (= 0.63.18) - - React-TurboModuleCxx-RNW (0.63.18): - - RCT-Folly (= 2020.01.13.00) - - React-callinvoker (= 0.63.18) - - React-TurboModuleCxx-WinRTPort (= 0.63.18) - - ReactCommon/turbomodule/core (= 0.63.18) - - React-TurboModuleCxx-WinRTPort (0.63.18): - - React-TurboModuleCxx-WinRTPort/Shared (= 0.63.18) - - React-TurboModuleCxx-WinRTPort/WinRT (= 0.63.18) - - React-TurboModuleCxx-WinRTPort/Shared (0.63.18) - - React-TurboModuleCxx-WinRTPort/WinRT (0.63.18): - - React-callinvoker (= 0.63.18) - - React-TurboModuleCxx-WinRTPort/Shared (= 0.63.18) - - ReactCommon/turbomodule/core (0.63.18): + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - React-jsinspector (0.63.20) + - React-RCTActionSheet (0.63.20): + - React-Core/RCTActionSheetHeaders (= 0.63.20) + - React-RCTAnimation (0.63.20): + - FBReactNativeSpec (= 0.63.20) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.20) + - React-Core/RCTAnimationHeaders (= 0.63.20) + - React-jsi (= 0.63.20) + - ReactCommon/turbomodule/core (= 0.63.20) + - React-RCTBlob (0.63.20): + - FBReactNativeSpec (= 0.63.20) + - RCT-Folly (= 2020.01.13.00) + - React-Core/RCTBlobHeaders (= 0.63.20) + - React-Core/RCTWebSocket (= 0.63.20) + - React-jsi (= 0.63.20) + - React-RCTNetwork (= 0.63.20) + - ReactCommon/turbomodule/core (= 0.63.20) + - React-RCTImage (0.63.20): + - FBReactNativeSpec (= 0.63.20) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.20) + - React-Core/RCTImageHeaders (= 0.63.20) + - React-jsi (= 0.63.20) + - React-RCTNetwork (= 0.63.20) + - ReactCommon/turbomodule/core (= 0.63.20) + - React-RCTLinking (0.63.20): + - FBReactNativeSpec (= 0.63.20) + - React-Core/RCTLinkingHeaders (= 0.63.20) + - React-jsi (= 0.63.20) + - ReactCommon/turbomodule/core (= 0.63.20) + - React-RCTNetwork (0.63.20): + - FBReactNativeSpec (= 0.63.20) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.20) + - React-Core/RCTNetworkHeaders (= 0.63.20) + - React-jsi (= 0.63.20) + - ReactCommon/turbomodule/core (= 0.63.20) + - React-RCTPushNotification (0.63.20): + - FBReactNativeSpec (= 0.63.20) + - RCTTypeSafety (= 0.63.20) + - React-Core/RCTPushNotificationHeaders (= 0.63.20) + - React-jsi (= 0.63.20) + - ReactCommon/turbomodule/core (= 0.63.20) + - React-RCTSettings (0.63.20): + - FBReactNativeSpec (= 0.63.20) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.20) + - React-Core/RCTSettingsHeaders (= 0.63.20) + - React-jsi (= 0.63.20) + - ReactCommon/turbomodule/core (= 0.63.20) + - React-RCTTest (0.63.20): + - RCT-Folly (= 2020.01.13.00) + - React-Core (= 0.63.20) + - React-CoreModules (= 0.63.20) + - React-jsi (= 0.63.20) + - ReactCommon/turbomodule/core (= 0.63.20) + - React-RCTText (0.63.20): + - React-Core/RCTTextHeaders (= 0.63.20) + - React-RCTVibration (0.63.20): + - FBReactNativeSpec (= 0.63.20) + - RCT-Folly (= 2020.01.13.00) + - React-Core/RCTVibrationHeaders (= 0.63.20) + - React-jsi (= 0.63.20) + - ReactCommon/turbomodule/core (= 0.63.20) + - React-TurboModuleCxx-RNW (0.63.20): + - RCT-Folly (= 2020.01.13.00) + - React-callinvoker (= 0.63.20) + - React-TurboModuleCxx-WinRTPort (= 0.63.20) + - ReactCommon/turbomodule/core (= 0.63.20) + - React-TurboModuleCxx-WinRTPort (0.63.20): + - React-TurboModuleCxx-WinRTPort/Shared (= 0.63.20) + - React-TurboModuleCxx-WinRTPort/WinRT (= 0.63.20) + - React-TurboModuleCxx-WinRTPort/Shared (0.63.20) + - React-TurboModuleCxx-WinRTPort/WinRT (0.63.20): + - React-callinvoker (= 0.63.20) + - React-TurboModuleCxx-WinRTPort/Shared (= 0.63.20) + - ReactCommon/turbomodule/core (0.63.20): - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-callinvoker (= 0.63.18) - - React-Core (= 0.63.18) - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - ReactCommon/turbomodule/samples (0.63.18): + - React-callinvoker (= 0.63.20) + - React-Core (= 0.63.20) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - ReactCommon/turbomodule/samples (0.63.20): - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-callinvoker (= 0.63.18) - - React-Core (= 0.63.18) - - React-cxxreact (= 0.63.18) - - React-jsi (= 0.63.18) - - ReactCommon/turbomodule/core (= 0.63.18) + - React-callinvoker (= 0.63.20) + - React-Core (= 0.63.20) + - React-cxxreact (= 0.63.20) + - React-jsi (= 0.63.20) + - ReactCommon/turbomodule/core (= 0.63.20) - Yoga (1.14.0) - YogaKit (1.18.1): - Yoga (~> 1.14) @@ -519,8 +519,8 @@ SPEC CHECKSUMS: CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f DoubleConversion: 56a44bcfd14ab2ff66f5a146b2e875eb4b69b19b - FBLazyVector: 2746dbff722ea2da36a8a97b49f13c5c297dff55 - FBReactNativeSpec: 88f127f7340b568913319f27f61c9cbad2278a36 + FBLazyVector: 79cc38ff857d9d0a379cb038fbd3ab9b6588df1d + FBReactNativeSpec: 46828a1185b18cc57015876cced0e95b294a1a91 Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3 @@ -533,35 +533,34 @@ SPEC CHECKSUMS: libevent: ee9265726a1fc599dea382964fa304378affaa5f OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 RCT-Folly: 1347093ffe75e152d846f7e45a3ef901b60021aa - RCTRequired: 89d863cb0f229a96d1c39c66a87191b12198fa85 - RCTTypeSafety: beeae25125e797a744df7c074d22edc315f856e9 - React: 0818c89eb37776223802eedcc80d23580b2a43ab - React-ART: ef6879f502ceef17ede5bc3cb213e066a98982e7 - React-callinvoker: 5e4a89cee67f260c2387bf73a8ec94dfc7d8be6a - React-Core: 3465c7d1d44ea56d46cc2908bcc3fb5a338d3bfb - React-CoreModules: 04d9c480bbfa23931c661212c860d2b1f35377fb - React-cxxreact: cb7028ef5b970566b370034888b871c3bb6e6774 - React-jsi: 172927cdedf9f8650780020cf0885ccfb657b8bb - React-jsiexecutor: 53e7189664847fd765172b67c6caca5ed4c243e5 - React-jsinspector: 0403c3910a89242436a0c0846769e53795f9ae1b - React-RCTActionSheet: 6d1028c08d46bd712ae9d7e5f943c1d357ffb5c5 - React-RCTAnimation: 819bbb5330bce425d532c5507a8cef60a50c0f62 - React-RCTBlob: 1ef28803d608c67963e81567b4d7bb2259f6a293 - React-RCTImage: cbf259efc171a0c0611f3b5441b24fdcda0c32d0 - React-RCTLinking: 5496f71f5c477eaee7068c037aa82bc347cbb41f - React-RCTNetwork: 8f6e1069c6b99188201f8d441ff0575b1f799c05 - React-RCTPushNotification: fdf8459b0be57755014ac5ee2ea6428b6774e5ba - React-RCTSettings: 0c0bd5563b7ab01c71e168e09dced9f98a9f069e - React-RCTTest: c35dbb6b1eacac3fc622a4de30de7bedac594a06 - React-RCTText: 48a15a35f9535fe2cc21aa1820bb3af4050ee268 - React-RCTVibration: 6505182ecf25958c16d06a4691c60d82522c62e0 - React-TurboModuleCxx-RNW: 421affda67b42ba858043be6c1fc33c66f132a6b - React-TurboModuleCxx-WinRTPort: 3e0bee695bc85e62336fc4ee52c1fd69a6aeea14 - ReactCommon: fb27b1c21b947e9ad4c3f7717ecb817b3209559a - Yoga: ca33e41d62b402443eca4c016b8f290f08403c4b + RCTRequired: e308fa31344de57ec1f3b6befd6e011398c624b0 + RCTTypeSafety: 3806ce404983963d8725c20cc8ea3fecbee53490 + React: f74f3ea6b493681ffaccbaff9564bac385ab1c63 + React-ART: 44db9262c574018dfdfd0f0d2ff1995d54d8a8e9 + React-callinvoker: e0ac5d7e2047e57e70f7f730f1f0e7bd46ec1222 + React-Core: 640c4a74432d9a356ee17ab9068cfac350be963e + React-CoreModules: 87373f666cafddb361a1da5520ba58ee77e22a25 + React-cxxreact: 8c76344c19b365f868a81eb4961b3c7ff5c8398b + React-jsi: db22c9e5430de458d774abd0c421a4b3e06f8b18 + React-jsiexecutor: 9292f109535c43310fc7cf78251a33e110474577 + React-jsinspector: 34d419635259cd0efb112a45e3f8067187b0e0d6 + React-RCTActionSheet: eab2d9b676594181d76b852f6833945d4f916c46 + React-RCTAnimation: fec552e1aa7c35795f433de0d2b6b743ba0bbef4 + React-RCTBlob: 21f99e05cbd9c15849e0a7afc1ddfe0d0b2457e7 + React-RCTImage: 8ab2c1da7d8ae627cb358d2c53fab03f66805755 + React-RCTLinking: da206f7e15d5fbca11a07281582b0d1b0c1595d1 + React-RCTNetwork: 6b865835785e8e12c81311cd161a63ec8216b91c + React-RCTPushNotification: eca924c8f3c417ea56e7e2ade2bde083f4dfbb9e + React-RCTSettings: 92d728ba21d8d844f1823bdc3da52f4137d528cb + React-RCTTest: b3679bb50670d3855461dba5207a1b5b809529e9 + React-RCTText: 9d50bb9fdca3c00a93586843f466dee5a1482b34 + React-RCTVibration: 0f53e3fc9c1749279f41e8fede187dc0232db579 + React-TurboModuleCxx-RNW: 6b74cbd80e7d373ba2e83024d373dc9ac8207135 + React-TurboModuleCxx-WinRTPort: e218c3fbc94717361499f3f04ab32a6f5ef360c6 + ReactCommon: cdf00e2d6469c5b12abbdfeb74b5dbe777d63ae9 + Yoga: 6f5fd3f783d0356f9eccaffbc1dba2b6f3859d50 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 18ca7d3b0e7db79041574a8bb6200b9e1c2d5359 - -COCOAPODS: 1.10.1 +COCOAPODS: 1.9.1 From 26c62375815d1d0cd8e47f3167b4edb5632249c5 Mon Sep 17 00:00:00 2001 From: Scott Kyle Date: Mon, 1 Mar 2021 13:37:02 -0800 Subject: [PATCH 4/4] Fix ability to call focus()/blur() on any view (#738) This fixes a regression from when we upgraded to 0.63 where we could no longer call `focus()` or `blur()` on any `View` (including `Text`). This regression was due to a change that dispatches these as commands (to be compatible with Fabric) instead of directly using `UIManager` to change focus. Only the `TextInput` supported these commands. --- React/Views/RCTViewManager.m | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m index 8a41562516976d..fbc4f8c0487ab5 100644 --- a/React/Views/RCTViewManager.m +++ b/React/Views/RCTViewManager.m @@ -124,6 +124,24 @@ - (RCTShadowView *)shadowView ]; } +#if TARGET_OS_OSX // [TODO(macOS ISS#2323203) +RCT_EXPORT_METHOD(focus : (nonnull NSNumber *)viewTag) +{ + [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary *viewRegistry) { + RCTUIView *view = viewRegistry[viewTag]; + [view reactFocus]; + }]; +} + +RCT_EXPORT_METHOD(blur : (nonnull NSNumber *)viewTag) +{ + [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary *viewRegistry) { + RCTUIView *view = viewRegistry[viewTag]; + [view reactBlur]; + }]; +} +#endif // ]TODO(macOS ISS#2323203) + #pragma mark - View properties #if TARGET_OS_TV