react-native-navigation 8.8.7-snapshot.2601 → 8.8.8-snapshot.2616

package/android/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactButtonView.java

@@ -18,7 +18,6 @@ import static com.reactnativenavigation.utils.UiUtils.dpToPx;
 
 @SuppressLint("ViewConstructor")
 public class TitleBarReactButtonView extends ReactView {
-    private static final float FINAL_WIDTH_PADDING_DP = 1f;
     private final ComponentOptions component;
 
     public TitleBarReactButtonView(Context context, ComponentOptions component) {
@@ -45,27 +44,21 @@ public class TitleBarReactButtonView extends ReactView {
             this.setId(View.NO_ID);
         }
 
-        int initialWidthSpec = component.width.hasValue()
+        // Width: bounded (AT_MOST) so the hosted React surface sizes itself to its content. Under
+        // Fabric, ReactSurfaceView reports max-of-children under AT_MOST (the laid-out content width)
+        // and pushes that to the async layout. Crucially we must NOT push a forced EXACTLY *width*:
+        // before the content has laid out that width is collapsed (~1px), Fabric lays the content into
+        // it and the button never recovers (#8320/#8326 did this and regressed under the New Arch).
+        //
+        // Height: EXACTLY the available bar height. Giving the surface a filled height (rather than a
+        // content-hugging AT_MOST height) lets content that centers itself (e.g. a flex container with
+        // justifyContent: 'center') sit vertically centered in the bar, matching the legacy layout.
+        // It does not cause the width collapse — only a forced width does.
+        int widthSpec = component.width.hasValue()
                 ? createExactSpec(component.width)
                 : makeMeasureSpec(resolveAvailableWidth(widthMeasureSpec), AT_MOST);
-        int initialHeightSpec = createHeightSpec(heightMeasureSpec, component.height);
-
-        // First discover the content size without forcing every custom button to actionBarSize.
-        super.onMeasure(initialWidthSpec, initialHeightSpec);
-
-        if (component.width.hasValue() && component.height.hasValue()) {
-            return;
-        }
-
-        // Then give RN/Yoga a stable exact final box for compatibility with centered button layouts.
-        // A small allowance avoids clipping implicit RN padding/subpixel layout while staying content-based.
-        int finalWidth = component.width.hasValue()
-                ? MeasureSpec.getSize(initialWidthSpec)
-                : resolveFinalWidth(getMeasuredWidth());
-        int finalHeight = component.height.hasValue()
-                ? MeasureSpec.getSize(initialHeightSpec)
-                : Math.max(getMeasuredHeight(), 1);
-        super.onMeasure(makeMeasureSpec(finalWidth, EXACTLY), makeMeasureSpec(finalHeight, EXACTLY));
+        int heightSpec = createHeightSpec(heightMeasureSpec, component.height);
+        super.onMeasure(widthSpec, heightSpec);
     }
 
     private int createHeightSpec(int measureSpec, Number dimension) {
@@ -73,7 +66,7 @@ public class TitleBarReactButtonView extends ReactView {
             return createExactSpec(dimension);
         }
         int availableSize = MeasureSpec.getSize(measureSpec);
-        return makeMeasureSpec(availableSize > 0 ? availableSize : Math.max(resolveActionBarSize(), 1), AT_MOST);
+        return makeMeasureSpec(availableSize > 0 ? availableSize : Math.max(resolveActionBarSize(), 1), EXACTLY);
     }
 
     private int resolveAvailableWidth(int measureSpec) {
@@ -81,10 +74,6 @@ public class TitleBarReactButtonView extends ReactView {
         return availableSize > 0 ? availableSize : Math.max(getResources().getDisplayMetrics().widthPixels, 1);
     }
 
-    private int resolveFinalWidth(int measuredContentWidth) {
-        return Math.max(measuredContentWidth + (int) Math.ceil(dpToPx(getContext(), FINAL_WIDTH_PADDING_DP)), 1);
-    }
-
     private int createExactSpec(Number dimension) {
         return makeMeasureSpec(MeasureSpec.getSize(dpToPx(getContext(), dimension.get())), EXACTLY);
     }

package/android/src/test/java/com/reactnativenavigation/views/TitleBarReactButtonViewTest.java

@@ -32,8 +32,14 @@ public class TitleBarReactButtonViewTest extends BaseTest {
     private static final int CHILD_WIDTH = 24;
     private static final int CHILD_HEIGHT = 16;
 
+    // Without explicit dimensions the button measures the hosted React surface ONCE:
+    //  - width  AT_MOST  → the surface sizes itself to its content (max-of-children under Fabric).
+    //  - height EXACTLY the available bar height → the surface gets a filled box so content that
+    //    centers itself (flex justifyContent: 'center') stays vertically centered in the bar.
+    // It deliberately does not push a forced EXACTLY *width*; under the New Architecture that re-pushes
+    // a (initially collapsed) width to the async Fabric layout and the button never recovers.
     @Test
-    public void missingDimensionsMeasureToContentThenRemeasureExactForStableAlignment() {
+    public void missingDimensionsSizeWidthToContentAndFillHeight() {
         Activity activity = newActivity();
         TitleBarReactButtonView uut = createView(activity, new ComponentOptions());
         RecordingContentView child = new RecordingContentView(activity);
@@ -41,17 +47,13 @@ public class TitleBarReactButtonViewTest extends BaseTest {
 
         uut.measure(makeMeasureSpec(PARENT_WIDTH, AT_MOST), makeMeasureSpec(PARENT_HEIGHT, AT_MOST));
 
-        assertThat(uut.getMeasuredWidth()).isEqualTo(finalWidth(activity));
-        assertThat(uut.getMeasuredHeight()).isEqualTo(CHILD_HEIGHT);
-        assertThat(child.widthMeasureSpecs.size()).isEqualTo(2);
+        assertThat(uut.getMeasuredWidth()).isEqualTo(CHILD_WIDTH);
+        assertThat(uut.getMeasuredHeight()).isEqualTo(PARENT_HEIGHT);
+        assertThat(child.widthMeasureSpecs.size()).isEqualTo(1);
         assertThat(getMode(child.widthMeasureSpecs.get(0))).isEqualTo(AT_MOST);
         assertThat(getSize(child.widthMeasureSpecs.get(0))).isEqualTo(PARENT_WIDTH);
-        assertThat(getMode(child.heightMeasureSpecs.get(0))).isEqualTo(AT_MOST);
+        assertThat(getMode(child.heightMeasureSpecs.get(0))).isEqualTo(EXACTLY);
         assertThat(getSize(child.heightMeasureSpecs.get(0))).isEqualTo(PARENT_HEIGHT);
-        assertThat(getMode(child.widthMeasureSpecs.get(1))).isEqualTo(EXACTLY);
-        assertThat(getSize(child.widthMeasureSpecs.get(1))).isEqualTo(finalWidth(activity));
-        assertThat(getMode(child.heightMeasureSpecs.get(1))).isEqualTo(EXACTLY);
-        assertThat(getSize(child.heightMeasureSpecs.get(1))).isEqualTo(CHILD_HEIGHT);
     }
 
     @Test
@@ -76,7 +78,7 @@ public class TitleBarReactButtonViewTest extends BaseTest {
     }
 
     @Test
-    public void zeroParentSpecsFallbackToBoundedAtMostSpecs() {
+    public void zeroParentSpecsFallBackToScreenWidthAndActionBarHeight() {
         Activity activity = newActivity();
         TitleBarReactButtonView uut = createView(activity, new ComponentOptions());
         RecordingContentView child = new RecordingContentView(activity);
@@ -84,20 +86,16 @@ public class TitleBarReactButtonViewTest extends BaseTest {
 
         uut.measure(makeMeasureSpec(0, AT_MOST), makeMeasureSpec(0, AT_MOST));
 
-        assertThat(child.widthMeasureSpecs.size()).isEqualTo(2);
+        assertThat(child.widthMeasureSpecs.size()).isEqualTo(1);
         assertThat(getMode(child.widthMeasureSpecs.get(0))).isEqualTo(AT_MOST);
         assertThat(getSize(child.widthMeasureSpecs.get(0)))
                 .isEqualTo(Math.max(activity.getResources().getDisplayMetrics().widthPixels, 1));
-        assertThat(getMode(child.widthMeasureSpecs.get(1))).isEqualTo(EXACTLY);
-        assertThat(getSize(child.widthMeasureSpecs.get(1))).isEqualTo(finalWidth(activity));
-        assertThat(getMode(child.heightMeasureSpecs.get(0))).isEqualTo(AT_MOST);
+        assertThat(getMode(child.heightMeasureSpecs.get(0))).isEqualTo(EXACTLY);
         assertThat(getSize(child.heightMeasureSpecs.get(0))).isEqualTo(Math.max(resolveActionBarSize(activity), 1));
-        assertThat(getMode(child.heightMeasureSpecs.get(1))).isEqualTo(EXACTLY);
-        assertThat(getSize(child.heightMeasureSpecs.get(1))).isEqualTo(CHILD_HEIGHT);
     }
 
     @Test
-    public void rtlMissingDimensionsUseBoundedSpecs() {
+    public void rtlMissingDimensionsUseBoundedWidthAndFilledHeight() {
         Activity activity = newActivity();
         TitleBarReactButtonView uut = createView(activity, new ComponentOptions());
         RecordingContentView child = new RecordingContentView(activity);
@@ -106,28 +104,11 @@ public class TitleBarReactButtonViewTest extends BaseTest {
 
         uut.measure(makeMeasureSpec(PARENT_WIDTH, AT_MOST), makeMeasureSpec(PARENT_HEIGHT, AT_MOST));
 
-        assertThat(child.widthMeasureSpecs.size()).isEqualTo(2);
+        assertThat(child.widthMeasureSpecs.size()).isEqualTo(1);
         assertThat(getMode(child.widthMeasureSpecs.get(0))).isEqualTo(AT_MOST);
         assertThat(getSize(child.widthMeasureSpecs.get(0))).isEqualTo(PARENT_WIDTH);
-        assertThat(getMode(child.widthMeasureSpecs.get(1))).isEqualTo(EXACTLY);
-        assertThat(getSize(child.widthMeasureSpecs.get(1))).isEqualTo(finalWidth(activity));
-        assertThat(getMode(child.heightMeasureSpecs.get(1))).isEqualTo(EXACTLY);
-        assertThat(getSize(child.heightMeasureSpecs.get(1))).isEqualTo(CHILD_HEIGHT);
-    }
-
-    @Test
-    public void contentRemainsCenteredWhenMenuCellLaysButtonOutTallerThanMeasuredHeight() {
-        Activity activity = newActivity();
-        TitleBarReactButtonView uut = createView(activity, new ComponentOptions());
-        RecordingContentView child = new RecordingContentView(activity);
-        setContentView(uut, child);
-
-        uut.measure(makeMeasureSpec(PARENT_WIDTH, AT_MOST), makeMeasureSpec(PARENT_HEIGHT, AT_MOST));
-        uut.layout(0, 0, uut.getMeasuredWidth(), PARENT_HEIGHT);
-
-        assertThat(uut.getMeasuredHeight()).isEqualTo(CHILD_HEIGHT);
-        assertThat(child.getTop()).isEqualTo((PARENT_HEIGHT - CHILD_HEIGHT) / 2);
-        assertThat(child.getBottom()).isEqualTo((PARENT_HEIGHT + CHILD_HEIGHT) / 2);
+        assertThat(getMode(child.heightMeasureSpecs.get(0))).isEqualTo(EXACTLY);
+        assertThat(getSize(child.heightMeasureSpecs.get(0))).isEqualTo(PARENT_HEIGHT);
     }
 
     @Test
@@ -170,10 +151,6 @@ public class TitleBarReactButtonViewTest extends BaseTest {
         return UiUtils.dpToPx(activity, 48);
     }
 
-    private int finalWidth(Activity activity) {
-        return CHILD_WIDTH + (int) Math.ceil(UiUtils.dpToPx(activity, 1f));
-    }
-
     private static class RecordingContentView extends View {
         final List<Integer> widthMeasureSpecs = new ArrayList<>();
         final List<Integer> heightMeasureSpecs = new ArrayList<>();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "8.8.7-snapshot.2601",
+  "version": "8.8.8-snapshot.2616",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,