From 83906dbc9b6cd39e8b523aa36f77d6ea229d7fcb Mon Sep 17 00:00:00 2001
From: Tienson Qin <tiensonqin@gmail.com>
Date: Wed, 13 Dec 2023 18:09:21 +0800
Subject: [PATCH] fix: allow to `DEL` if the next element is not its right
 sibling

---
 src/main/frontend/db/model.cljs       |  8 +++++++
 src/main/frontend/handler/editor.cljs | 32 +++++++++++++--------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/main/frontend/db/model.cljs b/src/main/frontend/db/model.cljs
index ea881b39c..d86407a73 100644
--- a/src/main/frontend/db/model.cljs
+++ b/src/main/frontend/db/model.cljs
@@ -596,6 +596,14 @@ independent of format as format specific heading characters are stripped"
                           (:db/id (:block/parent block))
                           db-id)))
 
+(defn get-next
+  "Get next block, either right sibling, or loop to find its next block."
+  [db db-id]
+  (or (get-right-sibling db db-id)
+      (let [parent-id (:db/id (:block/parent (db-utils/entity db db-id)))]
+        (get-next db parent-id))))
+
+
 (defn last-child-block?
   "The child block could be collapsed."
   [db parent-id child-id]
diff --git a/src/main/frontend/handler/editor.cljs b/src/main/frontend/handler/editor.cljs
index 07547938d..4b1831747 100644
--- a/src/main/frontend/handler/editor.cljs
+++ b/src/main/frontend/handler/editor.cljs
@@ -257,15 +257,14 @@
                :block/content value}]
     (profile
      "Save block: "
-     (let [original-block (db/entity (:db/id block))
-           original-props (:block/properties original-block)
-           block' (-> (wrap-parse-block block)
+      (let [block' (-> (wrap-parse-block block)
                       ;; :block/uuid might be changed when backspace/delete
                       ;; a block that has been refed
                       (assoc :block/uuid (:block/uuid block)))
-           opts' (assoc opts :outliner-op :save-block)]
-
-       (let [{:keys [tx-data]}
+            opts' (assoc opts :outliner-op :save-block)]
+        (let [original-block (db/entity (:db/id block))
+             original-props (:block/properties original-block)
+             {:keys [tx-data]}
              (outliner-tx/transact!
               opts'
               (outliner-core/save-block! block')
@@ -2660,22 +2659,16 @@
         ^js input (state/get-input)
         current-pos (cursor/pos input)
         value (gobj/get input "value")
-        right (outliner-core/get-right-sibling (:db/id current-block))
-        current-block-has-children? (db/has-children? (:block/uuid current-block))
         collapsed? (util/collapsed? current-block)
-        first-child (:data (tree/-get-down (outliner-core/block current-block)))
-        next-block (if (or collapsed? (not current-block-has-children?))
-                     (when right (db/pull (:db/id right)))
-                     first-child)
+        next-block (when-let [e (db-model/get-next (db/get-db repo) (:db/id current-block))]
+                     (db/pull (:db/id e)))
+        next-block-right (when next-block (outliner-core/get-right-sibling (:db/id next-block)))
         db-based? (config/db-based-graph? repo)]
     (cond
       (nil? next-block)
       nil
 
-      (and collapsed? right (db/has-children? (:block/uuid right)))
-      nil
-
-      (and (not collapsed?) first-child (db/has-children? (:block/uuid first-child)))
+      (and collapsed? next-block (db/has-children? (:block/uuid next-block)))
       nil
 
       :else
@@ -2698,7 +2691,12 @@
          (save-block! repo keep-block new-content {:editor/op :delete})
          (when next-block-has-refs?
            (outliner-core/save-block! {:db/id (:db/id keep-block)
-                                       :block/left (:db/id (:block/left delete-block))}))
+                                       :block/left (:db/id (:block/left delete-block))
+                                       :block/parent (:db/id (:block/parent delete-block))})
+           (when (and next-block-right (not= (:db/id (:block/parent next-block))
+                                             (:db/id (:block/parent edit-block))))
+             (outliner-core/save-block! {:db/id (:db/id next-block-right)
+                                         :block/left (:db/id (:block/left next-block))})))
          (when db-based?
            (let [new-properties (merge
                                  (:block/properties (db/entity (:db/id edit-block)))