react-native-navigation 7.33.2 → 7.33.3-hotfix.2

package/jest.config.js

@@ -8,6 +8,7 @@ module.exports = {
   },
   roots: [
     '<rootDir>/lib/src/',
+    '<rootDir>/lib/Mock/',
     '<rootDir>/playground/src/',
     '<rootDir>/integration/',
     '<rootDir>/scripts/',
@@ -23,8 +24,8 @@ module.exports = {
       '<rootDir>/playground/img/layouts@2x.png',
   },
   collectCoverageFrom: [
-    'lib/src/**/*.ts',
-    'lib/src/**/*.tsx',
+    'lib/src/**/*.(ts|tsx)',
+    'lib/Mock/**/*.(ts|tsx)',
     'integration/**/*.js',
     '!lib/dist/index.js',
     '!lib/dist/Navigation.js',

package/lib/Mock/Layouts/BottomTabsNode.ts

@@ -4,9 +4,10 @@ import { switchTabByIndex } from '../actions/layoutActions';
 import ParentNode from './ParentNode';
 
 export default class BottomTabsNode extends ParentNode {
-  selectedIndex: number = 0;
+  selectedIndex: number;
   constructor(layout: any, parentNode?: ParentNode) {
     super(layout, 'BottomTabs', parentNode);
+    this.selectedIndex = layout.data?.options?.bottomTabs?.currentTabIndex || 0;
   }
 
   mergeOptions(options: Options) {

package/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleAndButtonsContainer.kt

@@ -153,6 +153,10 @@ class TitleAndButtonsContainer(context: Context) : ViewGroup(context) {
         val isCenter = titleComponentAlignment == Alignment.Center
         val titleHeightMeasureSpec = MeasureSpec.makeMeasureSpec(containerHeight, MeasureSpec.AT_MOST)
         val titleWidthMeasureSpec = makeTitleAtMostWidthMeasureSpec(containerWidth, rightBarWidth, leftBarWidth, isCenter)
+        if (titleComponent is TitleBarReactView) {
+            titleComponent.centered = isCenter
+        }
+
         titleComponent.measure(titleWidthMeasureSpec, titleHeightMeasureSpec)
     }
 

package/lib/android/app/src/reactNative51/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,6 +9,7 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
     }

package/lib/android/app/src/reactNative55/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,6 +9,7 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
     }

package/lib/android/app/src/reactNative56/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,6 +9,7 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
     }

package/lib/android/app/src/reactNative57/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,6 +9,7 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
     }

package/lib/android/app/src/reactNative57_5/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,6 +9,7 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
     }

package/lib/android/app/src/reactNative60/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,6 +9,7 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
     }

package/lib/android/app/src/reactNative62/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,6 +9,7 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
     }

package/lib/android/app/src/reactNative63/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,6 +9,7 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
     }

package/lib/android/app/src/reactNative68/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -9,6 +9,7 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
     }

