fix(ios): add missing +load guards and normalize #endif comments

kkafar · kkafar · commit da35f5e5defd · 2026-04-07T15:45:27.000+02:00
Add guarded +load to 9 ComponentView subclasses (tabs, gamma) that
were missing it entirely, which would prevent proper registration
when using USE_FRAMEWORKS=dynamic. Normalize all #endif to include
the // RCT_DYNAMIC_FRAMEWORKS comment for consistency.
diff --git a/ios/RNSFullWindowOverlay.mm b/ios/RNSFullWindowOverlay.mm
@@ -86,7 +86,7 @@ + (void)load
 {
   [super load];
 }
-#endif
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
 #ifdef RCT_NEW_ARCH_ENABLED
 - (instancetype)init
diff --git a/ios/RNSModalScreen.mm b/ios/RNSModalScreen.mm
@@ -37,7 +37,7 @@ + (void)load
 {
   [super load];
 }
-#endif
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
diff --git a/ios/RNSScreen.mm b/ios/RNSScreen.mm
@@ -98,7 +98,7 @@ + (void)load
 {
   [super load];
 }
-#endif
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
diff --git a/ios/RNSScreenContainer.mm b/ios/RNSScreenContainer.mm
@@ -266,7 +266,7 @@ + (void)load
 {
   [super load];
 }
-#endif
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
 #pragma mark - RCTComponentViewProtocol
 
diff --git a/ios/RNSScreenFooter.mm b/ios/RNSScreenFooter.mm
@@ -105,7 +105,7 @@ + (void)load
 {
   [super load];
 }
-#endif
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
diff --git a/ios/RNSScreenNavigationContainer.mm b/ios/RNSScreenNavigationContainer.mm
@@ -50,7 +50,7 @@ + (void)load
 {
   [super load];
 }
-#endif
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
 #endif
 
diff --git a/ios/RNSScreenStack.mm b/ios/RNSScreenStack.mm
@@ -223,7 +223,7 @@ + (void)load
 {
   [super load];
 }
-#endif
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
diff --git a/ios/RNSScreenStackHeaderConfig.mm b/ios/RNSScreenStackHeaderConfig.mm
@@ -96,7 +96,7 @@ + (void)load
 {
   [super load];
 }
-#endif
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
diff --git a/ios/RNSScreenStackHeaderSubview.mm b/ios/RNSScreenStackHeaderSubview.mm
@@ -128,7 +128,7 @@ + (void)load
 {
   [super load];
 }
-#endif
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
diff --git a/ios/RNSSearchBar.mm b/ios/RNSSearchBar.mm
@@ -50,7 +50,7 @@ + (void)load
 {
   [super load];
 }
-#endif
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
 - (instancetype)init
 {
diff --git a/ios/gamma/scroll-view-marker/RNSScrollViewMarkerComponentView.mm b/ios/gamma/scroll-view-marker/RNSScrollViewMarkerComponentView.mm
@@ -241,6 +241,14 @@ + (BOOL)shouldBeRecycled
   return NO;
 }
 
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
+#ifdef RCT_DYNAMIC_FRAMEWORKS
++ (void)load
+{
+  [super load];
+}
+#endif // RCT_DYNAMIC_FRAMEWORKS
+
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
   return react::concreteComponentDescriptorProvider<react::RNSScrollViewMarkerComponentDescriptor>();
diff --git a/ios/gamma/split/RNSSplitHostComponentView.mm b/ios/gamma/split/RNSSplitHostComponentView.mm
@@ -191,6 +191,14 @@ - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompo
   _hasModifiedReactSubviewsInCurrentTransaction = true;
 }
 
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
+#ifdef RCT_DYNAMIC_FRAMEWORKS
++ (void)load
+{
+  [super load];
+}
+#endif // RCT_DYNAMIC_FRAMEWORKS
+
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
   return react::concreteComponentDescriptorProvider<react::RNSSplitHostComponentDescriptor>();
