fix(KAN-71): use interactive WebKit navigation gestures

native/src-tauri/Cargo.lock

@@ -1770,7 +1770,7 @@ dependencies = [
 
 [[package]]
 name = "kanbangit-native"
-version = "0.2.4"
+version = "0.2.5"
 dependencies = [
  "semver",
  "serde",

native/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kanbangit-native"
-version = "0.2.4"
+version = "0.2.5"
 description = "KanbanGit native application"
 edition = "2021"
 publish = false

native/src-tauri/gen/apple/Sources/kanbangit-native/WorkspaceViewController.swift

@@ -24,7 +24,7 @@ func installIOSWorkspace() {
     }
 }
 
-final class WorkspaceViewController: UIViewController, WKNavigationDelegate, WKUIDelegate, UITextFieldDelegate, UIGestureRecognizerDelegate {
+final class WorkspaceViewController: UIViewController, WKNavigationDelegate, WKUIDelegate, UITextFieldDelegate {
     private let defaults: UserDefaults
     private let serverKey = "ios.activeServer"
     private(set) var server: WorkspaceServer?
@@ -40,9 +40,6 @@ final class WorkspaceViewController: UIViewController, WKNavigationDelegate, WKU
     private let connectButton = UIButton(type: .system)
     private let resumeButton = UIButton(type: .system)
     private let toolbar = UIToolbar()
-    private var gestureStart = CGPoint.zero
-    private var gestureAllowed = false
-    private var gestureRevision = 0
     private var appearance: UISegmentedControl!
 
     init(defaults: UserDefaults = .standard) {
@@ -216,17 +213,8 @@ final class WorkspaceViewController: UIViewController, WKNavigationDelegate, WKU
         let webview = WKWebView(frame: .zero, configuration: configuration)
         webview.navigationDelegate = self
         webview.uiDelegate = self
-        // Native WebKit swipes can skip async pushState entries. One edge recognizer
-        // owns each gesture and traverses the same history that Inertia restores.
-        webview.allowsBackForwardNavigationGestures = false
+        webview.allowsBackForwardNavigationGestures = true
         webview.scrollView.bounces = false
-        for edge: UIRectEdge in [.left, .right] {
-            let gesture = UIScreenEdgePanGestureRecognizer(target: self, action: #selector(navigateGesture(_:)))
-            gesture.edges = edge
-            gesture.delegate = self
-            webview.addGestureRecognizer(gesture)
-            webview.scrollView.panGestureRecognizer.require(toFail: gesture)
-        }
         webview.accessibilityIdentifier = "workspace"
         webview.translatesAutoresizingMaskIntoConstraints = false
         webview.isHidden = true
@@ -285,45 +273,6 @@ final class WorkspaceViewController: UIViewController, WKNavigationDelegate, WKU
         workspace?.isHidden = false
     }
 
-    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
-        guard gestureRecognizer is UIScreenEdgePanGestureRecognizer, let webview = workspace else { return false }
-        gestureStart = touch.location(in: webview)
-        gestureAllowed = false
-        gestureRevision += 1
-        let revision = gestureRevision
-        webview.evaluateJavaScript("window.__kanbanNavigation?.canSwipe(\(gestureStart.x), \(gestureStart.y)) === true") { [weak self, weak gestureRecognizer] result, _ in
-            guard let self, self.gestureRevision == revision, self.workspace === webview else { return }
-            self.gestureAllowed = result as? Bool == true
-            // Release the scroll view immediately when a board, field or overlay owns the touch.
-            if !self.gestureAllowed, gestureRecognizer?.state == .possible { gestureRecognizer?.state = .failed }
-        }
-        return true
-    }
-
-    func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
-        guard let edge = gestureRecognizer as? UIScreenEdgePanGestureRecognizer,
-              let webview = workspace, !webview.isHidden, gestureAllowed else { return false }
-        let velocity = edge.velocity(in: webview)
-        return abs(velocity.x) > abs(velocity.y)
-            && (edge.edges == .left ? webview.canGoBack && velocity.x > 0 : webview.canGoForward && velocity.x < 0)
-    }
-
-    @objc private func navigateGesture(_ gesture: UIScreenEdgePanGestureRecognizer) {
-        guard gesture.state == .ended, let webview = workspace else { return }
-        let direction = gesture.edges == .left ? -1 : 1
-        let distance = gesture.translation(in: webview).x * CGFloat(-direction)
-        let velocity = gesture.velocity(in: webview).x * CGFloat(-direction)
-        guard distance > webview.bounds.width * 0.25 || (distance > 30 && velocity > 500) else { return }
-        navigateHistory(direction, from: gestureStart)
-    }
-
-    func navigateHistory(_ direction: Int, from point: CGPoint) {
-        guard let webview = workspace,
-              direction == -1 ? webview.canGoBack : webview.canGoForward else { return }
-        let script = "if (window.__kanbanNavigation?.canSwipe(\(point.x), \(point.y))) window.__kanbanNavigation.step(\(direction))"
-        webview.evaluateJavaScript(script, completionHandler: nil)
-    }
-
     func webView(_ webView: WKWebView, decidePolicyFor action: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
         guard webView === workspace, let url = action.request.url else { decisionHandler(.cancel); return }
         guard server?.allows(url) == true else {

native/src-tauri/gen/apple/Tests/WorkspaceTests.swift

@@ -95,7 +95,7 @@ final class WorkspaceTests: XCTestCase {
     }
 
     @MainActor
-    func testGesturesTraverseEverySPAEntryOnceAndPreserveForwardHistory() async throws {
+    func testWebKitOwnsInteractiveGesturesAndKeepsScrollBounds() async throws {
         let name = "KAN71-history-\(UUID())"
         let defaults = try XCTUnwrap(UserDefaults(suiteName: name))
         defer { defaults.removePersistentDomain(forName: name) }
@@ -113,44 +113,16 @@ final class WorkspaceTests: XCTestCase {
             """)
         try await waitFor(webview, "document.querySelector('#draft')?.value === 'unsaved'")
         XCTAssertFalse(webview.canGoBack)
-        controller.navigateHistory(-1, from: CGPoint(x: 1, y: 1))
+        XCTAssertNil(webview.goBack())
+        XCTAssertNil(webview.goForward())
         try await waitFor(webview, "location.pathname === '/dashboard'")
-        for index in 1...3 {
-            _ = try await webview.evaluateJavaScript("history.pushState({page: {url: '/page\(index)'}}, '', '/page\(index)')")
-        }
-        _ = try await webview.evaluateJavaScript("window.steps = 0; addEventListener('popstate', () => window.steps++)")
-        let edge = TestEdgeGesture()
-        edge.edges = .left
-        edge.testVelocity = CGPoint(x: 800, y: 0)
-        XCTAssertTrue(controller.gestureRecognizer(edge, shouldReceive: TestTouch()))
-        var allowed = false
-        for _ in 0..<50 {
-            if controller.gestureRecognizerShouldBegin(edge) { allowed = true; break }
-            try await Task.sleep(for: .milliseconds(20))
-        }
-        XCTAssertTrue(allowed)
-        edge.testState = .cancelled
-        edge.testTranslation = CGPoint(x: 200, y: 0)
-        controller.perform(NSSelectorFromString("navigateGesture:"), with: edge)
-        try await Task.sleep(for: .milliseconds(100))
-        try await waitFor(webview, "location.pathname === '/page3' && window.steps === 0")
-        edge.testState = .ended
-        edge.testTranslation = CGPoint(x: 10, y: 0)
-        controller.perform(NSSelectorFromString("navigateGesture:"), with: edge)
-        try await Task.sleep(for: .milliseconds(100))
-        try await waitFor(webview, "location.pathname === '/page3' && window.steps === 0")
-        edge.testTranslation = CGPoint(x: 200, y: 0)
-        controller.perform(NSSelectorFromString("navigateGesture:"), with: edge)
-        try await waitFor(webview, "location.pathname === '/page2' && window.steps === 1")
-        controller.navigateHistory(-1, from: CGPoint(x: 1, y: 1))
-        try await waitFor(webview, "location.pathname === '/page1' && window.steps === 2")
-        controller.navigateHistory(1, from: CGPoint(x: 1, y: 1))
-        try await waitFor(webview, "location.pathname === '/page2' && window.steps === 3")
+        XCTAssertTrue(webview.allowsBackForwardNavigationGestures)
+        XCTAssertFalse(webview.scrollView.bounces)
+        XCTAssertFalse(controller.responds(to: NSSelectorFromString("navigateGesture:")))
+        let customNavigation = try await webview.evaluateJavaScript("typeof window.__kanbanNavigation")
+        XCTAssertEqual(customNavigation as? String, "undefined")
         let draft = try await webview.evaluateJavaScript("document.querySelector('#draft').value")
         XCTAssertEqual(draft as? String, "unsaved")
-        XCTAssertFalse(webview.scrollView.bounces)
-        XCTAssertFalse(webview.allowsBackForwardNavigationGestures)
-        XCTAssertEqual(webview.gestureRecognizers?.compactMap { $0 as? UIScreenEdgePanGestureRecognizer }.count, 2)
         let toolbar = try XCTUnwrap(controller.view.subviews.compactMap { $0 as? UIToolbar }.first)
         XCTAssertFalse(toolbar.items!.contains { $0.accessibilityIdentifier == "workspaceBack" })
         XCTAssertTrue(toolbar.items!.contains { $0.accessibilityIdentifier == "showServerSettings" })
@@ -158,10 +130,9 @@ final class WorkspaceTests: XCTestCase {
         XCTAssertEqual(scroll as? String, "none")
         let horizontal = try await webview.evaluateJavaScript("getComputedStyle(document.documentElement).overscrollBehaviorX")
         XCTAssertEqual(horizontal as? String, "auto")
-        _ = try await webview.evaluateJavaScript("document.body.insertAdjacentHTML('beforeend', '<div role=dialog style=\"position:fixed;inset:0\">Dialog</div>')")
-        controller.navigateHistory(-1, from: CGPoint(x: 1, y: 1))
-        try await Task.sleep(for: .milliseconds(200))
-        try await waitFor(webview, "location.pathname === '/page2' && window.steps === 3")
+        controller.open(URL(string: "https://other.invalid/")!)
+        XCTAssertTrue(try XCTUnwrap(controller.workspace).allowsBackForwardNavigationGestures,
+                      "Changing workspaces must retain native gesture navigation")
     }
 
     @MainActor
@@ -272,19 +243,3 @@ final class WorkspaceTests: XCTestCase {
     }
 
 }
-
-private final class TestTouch: UITouch {
-    override func location(in view: UIView?) -> CGPoint { CGPoint(x: 1, y: 1) }
-}
-
-private final class TestEdgeGesture: UIScreenEdgePanGestureRecognizer {
-    var testState: UIGestureRecognizer.State = .possible
-    var testVelocity = CGPoint.zero
-    var testTranslation = CGPoint.zero
-    override var state: UIGestureRecognizer.State {
-        get { testState }
-        set { testState = newValue }
-    }
-    override func velocity(in view: UIView?) -> CGPoint { testVelocity }
-    override func translation(in view: UIView?) -> CGPoint { testTranslation }
-}

native/src-tauri/gen/apple/kanbangit-native.xcodeproj/project.pbxproj

@@ -441,7 +441,7 @@
 				CODE_SIGN_ENTITLEMENTS = "kanbangit-native_iOS/kanbangit-native_iOS.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = ZZX2KZGTHU;
 				ENABLE_BITCODE = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -457,7 +457,7 @@
 				);
 				"LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/$(PLATFORM_NAME) $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.0/$(PLATFORM_NAME)";
 				"LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/$(PLATFORM_NAME) $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.0/$(PLATFORM_NAME)";
-				MARKETING_VERSION = 0.2.4;
+				MARKETING_VERSION = 0.2.5;
 				PRODUCT_BUNDLE_IDENTIFIER = de.kanbangit.ios;
 				PRODUCT_MODULE_NAME = KanbanGitNative;
 				PRODUCT_NAME = KanbanGit;
@@ -618,7 +618,7 @@
 				CODE_SIGN_ENTITLEMENTS = "kanbangit-native_iOS/kanbangit-native_iOS.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = ZZX2KZGTHU;
 				ENABLE_BITCODE = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -634,7 +634,7 @@
 				);
 				"LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/$(PLATFORM_NAME) $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.0/$(PLATFORM_NAME)";
 				"LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/$(PLATFORM_NAME) $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.0/$(PLATFORM_NAME)";
-				MARKETING_VERSION = 0.2.4;
+				MARKETING_VERSION = 0.2.5;
 				PRODUCT_BUNDLE_IDENTIFIER = de.kanbangit.ios;
 				PRODUCT_MODULE_NAME = KanbanGitNative;
 				PRODUCT_NAME = KanbanGit;

native/src-tauri/gen/apple/project.yml

@@ -18,8 +18,8 @@ settingGroups:
       DEVELOPMENT_TEAM: ZZX2KZGTHU
       ENABLE_USER_SCRIPT_SANDBOXING: false
       PRODUCT_BUNDLE_IDENTIFIER: de.kanbangit.ios
-      MARKETING_VERSION: "0.2.4"
-      CURRENT_PROJECT_VERSION: "4"
+      MARKETING_VERSION: "0.2.5"
+      CURRENT_PROJECT_VERSION: "5"
     configs:
       debug:
         CODE_SIGN_IDENTITY: Apple Development

native/src-tauri/src/navigation.m

@@ -1,102 +1,6 @@
-#import <AppKit/AppKit.h>
 #import <WebKit/WebKit.h>
-#import <objc/runtime.h>
-
-// Keep AppKit's system swipe preferences and cancellation thresholds, but use
-// script history traversal so asynchronously created Inertia entries aren't skipped.
-@interface KanbanNavigation : NSObject
-@property(nonatomic, weak) WKWebView *webview;
-@property(nonatomic, strong) id monitor;
-@property(nonatomic) BOOL pending;
-@property(nonatomic) BOOL tracking;
-@property(nonatomic) BOOL blocked;
-@property(nonatomic) NSUInteger sequence;
-@end
-
-@implementation KanbanNavigation
-- (BOOL)swipeTrackingEnabled {
-    return NSEvent.isSwipeTrackingFromScrollEventsEnabled;
-}
-
-- (void)dealloc {
-    if (_monitor) [NSEvent removeMonitor:_monitor];
-}
-
-- (NSEvent *)handleEvent:(NSEvent *)event {
-    WKWebView *webview = self.webview;
-    if (!webview || event.window != webview.window || !webview.window.isKeyWindow ||
-        webview.hidden || ![self swipeTrackingEnabled]) return event;
-    if (event.phase == NSEventPhaseBegan) {
-        self.sequence++;
-        self.blocked = NO;
-        self.pending = NO;
-        self.tracking = NO;
-    }
-    if (self.tracking) return nil;
-    if (event.phase == NSEventPhaseEnded || event.phase == NSEventPhaseCancelled) {
-        self.sequence++;
-        self.pending = NO;
-        return event;
-    }
-    if (self.blocked || self.pending || event.momentumPhase != NSEventPhaseNone ||
-        !(event.phase & (NSEventPhaseBegan | NSEventPhaseChanged)) || !event.hasPreciseScrollingDeltas) return event;
-    if (fabs(event.scrollingDeltaX) <= fabs(event.scrollingDeltaY)) {
-        if (fabs(event.scrollingDeltaY) > 0) self.blocked = YES;
-        return event;
-    }
-    NSPoint point = [webview convertPoint:event.locationInWindow fromView:nil];
-    if (!NSPointInRect(point, webview.bounds)) return event;
-    if (!webview.isFlipped) point.y = webview.bounds.size.height - point.y;
-    NSString *script = [NSString stringWithFormat:@"window.__kanbanNavigation?.canSwipe(%f, %f) === true", point.x, point.y];
-    self.pending = YES;
-    NSUInteger sequence = self.sequence;
-    NSURL *page = webview.URL;
-    __weak KanbanNavigation *weakSelf = self;
-    [webview evaluateJavaScript:script completionHandler:^(id allowed, NSError *error) {
-        KanbanNavigation *owner = weakSelf;
-        if (!owner || owner.sequence != sequence) return;
-        owner.pending = NO;
-        owner.blocked = YES;
-        if (error || ![allowed isEqual:@YES] || ![webview.URL isEqual:page] ||
-            (!webview.canGoBack && !webview.canGoForward)) return;
-        owner.tracking = YES;
-        [event trackSwipeEventWithOptions:NSEventSwipeTrackingLockDirection | NSEventSwipeTrackingClampGestureAmount
-                dampenAmountThresholdMin:webview.canGoForward ? -1 : 0
-                                    max:webview.canGoBack ? 1 : 0
-                           usingHandler:^(CGFloat amount, NSEventPhase phase, BOOL complete, BOOL *stop) {
-            KanbanNavigation *current = weakSelf;
-            if (current.sequence != sequence) {
-                *stop = YES;
-                return;
-            }
-            if (!current || !webview.window.isKeyWindow || ![webview.URL isEqual:page]) {
-                current.tracking = NO;
-                *stop = YES;
-                return;
-            }
-            if (!complete) return;
-            current.tracking = NO;
-            if (phase == NSEventPhaseCancelled) return;
-            NSInteger direction = amount >= 1 ? -1 : amount <= -1 ? 1 : 0;
-            if ((direction == -1 && webview.canGoBack) || (direction == 1 && webview.canGoForward)) {
-                NSString *navigate = [NSString stringWithFormat:@"if (%@) window.__kanbanNavigation.step(%ld)", script, (long)direction];
-                [webview evaluateJavaScript:navigate completionHandler:nil];
-            }
-        }];
-    }];
-    return event;
-}
-@end
 
 void install_workspace_navigation(void *pointer) {
     WKWebView *webview = (__bridge WKWebView *)pointer;
-    webview.allowsBackForwardNavigationGestures = NO;
-    KanbanNavigation *navigation = [KanbanNavigation new];
-    navigation.webview = webview;
-    __weak KanbanNavigation *weakNavigation = navigation;
-    navigation.monitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskScrollWheel handler:^NSEvent *(NSEvent *event) {
-        KanbanNavigation *owner = weakNavigation;
-        return owner ? [owner handleEvent:event] : event;
-    }];
-    objc_setAssociatedObject(webview, @selector(handleEvent:), navigation, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+    webview.allowsBackForwardNavigationGestures = YES;
 }

native/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://schema.tauri.app/config/2",
     "productName": "KanbanGit",
-    "version": "0.2.4",
+    "version": "0.2.5",
     "identifier": "de.kanbangit.desktop",
     "build": {
         "frontendDist": "../ui"
@@ -25,7 +25,7 @@
         ],
         "macOS": {
             "minimumSystemVersion": "14.0",
-            "bundleVersion": "9",
+            "bundleVersion": "10",
             "dmg": {
                 "windowSize": {
                     "width": 660,

native/src-tauri/tauri.ios.conf.json

@@ -5,7 +5,7 @@
         "iOS": {
             "minimumSystemVersion": "17.0",
             "developmentTeam": "ZZX2KZGTHU",
-            "bundleVersion": "4"
+            "bundleVersion": "5"
         }
     }
 }

native/src-tauri/tests/macos_smoke.rs

@@ -125,27 +125,9 @@ fn main() {
                             input.id = 'kan52-unsaved'; input.value = 'unsaved input'; document.body.append(input);
                             document.cookie = 'kan52_fixture=isolated; Path=/; Secure; SameSite=Lax';
                             localStorage.setItem('kan52_fixture', 'isolated');
-                            const initialHistory = history.length;
-                            const initialPath = location.pathname;
-                            const navigation = window.__kanbanNavigation;
-                            if (!navigation || getComputedStyle(document.documentElement).overscrollBehaviorY !== 'none' || getComputedStyle(document.documentElement).overscrollBehaviorX !== 'auto') throw new Error('Scroll boundary policy missing');
-                            const traverse = direction => new Promise(resolve => {
-                                addEventListener('popstate', resolve, { once: true });
-                                navigation.step(direction);
-                            });
-                            for (const hash of ['#board', '#ticket', '#settings']) history.pushState({ page: { url: hash } }, '', hash);
-                            await traverse(-1);
-                            if (location.hash !== '#ticket') throw new Error('Back skipped an SPA entry');
-                            await traverse(-1);
-                            if (location.hash !== '#board') throw new Error('Back skipped a second SPA entry');
-                            await traverse(1);
-                            if (location.hash !== '#ticket' || history.length !== initialHistory + 3) throw new Error('Forward history was lost');
-                            const dialog = document.createElement('dialog');
-                            dialog.textContent = 'Navigation overlay'; document.body.append(dialog); dialog.showModal();
-                            if (navigation.canSwipe(1, 1)) throw new Error('Overlay must own navigation');
-                            dialog.close(); dialog.remove();
-                            if (input.value !== 'unsaved input') throw new Error('History discarded form state');
-                            const ok = rendered && denied && typeof window.__TAURI__ === 'undefined' && initialPath === '/login' && initialHistory === 1;
+                            if (typeof window.__kanbanNavigation !== 'undefined') throw new Error('Custom gesture bridge must be removed');
+                            if (getComputedStyle(document.documentElement).overscrollBehaviorY !== 'none' || getComputedStyle(document.documentElement).overscrollBehaviorX !== 'auto') throw new Error('Scroll boundary policy missing');
+                            const ok = rendered && denied && typeof window.__TAURI__ === 'undefined' && location.pathname === '/login' && history.length === 1;
                             location.href = '/__native_smoke_result?stage=loaded&passed=' + ok;
                         })();
                     "#).unwrap();