clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-06-01 19:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add button should create new page instead of new block

Browse Source 
For the Library page.
This commit is contained in:
Tienson Qin
2025-06-16 14:38:00 +08:00
parent f442ae82a0
commit e9df12d452
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/frontend/components/page.cljs
View File

@@ -100,11 +100,12 @@
(declare page-cp)
(rum/defc add-button
[block container-id]
[block {:keys [container-id] :as config*}]
(let [*ref (rum/use-ref nil)
has-children? (:block/_parent block)
page? (ldb/page? block)
opacity-class (if has-children? "opacity-0" "opacity-50")]
opacity-class (if has-children? "opacity-0" "opacity-50")
config (dissoc config* :page)]
(when page?
[:div.ls-block.block-add-button.flex-1.flex-col.rounded-sm.cursor-text.transition-opacity.ease-in.duration-100.!py-0
{:class opacity-class
@@ -113,8 +114,8 @@
:on-click (fn [e]
(util/stop e)
(state/set-state! :editor/container-id container-id)
(editor-handler/api-insert-new-block! ""
{:block-uuid (:block/uuid block)}))
(editor-handler/api-insert-new-block! "" (merge config
{:block-uuid (:block/uuid block)})))
:on-mouse-over (fn []
(let [ref (rum/deref *ref)
prev-block (util/get-prev-block-non-collapsed (rum/deref *ref) {:up-down? true})]
@@ -132,7 +133,7 @@
(util/stop e)
(when (= "Enter" (util/ekey e))
(state/set-state! :editor/container-id container-id)
(editor-handler/api-insert-new-block! "" block)))
(editor-handler/api-insert-new-block! "" (merge config block))))
:tab-index 0}
[:div.flex.flex-row
[:div.flex.items-center {:style {:height 28
@@ -165,13 +166,14 @@
(remove (fn [b] (some? (get b (:db/ident block)))) children)
:else
children)]
children)
config (assoc config :library? (ldb/library? block))]
(cond
(and
(not block?)
(not config/publishing?)
(empty? children) block)
(add-button block (:container-id config))
(add-button block config)
:else
(let [document-mode? (state/sub :document/mode?)
@@ -180,14 +182,13 @@
:db/id (:db/id block)
:block? block?
:editor-box editor/box
:document/mode? document-mode?
:library? (ldb/library? block)}
:document/mode? document-mode?}
config)
config (common-handler/config-with-document-mode hiccup-config)
blocks (if block? [block] (db/sort-by-order children block))]
[:div.relative
(page-blocks-inner block blocks config sidebar? whiteboard? block-id)
(add-button block (:container-id config))])))))
(add-button block config)])))))
(rum/defc today-queries < rum/reactive
[repo today? sidebar?]

12
src/main/frontend/handler/editor.cljs
View File

@@ -533,7 +533,8 @@
custom-uuid replace-empty-target? edit-block? ordered-list? other-attrs]
:or {sibling? false
before? false
edit-block? true}}]
edit-block? true}
:as config}]
(when (or page block-uuid)
(let [repo (state/get-current-repo)
db-based? (config/db-based-graph? repo)
@@ -594,10 +595,11 @@
(p/do!
(ui-outliner-tx/transact!
{:outliner-op :insert-blocks}
(outliner-insert-block! {} block-m new-block {:sibling? sibling?
:keep-uuid? true
:ordered-list? ordered-list?
:replace-empty-target? replace-empty-target?})
(outliner-insert-block! config block-m new-block
{:sibling? sibling?
:keep-uuid? true
:ordered-list? ordered-list?
:replace-empty-target? replace-empty-target?})
(when (and db-based? (seq properties))
(property-handler/set-block-properties! repo (:block/uuid new-block) properties)))
(when edit-block?