chore(Stack): refactor component definition & nomenclature on native side (#3493)

kkafar · web-flow · commit b755accdd0ee · 2025-12-18T12:32:01.000+01:00
## Description Closes software-mansion/react-native-screens-labs#743 ## Changes - **Move stack related native components to dedicated directory** - **Rename native spec file of `StackHost` component** - **Change `RNSScreenStackHost` component definition to `RNSStackHost`** - **Rename `RNSScreenStackHostComponentView` -> `RNSStackHostComponentView`**
diff --git a/ios/gamma/stack/RNSScreenStackHostComponentViewManager.mm b/ios/gamma/stack/RNSScreenStackHostComponentViewManager.mm
diff --git a/ios/gamma/stack/RNSStackController.swift b/ios/gamma/stack/RNSStackController.swift
@@ -4,10 +4,10 @@ import UIKit
 @objc
 public class RNSStackController: UINavigationController, ReactMountingTransactionObserving {
   private var needsChildViewControllersUpdate = false
-  private let screenStackHostComponentView: RNSScreenStackHostComponentView
+  private let stackHostComponentView: RNSStackHostComponentView
 
-  @objc public required init(stackHostComponentView: RNSScreenStackHostComponentView) {
-    self.screenStackHostComponentView = stackHostComponentView
+  @objc public required init(stackHostComponentView: RNSStackHostComponentView) {
+    self.stackHostComponentView = stackHostComponentView
     super.init(nibName: nil, bundle: nil)
   }
 
@@ -38,7 +38,7 @@ public class RNSStackController: UINavigationController, ReactMountingTransactio
       "[RNScreens] Child view controller must be invalidated when update is forced!")
 
     let activeControllers = sourceAllViewControllers()
-      .filter { screenCtrl in screenCtrl.screenStackComponentView.maxLifecycleState == .attached }
+      .filter { screenCtrl in screenCtrl.screen.maxLifecycleState == .attached }
 
     setViewControllers(activeControllers, animated: true)
 
@@ -47,7 +47,7 @@ public class RNSStackController: UINavigationController, ReactMountingTransactio
 
   private func sourceAllViewControllers() -> [RNSStackScreenController] {
     let screenStackComponents =
-      screenStackHostComponentView.reactSubviews() as! [RNSStackScreenComponentView]
+      stackHostComponentView.reactSubviews() as! [RNSStackScreenComponentView]
     return screenStackComponents.lazy.map(\.controller)
   }
 
diff --git a/ios/gamma/stack/RNSStackHostComponentView.h b/ios/gamma/stack/RNSStackHostComponentView.h
@@ -7,7 +7,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RNSScreenStackHostComponentView : RNSReactBaseView
+@interface RNSStackHostComponentView : RNSReactBaseView
 
 @property (nonatomic, nonnull, strong, readonly) RNSStackController *stackController;
 
diff --git a/ios/gamma/stack/RNSStackHostComponentView.mm b/ios/gamma/stack/RNSStackHostComponentView.mm
@@ -1,4 +1,4 @@
-#import "RNSScreenStackHostComponentView.h"
+#import "RNSStackHostComponentView.h"
 
 #import <React/RCTConversions.h>
 #import <React/RCTMountingTransactionObserving.h>
@@ -13,10 +13,10 @@
 
 namespace react = facebook::react;
 
-@interface RNSScreenStackHostComponentView () <RCTMountingTransactionObserving>
+@interface RNSStackHostComponentView () <RCTMountingTransactionObserving>
 @end
 
-@implementation RNSScreenStackHostComponentView {
+@implementation RNSStackHostComponentView {
   RNSStackController *_Nonnull _controller;
   NSMutableArray<RNSStackScreenComponentView *> *_Nonnull _reactSubviews;
 
@@ -107,7 +107,7 @@ - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompo
 
 + (react::ComponentDescriptorProvider)componentDescriptorProvider
 {
-  return react::concreteComponentDescriptorProvider<react::RNSScreenStackHostComponentDescriptor>();
+  return react::concreteComponentDescriptorProvider<react::RNSStackHostComponentDescriptor>();
 }
 
 + (BOOL)shouldBeRecycled
@@ -137,7 +137,7 @@ - (void)mountingTransactionDidMount:(const facebook::react::MountingTransaction
 
 @end
 
-Class<RCTComponentViewProtocol> RNSScreenStackHostCls(void)
+Class<RCTComponentViewProtocol> RNSStackHostCls(void)
 {
-  return RNSScreenStackHostComponentView.class;
+  return RNSStackHostComponentView.class;
 }
diff --git a/ios/gamma/stack/RNSStackHostComponentViewManager.h b/ios/gamma/stack/RNSStackHostComponentViewManager.h
@@ -4,7 +4,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RNSScreenStackHostComponentViewManager : RCTViewManager
+@interface RNSStackHostComponentViewManager : RCTViewManager
 
 @end
 
diff --git a/ios/gamma/stack/RNSStackHostComponentViewManager.mm b/ios/gamma/stack/RNSStackHostComponentViewManager.mm
@@ -0,0 +1,7 @@
+#import "RNSStackHostComponentViewManager.h"
+
+@implementation RNSStackHostComponentViewManager
+
+RCT_EXPORT_MODULE(RNSStackHostViewManager)
+
+@end
diff --git a/ios/gamma/stack/RNSStackScreenComponentView.h b/ios/gamma/stack/RNSStackScreenComponentView.h
@@ -6,21 +6,21 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @class RNSStackScreenController;
-@class RNSScreenStackHostComponentView;
+@class RNSStackHostComponentView;
 
-typedef NS_ENUM(int, RNSScreenStackLifecycleState) {
-  RNSScreenStackLifecycleInitial = 0,
-  RNSScreenStackLifecycleDetached = 1,
-  RNSScreenStackLifecycleAttached = 2,
+typedef NS_ENUM(int, RNSStackScreenLifecycleState) {
+  RNSStackScreenLifecycleInitial = 0,
+  RNSStackScreenLifecycleDetached = 1,
+  RNSStackScreenLifecycleAttached = 2,
 };
 
 @interface RNSStackScreenComponentView : RNSReactBaseView
 
-@property (nonatomic, weak, readwrite, nullable) RNSScreenStackHostComponentView *stackHost;
+@property (nonatomic, weak, readwrite, nullable) RNSStackHostComponentView *stackHost;
 @property (nonatomic, strong, readonly, nonnull) RNSStackScreenController *controller;
 
 @property (nonatomic, strong, readonly, nullable) NSString *screenKey;
-@property (nonatomic, readonly) RNSScreenStackLifecycleState maxLifecycleState;
+@property (nonatomic, readonly) RNSStackScreenLifecycleState maxLifecycleState;
 
 @end
 
diff --git a/ios/gamma/stack/RNSStackScreenComponentView.mm b/ios/gamma/stack/RNSStackScreenComponentView.mm
@@ -49,7 +49,7 @@ - (void)resetProps
 
   // container state
   _screenKey = nil;
-  _maxLifecycleState = RNSScreenStackLifecycleInitial;
+  _maxLifecycleState = RNSStackScreenLifecycleInitial;
 }
 
 - (void)setupController
@@ -87,7 +87,7 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
   const auto &newComponentProps = *std::static_pointer_cast<const react::RNSStackScreenProps>(props);
 
   if (oldComponentProps.maxLifecycleState != newComponentProps.maxLifecycleState) {
-    _maxLifecycleState = static_cast<RNSScreenStackLifecycleState>(newComponentProps.maxLifecycleState);
+    _maxLifecycleState = static_cast<RNSStackScreenLifecycleState>(newComponentProps.maxLifecycleState);
     _needsLifecycleStateUpdate = YES;
   }
 
diff --git a/ios/gamma/stack/RNSStackScreenController.swift b/ios/gamma/stack/RNSStackScreenController.swift
@@ -3,13 +3,13 @@ import UIKit
 
 @objc
 public class RNSStackScreenController: UIViewController {
-  let screenStackComponentView: RNSStackScreenComponentView
+  let screen: RNSStackScreenComponentView
   private var reactEventEmitter: RNSStackScreenComponentEventEmitter {
-    return screenStackComponentView.reactEventEmitter()
+    return screen.reactEventEmitter()
   }
 
   @objc public required init(componentView: RNSStackScreenComponentView) {
-    self.screenStackComponentView = componentView
+    self.screen = componentView
     super.init(nibName: nil, bundle: nil)
   }
 
@@ -22,7 +22,7 @@ public class RNSStackScreenController: UIViewController {
       return navCtrl as? RNSStackController
     }
 
-    if let stackHost = self.screenStackComponentView.stackHost {
+    if let stackHost = self.screen.stackHost {
       return stackHost.stackController
     }
 
diff --git a/ios/stubs/RNSGammaStubs.h b/ios/stubs/RNSGammaStubs.h
@@ -9,7 +9,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RNSScreenStackHostComponentView : NSObject
+@interface RNSStackHostComponentView : NSObject
 @end
 
 @interface RNSStackScreenComponentView : NSObject
diff --git a/ios/stubs/RNSGammaStubs.mm b/ios/stubs/RNSGammaStubs.mm
@@ -1,6 +1,6 @@
 #import "RNSGammaStubs.h"
 
-@implementation RNSScreenStackHostComponentView
+@implementation RNSStackHostComponentView
 @end
 
 @implementation RNSStackScreenComponentView
diff --git a/package.json b/package.json
@@ -165,7 +165,7 @@
     "ios": {
       "componentProvider": {
         "RNSStackScreen": "RNSStackScreenComponentView",
-        "RNSScreenStackHost": "RNSScreenStackHostComponentView",
+        "RNSStackHost": "RNSStackHostComponentView",
         "RNSBottomTabsScreen": "RNSBottomTabsScreenComponentView",
         "RNSBottomTabs": "RNSBottomTabsHostComponentView",
         "RNSBottomTabsAccessory": "RNSBottomTabsAccessoryComponentView",
@@ -222,8 +222,8 @@
         "RNSStackScreen": {
           "className": "RNSStackScreenComponentView"
         },
-        "RNSScreenStackHost": {
-          "className": "RNSScreenStackHostComponentView"
+        "RNSStackHost": {
+          "className": "RNSStackHostComponentView"
         },
         "RNSBottomTabsScreen": {
           "className": "RNSBottomTabsScreenComponentView"
diff --git a/src/components/gamma/stack/StackHost.tsx b/src/components/gamma/stack/StackHost.tsx
@@ -1,16 +1,16 @@
 import React from 'react';
 import { StyleSheet } from 'react-native';
-import ScreenStackHostNativeComponent from '../../../fabric/gamma/ScreenStackHostNativeComponent';
-import type { ScreenStackHostProps } from './StackHost.types';
+import StackHostNativeComponent from '../../../fabric/gamma/stack/StackHostNativeComponent';
+import type { StackHostProps } from './StackHost.types';
 
 /**
  * EXPERIMENTAL API, MIGHT CHANGE W/O ANY NOTICE
  */
-function StackHost({ children }: ScreenStackHostProps) {
+function StackHost({ children }: StackHostProps) {
   return (
-    <ScreenStackHostNativeComponent style={styles.container}>
+    <StackHostNativeComponent style={styles.container}>
       {children}
-    </ScreenStackHostNativeComponent>
+    </StackHostNativeComponent>
   );
 }
 
diff --git a/src/components/gamma/stack/StackHost.types.ts b/src/components/gamma/stack/StackHost.types.ts
@@ -1,5 +1,5 @@
 import type { ViewProps } from 'react-native';
 
-export type ScreenStackHostProps = {
+export type StackHostProps = {
   children?: ViewProps['children'];
 };
diff --git a/src/components/gamma/stack/StackHost.web.tsx b/src/components/gamma/stack/StackHost.web.tsx
@@ -1,7 +1,8 @@
 import { View, ViewProps } from 'react-native';
 
+// TODO: Determine what this type is & whether it should not be removed
 export type ScreenStackNativeProps = ViewProps;
 
-const ScreenStackHost = View;
+const StackHost = View;
 
-export default ScreenStackHost;
+export default StackHost;
diff --git a/src/components/gamma/stack/StackScreen.tsx b/src/components/gamma/stack/StackScreen.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { StyleSheet } from 'react-native';
-import StackScreenNativeComponent from '../../../fabric/gamma/StackScreenNativeComponent';
+import StackScreenNativeComponent from '../../../fabric/gamma/stack/StackScreenNativeComponent';
 import type { NativeSyntheticEvent } from 'react-native';
 import { StackScreenProps } from './StackScreen.types';
 
diff --git a/src/fabric/gamma/stack/StackHostNativeComponent.ts b/src/fabric/gamma/stack/StackHostNativeComponent.ts
@@ -5,4 +5,4 @@ import { codegenNativeComponent } from 'react-native';
 
 export interface NativeProps extends ViewProps {}
 
-export default codegenNativeComponent<NativeProps>('RNSScreenStackHost', {});
+export default codegenNativeComponent<NativeProps>('RNSStackHost', {});
diff --git a/src/fabric/gamma/stack/StackScreenNativeComponent.ts b/src/fabric/gamma/stack/StackScreenNativeComponent.ts

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ - (void)resetProps`
`49`	`49`
`50`	`50`	`// container state`
`51`	`51`	`_screenKey = nil;`
`52`		`- _maxLifecycleState = RNSScreenStackLifecycleInitial;`
	`52`	`+ _maxLifecycleState = RNSStackScreenLifecycleInitial;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`- (void)setupController`
`@@ -87,7 +87,7 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props`
`87`	`87`	`const auto &newComponentProps = *std::static_pointer_cast<const react::RNSStackScreenProps>(props);`
`88`	`88`
`89`	`89`	`if (oldComponentProps.maxLifecycleState != newComponentProps.maxLifecycleState) {`
`90`		`- _maxLifecycleState = static_cast<RNSScreenStackLifecycleState>(newComponentProps.maxLifecycleState);`
	`90`	`+ _maxLifecycleState = static_cast<RNSStackScreenLifecycleState>(newComponentProps.maxLifecycleState);`
`91`	`91`	`_needsLifecycleStateUpdate = YES;`
`92`	`92`	`}`
`93`	`93`
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,13 @@ import UIKit`
`3`	`3`
`4`	`4`	`@objc`
`5`	`5`	`public class RNSStackScreenController: UIViewController {`
`6`		`- let screenStackComponentView: RNSStackScreenComponentView`
	`6`	`+ let screen: RNSStackScreenComponentView`
`7`	`7`	`private var reactEventEmitter: RNSStackScreenComponentEventEmitter {`
`8`		`- return screenStackComponentView.reactEventEmitter()`
	`8`	`+ return screen.reactEventEmitter()`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`@objc public required init(componentView: RNSStackScreenComponentView) {`
`12`		`- self.screenStackComponentView = componentView`
	`12`	`+ self.screen = componentView`
`13`	`13`	`super.init(nibName: nil, bundle: nil)`
`14`	`14`	`}`
`15`	`15`
`@@ -22,7 +22,7 @@ public class RNSStackScreenController: UIViewController {`
`22`	`22`	`return navCtrl as? RNSStackController`
`23`	`23`	`}`
`24`	`24`
`25`		`- if let stackHost = self.screenStackComponentView.stackHost {`
	`25`	`+ if let stackHost = self.screen.stackHost {`
`26`	`26`	`return stackHost.stackController`
`27`	`27`	`}`
`28`	`28`