From eeb5bef7ffd0036e4ee16c2b539e6dcd0c43dc1a Mon Sep 17 00:00:00 2001
From: Mega Yu <yuhg2310@gmail.com>
Date: Wed, 11 Feb 2026 19:39:48 +0800
Subject: [PATCH] update current-page parameter

---
 src/main/frontend/components/cmdk/core.cljs | 18 ++++++++----------
 src/main/mobile/search.cljs                 |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/frontend/components/cmdk/core.cljs b/src/main/frontend/components/cmdk/core.cljs
index 786c581883..e24bb39208 100644
--- a/src/main/frontend/components/cmdk/core.cljs
+++ b/src/main/frontend/components/cmdk/core.cljs
@@ -277,7 +277,7 @@
                  new-result)))]))
 
 (defn page-item
-  [repo page current-page input]
+  [repo page current-page-uuid input]
   (let [entity (-> (or (db/entity [:block/uuid (:block/uuid page)]) page)
                    (update :block/tags (fn [tags]
                                          (map (fn [tag]
@@ -286,12 +286,11 @@
                                                   tag)) tags))))
         source-page (or (model/get-alias-source-page repo (:db/id entity))
                         (:alias page))
-        current-page-id (:block/uuid current-page)
         result-page-id (or (:block/uuid source-page)
                            (:block/uuid entity)
                            (:block/uuid page))
-        current-page? (and current-page-id
-                           (= current-page-id result-page-id))
+        current-page? (and current-page-uuid
+                           (= current-page-uuid result-page-id))
         icon (icon-component/get-node-icon-cp entity {:ignore-current-icon? true})
         title (block-handler/block-unique-title entity
                                                 :alias (:block/title source-page)
@@ -312,7 +311,7 @@
               :source-block (or source-page page))))
 
 (defn block-item
-  [repo block current-page input]
+  [repo block current-page-uuid input]
   (let [id (:block/uuid block)
         text (block-handler/block-unique-title block :truncate? false)
         icon (icon-component/get-node-icon-cp block {:ignore-current-icon? true})]
@@ -324,7 +323,7 @@
                                {:disabled? true})
      :result-type :block
      :current-page? (when-let [page-id (:block/page block)]
-                      (= page-id (:block/uuid current-page)))
+                      (= page-id current-page-uuid))
      :source-block block}))
 
 ;; The blocks search action uses an existing handler
@@ -332,8 +331,7 @@
   (let [!input (::input state)
         !results (::results state)
         repo (state/get-current-repo)
-        current-page (when-let [id (page-util/get-current-page-id)]
-                       (db/entity id))
+        current-page-uuid (page-util/get-current-page-uuid)
         opts (cmdk-state/cmdk-block-search-options
               {:filter-group :nodes
                :dev? config/dev?
@@ -344,8 +342,8 @@
             blocks (remove nil? blocks)
             items (keep (fn [block]
                           (if (:page? block)
-                            (page-item repo block current-page @!input)
-                            (block-item repo block current-page @!input))) blocks)]
+                            (page-item repo block current-page-uuid @!input)
+                            (block-item repo block current-page-uuid @!input))) blocks)]
       (if (= group :current-page)
         (let [items-on-current-page (filter :current-page? items)]
           (swap! !results update group merge {:status :success :items items-on-current-page}))
diff --git a/src/main/mobile/search.cljs b/src/main/mobile/search.cljs
index e8fb955b3f..b26abb7a3f 100644
--- a/src/main/mobile/search.cljs
+++ b/src/main/mobile/search.cljs
@@ -19,7 +19,7 @@
                                                     :extract-fn :block/title})
           items (keep (fn [block]
                         (if (:page? block)
-                          (assoc (cmdk/page-item repo block input) :page? true)
+                          (assoc (cmdk/page-item repo block nil input) :page? true)
                           (cmdk/block-item repo block nil input))) blocks)]
     items))