Skip to content

Commit d7a159a

Browse files
committed
chore: remove unnecessary diff
1 parent 87c47b2 commit d7a159a

File tree

8 files changed

+5
-72
lines changed

8 files changed

+5
-72
lines changed

packages/react-native/Libraries/LinkingIOS/React-RCTLinking.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Pod::Spec.new do |s|
4545
"HEADER_SEARCH_PATHS" => header_search_paths.join(' ')
4646
}
4747
s.framework = "UIKit"
48-
48+
4949
s.dependency "React-Core/RCTLinkingHeaders", version
5050
s.dependency "ReactCommon/turbomodule/core", version
5151
s.dependency "React-jsi", version

packages/react-native/Libraries/NativeAnimation/React-RCTAnimation.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Pod::Spec.new do |s|
4444
"HEADER_SEARCH_PATHS" => header_search_paths.join(" ")
4545
}
4646
s.framework = ["UIKit", "QuartzCore"]
47-
47+
4848
s.dependency "RCT-Folly", folly_version
4949
s.dependency "RCTTypeSafety"
5050
s.dependency "React-jsi"

packages/react-native/React/CoreModules/RCTDeviceInfo.mm

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ - (void)initialize
5151
selector:@selector(didReceiveNewContentSizeMultiplier)
5252
name:RCTAccessibilityManagerDidUpdateMultiplierNotification
5353
object:[_moduleRegistry moduleForName:"AccessibilityManager"]];
54-
5554

5655
_currentInterfaceDimensions = [self _exportedDimensions];
5756

@@ -105,12 +104,7 @@ - (void)_cleanupObservers
105104
[[NSNotificationCenter defaultCenter] removeObserver:self
106105
name:RCTAccessibilityManagerDidUpdateMultiplierNotification
107106
object:[_moduleRegistry moduleForName:"AccessibilityManager"]];
108-
#if !TARGET_OS_VISION
109-
[[NSNotificationCenter defaultCenter] removeObserver:self
110-
name:UIApplicationDidChangeStatusBarOrientationNotification
111-
object:nil];
112-
[[NSNotificationCenter defaultCenter] removeObserver:self name:UIDeviceOrientationDidChangeNotification object:nil];
113-
#endif
107+
114108
[[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
115109

116110
[[NSNotificationCenter defaultCenter] removeObserver:self name:RCTUserInterfaceStyleDidChangeNotification object:nil];
@@ -127,8 +121,7 @@ - (void)_cleanupObservers
127121
static BOOL RCTIsIPhoneNotched()
128122
{
129123
static BOOL isIPhoneNotched = NO;
130-
#if !TARGET_OS_VISION
131-
static dispatch_once_t onceToken;
124+
static dispatch_once_t onceToken;
132125

133126
#if TARGET_OS_IOS
134127
dispatch_once(&onceToken, ^{
@@ -139,10 +132,6 @@ static BOOL RCTIsIPhoneNotched()
139132
});
140133
#endif
141134

142-
// 20pt is the top safeArea value in non-notched devices
143-
isIPhoneNotched = RCTSharedApplication().keyWindow.safeAreaInsets.top > 20;
144-
});
145-
#endif
146135
return isIPhoneNotched;
147136
}
148137

packages/react-native/React/CoreModules/RCTKeyboardObserver.mm

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ @implementation RCTKeyboardObserver
2323

2424
- (void)startObserving
2525
{
26-
#if !TARGET_OS_VISION
2726
NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
2827

2928
#define ADD_KEYBOARD_HANDLER(NAME, SELECTOR) [nc addObserver:self selector:@selector(SELECTOR:) name:NAME object:nil]
@@ -36,7 +35,6 @@ - (void)startObserving
3635
ADD_KEYBOARD_HANDLER(UIKeyboardDidChangeFrameNotification, keyboardDidChangeFrame);
3736

3837
#undef ADD_KEYBOARD_HANDLER
39-
#endif
4038
}
4139

4240
- (NSArray<NSString *> *)supportedEvents
@@ -53,12 +51,9 @@ - (void)startObserving
5351

5452
- (void)stopObserving
5553
{
56-
#if !TARGET_OS_VISION
5754
[[NSNotificationCenter defaultCenter] removeObserver:self];
58-
#endif
5955
}
6056

61-
#if !TARGET_OS_VISION
6257
// Bridge might be already invalidated by the time the keyboard is about to be dismissed.
6358
// This might happen, for example, when reload from the packager is performed.
6459
// Thus we need to check against nil here.
@@ -77,7 +72,6 @@ -(void)EVENT : (NSNotification *)notification
7772
IMPLEMENT_KEYBOARD_HANDLER(keyboardDidHide)
7873
IMPLEMENT_KEYBOARD_HANDLER(keyboardWillChangeFrame)
7974
IMPLEMENT_KEYBOARD_HANDLER(keyboardDidChangeFrame)
80-
#endif
8175

8276
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
8377
(const facebook::react::ObjCTurboModule::InitParams &)params

packages/react-native/React/Views/RCTWrapperViewController.m

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ - (instancetype)initWithContentView:(UIView *)contentView
2929

3030
if ((self = [super initWithNibName:nil bundle:nil])) {
3131
_contentView = contentView;
32-
#if !TARGET_OS_VISION
33-
self.automaticallyAdjustsScrollViewInsets = NO;
34-
#endif
3532
}
3633
return self;
3734
}

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/localCommands.js

Lines changed: 0 additions & 45 deletions
This file was deleted.

packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Pod::Spec.new do |s|
5454
s.header_mappings_dir = "../../.."
5555
header_search_paths = header_search_paths + ["\"$(PODS_TARGET_SRCROOT)/platform/ios\""]
5656
end
57-
57+
5858
s.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
5959
"HEADER_SEARCH_PATHS" => header_search_paths.join(" "),
6060
"DEFINES_MODULE" => "YES",

packages/rn-tester/RNTester/AppDelegate.mm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ - (void)application:(__unused UIApplication *)application
107107
[RCTPushNotificationManager didFailToRegisterForRemoteNotificationsWithError:error];
108108
}
109109

110-
#if !TARGET_OS_VISION
111110
#pragma mark - UNUserNotificationCenterDelegate
112111

113112
// Required for the remoteNotificationReceived and localNotificationReceived events
@@ -137,7 +136,6 @@ - (void)userNotificationCenter:(UNUserNotificationCenter *)center
137136
[RCTPushNotificationManager didReceiveNotification:notification];
138137
completionHandler();
139138
}
140-
#endif
141139

142140
#pragma mark - New Arch Enabled settings
143141

0 commit comments

Comments
 (0)