diff --git a/ios/gamma/split/RNSSplitScreenComponentView.mm b/ios/gamma/split/RNSSplitScreenComponentView.mm
@@ -149,6 +149,14 @@ - (void)safeAreaInsetsDidChange
 
 #pragma mark - RCTComponentViewProtocol
 
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
+#ifdef RCT_DYNAMIC_FRAMEWORKS
++ (void)load
+{
+  [super load];
+}
+#endif // RCT_DYNAMIC_FRAMEWORKS
+
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
   return react::concreteComponentDescriptorProvider<react::RNSSplitScreenComponentDescriptor>();
diff --git a/ios/gamma/stack/host/RNSStackHostComponentView.mm b/ios/gamma/stack/host/RNSStackHostComponentView.mm
@@ -130,6 +130,14 @@ - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompo
       index);
 }
 
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
+#ifdef RCT_DYNAMIC_FRAMEWORKS
++ (void)load
+{
+  [super load];
+}
+#endif // RCT_DYNAMIC_FRAMEWORKS
+
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
   return react::concreteComponentDescriptorProvider<react::RNSStackHostComponentDescriptor>();
diff --git a/ios/gamma/stack/screen/RNSStackScreenComponentView.mm b/ios/gamma/stack/screen/RNSStackScreenComponentView.mm
@@ -119,6 +119,14 @@ - (void)updateEventEmitter:(const facebook::react::EventEmitter::Shared &)eventE
       updateEventEmitter:std::static_pointer_cast<const react::RNSStackScreenEventEmitter>(eventEmitter)];
 }
 
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
+#ifdef RCT_DYNAMIC_FRAMEWORKS
++ (void)load
+{
+  [super load];
+}
+#endif // RCT_DYNAMIC_FRAMEWORKS
+
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
   return react::concreteComponentDescriptorProvider<react::RNSStackScreenComponentDescriptor>();
diff --git a/ios/safe-area/RNSSafeAreaViewComponentView.mm b/ios/safe-area/RNSSafeAreaViewComponentView.mm
@@ -45,7 +45,7 @@ + (void)load
 {
   [super load];
 }
-#endif
+#endif // RCT_DYNAMIC_FRAMEWORKS
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
diff --git a/ios/tabs/bottom-accessory/RNSTabsBottomAccessoryComponentView.mm b/ios/tabs/bottom-accessory/RNSTabsBottomAccessoryComponentView.mm
@@ -101,6 +101,14 @@ - (void)updateEventEmitter:(const facebook::react::EventEmitter::Shared &)eventE
   [_reactEventEmitter updateEventEmitter:castedEventEmitter];
 }
 
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
+#ifdef RCT_DYNAMIC_FRAMEWORKS
++ (void)load
+{
+  [super load];
+}
+#endif // RCT_DYNAMIC_FRAMEWORKS
+
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
   return react::concreteComponentDescriptorProvider<react::RNSTabsBottomAccessoryComponentDescriptor>();
diff --git a/ios/tabs/bottom-accessory/RNSTabsBottomAccessoryContentComponentView.mm b/ios/tabs/bottom-accessory/RNSTabsBottomAccessoryContentComponentView.mm
@@ -93,6 +93,14 @@ - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask
 
 #endif // REACT_NATIVE_VERSION_MINOR >= 82
 
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
+#ifdef RCT_DYNAMIC_FRAMEWORKS
++ (void)load
+{
+  [super load];
+}
+#endif // RCT_DYNAMIC_FRAMEWORKS
+
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
   return react::concreteComponentDescriptorProvider<react::RNSTabsBottomAccessoryContentComponentDescriptor>();
diff --git a/ios/tabs/host/RNSTabsHostComponentView.mm b/ios/tabs/host/RNSTabsHostComponentView.mm
@@ -381,6 +381,14 @@ - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask
   [super finalizeUpdates:updateMask];
 }
 
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
+#ifdef RCT_DYNAMIC_FRAMEWORKS
++ (void)load
+{
+  [super load];
+}
+#endif // RCT_DYNAMIC_FRAMEWORKS
+
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
   return react::concreteComponentDescriptorProvider<react::RNSTabsHostComponentDescriptor>();
