From b1d6c064f43c730d574a92bb317e966e54884d98 Mon Sep 17 00:00:00 2001
From: Krzysztof Ligarski <krzysztof.ligarski@swmansion.com>
Date: Wed, 26 Nov 2025 07:55:06 +0100
Subject: [PATCH 1/5] override layoutSubviews on Fabric

---
 .../host/RNSBottomTabsHostComponentView.mm     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ios/bottom-tabs/host/RNSBottomTabsHostComponentView.mm b/ios/bottom-tabs/host/RNSBottomTabsHostComponentView.mm
index 2e403abcf6..2813e54ad9 100644
--- a/ios/bottom-tabs/host/RNSBottomTabsHostComponentView.mm
+++ b/ios/bottom-tabs/host/RNSBottomTabsHostComponentView.mm
@@ -155,6 +155,24 @@ - (void)reactAddControllerToClosestParent:(UIViewController *)controller
   }
 }
 
+#if RCT_NEW_ARCH_ENABLED
+
+// On Fabric, when tabs are rendered dynamically, tab screens receive incorrect frame from UIKit layout
+// (frame matches full window size instead of the size of the host). To mitigate this, we override
+// `layoutSubviews` and assign correct frame ourselves.
+// TODO: investigate why we receive incorrect frame, fix and remove this workaround
+- (void)layoutSubviews
+{
+  RCTAssert(
+      self.subviews.count == 1,
+      @"[RNScreens] Incorrect number of subviews in RNSBottomTabsHostComponentView. Expected 1, actual: %lu.",
+      static_cast<unsigned long>(self.subviews.count));
+
+  [self.subviews[0] setFrame:self.bounds];
+}
+
+#endif // RCT_NEW_ARCH_ENABLED
+
 #pragma mark - RNSScreenContainerDelegate
 
 - (void)updateContainer

From 9e6b26efb1ad659da08bef0a144e68a2cc07e8ea Mon Sep 17 00:00:00 2001
From: Krzysztof Ligarski <krzysztof.ligarski@swmansion.com>
Date: Wed, 26 Nov 2025 13:22:17 +0100
Subject: [PATCH 2/5] add test screen

---
 apps/src/tests/Test3425.tsx | 33 +++++++++++++++++++++++++++++++++
 apps/src/tests/index.ts     |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 apps/src/tests/Test3425.tsx

diff --git a/apps/src/tests/Test3425.tsx b/apps/src/tests/Test3425.tsx
new file mode 100644
index 0000000000..fd17edc867
--- /dev/null
+++ b/apps/src/tests/Test3425.tsx
@@ -0,0 +1,33 @@
+import React, { useState } from 'react';
+import { enableFreeze } from 'react-native-screens';
+import { Button, View } from 'react-native';
+import Colors from '../shared/styling/Colors';
+import { TestBottomTabs } from '.';
+
+enableFreeze(true);
+
+export default function App() {
+  const [index, setIndex] = useState(0);
+  return (
+    <View
+      style={{
+        flex: 1,
+        paddingHorizontal: 20,
+        paddingVertical: 100,
+        backgroundColor: Colors.BlueLight40,
+      }}>
+      {index === 0 ? (
+        <View
+          style={{
+            flex: 1,
+            justifyContent: 'center',
+            alignItems: 'center',
+          }}>
+          <Button title="Go to Bottom Tabs" onPress={() => setIndex(1)} />
+        </View>
+      ) : (
+        <TestBottomTabs />
+      )}
+    </View>
+  );
+}
diff --git a/apps/src/tests/index.ts b/apps/src/tests/index.ts
index 87855279b2..76e85cecbb 100644
--- a/apps/src/tests/index.ts
+++ b/apps/src/tests/index.ts
@@ -162,6 +162,7 @@ export { default as Test3342 } from './Test3342';
 export { default as Test3346 } from './Test3346';
 export { default as Test3369 } from './Test3369';
 export { default as Test3379 } from './Test3379';
+export { default as Test3425 } from './Test3425';
 export { default as TestScreenAnimation } from './TestScreenAnimation';
 export { default as TestScreenAnimationV5 } from './TestScreenAnimationV5';
 export { default as TestHeader } from './TestHeader';

From 64010567fb1308094146b68b44baf8801ba4bfc0 Mon Sep 17 00:00:00 2001
From: Krzysztof Ligarski <krzysztof.ligarski@swmansion.com>
Date: Wed, 26 Nov 2025 13:24:09 +0100
Subject: [PATCH 3/5] remove redundant freeze

---
 apps/src/tests/Test3425.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/src/tests/Test3425.tsx b/apps/src/tests/Test3425.tsx
