react-native-navigation 7.26.0-alpha.1 → 7.26.0

package/lib/Mock/Components/NavigationButton.tsx

@@ -18,6 +18,7 @@ export const NavigationButton = class extends Component<ButtonProps> {
         testID={button.testID}
         key={button.id}
         title={button.text || ''}
+        disabled={button.enabled === false}
         onPress={() =>
           button.enabled !== false &&
           events.invokeNavigationButtonPressed({

package/lib/Mock/mocks/NativeCommandsSender.tsx

@@ -77,17 +77,22 @@ export class NativeCommandsSender {
   }
 
   dismissModal(_commandId: string, componentId: string, _options?: object) {
-    return new Promise((resolve) => {
-      const modal = LayoutStore.getModalById(componentId).getTopParent();
-      modal.componentDidDisappear();
-      LayoutStore.dismissModal(componentId);
-      events.invokeModalDismissed({
-        componentName: modal.data.name,
-        componentId: modal.nodeId,
-        modalsDismissed: 1,
-      });
-      resolve(modal.nodeId);
-      LayoutStore.getVisibleLayout().componentDidAppear();
+    return new Promise((resolve, reject) => {
+      const modal = LayoutStore.getModalById(componentId);
+      if (modal) {
+        const modalTopParent = modal.getTopParent();
+        modalTopParent.componentDidDisappear();
+        LayoutStore.dismissModal(componentId);
+        events.invokeModalDismissed({
+          componentName: modalTopParent.data.name,
+          componentId: modalTopParent.nodeId,
+          modalsDismissed: 1,
+        });
+        resolve(modalTopParent.nodeId);
+        LayoutStore.getVisibleLayout().componentDidAppear();
+      } else {
+        reject(`component with id: ${componentId} is not a modal`);
+      }
     });
   }
 

package/lib/android/app/build.gradle

@@ -106,6 +106,10 @@ android {
             dimension "RNN.reactNativeVersion"
             buildConfigField("int", "REACT_NATVE_VERSION_MINOR", "63")
         }
+        reactNative68 {
+            dimension "RNN.reactNativeVersion"
+            buildConfigField("int", "REACT_NATVE_VERSION_MINOR", "68")
+        }
     }
 
     def flavor = resolveFlavor()
@@ -122,7 +126,9 @@ String resolveFlavor() {
     Integer reactNativeMinorComponent = reactNativeVersionComponents[1].toInteger()
     Integer reactNativePatchComponent = reactNativeVersionComponents[2].toInteger()
 
-    if (reactNativeMinorComponent >= 63) {
+    if (reactNativeMinorComponent >= 68) {
+        return "reactNative68"
+    } else if (reactNativeMinorComponent >= 63) {
         return "reactNative63"
     } else if (reactNativeMinorComponent >= 62) {
         return "reactNative62"
@@ -161,16 +167,6 @@ List reactNativeVersionComponents(rnPackageJsonFile) {
     return reactNativeVersion.tokenize('-')[0].tokenize('.')
 }
 
-allprojects { p ->
-    p.afterEvaluate {
-        p.android.compileOptions.sourceCompatibility JavaVersion.VERSION_1_8
-        p.android.compileOptions.targetCompatibility JavaVersion.VERSION_1_8
-    }
-    p.repositories {
-        maven { url "https://jitpack.io" }
-    }
-}
-
 dependencies {
 
     implementation "androidx.core:core-ktx:1.6.0"

package/lib/android/app/src/main/java/com/reactnativenavigation/options/Orientation.java

@@ -8,7 +8,8 @@ public enum Orientation {
     Landscape("landscape", ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE),
     Portrait("portrait", ActivityInfo.SCREEN_ORIENTATION_PORTRAIT),
     PortraitLandscape("sensor", ActivityInfo.SCREEN_ORIENTATION_USER),
-    SensorLandscape("sensorLandscape", ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+    SensorLandscape("sensorLandscape", ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE),
+    SensorPortrait("sensorPortrait", ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
 
     public String name;
     public int orientationCode;

package/lib/android/app/src/main/java/com/reactnativenavigation/options/OrientationOptions.java

@@ -44,6 +44,8 @@ public class OrientationOptions {
                 return orientations.contains(Orientation.Landscape) ? Orientation.PortraitLandscape.orientationCode : Orientation.Portrait.orientationCode;
             case SensorLandscape:
                 return Orientation.SensorLandscape.orientationCode;
+            case SensorPortrait:
+                return Orientation.SensorPortrait.orientationCode;
             default:
             case Default:
                 return Orientation.Default.orientationCode;

package/lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -59,7 +59,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
             @Override
             public void onHostPause() {
                 super.onHostPause();
-                navigator().onHostPause();
+                UiUtils.runOnMainThread(() -> navigator().onHostPause());
             }
 
             @Override
@@ -72,7 +72,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
                         navigator().getChildRegistry(),
                         ((NavigationApplication) activity().getApplication()).getExternalComponents()
                 );
-                navigator().onHostResume();
+                UiUtils.runOnMainThread(() -> navigator().onHostResume());
             }
         });
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/component/ComponentViewController.java

@@ -81,7 +81,8 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
         if (view != null)
             view.sendComponentWillStart();
         super.onViewDidAppear();
-        view.requestApplyInsets();
+        if (view != null)
+            view.requestApplyInsets();
         if (view != null && lastVisibilityState == VisibilityState.Disappear)
             view.sendComponentStart();
         lastVisibilityState = VisibilityState.Appear;

package/lib/android/app/src/reactNative55/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt

@@ -0,0 +1,81 @@
+package com.reactnativenavigation.react.modal
+
+import android.content.Context
+import android.view.MotionEvent
+import android.view.View
+import com.facebook.react.bridge.*
+import com.facebook.react.uimanager.*
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.views.view.ReactViewGroup
+
+
+class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
+    private var hasAdjustedSize = false
+    private var viewWidth = 0
+    private var viewHeight = 0
+    private val mJSTouchDispatcher = JSTouchDispatcher(this)
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        viewWidth = w
+        viewHeight = h
+        this.updateFirstChildView()
+    }
+    private fun updateFirstChildView() {
+        if (this.childCount > 0) {
+            hasAdjustedSize = false
+            val viewTag = getChildAt(0).id
+            val reactContext: ReactContext = this.getReactContext()
+            reactContext.runOnNativeModulesQueueThread(object : GuardedRunnable(reactContext) {
+                override fun runGuarded() {
+                    val uiManager = this@ModalContentLayout.getReactContext().getNativeModule(
+                            UIManagerModule::class.java
+                    ) as UIManagerModule
+                    uiManager.updateNodeSize(
+                            viewTag,
+                            this@ModalContentLayout.viewWidth,
+                            this@ModalContentLayout.viewHeight
+                    )
+                }
+            })
+        } else {
+            hasAdjustedSize = true
+        }
+    }
+
+    override fun addView(child: View?, index: Int, params: LayoutParams?) {
+        super.addView(child, index, params)
+        if (hasAdjustedSize) {
+            updateFirstChildView()
+        }
+    }
+    override fun onChildStartedNativeGesture(androidEvent: MotionEvent?) {
+        mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
+    }
+    override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
+    private fun getEventDispatcher(): EventDispatcher? {
+        val reactContext: ReactContext = this.getReactContext()
+        return reactContext.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
+    }
+
+
+    override fun handleException(t: Throwable?) {
+        getReactContext().handleException(RuntimeException(t))
+    }
+
+    private fun getReactContext(): ReactContext {
+        return this.context as ReactContext
+    }
+
+    override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        return super.onInterceptTouchEvent(event)
+    }
+
+    override fun onTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        super.onTouchEvent(event)
+        return true
+    }
+
+}

package/lib/android/app/src/reactNative56/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt

@@ -0,0 +1,81 @@
+package com.reactnativenavigation.react.modal
+
+import android.content.Context
+import android.view.MotionEvent
+import android.view.View
+import com.facebook.react.bridge.*
+import com.facebook.react.uimanager.*
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.views.view.ReactViewGroup
+
+
+class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
+    private var hasAdjustedSize = false
+    private var viewWidth = 0
+    private var viewHeight = 0
+    private val mJSTouchDispatcher = JSTouchDispatcher(this)
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        viewWidth = w
+        viewHeight = h
+        this.updateFirstChildView()
+    }
+    private fun updateFirstChildView() {
+        if (this.childCount > 0) {
+            hasAdjustedSize = false
+            val viewTag = getChildAt(0).id
+            val reactContext: ReactContext = this.getReactContext()
+            reactContext.runOnNativeModulesQueueThread(object : GuardedRunnable(reactContext) {
+                override fun runGuarded() {
+                    val uiManager = this@ModalContentLayout.getReactContext().getNativeModule(
+                            UIManagerModule::class.java
+                    ) as UIManagerModule
+                    uiManager.updateNodeSize(
+                            viewTag,
+                            this@ModalContentLayout.viewWidth,
+                            this@ModalContentLayout.viewHeight
+                    )
+                }
+            })
+        } else {
+            hasAdjustedSize = true
+        }
+    }
+
+    override fun addView(child: View?, index: Int, params: LayoutParams?) {
+        super.addView(child, index, params)
+        if (hasAdjustedSize) {
+            updateFirstChildView()
+        }
+    }
+    override fun onChildStartedNativeGesture(androidEvent: MotionEvent?) {
+        mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
+    }
+    override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
+    private fun getEventDispatcher(): EventDispatcher? {
+        val reactContext: ReactContext = this.getReactContext()
+        return reactContext.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
+    }
+
+
+    override fun handleException(t: Throwable?) {
+        getReactContext().handleException(RuntimeException(t))
+    }
+
+    private fun getReactContext(): ReactContext {
+        return this.context as ReactContext
+    }
+
+    override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        return super.onInterceptTouchEvent(event)
+    }
+
+    override fun onTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        super.onTouchEvent(event)
+        return true
+    }
+
+}

package/lib/android/app/src/reactNative57/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt

@@ -0,0 +1,81 @@
+package com.reactnativenavigation.react.modal
+
+import android.content.Context
+import android.view.MotionEvent
+import android.view.View
+import com.facebook.react.bridge.*
+import com.facebook.react.uimanager.*
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.views.view.ReactViewGroup
+
+
+class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
+    private var hasAdjustedSize = false
+    private var viewWidth = 0
+    private var viewHeight = 0
+    private val mJSTouchDispatcher = JSTouchDispatcher(this)
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        viewWidth = w
+        viewHeight = h
+        this.updateFirstChildView()
+    }
+    private fun updateFirstChildView() {
+        if (this.childCount > 0) {
+            hasAdjustedSize = false
+            val viewTag = getChildAt(0).id
+            val reactContext: ReactContext = this.getReactContext()
+            reactContext.runOnNativeModulesQueueThread(object : GuardedRunnable(reactContext) {
+                override fun runGuarded() {
+                    val uiManager = this@ModalContentLayout.getReactContext().getNativeModule(
+                            UIManagerModule::class.java
+                    ) as UIManagerModule
+                    uiManager.updateNodeSize(
+                            viewTag,
+                            this@ModalContentLayout.viewWidth,
+                            this@ModalContentLayout.viewHeight
+                    )
+                }
+            })
+        } else {
+            hasAdjustedSize = true
+        }
+    }
+
+    override fun addView(child: View?, index: Int, params: LayoutParams?) {
+        super.addView(child, index, params)
+        if (hasAdjustedSize) {
+            updateFirstChildView()
+        }
+    }
+    override fun onChildStartedNativeGesture(androidEvent: MotionEvent?) {
+        mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
+    }
+    override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
+    private fun getEventDispatcher(): EventDispatcher? {
+        val reactContext: ReactContext = this.getReactContext()
+        return reactContext.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
+    }
+
+
+    override fun handleException(t: Throwable?) {
+        getReactContext().handleException(RuntimeException(t))
+    }
+
+    private fun getReactContext(): ReactContext {
+        return this.context as ReactContext
+    }
+
+    override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        return super.onInterceptTouchEvent(event)
+    }
+
+    override fun onTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        super.onTouchEvent(event)
+        return true
+    }
+
+}

