Bläddra i källkod

fix: clear editor action too when exits editing

Tienson Qin 1 år sedan
förälder
incheckning
abe4f045b5
2 ändrade filer med 10 tillägg och 8 borttagningar
  1. 9 8
      src/main/frontend/db/model.cljs
  2. 1 0
      src/main/frontend/state.cljs

+ 9 - 8
src/main/frontend/db/model.cljs

@@ -237,14 +237,15 @@ independent of format as format specific heading characters are stripped"
 (defn sub-block
 (defn sub-block
   [id & {:keys [ref?]}]
   [id & {:keys [ref?]}]
   (when-let [repo (state/get-current-repo)]
   (when-let [repo (state/get-current-repo)]
-    (let [ref (react/q repo [:frontend.worker.react/block id]
-                       {:query-fn (fn [_]
-                                    (let [e (db-utils/entity id)]
-                                      [e (:block/tx-id e)]))}
-                       nil)]
-      (if ref?
-        ref
-        (-> ref react first)))))
+    (when id
+      (let [ref (react/q repo [:frontend.worker.react/block id]
+                         {:query-fn (fn [_]
+                                      (let [e (db-utils/entity id)]
+                                        [e (:block/tx-id e)]))}
+                         nil)]
+        (if ref?
+          ref
+          (-> ref react first))))))
 
 
 (defn sort-by-order-recursive
 (defn sort-by-order-recursive
   [form]
   [form]

+ 1 - 0
src/main/frontend/state.cljs

@@ -1345,6 +1345,7 @@ Similar to re-frame subscriptions"
 
 
 (defn clear-edit!
 (defn clear-edit!
   []
   []
+  (clear-editor-action!)
   (set-state! :editor/editing? {})
   (set-state! :editor/editing? {})
   (set-state! :editor/start-pos nil)
   (set-state! :editor/start-pos nil)
   (clear-editor-last-pos!)
   (clear-editor-last-pos!)