fix(runtime/{webview,window}: fix swipe gesture delegates for ios

Author: jwerle

src/runtime/webview/webview.cc

@@ -732,6 +732,21 @@ int lastY = 0;
 
 #if SOCKET_RUNTIME_PLATFORM_IOS
 @implementation SSCWebViewController
+-                         (BOOL) gestureRecognizer: (UIGestureRecognizer*) gestureRecognizer
+shouldRecognizeSimultaneouslyWithGestureRecognizer: (UIGestureRecognizer*) otherGestureRecognizer
+{
+  return YES;
+}
+
+- (BOOL) gestureRecognizer: (UIGestureRecognizer*) gestureRecognizer
+        shouldReceiveTouch: (UITouch*) touch
+{
+  if ([touch.view isDescendantOfView: self.webview]) {
+    return NO;
+  }
+
+  return YES;
+}
 @end
 #endif
 #endif

src/runtime/webview/webview.hh

@@ -93,6 +93,12 @@ namespace ssc::runtime::webview {
 #if SOCKET_RUNTIME_PLATFORM_IOS
 @interface SSCWebViewController : UIViewController<UIGestureRecognizerDelegate>
   @property (nonatomic, strong) SSCWebView* webview;
+
+-                         (BOOL) gestureRecognizer: (UIGestureRecognizer*) gestureRecognizer
+shouldRecognizeSimultaneouslyWithGestureRecognizer: (UIGestureRecognizer*) otherGestureRecognizer;
+
+- (BOOL) gestureRecognizer: (UIGestureRecognizer*) gestureRecognizer
+        shouldReceiveTouch: (UITouch*) touch;
 @end
 #endif
 #endif

src/runtime/window.hh

@@ -43,6 +43,7 @@ namespace ssc::runtime::bridge {
     UIScrollViewDelegate,
     WKScriptMessageHandler
   >
+- (void) handleEdgePanGesture: (UIScreenEdgePanGestureRecognizer*) gesture;
 #else
   NSObject <
     NSWindowDelegate,

src/runtime/window/apple.mm

@@ -175,19 +175,25 @@ - (void) scrollViewDidScroll: (UIScrollView*) scrollView {
 
 - (void) handleEdgePanGesture: (UIScreenEdgePanGestureRecognizer*) gesture {
   auto window = (Window*) objc_getAssociatedObject(self, "window");
-  CGPoint translation = [gesture translationInView:self.view];
-  CGFloat progress = translation.x / self.view.bounds.size.width;
+  if (!window) {
+    return;
+  }
+  CGPoint translation = [gesture translationInView: window->viewController.view];
+  CGFloat progress = translation.x / window->viewController.view.bounds.size.width;
   progress = fmin(fmax(progress, 0.0), 1.0);
   if (
     gesture.state == UIGestureRecognizerStateEnded ||
     gesture.state == UIGestureRecognizerStateCancelled
   ) {
     if (progress > 0.3) {
       if (window && window->webview.canGoBack) {
-        [window->webview.goBack];
+        [window->webview goBack];
       } else {
-        window->close();
-        // [self.navigationController popViewControllerAnimated:YES];
+        const auto app = App::sharedApplication();
+        const auto index = window->index;
+        app->dispatch([index, app](){
+          app->runtime.windowManager.destroyWindow(index);
+        });
       }
     }
   }
@@ -452,14 +458,15 @@ - (void) handleEdgePanGesture: (UIScreenEdgePanGestureRecognizer*) gesture {
 
   #if SOCKET_RUNTIME_PLATFORM_IOS
     this->webview.allowsBackForwardNavigationGestures = NO;
-    if (userConfig["webview_navigator_enable_navigation_gestures"] == "true") {
+    if (!this->options.headless && userConfig["webview_navigator_enable_navigation_gestures"] == "true") {
       auto edgePanGesture = [[UIScreenEdgePanGestureRecognizer alloc]
         initWithTarget: this->windowDelegate
-               action: @selector(handleEdgePanGesture:)
+                action: @selector(handleEdgePanGesture:)
       ];
       edgePanGesture.edges = UIRectEdgeLeft;
-      edgePanGesture.delegate = self;
+      edgePanGesture.delegate = this->viewController;
       [this->viewController.view addGestureRecognizer: edgePanGesture];
+      [this->webview addGestureRecognizer: edgePanGesture];
     }
   #else
     this->webview.allowsBackForwardNavigationGestures = userConfig["webview_navigator_enable_navigation_gestures"] == "true";
@@ -798,6 +805,17 @@ - (void) handleEdgePanGesture: (UIScreenEdgePanGestureRecognizer*) gesture {
     }
 
     if (this->webview != nullptr) {
+    #if SOCKET_RUNTIME_PLATFORM_IOS
+      const auto managedWindow = app->runtime.windowManager.getWindow(this->index);
+      if (managedWindow) {
+        const auto json = managedWindow->json();
+        for (auto window : app->runtime.windowManager.windows) {
+          if (window != nullptr && window->index != this->index) {
+            window->eval(getEmitToRenderProcessJavaScript("windowclosed", json.str()));
+          }
+        }
+      }
+    #endif
       objc_removeAssociatedObjects(this->webview);
       [this->webview stopLoading];
       [this->webview.configuration.userContentController removeAllScriptMessageHandlers];
@@ -833,9 +851,13 @@ - (void) handleEdgePanGesture: (UIScreenEdgePanGestureRecognizer*) gesture {
       }
 
       this->window.titleBarView = nullptr;
-      this->window = nullptr;
     #endif
+      this->window = nullptr;
     }
+
+   #if SOCKET_RUNTIME_PLATFORM_IOS
+    this->viewController = nullptr;
+   #endif
   }
 
   void Window::maximize () {

src/runtime/window/manager.cc

@@ -153,11 +153,13 @@ namespace ssc::runtime::window {
 
       this->windows[index] = nullptr;
       if (window->options.shouldExitApplicationOnClose) {
-        static_cast<runtime::Runtime&>(this->context).dispatch([window]() {
+        static_cast<runtime::Runtime&>(this->context).dispatch([this, index, window]() {
           window->exit(0);
+          static_cast<runtime::Runtime&>(this->context).bridgeManager.remove(index);
         });
       } else {
         window->kill();
+        static_cast<runtime::Runtime&>(this->context).bridgeManager.remove(index);
       }
     }
   }