package/lib/android/app/src/reactNative57_5/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt

@@ -0,0 +1,81 @@
+package com.reactnativenavigation.react.modal
+
+import android.content.Context
+import android.view.MotionEvent
+import android.view.View
+import com.facebook.react.bridge.*
+import com.facebook.react.uimanager.*
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.views.view.ReactViewGroup
+
+
+class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
+    private var hasAdjustedSize = false
+    private var viewWidth = 0
+    private var viewHeight = 0
+    private val mJSTouchDispatcher = JSTouchDispatcher(this)
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        viewWidth = w
+        viewHeight = h
+        this.updateFirstChildView()
+    }
+    private fun updateFirstChildView() {
+        if (this.childCount > 0) {
+            hasAdjustedSize = false
+            val viewTag = getChildAt(0).id
+            val reactContext: ReactContext = this.getReactContext()
+            reactContext.runOnNativeModulesQueueThread(object : GuardedRunnable(reactContext) {
+                override fun runGuarded() {
+                    val uiManager = this@ModalContentLayout.getReactContext().getNativeModule(
+                            UIManagerModule::class.java
+                    ) as UIManagerModule
+                    uiManager.updateNodeSize(
+                            viewTag,
+                            this@ModalContentLayout.viewWidth,
+                            this@ModalContentLayout.viewHeight
+                    )
+                }
+            })
+        } else {
+            hasAdjustedSize = true
+        }
+    }
+
+    override fun addView(child: View?, index: Int, params: LayoutParams?) {
+        super.addView(child, index, params)
+        if (hasAdjustedSize) {
+            updateFirstChildView()
+        }
+    }
+    override fun onChildStartedNativeGesture(androidEvent: MotionEvent?) {
+        mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
+    }
+    override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
+    private fun getEventDispatcher(): EventDispatcher? {
+        val reactContext: ReactContext = this.getReactContext()
+        return reactContext.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
+    }
+
+
+    override fun handleException(t: Throwable?) {
+        getReactContext().handleException(RuntimeException(t))
+    }
+
+    private fun getReactContext(): ReactContext {
+        return this.context as ReactContext
+    }
+
+    override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        return super.onInterceptTouchEvent(event)
+    }
+
+    override fun onTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        super.onTouchEvent(event)
+        return true
+    }
+
+}