package/lib/android/app/src/reactNative71/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -11,61 +11,17 @@ import com.reactnativenavigation.react.ReactView
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+    var centered: Boolean = false
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(interceptReactRootViewMeasureSpecWidth(widthMeasureSpec), interceptReactRootViewMeasureSpecHeight(heightMeasureSpec))
-    }
-
-    private fun interceptReactRootViewMeasureSpecWidth(widthMeasureSpec: Int): Int {
-        // This is a HACK.
-        // ReactRootView has problematic behavior when setting width to WRAP_CONTENT,
-        // It's causing infinite measurements, that hung up the UI.
-        // Intercepting largest child by width, and use its width as (parent) ReactRootView width fixed that.
-        // See for more details https://github.com/wix/react-native-navigation/pull/7096
-        val measuredWidth = this.getLastRootViewChildMaxWidth()
-
-        return MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.EXACTLY)
-    }
-
-    private fun interceptReactRootViewMeasureSpecHeight(heightMeasureSpec: Int): Int {
-        // This is a HACK.
-        // ReactRootView has problematic behavior when setting width to WRAP_CONTENT,
-        // It's causing infinite measurements, that hung up the UI.
-        // Intercepting largest child by height, and use its height as (parent) ReactRootView width fixed that.
-        // See for more details https://github.com/wix/react-native-navigation/pull/7096
-        val measuredHeight = this.getLastRootViewChild()?.height
-
-        return if (measuredHeight != null) MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.EXACTLY) else
-            heightMeasureSpec
-    }
-
-    private fun getLastRootViewChildMaxWidth(): Int {
-        if (rootViewGroup.children.count() == 0) {
-            return 0
-        }
-        var maxWidth = rootViewGroup.width
-        var next = rootViewGroup as Any
-        while(next is ViewGroup) { //try {
-            if (next.width > maxWidth) {
-                maxWidth = next.width
-            }
-            if (next.children.count() == 0) break
-            next.children.first().also { next = it }
-        }
-        return maxWidth
-    }
-
-    private fun getLastRootViewChild(): View? {
-        if (rootViewGroup.children.count() == 0) {
-            return null
-        }
-        var rootViewGroupLastChild: View = rootViewGroup
-        var next = rootViewGroup as Any
-        while(next is ViewGroup) { //try {
-            rootViewGroupLastChild = next
-            if (next.children.count() == 0) break
-            next.children.first().also { next = it }
+        var titleHeightMeasureSpec: Int
+        var titleWidthMeasureSpec: Int
+        if (centered) {
+            titleHeightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)
+            titleWidthMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)
+        } else {
+            titleHeightMeasureSpec = heightMeasureSpec
+            titleWidthMeasureSpec = widthMeasureSpec
         }
-        @Suppress("UNREACHABLE_CODE")
-        return rootViewGroupLastChild
+        super.onMeasure(titleWidthMeasureSpec, titleHeightMeasureSpec)
     }
 }

package/lib/dist/Mock/Layouts/BottomTabsNode.js

@@ -5,9 +5,10 @@ const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
 const layoutActions_1 = require("../actions/layoutActions");
 const ParentNode_1 = (0, tslib_1.__importDefault)(require("./ParentNode"));
 class BottomTabsNode extends ParentNode_1.default {
-    selectedIndex = 0;
+    selectedIndex;
     constructor(layout, parentNode) {
         super(layout, 'BottomTabs', parentNode);
+        this.selectedIndex = layout.data?.options?.bottomTabs?.currentTabIndex || 0;
     }
     mergeOptions(options) {
         super.mergeOptions(options);

package/lib/ios/RNNBaseIconCreator.m

@@ -18,7 +18,7 @@
 
 - (UIImage *)createEnabledIcon:(RNNButtonOptions *)buttonOptions {
     UIColor *backgroundColor = [buttonOptions.iconBackground.color withDefault:UIColor.clearColor];
-    UIColor *tintColor = [buttonOptions.color withDefault:nil];
+    UIColor *tintColor = buttonOptions.resolveColor;
 
     return [self createIcon:buttonOptions tintColor:tintColor backgroundColor:backgroundColor];
 }

package/lib/ios/RNNBottomTabsController.m

@@ -58,11 +58,11 @@
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     // This hack is needed for cases when the initialized state of the tabBar should be hidden
-    UINavigationController *firstChild = [self.childViewControllers objectAtIndex:0];
-    if ([firstChild isKindOfClass:UINavigationController.class] &&
-        firstChild.hidesBottomBarWhenPushed) {
-        [firstChild pushViewController:UIViewController.new animated:NO];
-        [firstChild popViewControllerAnimated:NO];
+    UINavigationController *selectedChild = self.selectedViewController;
+    if ([selectedChild isKindOfClass:UINavigationController.class] &&
+        selectedChild.hidesBottomBarWhenPushed) {
+        [selectedChild pushViewController:UIViewController.new animated:NO];
+        [selectedChild popViewControllerAnimated:NO];
     }
 }
 

package/lib/ios/RNNButtonOptions.h

@@ -22,10 +22,11 @@
 @property(nonatomic, strong) Bool *selectTabOnPress;
 @property(nonatomic, strong) RNNComponentOptions *component;
 @property(nonatomic, strong) RNNIconBackgroundOptions *iconBackground;
+@property(nonatomic, strong) Bool *disableIconTint;
 
 - (RNNButtonOptions *)withDefault:(RNNButtonOptions *)defaultOptions;
 
-- (Color *)resolveColor;
+- (UIColor *)resolveColor;
 
 - (RNNButtonOptions *)withDefaultColor:(Color *)color disabledColor:(Color *)disabledColor;
 

package/lib/ios/RNNButtonOptions.m

@@ -1,4 +1,5 @@
 #import "RNNButtonOptions.h"
+#import "NullColor.h"
 
 @implementation RNNButtonOptions
 
@@ -23,6 +24,7 @@
     self.iconBackground = [[RNNIconBackgroundOptions alloc] initWithDict:dict[@"iconBackground"]
                                                                  enabled:self.enabled];
     self.systemItem = [TextParser parse:dict key:@"systemItem"];
+    self.disableIconTint = [BoolParser parse:dict key:@"disableIconTint"];
 
     return self;
 }
@@ -46,6 +48,7 @@
     newOptions.selectTabOnPress = self.selectTabOnPress.copy;
     newOptions.iconBackground = self.iconBackground.copy;
     newOptions.systemItem = self.systemItem.copy;
+    newOptions.disableIconTint = self.disableIconTint.copy;
     return newOptions;
 }
 
