react-native-navigation 7.33.3 → 7.34.0

package/autolink/fixtures/rn71/AppDelegate.mm.template

@@ -0,0 +1,36 @@
+#import "AppDelegate.h"
+
+#import <React/RCTBundleURLProvider.h>
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+  self.moduleName = @"app";
+  // You can add your custom initial props in the dictionary below.
+  // They will be passed down to the ViewController used by React Native.
+  self.initialProps = @{};
+
+  return [super application:application didFinishLaunchingWithOptions:launchOptions];
+}
+
+- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+{
+#if DEBUG
+  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
+#else
+  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+#endif
+}
+
+/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off.
+///
+/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html
+/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture).
+/// @return: `true` if the `concurrentRoot` feature is enabled. Otherwise, it returns `false`.
+- (BOOL)concurrentRootEnabled
+{
+  return true;
+}
+
+@end

package/autolink/fixtures/rn71/MainActivity.java.template

@@ -0,0 +1,35 @@
+package com.app;
+
+import com.reactnativenavigation.NavigationActivity;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
+import com.facebook.react.defaults.DefaultReactActivityDelegate;
+
+public class MainActivity extends NavigationActivity {
+
+  /**
+   * Returns the name of the main component registered from JavaScript. This is used to schedule
+   * rendering of the component.
+   */
+  @Override
+  protected String getMainComponentName() {
+    return "app";
+  }
+
+  /**
+   * Returns the instance of the {@link ReactActivityDelegate}. Here we use a util class {@link
+   * DefaultReactActivityDelegate} which allows you to easily enable Fabric and Concurrent React
+   * (aka React 18) with two boolean flags.
+   */
+  @Override
+  protected ReactActivityDelegate createReactActivityDelegate() {
+    return new DefaultReactActivityDelegate(
+        this,
+        getMainComponentName(),
+        // If you opted-in for the New Architecture, we enable the Fabric Renderer.
+        DefaultNewArchitectureEntryPoint.getFabricEnabled(), // fabricEnabled
+        // If you opted-in for the New Architecture, we enable Concurrent React (i.e. React 18).
+        DefaultNewArchitectureEntryPoint.getConcurrentReactEnabled() // concurrentRootEnabled
+        );
+  }
+}

package/autolink/postlink/__snapshots__/activityLinker.test.js.snap

@@ -66,3 +66,21 @@ public class MainActivity extends NavigationActivity {
 }
 "
 `;
+
+
+exports[`activityLinker should work for RN 0.71 1`] = `
+"package com.app;
+
+import com.reactnativenavigation.NavigationActivity;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
+import com.facebook.react.defaults.DefaultReactActivityDelegate;
+
+public class MainActivity extends NavigationActivity {
+
+  
+
+  
+}
+"
+`;

package/autolink/postlink/__snapshots__/appDelegateLinker.test.js.snap

@@ -239,3 +239,49 @@ static NSString *const kRNConcurrentRoot = @\\"concurrentRoot\\";
 @end
 "
 `;
+
+exports[`appDelegateLinker should work for RN 0.71 1`] = `
+"#import \\"AppDelegate.h\\"
+#import <ReactNativeNavigation/ReactNativeNavigation.h>
+
+#import <React/RCTBundleURLProvider.h>
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+  [ReactNativeNavigation bootstrapWithBridge:bridge];
+  // You can add your custom initial props in the dictionary below.
+  // They will be passed down to the ViewController used by React Native.
+  self.initialProps = @{};
+
+  return YES;
+}
+
+- (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge {
+  return [ReactNativeNavigation extraModulesForBridge:bridge];
+}
+
+- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+{
+#if DEBUG
+  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@\\"index\\"];
+#else
+  return [[NSBundle mainBundle] URLForResource:@\\"main\\" withExtension:@\\"jsbundle\\"];
+#endif
+}
+
+/// This method controls whether the \`concurrentRoot\`feature of React18 is turned on or off.
+///
+/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html
+/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture).
+/// @return: \`true\` if the \`concurrentRoot\` feature is enabled. Otherwise, it returns \`false\`.
+- (BOOL)concurrentRootEnabled
+{
+  return true;
+}
+
+@end
+"
+`;

package/autolink/postlink/activityLinker.js