package/lib/android/app/src/reactNative60/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt

@@ -0,0 +1,81 @@
+package com.reactnativenavigation.react.modal
+
+import android.content.Context
+import android.view.MotionEvent
+import android.view.View
+import com.facebook.react.bridge.*
+import com.facebook.react.uimanager.*
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.views.view.ReactViewGroup
+
+
+class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
+    private var hasAdjustedSize = false
+    private var viewWidth = 0
+    private var viewHeight = 0
+    private val mJSTouchDispatcher = JSTouchDispatcher(this)
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        viewWidth = w
+        viewHeight = h
+        this.updateFirstChildView()
+    }
+    private fun updateFirstChildView() {
+        if (this.childCount > 0) {
+            hasAdjustedSize = false
+            val viewTag = getChildAt(0).id
+            val reactContext: ReactContext = this.getReactContext()
+            reactContext.runOnNativeModulesQueueThread(object : GuardedRunnable(reactContext) {
+                override fun runGuarded() {
+                    val uiManager = this@ModalContentLayout.getReactContext().getNativeModule(
+                            UIManagerModule::class.java
+                    ) as UIManagerModule
+                    uiManager.updateNodeSize(
+                            viewTag,
+                            this@ModalContentLayout.viewWidth,
+                            this@ModalContentLayout.viewHeight
+                    )
+                }
+            })
+        } else {
+            hasAdjustedSize = true
+        }
+    }
+
+    override fun addView(child: View?, index: Int, params: LayoutParams?) {
+        super.addView(child, index, params)
+        if (hasAdjustedSize) {
+            updateFirstChildView()
+        }
+    }
+    override fun onChildStartedNativeGesture(androidEvent: MotionEvent?) {
+        mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
+    }
+    override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
+    private fun getEventDispatcher(): EventDispatcher? {
+        val reactContext: ReactContext = this.getReactContext()
+        return reactContext.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
+    }
+
+
+    override fun handleException(t: Throwable?) {
+        getReactContext().handleException(RuntimeException(t))
+    }
+
+    private fun getReactContext(): ReactContext {
+        return this.context as ReactContext
+    }
+
+    override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        return super.onInterceptTouchEvent(event)
+    }
+
+    override fun onTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        super.onTouchEvent(event)
+        return true
+    }
+
+}