index fd17edc867..2d72d6fc16 100644
--- a/apps/src/tests/Test3425.tsx
+++ b/apps/src/tests/Test3425.tsx
@@ -1,11 +1,8 @@
 import React, { useState } from 'react';
-import { enableFreeze } from 'react-native-screens';
 import { Button, View } from 'react-native';
 import Colors from '../shared/styling/Colors';
 import { TestBottomTabs } from '.';
 
-enableFreeze(true);
-
 export default function App() {
   const [index, setIndex] = useState(0);
   return (

From 2ffc67f01955315e91cb4a8b1361e41e1848f2a5 Mon Sep 17 00:00:00 2001
From: Krzysztof Ligarski <krzysztof.ligarski@swmansion.com>
Date: Wed, 26 Nov 2025 13:25:21 +0100
Subject: [PATCH 4/5] adjust error message

---
 ios/bottom-tabs/host/RNSBottomTabsHostComponentView.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ios/bottom-tabs/host/RNSBottomTabsHostComponentView.mm b/ios/bottom-tabs/host/RNSBottomTabsHostComponentView.mm
index 2813e54ad9..a4a092fafa 100644
--- a/ios/bottom-tabs/host/RNSBottomTabsHostComponentView.mm
+++ b/ios/bottom-tabs/host/RNSBottomTabsHostComponentView.mm
@@ -165,7 +165,7 @@ - (void)layoutSubviews
 {
   RCTAssert(
       self.subviews.count == 1,
-      @"[RNScreens] Incorrect number of subviews in RNSBottomTabsHostComponentView. Expected 1, actual: %lu.",
+      @"[RNScreens] Unexpected number of subviews in RNSBottomTabsHostComponentView. Expected 1, actual: %lu.",
       static_cast<unsigned long>(self.subviews.count));
 
   [self.subviews[0] setFrame:self.bounds];

From 7000be478f0d43a7c49b6f229beb28e65872332e Mon Sep 17 00:00:00 2001
From: Krzysztof Ligarski <krzysztof.ligarski@swmansion.com>
Date: Thu, 27 Nov 2025 12:36:32 +0100
Subject: [PATCH 5/5] use layout constraints

---
 .../host/RNSBottomTabsHostComponentView.mm    | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/ios/bottom-tabs/host/RNSBottomTabsHostComponentView.mm b/ios/bottom-tabs/host/RNSBottomTabsHostComponentView.mm
index a4a092fafa..5ed820dd9a 100644
--- a/ios/bottom-tabs/host/RNSBottomTabsHostComponentView.mm
+++ b/ios/bottom-tabs/host/RNSBottomTabsHostComponentView.mm
@@ -146,6 +146,17 @@ - (void)reactAddControllerToClosestParent:(UIViewController *)controller
       if (parentView.reactViewController) {
         [parentView.reactViewController addChildViewController:controller];
         [self addSubview:controller.view];
+
+        // Enable auto-layout to ensure valid size of tabBarController.view.
+        // In host tree, tabBarController.view is the only child of HostComponentView.
+        controller.view.translatesAutoresizingMaskIntoConstraints = NO;
+        [NSLayoutConstraint activateConstraints:@[
+          [controller.view.topAnchor constraintEqualToAnchor:self.topAnchor],
+          [controller.view.bottomAnchor constraintEqualToAnchor:self.bottomAnchor],
+          [controller.view.leadingAnchor constraintEqualToAnchor:self.leadingAnchor],
+          [controller.view.trailingAnchor constraintEqualToAnchor:self.trailingAnchor]
+        ]];
+
         [controller didMoveToParentViewController:parentView.reactViewController];
         break;
       }
@@ -155,24 +166,6 @@ - (void)reactAddControllerToClosestParent:(UIViewController *)controller
   }
 }
 
-#if RCT_NEW_ARCH_ENABLED
-
-// On Fabric, when tabs are rendered dynamically, tab screens receive incorrect frame from UIKit layout
-// (frame matches full window size instead of the size of the host). To mitigate this, we override
-// `layoutSubviews` and assign correct frame ourselves.
-// TODO: investigate why we receive incorrect frame, fix and remove this workaround
-- (void)layoutSubviews
-{
-  RCTAssert(
-      self.subviews.count == 1,
-      @"[RNScreens] Unexpected number of subviews in RNSBottomTabsHostComponentView. Expected 1, actual: %lu.",
-      static_cast<unsigned long>(self.subviews.count));
-
-  [self.subviews[0] setFrame:self.bounds];
-}
-
-#endif // RCT_NEW_ARCH_ENABLED
-
 #pragma mark - RNSScreenContainerDelegate
 
 - (void)updateContainer