react-native-screens 4.24.0 → 4.25.0-beta.2

package/ios/gamma/{split-view/RNSSplitViewHostController.swift → split/RNSSplitHostController.swift}

@@ -1,27 +1,27 @@
 import Foundation
 import UIKit
 
-/// @class RNSSplitViewHostController
-/// @brief A controller associated with the RN native component representing SplitView host.
+/// @class RNSSplitHostController
+/// @brief A controller associated with the RN native component representing Split host.
 ///
-/// Manages a collection of RNSSplitViewScreenComponentView instances,
+/// Manages a collection of RNSSplitScreenComponentView instances,
 /// synchronizes appearance settings with props, observes component lifecycle, and emits events.
 @objc
-public class RNSSplitViewHostController: UISplitViewController, ReactMountingTransactionObserving,
+public class RNSSplitHostController: UISplitViewController, ReactMountingTransactionObserving,
   RNSOrientationProvidingSwift
 {
   private var needsChildViewControllersUpdate = false
 
-  private var splitViewAppearanceCoordinator: RNSSplitViewAppearanceCoordinator
-  private var splitViewAppearanceApplicator: RNSSplitViewAppearanceApplicator
+  private var splitAppearanceCoordinator: RNSSplitAppearanceCoordinator
+  private var splitAppearanceApplicator: RNSSplitAppearanceApplicator
 
-  private var reactEventEmitter: RNSSplitViewHostComponentEventEmitter {
-    return splitViewHostComponentView.reactEventEmitter()
+  private var reactEventEmitter: RNSSplitHostComponentEventEmitter {
+    return splitHostComponentView.reactEventEmitter()
   }
 
-  private let splitViewHostComponentView: RNSSplitViewHostComponentView
+  private let splitHostComponentView: RNSSplitHostComponentView
 
-  /// This variable is keeping the value of how many columns were set in the initial render. It's used for validation, because SplitView doesn't support changing number of columns dynamically.
+  /// This variable is keeping the value of how many columns were set in the initial render. It's used for validation, because Split doesn't support changing number of columns dynamically.
   private let fixedColumnsCount: Int
 
   private let minNumberOfColumns: Int = 2
@@ -37,23 +37,23 @@ public class RNSSplitViewHostController: UISplitViewController, ReactMountingTra
   private var visibleColumns: Set<UISplitViewController.Column> = []
 
   ///
-  /// @brief Initializes the SplitView host controller with provided style.
+  /// @brief Initializes the Split host controller with provided style.
   ///
-  /// The style for the SplitView component can be passed only in the initialization method and cannot be changed dynamically.
+  /// The style for the Split component can be passed only in the initialization method and cannot be changed dynamically.
   ///
-  /// @param splitViewHostComponentView The view managed by this controller.
+  /// @param splitHostComponentView The view managed by this controller.
   /// @param numberOfColumns Expected number of visible columns.
   ///
   @objc public init(
-    splitViewHostComponentView: RNSSplitViewHostComponentView,
+    splitHostComponentView: RNSSplitHostComponentView,
     numberOfColumns: Int
   ) {
-    self.splitViewHostComponentView = splitViewHostComponentView
-    self.splitViewAppearanceCoordinator = RNSSplitViewAppearanceCoordinator()
-    self.splitViewAppearanceApplicator = RNSSplitViewAppearanceApplicator()
+    self.splitHostComponentView = splitHostComponentView
+    self.splitAppearanceCoordinator = RNSSplitAppearanceCoordinator()
+    self.splitAppearanceApplicator = RNSSplitAppearanceApplicator()
     self.fixedColumnsCount = numberOfColumns
 
-    super.init(style: RNSSplitViewHostController.styleByNumberOfColumns(numberOfColumns))
+    super.init(style: RNSSplitHostController.styleByNumberOfColumns(numberOfColumns))
 
     delegate = self
   }
@@ -71,7 +71,7 @@ public class RNSSplitViewHostController: UISplitViewController, ReactMountingTra
 
   @objc
   public func setNeedsAppearanceUpdate() {
-    splitViewAppearanceCoordinator.needs(.generalUpdate)
+    splitAppearanceCoordinator.needs(.generalUpdate)
   }
 
   @objc
@@ -81,17 +81,17 @@ public class RNSSplitViewHostController: UISplitViewController, ReactMountingTra
     // We noticed that we can forcefully refresh navigation bar from UINavigationController level by toggling setNavigationBarHidden.
     // After some testing, it looks well and I haven't noticed any flicker - missing button is appearing naturally.
     // Please note that this is a hack rather than a solution so feel free to remove this code in case of any problems and treat the bug with toggling button as a platform's issue.
-    splitViewAppearanceCoordinator.needs(.secondaryScreenNavBarUpdate)
+    splitAppearanceCoordinator.needs(.secondaryScreenNavBarUpdate)
   }
 
   @objc
   public func setNeedsDisplayModeUpdate() {
-    splitViewAppearanceCoordinator.needs(.displayModeUpdate)
+    splitAppearanceCoordinator.needs(.displayModeUpdate)
   }
 
   @objc
   public func setNeedsOrientationUpdate() {
-    splitViewAppearanceCoordinator.needs(.orientationUpdate)
+    splitAppearanceCoordinator.needs(.orientationUpdate)
   }
 
   // MARK: Updating
@@ -104,11 +104,11 @@ public class RNSSplitViewHostController: UISplitViewController, ReactMountingTra
   }
 
   ///