diff --git a/ios/tabs/screen/RNSTabsScreenComponentView.mm b/ios/tabs/screen/RNSTabsScreenComponentView.mm
@@ -478,6 +478,14 @@ - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompo
   [super unmountChildComponentView:childComponentView index:index];
 }
 
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
+#ifdef RCT_DYNAMIC_FRAMEWORKS
++ (void)load
+{
+  [super load];
+}
+#endif // RCT_DYNAMIC_FRAMEWORKS
+
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
   return react::concreteComponentDescriptorProvider<react::RNSTabsScreenIOSComponentDescriptor>();

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ + (void)load`
`86`	`86`	`{`
`87`	`87`	`[super load];`
`88`	`88`	`}`
`89`		`-#endif`
	`89`	`+#endif // RCT_DYNAMIC_FRAMEWORKS`
`90`	`90`
`91`	`91`	`#ifdef RCT_NEW_ARCH_ENABLED`
`92`	`92`	`- (instancetype)init`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ + (void)load`
`37`	`37`	`{`
`38`	`38`	`[super load];`
`39`	`39`	`}`
`40`		`-#endif`
	`40`	`+#endif // RCT_DYNAMIC_FRAMEWORKS`
`41`	`41`
`42`	`42`	`+ (react::ComponentDescriptorProvider)componentDescriptorProvider`
`43`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ + (void)load`
`98`	`98`	`{`
`99`	`99`	`[super load];`
`100`	`100`	`}`
`101`		`-#endif`
	`101`	`+#endif // RCT_DYNAMIC_FRAMEWORKS`
`102`	`102`
`103`	`103`	`- (instancetype)initWithFrame:(CGRect)frame`
`104`	`104`	`{`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ + (void)load`
`266`	`266`	`{`
`267`	`267`	`[super load];`
`268`	`268`	`}`
`269`		`-#endif`
	`269`	`+#endif // RCT_DYNAMIC_FRAMEWORKS`
`270`	`270`
`271`	`271`	`#pragma mark - RCTComponentViewProtocol`
`272`	`272`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ + (void)load`
`105`	`105`	`{`
`106`	`106`	`[super load];`
`107`	`107`	`}`
`108`		`-#endif`
	`108`	`+#endif // RCT_DYNAMIC_FRAMEWORKS`
`109`	`109`
`110`	`110`	`+ (react::ComponentDescriptorProvider)componentDescriptorProvider`
`111`	`111`	`{`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ + (void)load`
`50`	`50`	`{`
`51`	`51`	`[super load];`
`52`	`52`	`}`
`53`		`-#endif`
	`53`	`+#endif // RCT_DYNAMIC_FRAMEWORKS`
`54`	`54`
`55`	`55`	`#endif`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ + (void)load`
`223`	`223`	`{`
`224`	`224`	`[super load];`
`225`	`225`	`}`
`226`		`-#endif`
	`226`	`+#endif // RCT_DYNAMIC_FRAMEWORKS`
`227`	`227`
`228`	`228`	`- (instancetype)initWithFrame:(CGRect)frame`
`229`	`229`	`{`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ + (void)load`
`96`	`96`	`{`
`97`	`97`	`[super load];`
`98`	`98`	`}`
`99`		`-#endif`
	`99`	`+#endif // RCT_DYNAMIC_FRAMEWORKS`
`100`	`100`
`101`	`101`	`- (instancetype)initWithFrame:(CGRect)frame`
`102`	`102`	`{`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ + (void)load`
`128`	`128`	`{`
`129`	`129`	`[super load];`
`130`	`130`	`}`
`131`		`-#endif`
	`131`	`+#endif // RCT_DYNAMIC_FRAMEWORKS`
`132`	`132`
`133`	`133`	`- (instancetype)initWithFrame:(CGRect)frame`
`134`	`134`	`{`