diff --git a/apps/fabric-example/ios/Podfile.lock b/apps/fabric-example/ios/Podfile.lock
index 35cd120ec61..b609ee5435c 100644
--- a/apps/fabric-example/ios/Podfile.lock
+++ b/apps/fabric-example/ios/Podfile.lock
@@ -2233,7 +2233,7 @@ SPEC CHECKSUMS:
   RNScreens: de6e57426ba0e6cbc3fb5b4f496e7f08cb2773c2
   RNSVG: 08750404f92a36162a92522cc77dee437be1d257
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
-  Yoga: 8833bd4378ffd79f1dea711d6dc7231c09e63590
+  Yoga: 2a74e67570a7902969ff44f35dd41f47a9693be8
 
 PODFILE CHECKSUM: 3eb88d49c8fe32af0ac2c85501e29d29171f1070
 
diff --git a/apps/next-example/pages/_app.js b/apps/next-example/pages/_app.js
index 51bd8ea6636..90788afb3d1 100644
--- a/apps/next-example/pages/_app.js
+++ b/apps/next-example/pages/_app.js
@@ -1,3 +1,4 @@
+/* eslint-disable jsdoc/require-jsdoc */
 import Head from 'next/head';
 
 export default function App({ Component, pageProps }) {
diff --git a/apps/next-example/pages/index.js b/apps/next-example/pages/index.js
index 0b4290a8a11..518c90e000a 100644
--- a/apps/next-example/pages/index.js
+++ b/apps/next-example/pages/index.js
@@ -1,3 +1,4 @@
+/* eslint-disable jsdoc/require-jsdoc */
 import { StyleSheet, Text, View } from 'react-native';
 
 const styles = StyleSheet.create({
diff --git a/apps/next-example/pages/noreanimated.js b/apps/next-example/pages/noreanimated.js
index 99eb9249a46..2e27e4ea8a3 100644
--- a/apps/next-example/pages/noreanimated.js
+++ b/apps/next-example/pages/noreanimated.js
@@ -1,3 +1,4 @@
+/* eslint-disable jsdoc/require-jsdoc */
 import { StyleSheet, View, Text } from 'react-native';
 
 export default function App() {
diff --git a/apps/next-example/pages/reanimated.js b/apps/next-example/pages/reanimated.js
index 4d53b4003b2..21ae7fff438 100644
--- a/apps/next-example/pages/reanimated.js
+++ b/apps/next-example/pages/reanimated.js
@@ -1,3 +1,4 @@
+/* eslint-disable jsdoc/require-jsdoc */
 import { StyleSheet } from 'react-native';
 import Animated from 'react-native-reanimated';
 
diff --git a/apps/next-example/pages/ssg.js b/apps/next-example/pages/ssg.js
index 4ec92906430..5d82dd0b77c 100644
--- a/apps/next-example/pages/ssg.js
+++ b/apps/next-example/pages/ssg.js
@@ -1,3 +1,4 @@
+/* eslint-disable jsdoc/require-jsdoc */
 import Animated, {
   PinwheelIn,
   useAnimatedStyle,
diff --git a/apps/next-example/pages/ssr.js b/apps/next-example/pages/ssr.js
index f17b9b7df6a..bae088d5e0b 100644
--- a/apps/next-example/pages/ssr.js
+++ b/apps/next-example/pages/ssr.js
@@ -1,3 +1,4 @@
+/* eslint-disable jsdoc/require-jsdoc */
 import Animated, {
   PinwheelIn,
   useAnimatedStyle,
diff --git a/apps/next-example/pages/test.js b/apps/next-example/pages/test.js
index 071ba55c20c..7d6a242dcd5 100644
--- a/apps/next-example/pages/test.js
+++ b/apps/next-example/pages/test.js
@@ -1,3 +1,4 @@
+/* eslint-disable jsdoc/require-jsdoc */
 import Animated, {
   PinwheelIn,
   useAnimatedStyle,
diff --git a/packages/react-native-reanimated/Common/cpp/reanimated/LayoutAnimations/LayoutAnimationsProxy.cpp b/packages/react-native-reanimated/Common/cpp/reanimated/LayoutAnimations/LayoutAnimationsProxy.cpp
index 8102462188d..0aeda945bb4 100644
--- a/packages/react-native-reanimated/Common/cpp/reanimated/LayoutAnimations/LayoutAnimationsProxy.cpp
+++ b/packages/react-native-reanimated/Common/cpp/reanimated/LayoutAnimations/LayoutAnimationsProxy.cpp
@@ -784,13 +784,13 @@ void LayoutAnimationsProxy::maybeRestoreOpacity(
 void LayoutAnimationsProxy::maybeUpdateWindowDimensions(
     facebook::react::ShadowViewMutation &mutation,
     SurfaceId surfaceId) const {
-  // This is a hacky way to obtain the window dimensions.
-  // We can identify the root, by checking if its tag is equal to the surfaceId
-  if (mutation.parentShadowView.tag == surfaceId) {
+  if (mutation.type == ShadowViewMutation::Update &&
+      !std::strcmp(
+          mutation.oldChildShadowView.componentName, RootComponentName)) {
     surfaceManager.updateWindow(
         surfaceId,
-        mutation.parentShadowView.layoutMetrics.frame.size.width,
-        mutation.parentShadowView.layoutMetrics.frame.size.height);
+        mutation.newChildShadowView.layoutMetrics.frame.size.width,
+        mutation.newChildShadowView.layoutMetrics.frame.size.height);
   }
 }