瀏覽代碼

fix: can't create a new block when delete all the blocks

Tienson Qin 4 年之前
父節點
當前提交
c0df49a24a

+ 1 - 1
src/main/frontend/components/block.cljs

@@ -1363,7 +1363,7 @@
        (editor-handler/unhighlight-blocks!)
        (let [properties-hidden? (text/properties-hidden? properties)
              content (if properties-hidden? (text/remove-properties! format content) content)
-             block (db/pull [:block/uuid (:block/uuid block)])
+             block (or (db/pull [:block/uuid (:block/uuid block)]) block)
              f #(let [cursor-range (util/caret-range (gdom/getElement block-id))]
                   (state/set-editing!
                    edit-input-id

+ 2 - 1
src/main/frontend/components/journal.cljs

@@ -59,7 +59,8 @@
   (let [raw-blocks (db/get-page-blocks repo page)
         document-mode? (state/sub :document/mode?)
         blocks (->>
-                (block-handler/with-dummy-block raw-blocks format nil {:journal? true})
+                (block-handler/with-dummy-block raw-blocks format nil {:journal? true
+                                                                       :page-name page})
                 (db/with-block-refs-count repo))]
     (blocks-inner blocks page document-mode?)))
 

+ 1 - 0
src/main/frontend/handler/block.cljs

@@ -40,6 +40,7 @@
              dummy (merge {:block/uuid (db/new-block-id)
                            :block/left page-id
                            :block/parent page-id
+                           :block/page page-id
                            :block/title ""
                            :block/content ""
                            :block/format format

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

@@ -702,7 +702,7 @@
   ([edit-input-id content block cursor-range]
    (set-editing! edit-input-id content block cursor-range true))
   ([edit-input-id content block cursor-range move-cursor?]
-   (when edit-input-id
+   (when (and edit-input-id block)
      (let [block-element (gdom/getElement (string/replace edit-input-id "edit-block" "ls-block"))
            container (util/get-block-container block-element)
            block (if container