package/lib/android/app/src/reactNative62/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt

@@ -0,0 +1,81 @@
+package com.reactnativenavigation.react.modal
+
+import android.content.Context
+import android.view.MotionEvent
+import android.view.View
+import com.facebook.react.bridge.*
+import com.facebook.react.uimanager.*
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.views.view.ReactViewGroup
+
+
+class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
+    private var hasAdjustedSize = false
+    private var viewWidth = 0
+    private var viewHeight = 0
+    private val mJSTouchDispatcher = JSTouchDispatcher(this)
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        viewWidth = w
+        viewHeight = h
+        this.updateFirstChildView()
+    }
+    private fun updateFirstChildView() {
+        if (this.childCount > 0) {
+            hasAdjustedSize = false
+            val viewTag = getChildAt(0).id
+            val reactContext: ReactContext = this.getReactContext()
+            reactContext.runOnNativeModulesQueueThread(object : GuardedRunnable(reactContext) {
+                override fun runGuarded() {
+                    val uiManager = this@ModalContentLayout.getReactContext().getNativeModule(
+                            UIManagerModule::class.java
+                    ) as UIManagerModule
+                    uiManager.updateNodeSize(
+                            viewTag,
+                            this@ModalContentLayout.viewWidth,
+                            this@ModalContentLayout.viewHeight
+                    )
+                }
+            })
+        } else {
+            hasAdjustedSize = true
+        }
+    }
+
+    override fun addView(child: View?, index: Int, params: LayoutParams?) {
+        super.addView(child, index, params)
+        if (hasAdjustedSize) {
+            updateFirstChildView()
+        }
+    }
+    override fun onChildStartedNativeGesture(androidEvent: MotionEvent?) {
+        mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
+    }
+    override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
+    private fun getEventDispatcher(): EventDispatcher? {
+        val reactContext: ReactContext = this.getReactContext()
+        return reactContext.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
+    }
+
+
+    override fun handleException(t: Throwable?) {
+        getReactContext().handleException(RuntimeException(t))
+    }
+
+    private fun getReactContext(): ReactContext {
+        return this.context as ReactContext
+    }
+
+    override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        return super.onInterceptTouchEvent(event)
+    }
+
+    override fun onTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        super.onTouchEvent(event)
+        return true
+    }
+
+}

