diff --git a/React/Base/RCTBridgeModule.h b/React/Base/RCTBridgeModule.h index 31aaeffd2dfee7..9ad1836ea8c39e 100644 --- a/React/Base/RCTBridgeModule.h +++ b/React/Base/RCTBridgeModule.h @@ -430,7 +430,7 @@ RCT_EXTERN_C_END @end typedef void (^RCTBridgelessBundleURLSetter)(NSURL *bundleURL); -typedef NSURL * (^RCTBridgelessBundleURLGetter)(); +typedef NSURL * (^RCTBridgelessBundleURLGetter)(void); /** * A class that allows NativeModules/TurboModules to read/write the bundleURL, with or without the bridge. diff --git a/React/CoreModules/RCTAccessibilityManager.mm b/React/CoreModules/RCTAccessibilityManager.mm index 3b15ec0e89a3c8..1ea4436cf33c98 100644 --- a/React/CoreModules/RCTAccessibilityManager.mm +++ b/React/CoreModules/RCTAccessibilityManager.mm @@ -82,7 +82,7 @@ - (instancetype)init [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(voiceVoiceOverStatusDidChange:) - name:UIAccessibilityVoiceOverStatusChanged + name:UIAccessibilityVoiceOverStatusDidChangeNotification object:nil]; self.contentSizeCategory = RCTSharedApplication().preferredContentSizeCategory; diff --git a/React/Views/RCTView.m b/React/Views/RCTView.m index 87ff206081f6f8..c4b9a25438784f 100644 --- a/React/Views/RCTView.m +++ b/React/Views/RCTView.m @@ -490,7 +490,7 @@ + (UIEdgeInsets)contentInsetsForView:(UIView *)view while (view) { UIViewController *controller = view.reactViewController; if (controller) { - return (UIEdgeInsets){controller.topLayoutGuide.length, 0, controller.bottomLayoutGuide.length, 0}; + return controller.view.safeAreaInsets; } view = view.superview; }