From c6a46c43f2b8b3743b793b71b68a87d1cdb5b629 Mon Sep 17 00:00:00 2001
From: Tienson Qin <tiensonqin@gmail.com>
Date: Wed, 13 Sep 2023 20:48:29 +0800
Subject: [PATCH] fix: can't backspace to edit tagged page block

---
 src/main/frontend/handler/editor.cljs | 31 ++++++++++++---------------
 src/main/frontend/handler/page.cljs   |  6 ++++--
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/main/frontend/handler/editor.cljs b/src/main/frontend/handler/editor.cljs
index bbe6a7742..d007d1234 100644
--- a/src/main/frontend/handler/editor.cljs
+++ b/src/main/frontend/handler/editor.cljs
@@ -708,11 +708,13 @@
        (outliner-core/delete-blocks! [block] {:children? children?})))))
 
 (defn- move-to-prev-block
-  [repo sibling-block format id value move?]
+  [repo sibling-block format id value]
   (when (and repo sibling-block)
     (when-let [sibling-block-id (dom/attr sibling-block "blockid")]
       (when-let [block (db/entity [:block/uuid (uuid sibling-block-id)])]
-        (let [original-content (util/trim-safe (:block/content block))
+        (let [original-block (dom/attr sibling-block "originalblockid")
+              id (if original-block (:block/uuid block) id)
+              original-content (util/trim-safe (:block/content block))
               value' (-> (file-property/remove-built-in-properties-when-file-based repo format original-content)
                          (drawer/remove-logbook))
               value (->> value
@@ -724,17 +726,14 @@
                    (if original-content
                      (gobj/get (utf8/encode original-content) "length")
                      0)
-                   0)
-              f (fn []
-                  (edit-block! (db/pull (:db/id block))
-                               pos
-                               id
-                               {:custom-content new-value
-                                :tail-len tail-len}))]
-          (when move? (f))
+                   0)]
+          (edit-block! (db/pull (:db/id block))
+                                       pos
+                                       id
+                                       {:custom-content new-value
+                                        :tail-len tail-len})
           {:prev-block block
-           :new-content new-value
-           :move-fn f})))))
+           :new-content new-value})))))
 
 (declare save-block!)
 
@@ -765,7 +764,7 @@
                                     block-parent
                                     {:container (util/rec-get-blocks-container block-parent)})
                                    (util/get-prev-block-non-collapsed-non-embed block-parent))
-                   {:keys [prev-block new-content move-fn]} (move-to-prev-block repo sibling-block format id value false)
+                   {:keys [prev-block new-content]} (move-to-prev-block repo sibling-block format id value)
                    concat-prev-block? (boolean (and prev-block new-content))
                    transact-opts (cond->
                                   {:outliner-op :delete-blocks}
@@ -781,8 +780,7 @@
                                                             prev-block)]
                                           (delete-block-aux! block delete-children?)
                                           (save-block! repo prev-block' new-content {:editor/op :delete}))
-                                        (delete-block-aux! block delete-children?)))
-               (when (fn? move-fn) (move-fn))))))))
+                                        (delete-block-aux! block delete-children?)))))))))
    (state/set-editor-op! nil)))
 
 (defn delete-blocks!
@@ -799,8 +797,7 @@
         (move-to-prev-block repo sibling-block
                             (:block/format block)
                             (dom/attr sibling-block "id")
-                            ""
-                            true)))))
+                            "")))))
 
 (defn- set-block-property-aux!
   [repo block-or-id key value]
diff --git a/src/main/frontend/handler/page.cljs b/src/main/frontend/handler/page.cljs
index 54b602e41..7ac9a3a18 100644
--- a/src/main/frontend/handler/page.cljs
+++ b/src/main/frontend/handler/page.cljs
@@ -1018,7 +1018,8 @@
            (when (> (count edit-content) current-pos)
              (gp-util/safe-subs edit-content pos current-pos)))]
     (if hashtag?
-      (fn [chosen _e]
+      (fn [chosen e]
+        (util/stop e)
         (state/clear-editor-action!)
         (let [wrapped? (= page-ref/left-brackets (gp-util/safe-subs edit-content (- pos 2) pos))
               chosen (if (and (util/safe-re-find #"\s+" chosen) (not wrapped?))
@@ -1038,7 +1039,8 @@
                                            :end-pattern (when wrapped? page-ref/right-brackets)
                                            :command :page-ref})
           (when input (.focus input))))
-      (fn [chosen _e]
+      (fn [chosen e]
+        (util/stop e)
         (state/clear-editor-action!)
         (let [page-ref-text (get-page-ref-text chosen)]
           (editor-handler/insert-command! id