package/lib/android/app/src/reactNative63/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt

@@ -0,0 +1,81 @@
+package com.reactnativenavigation.react.modal
+
+import android.content.Context
+import android.view.MotionEvent
+import android.view.View
+import com.facebook.react.bridge.*
+import com.facebook.react.uimanager.*
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.views.view.ReactViewGroup
+
+
+class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
+    private var hasAdjustedSize = false
+    private var viewWidth = 0
+    private var viewHeight = 0
+    private val mJSTouchDispatcher = JSTouchDispatcher(this)
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        viewWidth = w
+        viewHeight = h
+        this.updateFirstChildView()
+    }
+    private fun updateFirstChildView() {
+        if (this.childCount > 0) {
+            hasAdjustedSize = false
+            val viewTag = getChildAt(0).id
+            val reactContext: ReactContext = this.getReactContext()
+            reactContext.runOnNativeModulesQueueThread(object : GuardedRunnable(reactContext) {
+                override fun runGuarded() {
+                    val uiManager = this@ModalContentLayout.getReactContext().getNativeModule(
+                            UIManagerModule::class.java
+                    ) as UIManagerModule
+                    uiManager.updateNodeSize(
+                            viewTag,
+                            this@ModalContentLayout.viewWidth,
+                            this@ModalContentLayout.viewHeight
+                    )
+                }
+            })
+        } else {
+            hasAdjustedSize = true
+        }
+    }
+
+    override fun addView(child: View?, index: Int, params: LayoutParams?) {
+        super.addView(child, index, params)
+        if (hasAdjustedSize) {
+            updateFirstChildView()
+        }
+    }
+    override fun onChildStartedNativeGesture(androidEvent: MotionEvent?) {
+        mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
+    }
+    override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
+    private fun getEventDispatcher(): EventDispatcher? {
+        val reactContext: ReactContext = this.getReactContext()
+        return reactContext.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
+    }
+
+
+    override fun handleException(t: Throwable?) {
+        getReactContext().handleException(RuntimeException(t))
+    }
+
+    private fun getReactContext(): ReactContext {
+        return this.context as ReactContext
+    }
+
+    override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        return super.onInterceptTouchEvent(event)
+    }
+
+    override fun onTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        super.onTouchEvent(event)
+        return true
+    }
+
+}

package/lib/android/app/src/reactNative68/java/com/reactnativenavigation/options/parsers/ColorParser.kt

@@ -0,0 +1,38 @@
+package com.reactnativenavigation.options.parsers
+
+import android.content.Context
+import com.facebook.react.bridge.ColorPropConverter
+import com.reactnativenavigation.options.params.Colour
+import com.reactnativenavigation.options.params.DontApplyColour
+import com.reactnativenavigation.options.params.NullColor
+import com.reactnativenavigation.options.params.ReactPlatformColor
+import org.json.JSONObject
+
+object ColorParser {
+    private const val KEY_RESOURCE_PATHS = "resource_paths"
+    private const val VAL_NO_COLOR = "NoColor"
+
+    @JvmStatic
+    fun parse(context: Context?, json: JSONObject, colorName: String?): Colour {
+        if (json.has(KEY_RESOURCE_PATHS)) {
+            return ReactPlatformColor(JSONParser.convert(json))
+        }
+        return when (val color = json.opt(colorName)) {
+            null, VAL_NO_COLOR -> {
+                DontApplyColour()
+            }
+            is Int -> {
+                Colour(json.optInt(colorName))
+            }
+            is JSONObject -> {
+                ColorPropConverter.getColor(color, context)?.let {
+                    Colour(it)
+                } ?: NullColor()
+            }
+            else -> {
+                NullColor()
+            }
+        }
+
+    }
+}

package/lib/android/app/src/reactNative68/java/com/reactnativenavigation/react/DevBundleDownloadListenerAdapter.java

@@ -0,0 +1,22 @@
+package com.reactnativenavigation.react;
+
+import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
+
+import javax.annotation.Nullable;
+
+public class DevBundleDownloadListenerAdapter implements DevBundleDownloadListener, NavigationDevBundleDownloadListener {
+    @Override
+    public void onSuccess() {
+        onSuccess();
+    }
+
+    @Override
+    public void onProgress(@Nullable String status, @Nullable Integer done, @Nullable Integer total) {
+
+    }
+
+    @Override
+    public void onFailure(Exception cause) {
+
+    }
+}

