react-native-navigation 8.8.6-snapshot.2571 → 8.8.6-snapshot.2581

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

@@ -5,11 +5,11 @@ import android.content.Context;
 import android.util.TypedValue;
 import android.view.View;
 
-import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.options.ComponentOptions;
 import com.reactnativenavigation.options.params.Number;
 import com.reactnativenavigation.react.ReactView;
 
+import static android.view.View.MeasureSpec.AT_MOST;
 import static android.view.View.MeasureSpec.EXACTLY;
 import static android.view.View.MeasureSpec.makeMeasureSpec;
 import static com.reactnativenavigation.utils.UiUtils.dpToPx;
@@ -25,28 +25,44 @@ public class TitleBarReactButtonView extends ReactView {
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        
-        //This is a workaround, ReactNative throws exception when views have ids, On android MenuItems 
+        // This is a workaround, ReactNative throws exception when views have ids, On android MenuItems
         // With ActionViews like this got an id, see #7253
         if (!this.isAttachedToWindow()) {
             this.setId(View.NO_ID);
         }
 
-        super.onMeasure(createSpec(widthMeasureSpec, component.width), createSpec(heightMeasureSpec, component.height));
+        super.onMeasure(
+                createWidthSpec(widthMeasureSpec, component.width),
+                createHeightSpec(heightMeasureSpec, component.height)
+        );
     }
 