-  /// @brief Creates and attaches the SplitView child controllers based on the current React subviews.
+  /// @brief Creates and attaches the Split child controllers based on the current React subviews.
   ///
-  /// It validates constraints for SplitView hierarchy and it will crash after recognizing an invalid state,
+  /// It validates constraints for Split hierarchy and it will crash after recognizing an invalid state,
   /// e. g. dynamically changed number of columns or number of columns that isn't between defined bounds.
-  /// If SplitView constraints are met, it attaches SplitViewScreen representatives to SplitViewHost component.
+  /// If Split constraints are met, it attaches SplitScreen representatives to SplitHost component.
   ///
   @objc
   public func updateChildViewControllers() {
@@ -117,15 +117,15 @@ public class RNSSplitViewHostController: UISplitViewController, ReactMountingTra
       "[RNScreens] Child view controller must be invalidated when update is forced!")
 
     let currentColumns = filterSubviews(
-      ofType: RNSSplitViewScreenColumnType.column, in: splitViewReactSubviews)
+      ofType: RNSSplitScreenColumnType.column, in: splitReactSubviews)
     let currentInspectors = filterSubviews(
-      ofType: RNSSplitViewScreenColumnType.inspector, in: splitViewReactSubviews)
+      ofType: RNSSplitScreenColumnType.inspector, in: splitReactSubviews)
 
     validateColumns(currentColumns)
     validateInspectors(currentInspectors)
 
     let currentViewControllers = currentColumns.map {
-      RNSSplitViewNavigationController(rootViewController: $0.controller)
+      RNSSplitNavigationController(rootViewController: $0.controller)
     }
 
     viewControllers = currentViewControllers
@@ -141,9 +141,9 @@ public class RNSSplitViewHostController: UISplitViewController, ReactMountingTra
     needsChildViewControllersUpdate = false
   }
 