@@ -105,7 +105,7 @@ class ActivityLinker {
     if (this._hasCreateReactActivityDelegate(activityContent)) {
       debugn('   Removing createReactActivityDelegate function');
       return activityContent.replace(
-        /\/\*\*(\s+\*.+)+\s+@Override\s+protected ReactActivityDelegate createReactActivityDelegate\(\) {(\s*[\w*(,);])*\s*}/,
+        /\/\*\*\s*\n([^\*]|(\*(?!\/)))*\*\/\s*@Override\s*protected\s*ReactActivityDelegate\s*createReactActivityDelegate\s*\(\)\s*{\s*return((.|\r|\s)*?)}/,
         ''
       );
     } else {
@@ -115,7 +115,7 @@ class ActivityLinker {
   }
 
   _hasCreateReactActivityDelegate(activityContent) {
-    return /\/\*\*(\s+\*.+)+\s+@Override\s+protected ReactActivityDelegate createReactActivityDelegate\(\) {(\s*[\w*(,);])*\s*}/.test(
+    return /\/\*\*\s*\n([^\*]|(\*(?!\/)))*\*\/\s*@Override\s*protected\s*ReactActivityDelegate\s*createReactActivityDelegate\s*\(\)\s*{\s*return((.|\r|\s)*?)}/.test(
       activityContent
     );
   }

package/autolink/postlink/appDelegateLinker.js

@@ -100,12 +100,22 @@ class AppDelegateLinker {
       return content;
     }
 
-    debugn('   Bootstrapping Navigation');
-    return content.replace(
-      /RCTBridge.*];/,
-      'RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];\n' +
-        '[ReactNativeNavigation bootstrapWithBridge:bridge];'
-    );
+    debugn('   Bootstrapping Navigation !!!!');
+    return content
+      .replace(
+        /RCTBridge.*];/,
+        'RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];\n' +
+          '[ReactNativeNavigation bootstrapWithBridge:bridge];'
+      )
+      .replace(
+        /return \[super application:application didFinishLaunchingWithOptions:launchOptions\];/,
+        'return YES;'
+      )
+      .replace(
+        /self.moduleName.*;/,
+        'RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];\n' +
+          '  [ReactNativeNavigation bootstrapWithBridge:bridge];'
+      );
   }
 
   _doesBootstrapNavigation(content) {

package/autolink/postlink/gradleLinker.js

@@ -3,7 +3,7 @@ var path = require('./path');
 var fs = require('fs');
 var { warnn, errorn, logn, infon, debugn } = require('./log');
 var { insertString } = require('./stringUtils');
-var DEFAULT_KOTLIN_VERSION = '1.4.31';
+var DEFAULT_KOTLIN_VERSION = '1.5.31';
 // This should be the minSdkVersion required for RNN.
 var DEFAULT_MIN_SDK_VERSION = 21;
 
@@ -80,7 +80,7 @@ class GradleLinker {
       return insertString(
         contents,
         match.index,
-        `classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${DEFAULT_KOTLIN_VERSION}"\n        `
+        `classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$RNNKotlinVersion"\n        `
       );
     } else {
       throw new Error('   Could not add kotlin plugin dependency');

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/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/dist/src/components/ComponentWrapper.js

@@ -46,7 +46,7 @@ class ComponentWrapper {
                 componentEventsObserver.unmounted(this.state.componentId);
             }
             render() {
-                return (React.createElement(GeneratedComponentClass, { ...this.state.allProps, componentId: this.state.componentId }));
+                return (React.createElement(GeneratedComponentClass, { ...this.state.allProps, componentId: this.state.componentId, componentName: componentName }));
             }
             _assertComponentId() {
                 if (!this.props.componentId) {

package/lib/dist/src/interfaces/NavigationComponentProps.d.ts

@@ -1,3 +1,4 @@
 export interface NavigationComponentProps {
     componentId: string;
+    componentName: string;
 }

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/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/lib/src/components/ComponentWrapper.tsx

@@ -79,7 +79,11 @@ export class ComponentWrapper {
 
       render() {
         return (
-          <GeneratedComponentClass {...this.state.allProps} componentId={this.state.componentId} />
+          <GeneratedComponentClass
+            {...this.state.allProps}
+            componentId={this.state.componentId}
+            componentName={componentName}
+          />
         );
       }
 

package/lib/src/interfaces/NavigationComponentProps.ts

@@ -1,3 +1,4 @@
 export interface NavigationComponentProps {
   componentId: string;
+  componentName: string;
 }

package/package.json

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