Merge pull request #1 from ewanharris/fix_nav_window_usage

fix: handle navigationwindows as left and right properties
mbender74 · Aug 7, 2021 · 5275db7 · 5275db7
2 parents 1763cc4 + e7743f7
commit 5275db7
Showing 1 changed file with 22 additions and 8 deletions.
diff --git a/ios/Classes/DkNappDrawerDrawer.m b/ios/Classes/DkNappDrawerDrawer.m
@@ -106,13 +106,24 @@ - (MMDrawerController *)controller
 
     if (leftWindow != nil) {
 
+      BOOL leftIsNav = NO;
+      if ([[[leftWindow class] description] isEqualToString:@"TiUINavigationWindowProxy"]) {
+          leftIsNav = YES;
+      }
+
+      TiViewController *leftController = leftIsNav ? NavigationControllerForViewProxy(leftWindow) : ControllerForViewProxy(leftWindow);
+
       //both left and right
       if (rightWindow != nil) {
 
-        TiViewController *leftController = ControllerForViewProxy(leftWindow);
-        TiViewController *rightController = ControllerForViewProxy(rightWindow);
+        BOOL rightIsNav = NO;
+        if ([[[rightWindow class] description] isEqualToString:@"TiUINavigationWindowProxy"]) {
+            rightIsNav = YES;
+        }
 
-          TiUINavigationWindowProxy *centerProxy = [self.proxy valueForUndefinedKey:@"centerWindow"];
+        TiViewController *rightController = rightIsNav ? NavigationControllerForViewProxy(rightWindow) : ControllerForViewProxy(rightWindow);
+
+        TiUINavigationWindowProxy *centerProxy = [self.proxy valueForUndefinedKey:@"centerWindow"];
 
         TiThreadPerformOnMainThread(^{
           [centerProxy windowWillOpen];
@@ -126,9 +137,7 @@ - (MMDrawerController *)controller
         //left only
       } else {
 
-        TiViewController *leftController = ControllerForViewProxy(leftWindow);
-
-          TiUINavigationWindowProxy *centerProxy = [self.proxy valueForUndefinedKey:@"centerWindow"];
+        TiUINavigationWindowProxy *centerProxy = [self.proxy valueForUndefinedKey:@"centerWindow"];
 
         TiThreadPerformOnMainThread(^{
           [centerProxy windowWillOpen];
@@ -142,9 +151,14 @@ - (MMDrawerController *)controller
       //right only
     } else if (rightWindow != nil) {
 
-      TiViewController *rightController = ControllerForViewProxy(rightWindow);
+      BOOL rightIsNav = NO;
+      if ([[[rightWindow class] description] isEqualToString:@"TiUINavigationWindowProxy"]) {
+          rightIsNav = YES;
+      }
 
-        TiUINavigationWindowProxy *centerProxy = [self.proxy valueForUndefinedKey:@"centerWindow"];
+      TiViewController *rightController = rightIsNav ? NavigationControllerForViewProxy(rightWindow) : ControllerForViewProxy(rightWindow);
+
+      TiUINavigationWindowProxy *centerProxy = [self.proxy valueForUndefinedKey:@"centerWindow"];
 
       TiThreadPerformOnMainThread(^{
         [centerProxy windowWillOpen];