@@ -83,6 +86,8 @@
         self.selectTabOnPress = options.selectTabOnPress;
     if (options.systemItem.hasValue)
         self.systemItem = options.systemItem;
+    if (options.disableIconTint.hasValue)
+        self.disableIconTint = options.disableIconTint;
 }
 
 - (BOOL)shouldCreateCustomView {
@@ -93,11 +98,13 @@
     return [self.enabled withDefault:YES];
 }
 
-- (Color *)resolveColor {
+- (UIColor *)resolveColor {
+    if ([_disableIconTint withDefault:NO])
+        return NullColor.new.get;
     if (![_enabled withDefault:YES] && _disabledColor.hasValue)
-        return _disabledColor;
+        return _disabledColor.get;
     else
-        return _color;
+        return [_color withDefault:nil];
 }
 
 - (RNNButtonOptions *)withDefault:(RNNButtonOptions *)defaultOptions {

package/lib/ios/RNNUIBarButtonItem.m

@@ -139,17 +139,16 @@
     [self applyDisabledTitleTextAttributes:buttonOptions];
 }
 
-- (void)applyColor:(Color *)color {
-    if (color.hasValue) {
+- (void)applyColor:(UIColor *)color {
+    if (color) {
         NSMutableDictionary *titleTextAttributes = [NSMutableDictionary
             dictionaryWithDictionary:[self titleTextAttributesForState:UIControlStateNormal]];
-        [titleTextAttributes setValue:color.get forKey:NSForegroundColorAttributeName];
+        [titleTextAttributes setValue:color forKey:NSForegroundColorAttributeName];
         [self setTitleTextAttributes:titleTextAttributes forState:UIControlStateNormal];
         [self setTitleTextAttributes:titleTextAttributes forState:UIControlStateHighlighted];
+        self.tintColor = color;
     } else
         self.image = [self.image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
-
-    self.tintColor = color.get;
 }
 
 - (void)mergeBackgroundColor:(Color *)color {
@@ -159,7 +158,7 @@
 
 - (void)mergeColor:(Color *)color {
     _buttonOptions.color = color;
-    [self applyColor:color];
+    [self applyColor:color.get];
     [self redrawIcon];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.33.2",
+  "version": "7.33.3-hotfix.2",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,