refactor: :editor/last-edit-block

src/main/frontend/modules/outliner/datascript.cljc

@@ -43,9 +43,9 @@
                 (not (:skip-transact? opts)))
        (try
          (let [conn (conn/get-conn false)
-              editor-cursor (state/get-last-edit-block)
-              meta (merge opts {:editor-cursor editor-cursor})
-              rs (d/transact! conn txs meta)]
+               editor-cursor (state/get-current-edit-block-and-position)
+               meta (merge opts {:editor-cursor editor-cursor})
+               rs (d/transact! conn txs meta)]
           (when-not config/test?
             (after-transact-pipelines rs))
           rs)

src/main/frontend/state.cljs

@@ -81,6 +81,7 @@
     :editor/show-input nil
     :editor/last-saved-cursor nil
     :editor/editing? nil
+    :editor/last-edit-block-input-id nil
     :editor/last-edit-block-id nil
     :editor/in-composition? false
     :editor/content {}
@@ -430,7 +431,7 @@
 
 (defn get-last-edit-input-id
   []
-  (:editor/last-edit-block-id @state))
+  (:editor/last-edit-block-input-id @state))
 
 (defn editing?
   []
@@ -697,6 +698,10 @@
   (get @state :editor/block))
 
 (defn get-last-edit-block
+  []
+  (:editor/last-edit-block @state))
+
+(defn get-current-edit-block-and-position
   []
   (let [edit-input-id (get-edit-input-id)
         edit-block (get-edit-block)
@@ -727,7 +732,8 @@
                     (assoc
                      :editor/block block
                      :editor/editing? {edit-input-id true}
-                     :editor/last-edit-block-id edit-input-id
+                     :editor/last-edit-block-input-id edit-input-id
+                     :editor/last-edit-block block
                      :cursor-range cursor-range))))
 
        (when-let [input (gdom/getElement edit-input-id)]

src/main/frontend/version.cljs

@@ -1,3 +1,3 @@
 (ns frontend.version)
 
-(defonce version "0.1.6")
+(defonce version "0.1.6-1")