-    private int createSpec(int measureSpec, Number dimension) {
+    private int createWidthSpec(int measureSpec, Number dimension) {
+        return createSpec(measureSpec, dimension, Math.max(getResources().getDisplayMetrics().widthPixels, 1));
+    }
+
+    private int createHeightSpec(int measureSpec, Number dimension) {
+        if (dimension.hasValue()) {
+            return createExactSpec(dimension);
+        }
+        return makeMeasureSpec(Math.max(resolveActionBarSize(), 1), EXACTLY);
+    }
+
+    private int createSpec(int measureSpec, Number dimension, int fallbackSize) {
         if (dimension.hasValue()) {
-            return makeMeasureSpec(MeasureSpec.getSize(dpToPx(getContext(), dimension.get())), EXACTLY);
+            return createExactSpec(dimension);
         } else {
-            // When JS doesn't pass width/height, default to the theme's actionBarSize (48dp on Material).
-            // Yoga's intrinsic measurement of the React view collapses `paddingHorizontal` on the
-            // trailing edge in RTL (RN/Fabric measurement quirk), so we cannot trust UNSPECIFIED here -
-            // it produces a 0dp visible inset against the screen edge in RTL.
-            return makeMeasureSpec(resolveActionBarSize(), EXACTLY);
+            // Use bounded wrap-content width to avoid RN/Yoga RTL padding issues caused by
+            // UNSPECIFIED, without forcing every custom button to actionBarSize width.
+            int availableSize = MeasureSpec.getSize(measureSpec);
+            return makeMeasureSpec(availableSize > 0 ? availableSize : fallbackSize, AT_MOST);
         }
     }
 
+    private int createExactSpec(Number dimension) {
+        return makeMeasureSpec(MeasureSpec.getSize(dpToPx(getContext(), dimension.get())), EXACTLY);
+    }
+
     private int resolveActionBarSize() {
         TypedValue tv = new TypedValue();
         if (getContext().getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true)) {

package/android/src/test/java/com/reactnativenavigation/views/TitleAndButtonsContainerTest.kt

@@ -294,6 +294,20 @@ class TitleAndButtonsContainerTest : BaseTest() {
         assertThat(uut.getTitleComponent().right).isEqualTo(UUT_WIDTH - rightBarWidth - DEFAULT_LEFT_MARGIN_PX)
     }
 
+    @Test
+    fun `Component - title width shrinks by measured right buttons only`() {
+        val rightButtonsWidth = 48
+        setup(
+                rightBarWidth = rightButtonsWidth,
+                componentWidth = UUT_WIDTH,
+                alignment = Alignment.Default
+        )
+
+        idleMainLooper()
+        assertThat(uut.getTitleComponent().left).isEqualTo(DEFAULT_LEFT_MARGIN_PX)
+        assertThat(uut.getTitleComponent().right).isEqualTo(UUT_WIDTH - rightButtonsWidth - DEFAULT_LEFT_MARGIN_PX)
+    }
+
     @Test
     fun `Component - should place title between the toolbars`() {
         val leftBarWidth = 50
@@ -475,4 +489,4 @@ class TitleAndButtonsContainerTest : BaseTest() {
     }
 
     private fun getTitleSubtitleView() = (uut.getTitleComponent() as TitleSubTitleLayout)
-}
+}

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

@@ -0,0 +1,135 @@
+package com.reactnativenavigation.views;
+
+import static android.view.View.MeasureSpec.AT_MOST;
+import static android.view.View.MeasureSpec.EXACTLY;
+import static android.view.View.MeasureSpec.getMode;
+import static android.view.View.MeasureSpec.getSize;
+import static android.view.View.MeasureSpec.makeMeasureSpec;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+import android.app.Activity;
+import android.util.TypedValue;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.options.ComponentOptions;
+import com.reactnativenavigation.options.params.Number;
+import com.reactnativenavigation.options.params.Text;
+import com.reactnativenavigation.utils.UiUtils;
+import com.reactnativenavigation.views.stack.topbar.titlebar.TitleBarReactButtonView;
+
+import org.junit.Test;
+
+public class TitleBarReactButtonViewTest extends BaseTest {
+    private static final int PARENT_WIDTH = 200;
+    private static final int PARENT_HEIGHT = 100;
+    private static final int CHILD_WIDTH = 24;
+    private static final int CHILD_HEIGHT = 16;
+
+    @Test
+    public void missingDimensionsMeasureToContentWithinParentBounds() {
+        Activity activity = newActivity();
+        TitleBarReactButtonView uut = createView(activity, new ComponentOptions());
+        uut.addView(new FixedSizeView(activity), new ViewGroup.LayoutParams(CHILD_WIDTH, CHILD_HEIGHT));
+
+        uut.measure(makeMeasureSpec(PARENT_WIDTH, AT_MOST), makeMeasureSpec(PARENT_HEIGHT, AT_MOST));
+
+        assertThat(uut.getMeasuredWidth()).isEqualTo(CHILD_WIDTH);
+        assertThat(uut.getMeasuredHeight()).isEqualTo(resolveActionBarSize(activity));
+    }
+
+    @Test
+    public void explicitDimensionsMeasureExactly() {
+        Activity activity = newActivity();
+        ComponentOptions component = new ComponentOptions();
+        component.width = new Number(72);
+        component.height = new Number(32);
+        TitleBarReactButtonView uut = createView(activity, component);
+        uut.addView(new FixedSizeView(activity), new ViewGroup.LayoutParams(CHILD_WIDTH, CHILD_HEIGHT));
+
+        uut.measure(makeMeasureSpec(PARENT_WIDTH, AT_MOST), makeMeasureSpec(PARENT_HEIGHT, AT_MOST));
+
+        assertThat(uut.getMeasuredWidth()).isEqualTo(UiUtils.dpToPx(activity, 72));
+        assertThat(uut.getMeasuredHeight()).isEqualTo(UiUtils.dpToPx(activity, 32));
+    }
+
+    @Test
+    public void zeroParentWidthFallbacksToBoundedAtMostSpecAndHeightUsesActionBarSize() {
+        Activity activity = newActivity();
+        TitleBarReactButtonView uut = createView(activity, new ComponentOptions());
+        RecordingView child = new RecordingView(activity);
+        uut.addView(child, new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT
+        ));
+
+        uut.measure(makeMeasureSpec(0, AT_MOST), makeMeasureSpec(0, AT_MOST));
+
+        assertThat(getMode(child.lastWidthMeasureSpec)).isEqualTo(AT_MOST);
+        assertThat(getSize(child.lastWidthMeasureSpec))
+                .isEqualTo(Math.max(activity.getResources().getDisplayMetrics().widthPixels, 1));
+        assertThat(getMode(child.lastHeightMeasureSpec)).isEqualTo(EXACTLY);
+        assertThat(getSize(child.lastHeightMeasureSpec)).isEqualTo(Math.max(resolveActionBarSize(activity), 1));
+    }
+
+    @Test
+    public void rtlMissingDimensionsUseBoundedSpecs() {
+        Activity activity = newActivity();
+        TitleBarReactButtonView uut = createView(activity, new ComponentOptions());
+        RecordingView child = new RecordingView(activity);
+        uut.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
+        uut.addView(child, new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT
+        ));
+
+        uut.measure(makeMeasureSpec(PARENT_WIDTH, AT_MOST), makeMeasureSpec(PARENT_HEIGHT, AT_MOST));
+
+        assertThat(getMode(child.lastWidthMeasureSpec)).isEqualTo(AT_MOST);
+        assertThat(getSize(child.lastWidthMeasureSpec)).isEqualTo(PARENT_WIDTH);
+        assertThat(getMode(child.lastHeightMeasureSpec)).isEqualTo(EXACTLY);
+        assertThat(getSize(child.lastHeightMeasureSpec)).isEqualTo(resolveActionBarSize(activity));
+    }
+
+    private TitleBarReactButtonView createView(Activity activity, ComponentOptions component) {
+        component.name = new Text("ButtonComponent");
+        component.componentId = new Text("ButtonComponentId");
+        return new TitleBarReactButtonView(activity, component);
+    }
+
+    private int resolveActionBarSize(Activity activity) {
+        TypedValue tv = new TypedValue();
+        if (activity.getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true)) {
+            return TypedValue.complexToDimensionPixelSize(tv.data, activity.getResources().getDisplayMetrics());
+        }
+        return UiUtils.dpToPx(activity, 48);
+    }
+
+    private static class FixedSizeView extends View {
+        FixedSizeView(Activity activity) {
+            super(activity);
+        }
+
+        @Override
+        protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+            setMeasuredDimension(CHILD_WIDTH, CHILD_HEIGHT);
+        }
+    }
+
+    private static class RecordingView extends View {
+        int lastWidthMeasureSpec;
+        int lastHeightMeasureSpec;
+
+        RecordingView(Activity activity) {
+            super(activity);
+        }
+
+        @Override
+        protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+            lastWidthMeasureSpec = widthMeasureSpec;
+            lastHeightMeasureSpec = heightMeasureSpec;
+            setMeasuredDimension(getSize(widthMeasureSpec), getSize(heightMeasureSpec));
+        }
+    }
+}

package/package.json

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