package/lib/android/app/src/reactNative68/java/com/reactnativenavigation/react/JsDevReloadHandlerFacade.java

@@ -0,0 +1,22 @@
+package com.reactnativenavigation.react;
+
+import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
+
+import javax.annotation.Nullable;
+
+public class JsDevReloadHandlerFacade implements DevBundleDownloadListener, NavigationDevBundleDownloadListener {
+    @Override
+    public void onSuccess() {
+        onSuccess();
+    }
+
+    @Override
+    public void onProgress(@Nullable String status, @Nullable Integer done, @Nullable Integer total) {
+
+    }
+
+    @Override
+    public void onFailure(Exception cause) {
+
+    }
+}

package/lib/android/app/src/reactNative68/java/com/reactnativenavigation/react/NavigationReactNativeHost.java

@@ -0,0 +1,66 @@
+package com.reactnativenavigation.react;
+
+import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.ReactInstanceManagerBuilder;
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.common.LifecycleState;
+import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
+import com.reactnativenavigation.NavigationApplication;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public abstract class NavigationReactNativeHost extends ReactNativeHost implements BundleDownloadListenerProvider {
+
+    private @Nullable NavigationDevBundleDownloadListener bundleListener;
+    private final DevBundleDownloadListener bundleListenerMediator = new DevBundleDownloadListenerAdapter() {
+        @Override
+        public void onSuccess() {
+            if (bundleListener != null) {
+                bundleListener.onSuccess();
+            }
+        }
+    };
+
+    public NavigationReactNativeHost(NavigationApplication application) {
+        super(application);
+    }
+
+    @Override
+    public void setBundleLoaderListener(NavigationDevBundleDownloadListener listener) {
+        bundleListener = listener;
+    }
+
+    protected ReactInstanceManager createReactInstanceManager() {
+        ReactInstanceManagerBuilder builder = ReactInstanceManager.builder()
+                .setApplication(getApplication())
+                .setJSMainModulePath(getJSMainModuleName())
+                .setUseDeveloperSupport(getUseDeveloperSupport())
+                .setRedBoxHandler(getRedBoxHandler())
+                .setJavaScriptExecutorFactory(getJavaScriptExecutorFactory())
+                .setUIImplementationProvider(getUIImplementationProvider())
+                .setInitialLifecycleState(LifecycleState.BEFORE_CREATE)
+                .setJSIModulesPackage(getJSIModulePackage())
+                .setDevBundleDownloadListener(getDevBundleDownloadListener());
+
+        for (ReactPackage reactPackage : getPackages()) {
+            builder.addPackage(reactPackage);
+        }
+
+        String jsBundleFile = getJSBundleFile();
+        if (jsBundleFile != null) {
+            builder.setJSBundleFile(jsBundleFile);
+        } else {
+            builder.setBundleAssetName(Assertions.assertNotNull(getBundleAssetName()));
+        }
+        return builder.build();
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    @NonNull
+    protected DevBundleDownloadListener getDevBundleDownloadListener() {
+        return bundleListenerMediator;
+    }
+}

package/lib/android/app/src/reactNative68/java/com/reactnativenavigation/react/ReactGateway.java

@@ -0,0 +1,72 @@
+package com.reactnativenavigation.react;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.res.Configuration;
+
+import com.facebook.react.ReactNativeHost;
+import com.reactnativenavigation.NavigationActivity;
+
+import androidx.annotation.NonNull;
+
+public class ReactGateway {
+
+	private final ReactNativeHost host;
+	private final NavigationReactInitializer initializer;
+	private final JsDevReloadHandler jsDevReloadHandler;
+
+    public ReactGateway(ReactNativeHost host) {
+        this.host = host;
+        initializer = new NavigationReactInitializer(host.getReactInstanceManager(), host.getUseDeveloperSupport());
+        jsDevReloadHandler = new JsDevReloadHandler(host.getReactInstanceManager().getDevSupportManager());
+        if (host instanceof BundleDownloadListenerProvider) {
+            ((BundleDownloadListenerProvider) host).setBundleLoaderListener(jsDevReloadHandler);
+        }
+    }
+
+	public void onActivityCreated(NavigationActivity activity) {
+		initializer.onActivityCreated();
+        jsDevReloadHandler.setReloadListener(activity);
+	}
+
+	public void onActivityResumed(NavigationActivity activity) {
+		initializer.onActivityResumed(activity);
+		jsDevReloadHandler.onActivityResumed(activity);
+	}
+
+    public boolean onNewIntent(Intent intent) {
+        if (host.hasInstance()) {
+            host.getReactInstanceManager().onNewIntent(intent);
+            return true;
+        }
+        return false;
+    }
+
+    public void onConfigurationChanged(NavigationActivity activity, @NonNull Configuration newConfig) {
+        if (host.hasInstance()) {
+            host.getReactInstanceManager().onConfigurationChanged(activity, newConfig);
+        }
+    }
+
+	public void onActivityPaused(NavigationActivity activity) {
+		initializer.onActivityPaused(activity);
+		jsDevReloadHandler.onActivityPaused(activity);
+	}
+
+	public void onActivityDestroyed(NavigationActivity activity) {
+        jsDevReloadHandler.removeReloadListener(activity);
+		initializer.onActivityDestroyed(activity);
+	}
+
+	public boolean onKeyUp(Activity activity, int keyCode) {
+		return jsDevReloadHandler.onKeyUp(activity, keyCode);
+	}
+
+    public void onBackPressed() {
+	    host.getReactInstanceManager().onBackPressed();
+    }
+
+    public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
+        host.getReactInstanceManager().onActivityResult(activity, requestCode, resultCode, data);
+    }
+}

