react-native-navigation 7.30.3 → 7.30.5

package/lib/android/app/build.gradle

@@ -12,9 +12,9 @@ def safeExtGetFallbackLowerBound(prop, fallback) {
     Math.max(safeExtGet(prop,fallback),fallback)
 }
 
-def DEFAULT_COMPILE_SDK_VERSION = 30
+def DEFAULT_COMPILE_SDK_VERSION = 33
 def DEFAULT_MIN_SDK_VERSION = 21
-def DEFAULT_TARGET_SDK_VERSION = 30
+def DEFAULT_TARGET_SDK_VERSION = 33
 def DEFAULT_KOTLIN_VERSION = "1.5.31"
 def DEFAULT_KOTLIN_STDLIB = 'kotlin-stdlib-jdk8'
 def kotlinVersion = safeExtGet("RNNKotlinVersion", DEFAULT_KOTLIN_VERSION)
@@ -22,7 +22,7 @@ def kotlinStdlib = safeExtGet('RNNKotlinStdlib',DEFAULT_KOTLIN_STDLIB )
 def kotlinCoroutinesCore = safeExtGet('RNNKotlinCoroutinesCore', '1.5.2')
 android {
     compileSdkVersion safeExtGetFallbackLowerBound('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
-
+    buildToolsVersion = "33.0.0"
     defaultConfig {
         minSdkVersion safeExtGetFallbackLowerBound('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
         targetSdkVersion safeExtGetFallbackLowerBound('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
@@ -167,6 +167,27 @@ List reactNativeVersionComponents(rnPackageJsonFile) {
     return reactNativeVersion.tokenize('-')[0].tokenize('.')
 }
 
+task installBuildToolsAndRenameD8IfNeeded {
+    def buildToolsVersion = android.getBuildToolsVersion()
+    def sdkDir = android.sdkDirectory
+    def buildToolsDir = new File(sdkDir, "/build-tools/" + buildToolsVersion)
+
+    if (!buildToolsDir.exists()) {
+        def command = sdkDir.absolutePath + "/cmdline-tools/latest/bin/sdkmanager build-tools;" + buildToolsVersion
+        command.execute().waitForProcessOutput(System.out, System.err)
+    }
+
+    def d8File = new File(buildToolsDir, "d8")
+    def dxFile = new File(buildToolsDir, "dx")
+    d8File.renameTo(dxFile)
+
+    def buildToolsLibDir = new File(buildToolsDir, "lib")
+    d8File = new File(buildToolsLibDir, "d8.jar")
+    dxFile = new File(buildToolsLibDir, "dx.jar")
+    d8File.renameTo(dxFile)
+}
+build.dependsOn installBuildToolsAndRenameD8IfNeeded
+
 dependencies {
 
     implementation "androidx.core:core-ktx:1.6.0"

package/lib/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.reactnativenavigation">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.reactnativenavigation">
 
     <application>
         <activity

package/lib/android/app/src/main/java/com/reactnativenavigation/NavigationActivity.java

@@ -22,6 +22,7 @@ import com.reactnativenavigation.viewcontrollers.child.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.modal.ModalStack;
 import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -47,6 +48,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         );
         navigator.bindViews();
         getReactGateway().onActivityCreated(this);
+        setBackPressedCallback();
     }
 
     @Override
@@ -103,11 +105,6 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         getReactGateway().onActivityResult(this, requestCode, resultCode, data);
     }
 
-    @Override
-    public void onBackPressed() {
-        getReactGateway().onBackPressed();
-    }
-
     @Override
     public boolean onKeyUp(final int keyCode, final KeyEvent event) {
         return getReactGateway().onKeyUp(this, keyCode) || super.onKeyUp(keyCode, event);
@@ -152,4 +149,14 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     public void onCatalystInstanceDestroy() {
         runOnUiThread(() -> navigator.destroyViews());
     }
+
+    private void setBackPressedCallback() {
+        OnBackPressedCallback callback = new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                getReactGateway().onBackPressed();
+            }
+        };
+        getOnBackPressedDispatcher().addCallback(this, callback);
+    }
 }

package/lib/dist/src/commands/Commands.js

@@ -65,8 +65,9 @@ class Commands {
     }
     mergeOptions(componentId, options) {
         const input = (0, cloneDeep_1.default)(options);
-        this.optionsProcessor.processOptions(CommandName_1.CommandName.MergeOptions, input);
         const component = this.store.getComponentInstance(componentId);
+        const componentProps = this.store.getPropsForId(componentId) || undefined;
+        this.optionsProcessor.processOptions(CommandName_1.CommandName.MergeOptions, input, componentProps);
         if (component && !component.isMounted)
             console.warn(`Navigation.mergeOptions was invoked on component with id: ${componentId} before it is mounted, this can cause UI issues and should be avoided.\n Use static options instead.`);
         this.nativeCommandsSender.mergeOptions(componentId, input);

package/lib/src/commands/Commands.ts

@@ -73,9 +73,10 @@ export class Commands {
 
   public mergeOptions(componentId: string, options: Options) {
     const input = cloneDeep(options);
-    this.optionsProcessor.processOptions(CommandName.MergeOptions, input);
 
     const component = this.store.getComponentInstance(componentId);
+    const componentProps = this.store.getPropsForId(componentId) || undefined;
+    this.optionsProcessor.processOptions(CommandName.MergeOptions, input, componentProps);
     if (component && !component.isMounted)
       console.warn(
         `Navigation.mergeOptions was invoked on component with id: ${componentId} before it is mounted, this can cause UI issues and should be avoided.\n Use static options instead.`

package/package.json

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