From 53c6494615fcc19e555adf7900cd443b88ce562a Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Sun, 29 Aug 2021 09:30:50 -0700
Subject: [PATCH] Remount children in scrollView if layout changes

Summary: changelog: [internal]

Reviewed By: hramos

Differential Revision: D30603617

fbshipit-source-id: bc189d4a0a997202e6b2cd5314b997395bcdf7b2
---
 .../ScrollView/RCTScrollViewComponentView.mm             | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
index 885e8636f180ea..37468a85b11e8b 100644
--- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
@@ -133,6 +133,15 @@ - (void)dealloc
   [self.scrollViewDelegateSplitter removeAllDelegates];
 }
 
+- (void)layoutSubviews
+{
+  [super layoutSubviews];
+
+  if (_subviewClippingEnabled) {
+    [self _remountChildren];
+  }
+}
+
 - (RCTGenericDelegateSplitter<id<UIScrollViewDelegate>> *)scrollViewDelegateSplitter
 {
   return ((RCTEnhancedScrollView *)_scrollView).delegateSplitter;