package/lib/android/app/src/reactNative68/java/com/reactnativenavigation/react/ReloadHandlerFacade.java

@@ -0,0 +1,22 @@
+package com.reactnativenavigation.react;
+
+import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
+
+import javax.annotation.Nullable;
+
+public abstract class ReloadHandlerFacade implements DevBundleDownloadListener {
+    @Override
+    public void onSuccess() {
+
+    }
+
+    @Override
+    public void onProgress(@Nullable String status, @Nullable Integer done, @Nullable Integer total) {
+
+    }
+
+    @Override
+    public void onFailure(Exception cause) {
+
+    }
+}

package/lib/android/app/src/reactNative68/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt

@@ -0,0 +1,87 @@
+package com.reactnativenavigation.react.modal
+
+import android.content.Context
+import android.view.MotionEvent
+import android.view.View
+import com.facebook.react.bridge.*
+import com.facebook.react.uimanager.*
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.views.view.ReactViewGroup
+
+
+class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
+    private var hasAdjustedSize = false
+    private var viewWidth = 0
+    private var viewHeight = 0
+    private val mJSTouchDispatcher = JSTouchDispatcher(this)
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        viewWidth = w
+        viewHeight = h
+        this.updateFirstChildView()
+    }
+    private fun updateFirstChildView() {
+        if (this.childCount > 0) {
+            hasAdjustedSize = false
+            val viewTag = getChildAt(0).id
+            val reactContext: ReactContext = this.getReactContext()
+            reactContext.runOnNativeModulesQueueThread(object : GuardedRunnable(reactContext) {
+                override fun runGuarded() {
+                    val uiManager = this@ModalContentLayout.getReactContext().getNativeModule(
+                            UIManagerModule::class.java
+                    ) as UIManagerModule
+                    uiManager.updateNodeSize(
+                            viewTag,
+                            this@ModalContentLayout.viewWidth,
+                            this@ModalContentLayout.viewHeight
+                    )
+                }
+            })
+        } else {
+            hasAdjustedSize = true
+        }
+    }
+
+    override fun addView(child: View?, index: Int, params: LayoutParams?) {
+        super.addView(child, index, params)
+        if (hasAdjustedSize) {
+            updateFirstChildView()
+        }
+    }
+    override fun onChildStartedNativeGesture(child: View, androidEvent: MotionEvent?) {
+        mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
+    }
+    override fun onChildStartedNativeGesture(androidEvent: MotionEvent?) {
+        mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
+    }
+    override fun onChildEndedNativeGesture(child: View, androidEvent: MotionEvent?) {
+        mJSTouchDispatcher.onChildEndedNativeGesture(androidEvent, this.getEventDispatcher())
+    }
+    override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
+    private fun getEventDispatcher(): EventDispatcher? {
+        val reactContext: ReactContext = this.getReactContext()
+        return reactContext.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
+    }
+
+
+    override fun handleException(t: Throwable?) {
+        getReactContext().handleException(RuntimeException(t))
+    }
+
+    private fun getReactContext(): ReactContext {
+        return this.context as ReactContext
+    }
+
+    override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        return super.onInterceptTouchEvent(event)
+    }
+
+    override fun onTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        super.onTouchEvent(event)
+        return true
+    }
+
+}

package/lib/android/app/src/reactNative68/java/com/reactnativenavigation/viewcontrollers/viewcontroller/YellowBoxHelper.java

@@ -0,0 +1,12 @@
+package com.reactnativenavigation.viewcontrollers.viewcontroller;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+public class YellowBoxHelper {
+    boolean isYellowBox(View parent, View child) {
+        return parent instanceof ViewGroup &&
+               child instanceof ViewGroup &&
+               ((ViewGroup) parent).indexOfChild(child) >= 1;
+    }
+}

