From f6f78c28b376a647a3eb171b9f3816ab1e091a0c Mon Sep 17 00:00:00 2001
From: Kacper Kafara <kacperkafara@gmail.com>
Date: Wed, 15 Jan 2025 21:27:58 +0100
Subject: [PATCH] A bit more of cleanup & refactor of iOS code

---
 ios/RNSScreenStack.mm              | 2 +-
 ios/RNSScreenStackHeaderConfig.mm  | 2 +-
 ios/RNSScreenStackHeaderSubview.h  | 2 +-
 ios/RNSScreenStackHeaderSubview.mm | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ios/RNSScreenStack.mm b/ios/RNSScreenStack.mm
index b3ca978bb..a580e5382 100644
--- a/ios/RNSScreenStack.mm
+++ b/ios/RNSScreenStack.mm
@@ -116,7 +116,7 @@ - (void)maybeUpdateHeaderInsetsInShadowTreeForScreen:(RNSScreen *)screenControll
   [headerConfig updateHeaderConfigState:self.navigationBar.frame.size];
   for (RNSScreenStackHeaderSubview *subview in headerConfig.reactSubviews) {
     CGRect frameInNavBarCoordinates = [subview convertRect:subview.frame toView:self.navigationBar];
-    [subview updateHeaderSubviewFrame:frameInNavBarCoordinates];
+    [subview updateHeaderSubviewFrameInShadowTree:frameInNavBarCoordinates];
   }
 #else
   NSDirectionalEdgeInsets navBarMargins = [self.navigationBar directionalLayoutMargins];
diff --git a/ios/RNSScreenStackHeaderConfig.mm b/ios/RNSScreenStackHeaderConfig.mm
index 4bbc5c812..490798104 100644
--- a/ios/RNSScreenStackHeaderConfig.mm
+++ b/ios/RNSScreenStackHeaderConfig.mm
@@ -949,7 +949,7 @@ - (void)prepareForRecycle
   _initialPropsSet = NO;
 
 #ifdef RCT_NEW_ARCH_ENABLED
-  _lastSize = CGSize();
+  _lastSize = CGSizeZero;
 #else
   _lastHeaderInsets = NSDirectionalEdgeInsets{};
 #endif
diff --git a/ios/RNSScreenStackHeaderSubview.h b/ios/RNSScreenStackHeaderSubview.h
index 4427892e9..64c59ce21 100644
--- a/ios/RNSScreenStackHeaderSubview.h
+++ b/ios/RNSScreenStackHeaderSubview.h
@@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, weak) UIView *reactSuperview;
 
 #ifdef RCT_NEW_ARCH_ENABLED
-- (void)updateHeaderSubviewFrame:(CGRect)frame;
+- (void)updateHeaderSubviewFrameInShadowTree:(CGRect)frame;
 #endif
 
 @end
diff --git a/ios/RNSScreenStackHeaderSubview.mm b/ios/RNSScreenStackHeaderSubview.mm
index c8390bade..1915437ac 100644
--- a/ios/RNSScreenStackHeaderSubview.mm
+++ b/ios/RNSScreenStackHeaderSubview.mm
@@ -137,7 +137,7 @@ - (void)updateState:(const facebook::react::State::Shared &)state
   _state = std::static_pointer_cast<const react::RNSScreenStackHeaderSubviewShadowNode::ConcreteState>(state);
 }
 
-- (void)updateHeaderSubviewFrame:(CGRect)frame
+- (void)updateHeaderSubviewFrameInShadowTree:(CGRect)frame
 {
   if (_state != nullptr) {
     auto newState =