-  func updateSplitViewAppearanceIfNeeded() {
-    splitViewAppearanceApplicator.updateAppearanceIfNeeded(
-      self.splitViewHostComponentView, self, self.splitViewAppearanceCoordinator)
+  func updateSplitAppearanceIfNeeded() {
+    splitAppearanceApplicator.updateAppearanceIfNeeded(
+      self.splitHostComponentView, self, self.splitAppearanceCoordinator)
   }
 
   ///
@@ -192,15 +192,15 @@ public class RNSSplitViewHostController: UISplitViewController, ReactMountingTra
   /// @brief Filters the given subviews array by a specific column type.
   ///
   /// Iterates over the provided subviews array and returns only the elements that match
-  /// the specified RNSSplitViewScreenColumnType (e.g., .column, .inspector).
+  /// the specified RNSSplitScreenColumnType (e.g., .column, .inspector).
   ///
-  /// @param type The target RNSSplitViewScreenColumnType to filter for.
-  /// @param subviews The array of RNSSplitViewScreenComponentView elements to filter.
-  /// @return A filtered array of RNSSplitViewScreenComponentView objects with the specified column type.
+  /// @param type The target RNSSplitScreenColumnType to filter for.
+  /// @param subviews The array of RNSSplitScreenComponentView elements to filter.
+  /// @return A filtered array of RNSSplitScreenComponentView objects with the specified column type.
   ///
   func filterSubviews(
-    ofType type: RNSSplitViewScreenColumnType, in subviews: [RNSSplitViewScreenComponentView]
-  ) -> [RNSSplitViewScreenComponentView] {
+    ofType type: RNSSplitScreenColumnType, in subviews: [RNSSplitScreenComponentView]
+  ) -> [RNSSplitScreenComponentView] {
     return subviews.filter { $0.columnType == type }
   }
 
@@ -277,14 +277,14 @@ public class RNSSplitViewHostController: UISplitViewController, ReactMountingTra
   @objc
   public func reactMountingTransactionDidMount() {
     updateChildViewControllersIfNeeded()
-    updateSplitViewAppearanceIfNeeded()
+    updateSplitAppearanceIfNeeded()
     validateSplitViewHierarchy()
   }
 
-  // MARK: RNSSplitViewHostOrientationProviding
+  // MARK: RNSSplitHostOrientationProviding
   @objc
   public func evaluateOrientation() -> RNSOrientationSwift {
-    return convertToSwiftEnum(splitViewHostComponentView.orientation)
+    return convertToSwiftEnum(splitHostComponentView.orientation)
   }
 
   func convertToSwiftEnum(_ orientation: RNSOrientation) -> RNSOrientationSwift {
@@ -319,9 +319,9 @@ public class RNSSplitViewHostController: UISplitViewController, ReactMountingTra
   ///
   func validateSplitViewHierarchy() {
     let columns = filterSubviews(
-      ofType: RNSSplitViewScreenColumnType.column, in: splitViewReactSubviews)
+      ofType: RNSSplitScreenColumnType.column, in: splitReactSubviews)
     let inspectors = filterSubviews(
-      ofType: RNSSplitViewScreenColumnType.inspector, in: splitViewReactSubviews)
+      ofType: RNSSplitScreenColumnType.inspector, in: splitReactSubviews)
 
     validateColumns(columns)
     validateInspectors(inspectors)
@@ -330,91 +330,91 @@ public class RNSSplitViewHostController: UISplitViewController, ReactMountingTra
   ///
   /// @brief Ensures that number of columns is valid and hasn't changed dynamically.
   ///
-  func validateColumns(_ columns: [RNSSplitViewScreenComponentView]) {
+  func validateColumns(_ columns: [RNSSplitScreenComponentView]) {
     assert(
       columns.count >= minNumberOfColumns
         && columns.count <= maxNumberOfColumns,
-      "[RNScreens] SplitView can only have from \(minNumberOfColumns) to \(maxNumberOfColumns) columns"
+      "[RNScreens] Split can only have from \(minNumberOfColumns) to \(maxNumberOfColumns) columns"
     )
 
     assert(
       columns.count == fixedColumnsCount,
-      "[RNScreens] SplitView number of columns shouldn't change dynamically")
+      "[RNScreens] Split number of columns shouldn't change dynamically")
   }
 
   ///
   /// @brief Ensures that at most one inspector is present.
   ///
-  func validateInspectors(_ inspectors: [RNSSplitViewScreenComponentView]) {
+  func validateInspectors(_ inspectors: [RNSSplitScreenComponentView]) {
     assert(
       inspectors.count <= maxNumberOfInspectors,
-      "[RNScreens] SplitView can only have \(maxNumberOfInspectors) inspector")
+      "[RNScreens] Split can only have \(maxNumberOfInspectors) inspector")
   }
 }
 