package/lib/dist/Mock/Components/NavigationButton.js

@@ -12,7 +12,7 @@ const NavigationButton = class extends react_1.Component {
         const { button, componentId } = this.props;
         if (button.component)
             return this.renderButtonComponent();
-        return (react_1.default.createElement(react_native_1.Button, { testID: button.testID, key: button.id, title: button.text || '', onPress: () => button.enabled !== false &&
+        return (react_1.default.createElement(react_native_1.Button, { testID: button.testID, key: button.id, title: button.text || '', disabled: button.enabled === false, onPress: () => button.enabled !== false &&
                 EventsStore_1.events.invokeNavigationButtonPressed({
                     buttonId: button.id,
                     componentId,

package/lib/dist/Mock/mocks/NativeCommandsSender.js

@@ -65,17 +65,23 @@ class NativeCommandsSender {
         });
     }
     dismissModal(_commandId, componentId, _options) {
-        return new Promise((resolve) => {
-            const modal = LayoutStore_1.LayoutStore.getModalById(componentId).getTopParent();
-            modal.componentDidDisappear();
-            LayoutStore_1.LayoutStore.dismissModal(componentId);
-            EventsStore_1.events.invokeModalDismissed({
-                componentName: modal.data.name,
-                componentId: modal.nodeId,
-                modalsDismissed: 1,
-            });
-            resolve(modal.nodeId);
-            LayoutStore_1.LayoutStore.getVisibleLayout().componentDidAppear();
+        return new Promise((resolve, reject) => {
+            const modal = LayoutStore_1.LayoutStore.getModalById(componentId);
+            if (modal) {
+                const modalTopParent = modal.getTopParent();
+                modalTopParent.componentDidDisappear();
+                LayoutStore_1.LayoutStore.dismissModal(componentId);
+                EventsStore_1.events.invokeModalDismissed({
+                    componentName: modalTopParent.data.name,
+                    componentId: modalTopParent.nodeId,
+                    modalsDismissed: 1,
+                });
+                resolve(modalTopParent.nodeId);
+                LayoutStore_1.LayoutStore.getVisibleLayout().componentDidAppear();
+            }
+            else {
+                reject(`component with id: ${componentId} is not a modal`);
+            }
         });
     }
     dismissAllModals(_commandId, _options) {

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

@@ -4,7 +4,7 @@ declare type FontFamily = string;
 declare type FontStyle = 'normal' | 'italic';
 declare type FontWeightIOS = 'normal' | 'ultralight' | 'thin' | 'light' | 'regular' | 'medium' | 'semibold' | 'demibold' | 'extrabold' | 'ultrabold' | 'bold' | 'heavy' | 'black';
 declare type FontWeight = 'normal' | 'bold' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900' | FontWeightIOS;
-export declare type LayoutOrientation = 'portrait' | 'landscape';
+export declare type LayoutOrientation = 'portrait' | 'landscape' | 'sensor' | 'sensorLandscape' | 'sensorPortrait';
 declare type AndroidDensityNumber = number;
 export declare type SystemItemIcon = 'done' | 'cancel' | 'edit' | 'save' | 'add' | 'flexibleSpace' | 'fixedSpace' | 'compose' | 'reply' | 'action' | 'organize' | 'bookmarks' | 'search' | 'refresh' | 'stop' | 'camera' | 'trash' | 'play' | 'pause' | 'rewind' | 'fastForward' | 'undo' | 'redo';
 export declare type Interpolation = {

package/lib/ios/RNNComponentRootView.m

@@ -2,6 +2,20 @@
 
 @implementation RNNComponentRootView
 
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties
+                  eventEmitter:(RNNEventEmitter *)eventEmitter
+           reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
+    self = [super initWithBridge:bridge
+                      moduleName:moduleName
+               initialProperties:initialProperties
+                    eventEmitter:eventEmitter
+             reactViewReadyBlock:reactViewReadyBlock];
+    [bridge.uiManager setAvailableSize:UIScreen.mainScreen.bounds.size forRootView:self];
+    return self;
+}
+
 - (NSString *)componentType {
     return ComponentTypeScreen;
 }

package/lib/src/interfaces/Options.ts

@@ -33,7 +33,12 @@ type FontWeight =
   | '800'
   | '900'
   | FontWeightIOS;
-export type LayoutOrientation = 'portrait' | 'landscape';
+export type LayoutOrientation =
+  | 'portrait'
+  | 'landscape'
+  | 'sensor'
+  | 'sensorLandscape'
+  | 'sensorPortrait';
 type AndroidDensityNumber = number;
 export type SystemItemIcon =
   | 'done'

package/package.json

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