Apply the fix only on iOS

kkafar · kkafar · commit 1496eea97490 · 2025-04-18T14:28:14.000+02:00
diff --git a/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewComponentDescriptor.h b/common/cpp/react/renderer/components/rnscreens/RNSScreenStackHeaderSubviewComponentDescriptor.h
@@ -35,6 +35,11 @@ class RNSScreenStackHeaderSubviewComponentDescriptor final
         shadowNode.getState());
     auto stateData = state->getData();
 
+#if defined(ANDROID)
+    if (!isSizeEmpty(stateData.frameSize)) {
+      layoutableShadowNode.setSize(stateData.frameSize);
+    }
+#else
     auto mostRecentState = std::static_pointer_cast<
         const RNSScreenStackHeaderSubviewShadowNode::ConcreteState>(
         shadowNode.getMostRecentState());
@@ -71,6 +76,7 @@ class RNSScreenStackHeaderSubviewComponentDescriptor final
         layoutableShadowNode.setSize({YGUndefined, YGUndefined});
       }
     }
+#endif // Android
 
     ConcreteComponentDescriptor::adopt(shadowNode);
   }

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,11 @@ class RNSScreenStackHeaderSubviewComponentDescriptor final`
`35`	`35`	`shadowNode.getState());`
`36`	`36`	`auto stateData = state->getData();`
`37`	`37`
	`38`	`+#if defined(ANDROID)`
	`39`	`+ if (!isSizeEmpty(stateData.frameSize)) {`
	`40`	`+ layoutableShadowNode.setSize(stateData.frameSize);`
	`41`	`+ }`
	`42`	`+#else`
`38`	`43`	`auto mostRecentState = std::static_pointer_cast<`
`39`	`44`	`const RNSScreenStackHeaderSubviewShadowNode::ConcreteState>(`
`40`	`45`	`shadowNode.getMostRecentState());`
`@@ -71,6 +76,7 @@ class RNSScreenStackHeaderSubviewComponentDescriptor final`
`71`	`76`	`layoutableShadowNode.setSize({YGUndefined, YGUndefined});`
`72`	`77`	`}`
`73`	`78`	`}`
	`79`	`+#endif // Android`
`74`	`80`
`75`	`81`	`ConcreteComponentDescriptor::adopt(shadowNode);`
`76`	`82`	`}`