-extension RNSSplitViewHostController {
+extension RNSSplitHostController {
 
   ///
-  /// @brief Gets the children RNSSplitViewScreenController instances.
+  /// @brief Gets the children RNSSplitScreenController instances.
   ///
-  /// Accesses SplitView controllers associated with presented columns. It asserts that each view controller is a navigation controller and its topViewController is of type RNSSplitViewScreenController.
+  /// Accesses Split controllers associated with presented columns. It asserts that each view controller is a navigation controller and its topViewController is of type RNSSplitScreenController.
   ///
-  /// @return An array of RNSSplitViewScreenController corresponding to current split view columns.
+  /// @return An array of RNSSplitScreenController corresponding to current split view columns.
   ///
-  var splitViewScreenControllers: [RNSSplitViewScreenController] {
+  var splitScreenControllers: [RNSSplitScreenController] {
     return visibleColumns.compactMap { column in
       let viewController = self.viewController(for: column)
       assert(viewController != nil, "[RNScreens] viewController for column \(column) is nil.")
 
-      let splitViewNavigationController = viewController as? RNSSplitViewNavigationController
+      let splitNavigationController = viewController as? RNSSplitNavigationController
       assert(
-        splitViewNavigationController != nil,
-        "[RNScreens] Expected RNSSplitViewNavigationController but got \(type(of: viewController))")
+        splitNavigationController != nil,
+        "[RNScreens] Expected RNSSplitNavigationController but got \(type(of: viewController))")
 
-      let maybeSplitViewScreenController = splitViewNavigationController?.topViewController
+      let maybeSplitScreenController = splitNavigationController?.topViewController
       assert(
-        maybeSplitViewScreenController != nil,
-        "[RNScreens] RNSSplitViewScreenController is nil for column \(column)")
+        maybeSplitScreenController != nil,
+        "[RNScreens] RNSSplitScreenController is nil for column \(column)")
       assert(
-        maybeSplitViewScreenController is RNSSplitViewScreenController,
-        "[RNScreens] Expected RNSSplitViewScreenController but got \(type(of: maybeSplitViewScreenController))"
+        maybeSplitScreenController is RNSSplitScreenController,
+        "[RNScreens] Expected RNSSplitScreenController but got \(type(of: maybeSplitScreenController))"
       )
 
-      return maybeSplitViewScreenController as? RNSSplitViewScreenController
+      return maybeSplitScreenController as? RNSSplitScreenController
     }
   }
 
   ///
-  /// @brief Gets all React subviews of type RNSSplitViewScreenComponentView.
+  /// @brief Gets all React subviews of type RNSSplitScreenComponentView.
   ///
-  /// Accesses all the subviews from the reactSubviews collection. It asserts that each one is a RNSSplitViewScreenComponentView.
+  /// Accesses all the subviews from the reactSubviews collection. It asserts that each one is a RNSSplitScreenComponentView.
   ///
-  /// @return An array of RNSSplitViewScreenComponentView subviews which are children of the host component view.
+  /// @return An array of RNSSplitScreenComponentView subviews which are children of the host component view.
   ///
-  var splitViewReactSubviews: [RNSSplitViewScreenComponentView] {
-    return self.splitViewHostComponentView.reactSubviews().lazy.map { subview in
+  var splitReactSubviews: [RNSSplitScreenComponentView] {
+    return self.splitHostComponentView.reactSubviews().lazy.map { subview in
       assert(
-        subview is RNSSplitViewScreenComponentView,
-        "[RNScreens] Expected RNSSplitViewScreenComponentView but got \(type(of: subview))")
+        subview is RNSSplitScreenComponentView,
+        "[RNScreens] Expected RNSSplitScreenComponentView but got \(type(of: subview))")
 
-      return subview as! RNSSplitViewScreenComponentView
+      return subview as! RNSSplitScreenComponentView
     }
   }
 }
 
-extension RNSSplitViewHostController: RNSSplitViewNavigationControllerViewFrameObserver {
+extension RNSSplitHostController: RNSSplitNavigationControllerViewFrameObserver {
 
   ///
-  /// @brief Notifies that an origin of parent RNSSplitViewNavigationController frame has changed.
+  /// @brief Notifies that an origin of parent RNSSplitNavigationController frame has changed.
   ///
   /// It iterates over children controllers and notifies them for the layout update.
   ///
-  /// @param splitViewNavCtrl The navigation controller whose frame origin changed.
+  /// @param splitNavCtrl The navigation controller whose frame origin changed.
   ///
-  func splitViewNavCtrlViewDidChangeFrameOrigin(
-    _ splitViewNavCtrl: RNSSplitViewNavigationController
+  func splitNavCtrlViewDidChangeFrameOrigin(
+    _ splitNavCtrl: RNSSplitNavigationController
   ) {
-    for controller in self.splitViewScreenControllers {
+    for controller in self.splitScreenControllers {
       controller.columnPositioningDidChangeIn(splitViewController: self)
     }
   }
@@ -424,7 +424,7 @@ extension RNSSplitViewHostController: RNSSplitViewNavigationControllerViewFrameO
 /// allowing the project to compile and run on iOS 18 or earlier versions.
 
 #if compiler(>=6.2)
-  extension RNSSplitViewHostController {
+  extension RNSSplitHostController {
 
     ///
     /// @brief Sets up the inspector column if available.
@@ -432,14 +432,14 @@ extension RNSSplitViewHostController: RNSSplitViewNavigationControllerViewFrameO
     ///
     /// Attaches a view controller for the inspector column.
     ///
-    /// @param inspectors An array of inspector-type RNSSplitViewScreenComponentView subviews.
+    /// @param inspectors An array of inspector-type RNSSplitScreenComponentView subviews.
     ///
-    func maybeSetupInspector(_ inspectors: [RNSSplitViewScreenComponentView]) {
+    func maybeSetupInspector(_ inspectors: [RNSSplitScreenComponentView]) {
       #if !os(tvOS)
         if #available(iOS 26.0, *) {
           let inspector = inspectors.first
           if inspector != nil {
-            let inspectorViewController = RNSSplitViewNavigationController(
+            let inspectorViewController = RNSSplitNavigationController(
               rootViewController: inspector!.controller)
             setViewController(inspectorViewController, for: .inspector)
           }
@@ -477,7 +477,7 @@ extension RNSSplitViewHostController: RNSSplitViewNavigationControllerViewFrameO
   }
 #endif
 
-extension RNSSplitViewHostController: UISplitViewControllerDelegate {
+extension RNSSplitHostController: UISplitViewControllerDelegate {
   public func splitViewController(
     _ svc: UISplitViewController, willShow column: UISplitViewController.Column
   ) {
@@ -547,8 +547,8 @@ extension RNSSplitViewHostController: UISplitViewControllerDelegate {
     _ svc: UISplitViewController,
     topColumnForCollapsingToProposedTopColumn proposedTopColumn: UISplitViewController.Column
   ) -> UISplitViewController.Column {
-    if splitViewHostComponentView.hasCustomTopColumnForCollapsing {
-      return splitViewHostComponentView.topColumnForCollapsingColumn
+    if splitHostComponentView.hasCustomTopColumnForCollapsing {
+      return splitHostComponentView.topColumnForCollapsingColumn
     }
     return proposedTopColumn
   }

package/ios/gamma/{split-view/RNSSplitViewNavigationController.swift → split/RNSSplitNavigationController.swift}

@@ -1,30 +1,30 @@
 import Foundation
 import UIKit
 
-/// @brief A protocol that observes origin changes in a RNSSplitViewNavigationController’s view frame.
+/// @brief A protocol that observes origin changes in a RNSSplitNavigationController’s view frame.
 ///
 /// The subscriber will be notified when the view's origin changes.
-protocol RNSSplitViewNavigationControllerViewFrameObserver: AnyObject {
-  func splitViewNavCtrlViewDidChangeFrameOrigin(
-    _ splitViewNavCtrl: RNSSplitViewNavigationController)
+protocol RNSSplitNavigationControllerViewFrameObserver: AnyObject {
+  func splitNavCtrlViewDidChangeFrameOrigin(
+    _ splitNavCtrl: RNSSplitNavigationController)
 }
 
-/// @class RNSSplitViewNavigationController
-/// @brief A subclass of UINavigationController, creates a view that wraps view associated with RNSSplitViewScreenController.
+/// @class RNSSplitNavigationController
+/// @brief A subclass of UINavigationController, creates a view that wraps view associated with RNSSplitScreenController.
 ///
 /// This subclass is responsible for tracking when the underlying view's frame origin changes,
 /// allowing for syncing the ShadowTree layout.
 ///
 /// It observes origin changes via key-value observer and notifies a delegate.
 @objc
-public class RNSSplitViewNavigationController: UINavigationController {
+public class RNSSplitNavigationController: UINavigationController {
   private var viewFrameObservation: NSKeyValueObservation?
-  weak var viewFrameOriginChangeObserver: RNSSplitViewNavigationControllerViewFrameObserver?
+  weak var viewFrameOriginChangeObserver: RNSSplitNavigationControllerViewFrameObserver?
 
   ///
   /// @brief Called after the view controller’s view has been loaded.
   ///
-  /// Sets up a frame-origin Key-Value Observer to monitor view position changes and propagate them via delegate to RNSSplitViewHostController.
+  /// Sets up a frame-origin Key-Value Observer to monitor view position changes and propagate them via delegate to RNSSplitHostController.
   ///
   override public func viewDidLoad() {
     super.viewDidLoad()
@@ -41,6 +41,6 @@ public class RNSSplitViewNavigationController: UINavigationController {
   }
 
   private func onViewOriginChange() {
-    viewFrameOriginChangeObserver?.splitViewNavCtrlViewDidChangeFrameOrigin(self)
+    viewFrameOriginChangeObserver?.splitNavCtrlViewDidChangeFrameOrigin(self)
   }
 }

package/ios/gamma/{split-view/RNSSplitViewScreenComponentEventEmitter.h → split/RNSSplitScreenComponentEventEmitter.h}

@@ -12,10 +12,10 @@ namespace react = facebook::react;
 NS_ASSUME_NONNULL_BEGIN
 
 /**
- * @class RNSSplitViewScreenComponentEventEmitter
- * @brief Responsible for emitting events from the native SplitViewScreen (column) to the React Element Tree.
+ * @class RNSSplitScreenComponentEventEmitter
+ * @brief Responsible for emitting events from the native SplitScreen (column) to the React Element Tree.
  */
-@interface RNSSplitViewScreenComponentEventEmitter : NSObject
+@interface RNSSplitScreenComponentEventEmitter : NSObject
 
 /**
  * @brief Emits the onWillAppear event to notify React Native.
@@ -59,9 +59,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 #if defined(__cplusplus)
 
-@interface RNSSplitViewScreenComponentEventEmitter ()
+@interface RNSSplitScreenComponentEventEmitter ()
 
-- (void)updateEventEmitter:(const std::shared_ptr<const react::RNSSplitViewScreenEventEmitter> &)emitter;
+- (void)updateEventEmitter:(const std::shared_ptr<const react::RNSSplitScreenEventEmitter> &)emitter;
 
 @end
 

package/ios/gamma/{split-view/RNSSplitViewScreenComponentEventEmitter.mm → split/RNSSplitScreenComponentEventEmitter.mm}

@@ -1,9 +1,9 @@
-#import "RNSSplitViewScreenComponentEventEmitter.h"
+#import "RNSSplitScreenComponentEventEmitter.h"
 
 #import <React/RCTLog.h>
 
-@implementation RNSSplitViewScreenComponentEventEmitter {
-  std::shared_ptr<const react::RNSSplitViewScreenEventEmitter> _reactEventEmitter;
+@implementation RNSSplitScreenComponentEventEmitter {
+  std::shared_ptr<const react::RNSSplitScreenEventEmitter> _reactEventEmitter;
 }
 
 - (BOOL)emitOnWillAppear
@@ -50,7 +50,7 @@
   }
 }
 
-- (void)updateEventEmitter:(const std::shared_ptr<const react::RNSSplitViewScreenEventEmitter> &)emitter
+- (void)updateEventEmitter:(const std::shared_ptr<const react::RNSSplitScreenEventEmitter> &)emitter
 {
   _reactEventEmitter = emitter;
 }

package/ios/gamma/{split-view/RNSSplitViewScreenComponentView.h → split/RNSSplitScreenComponentView.h}

@@ -3,25 +3,25 @@
 #import "RNSEnums.h"
 #import "RNSReactBaseView.h"
 #import "RNSSafeAreaProviding.h"
-#import "RNSSplitViewScreenComponentEventEmitter.h"
-#import "RNSSplitViewScreenShadowStateProxy.h"
+#import "RNSSplitScreenComponentEventEmitter.h"
+#import "RNSSplitScreenShadowStateProxy.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class RNSSplitViewHostComponentView;
-@class RNSSplitViewScreenController;
+@class RNSSplitHostComponentView;
+@class RNSSplitScreenController;
 
 /**
- * @class RNSSplitViewScreenComponentView
+ * @class RNSSplitScreenComponentView
  * @brief Native view component representing one column in a UISplitViewController layout.
  *
  * Responsible for a lifecycle management, layout, and event emission for a single screen; used as a child
- * of RNSSplitViewHostComponentView.
+ * of RNSSplitHostComponentView.
  */
-@interface RNSSplitViewScreenComponentView : RNSReactBaseView <RNSSafeAreaProviding>
+@interface RNSSplitScreenComponentView : RNSReactBaseView <RNSSafeAreaProviding>
 
-@property (nonatomic, strong, readonly, nonnull) RNSSplitViewScreenController *controller;
-@property (nonatomic, weak, readwrite, nullable) RNSSplitViewHostComponentView *splitViewHost;
+@property (nonatomic, strong, readonly, nonnull) RNSSplitScreenController *controller;
+@property (nonatomic, weak, readwrite, nullable) RNSSplitHostComponentView *splitHost;
 
 @end
 
@@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
  * @category ShadowTreeState
  * @brief Interactions between the host component and the associated ShadowNode.
  */
-@interface RNSSplitViewScreenComponentView ()
+@interface RNSSplitScreenComponentView ()
 
 /**
  * @brief Getter for the proxy object that interfaces with the Shadow Tree state for this screen.
@@ -39,9 +39,9 @@ NS_ASSUME_NONNULL_BEGIN
  * The ShadowStateProxy is the object that's responsible for sending layout updates coming from the Host tree to the
  * ShadowTree.
  *
- * @return A pointer to a RNSSplitViewScreenShadowStateProxy instance.
+ * @return A pointer to a RNSSplitScreenShadowStateProxy instance.
  */
-- (nonnull RNSSplitViewScreenShadowStateProxy *)shadowStateProxy;
+- (nonnull RNSSplitScreenShadowStateProxy *)shadowStateProxy;
 
 @end
 
@@ -51,12 +51,12 @@ NS_ASSUME_NONNULL_BEGIN
  * @category Props
  * @brief Definitions for React Native props.
  */
-@interface RNSSplitViewScreenComponentView ()
+@interface RNSSplitScreenComponentView ()
 
 /**
  * @brief Determines the purpose for the column (classic Column or one of specific types, like Inspector)
  */
-@property (nonatomic, readonly) RNSSplitViewScreenColumnType columnType;
+@property (nonatomic, readonly) RNSSplitScreenColumnType columnType;
 
 @end
 
@@ -66,14 +66,14 @@ NS_ASSUME_NONNULL_BEGIN
  * @category Events
  * @brief APIs related to event emission to React Native.
  */
-@interface RNSSplitViewScreenComponentView ()
+@interface RNSSplitScreenComponentView ()
 
 /**
  * @brief Getter for the component's event emitter used for emitting events to React.
  *
- * @return A pointer to RNSSplitViewScreenComponentEventEmitter instance.
+ * @return A pointer to RNSSplitScreenComponentEventEmitter instance.
  */
-- (nonnull RNSSplitViewScreenComponentEventEmitter *)reactEventEmitter;
+- (nonnull RNSSplitScreenComponentEventEmitter *)reactEventEmitter;
 
 @end