fix: reset search stack

Author: tiensonqin

ios/App/App/AppDelegate.swift

@@ -406,6 +406,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UINavigationControllerDel
             let path = self.normalizedPath(rawPath)
             let navigationType = (notification.userInfo?["navigationType"] as? String) ?? "push"
             let stackId = (notification.userInfo?["stack"] as? String) ?? "home"
+            let previousStackId = self.activeStackId
 
             #if DEBUG
             print("📡 routeDidChange from JS → native")
@@ -417,8 +418,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UINavigationControllerDel
             // 1️⃣ Stack switch: home ↔ capture ↔ goto ...
             // ============================================
             if stackId != self.activeStackId {
-                // Save current native stack paths
-                self.setPaths(self.pathStack, for: self.activeStackId)
+                // Save current native stack paths; drop stale search stack when leaving it.
+                if previousStackId == "search", stackId != "search" {
+                    self.setPaths(["/__stack__/search"], for: "search")
+                } else {
+                    self.setPaths(self.pathStack, for: previousStackId)
+                }
 
                 // Load (or create) new stack's paths
                 var newPaths = self.paths(for: stackId)

src/main/frontend/components/quick_add.cljs

@@ -58,11 +58,8 @@
              "Quick add"]
             add-button])
          (if mobile?
-           [:main#app-container-wrapper.ls-fold-button-on-right
-            [:div#app-container.pt-2
-             [:div#main-container.flex.flex-1
-              [:div.w-full.mt-4
-               (page-blocks add-page)]]]]
+           [:div.w-full.mt-4
+            (page-blocks add-page)]
            [:div.content {:class "block -ml-6"}
             (page-blocks add-page)])
          (when-not mobile? add-button)]))))

src/main/mobile/components/app.cljs

@@ -30,8 +30,7 @@
 
 (rum/defc journals
   []
-  (ui-component/classic-app-container-wrap
-   (journal/all-journals)))
+  (journal/all-journals))
 
 (rum/defc home-inner < rum/static
   [db-restoring?]
@@ -118,13 +117,13 @@
     ;; - Journals layer keeps its own scroll container and is always in the DOM.
     ;; - Page/other-tab layer keeps its own independent scroll container.
     ;; Both are absolutely positioned and stacked; we toggle visibility.
-    [:div.h-full.relative
-     ;; Journals scroll container (keep-alive)
+    [:div.w-full.relative
+        ;; Journals scroll container (keep-alive)
      [:div#app-main-home.pl-3.pr-2.absolute.inset-0
       {:class (when-not home? "invisible pointer-events-none")}
       (home)]
 
-     ;; Other pages: search, settings, specific page, etc.
+        ;; Other pages: search, settings, specific page, etc.
      (when-not home?
        (other-page view tab route-match))]))
 
@@ -141,7 +140,7 @@
        (when-let [element (util/app-scroll-container-node)]
          (common-handler/listen-to-scroll! element)))
      [])
-    [:div.h-full
+    [:<>
      (mobile-header/header current-repo tab)
      (main-content tab route-match)]))
 
@@ -156,13 +155,11 @@
         show-action-bar? (state/sub :mobile/show-action-bar?)
         {:keys [open? content-fn opts]} (rum/react mobile-state/*popup-data)
         show-popup? (and open? content-fn)
-        fold-button-on-right? (state/enable-fold-button-right?)
         route-match (state/sub :route-match)]
-    [:div#app-main.w-full.h-full
-     {:class (util/classnames
-              [{:ls-fold-button-on-right fold-button-on-right?}])}
-     [:div.w-full.h-full {:class (when show-popup? "invisible")}
-      (app current-repo route-match)]
+    [:main#app-container-wrapper.ls-fold-button-on-right
+     [:div#app-container {:class (when show-popup? "invisible")}
+      [:div#main-container.flex.flex-1.overflow-x-hidden.py-4
+       (app current-repo route-match)]]
      (when show-popup?
        [:div.ls-layer
         (popup/popup opts content-fn)])

src/main/mobile/components/app.css

@@ -14,7 +14,11 @@ html.is-ios {
   font-size: calc(var(--ls-mobile-font-size) * var(--ls-mobile-font-scale, 1));
 }
 
-#app-main {
+#app-container-wrapper, #app-container, #main-container {
+    @apply w-full h-full;
+}
+
+#app-container-wrapper {
     padding-top: env(safe-area-inset-top);
     padding-bottom: env(safe-area-inset-bottom);
 }

src/main/mobile/components/ui.cljs

@@ -11,13 +11,6 @@
 (defonce transition-group (r/adapt-class TransitionGroup))
 (defonce css-transition (r/adapt-class CSSTransition))
 
-(rum/defc classic-app-container-wrap
-  [content]
-  [:main#app-container-wrapper.ls-fold-button-on-right
-   [:div#app-container.pt-2
-    [:div#main-container.flex.flex-1.overflow-x-hidden
-     [:div.w-full content]]]])
-
 (rum/defc notification-clear-all
   []
   [:div.ui__notifications-content

src/main/mobile/routes.cljs

@@ -19,5 +19,4 @@
    ["/export"
     {:name :export
      :view (fn []
-             [:div.mt-8
-              (export/export)])}]])
+             (export/export))}]])

src/main/mobile/state.cljs

@@ -4,19 +4,25 @@
             [frontend.state :as state]
             [mobile.navigation :as mobile-nav]))
 
-(defonce *tab (atom "home"))
-(defn set-tab! [tab]
-  (reset! *tab tab)
-  (when tab
-    (mobile-nav/switch-stack! tab)))
-(defn use-tab [] (r/use-atom *tab))
 (defonce *search-input (atom ""))
 (defn use-search-input []
   (r/use-atom *search-input))
 (defonce *search-last-input-at (atom nil))
 (defn use-search-last-input-at []
   (r/use-atom *search-last-input-at))
 
+(defonce *tab (atom "home"))
+(defn set-tab! [tab]
+  (let [prev @*tab]
+    ;; When leaving the search tab, clear its stack so reopening starts fresh.
+    (when (and (= prev "search")
+               (not= tab "search"))
+      (reset! *search-input "")
+      (mobile-nav/reset-stack-history! "search"))
+    (reset! *tab tab)
+    (mobile-nav/switch-stack! tab)))
+(defn use-tab [] (r/use-atom *tab))
+
 (defonce *popup-data (atom nil))
 (defn set-popup!
   [data]