fix(ios): hierarchy error when using SplitWindow and NavigationWindow

Fixes TIMOB-28497
tidev · Jul 20, 2021 · 8e5b149 · 8e5b149
1 parent 743475a
commit 8e5b149
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/TiWindowProxy.m b/iphone/TitaniumKit/TitaniumKit/Sources/API/TiWindowProxy.m
@@ -505,11 +505,20 @@ - (UIViewController *)hostingController;
 
 - (UIViewController *)windowHoldingController
 {
+  // Use assigned controller if set.
   if (controller != nil) {
     return controller;
-  } else {
-    return [[TiApp app] controller];
   }
+
+  // Walk up the view hierarchy for the 1st controller available.
+  for (UIResponder *responder = [self view].nextResponder; responder != nil; responder = responder.nextResponder) {
+    if ([responder isKindOfClass:[UIViewController class]]) {
+      return (UIViewController *)responder;
+    }
+  }
+
+  // Fallback to the app's root view controller.
+  return [[TiApp app] controller];
 }
 
 #pragma mark - Private Methods