clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-25 05:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: redirecting to whiteboard if page-ref is a whiteboard

Browse Source
This commit is contained in:
Peng Xiao
2022-07-15 14:30:49 +08:00
parent 4a6ba1b9bc
commit aed9527f5a
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/frontend/components/block.cljs
View File

@@ -418,8 +418,9 @@
page-name-in-block is the overridable name of the page (legacy)
All page-names are sanitized except page-name-in-block"
[config page-name-in-block page-name redirect-page-name page-entity contents-page? children html-export? label]
(let [tag? (:tag? config)]
[config page-name-in-block page-name redirect-page-name page-entity contents-page? children html-export? label whiteboard-page?]
(let [tag? (:tag? config)
config (assoc config :whiteboard-page? whiteboard-page?)]
[:a
{:class (cond-> (if tag? "tag" "page-ref")
(:property? config)
@@ -429,6 +430,9 @@
(fn [e]
(util/stop e)
(cond
whiteboard-page?
(route-handler/redirect-to-whiteboard! page-name)
(gobj/get e "shiftKey")
(when-let [page-entity (db/entity [:block/name redirect-page-name])]
(state/sidebar-add-block!
@@ -544,6 +548,7 @@
(let [page-name-in-block (gp-util/remove-boundary-slashes page-name-in-block)
page-name (util/page-name-sanity-lc page-name-in-block)
page-entity (db/entity [:block/name page-name])
whiteboard-page? (model/whiteboard-page? page-name)
redirect-page-name (or (and (= :org (state/get-preferred-format))
(:org-mode/insert-file-link? (state/get-config))
redirect-page-name)
@@ -551,14 +556,15 @@
inner (page-inner config
page-name-in-block
page-name
redirect-page-name page-entity contents-page? children html-export? label)]
redirect-page-name page-entity contents-page? children html-export? label whiteboard-page?)]
(cond
(:breadcrumb? config)
(or (:block/original-name page)
(:block/name page))
(and (not (util/mobile?))
(not preview?))
(not preview?)
(not whiteboard-page?)) ;; TODO: support preview for whiteboard
(page-preview-trigger (assoc config :children inner) page-name)
:else
@@ -613,21 +619,22 @@
(draw-component {:file file :block-uuid block-uuid}))))
(rum/defc page-reference < rum/reactive
[html-export? s config label]
[html-export? s {:keys [nested-link? block-uuid id] :as config} label]
(let [show-brackets? (state/show-brackets?)
nested-link? (:nested-link? config)
contents-page? (= "contents" (string/lower-case (str (:id config))))
block-uuid (:block/uuid config)]
contents-page? (= "contents" (string/lower-case (str id)))
whiteboard? (model/whiteboard-page? s)]
(if (string/ends-with? s ".excalidraw")
[:div.draw {:on-click (fn [e]
(.stopPropagation e))}
(excalidraw s block-uuid)]
[:span.page-reference
{:data-ref s}
{:data-ref s
:class (str (if whiteboard? " whiteboard-page-ref" ""))}
(when (and (or show-brackets? nested-link?)
(not html-export?)
(not contents-page?))
[:span.text-gray-500.bracket "[["])
(when whiteboard? [:span.text-gray-500.ti.ti-artboard])
(let [s (string/trim s)]
(page-cp (assoc config
:label (mldoc/plain->text label)

10
src/main/frontend/db/model.cljs
View File

@@ -15,6 +15,7 @@
[frontend.state :as state]
[frontend.util :as util :refer [react]]
[logseq.graph-parser.util :as gp-util]
[logseq.graph-parser.config :as gp-config]
[logseq.db.rules :refer [rules]]
[logseq.db.default :as default-db]
[frontend.util.drawer :as drawer]))
@@ -1674,3 +1675,12 @@
(let [{:keys [pages]} (js->clj tldr :keywordize-keys true)
tx (tldr-page->blocks-tx page-name (first pages))]
(db-utils/transact! tx)))
(defn whiteboard-page?
[page-name]
(let [page (db-utils/entity [:block/name (util/safe-page-name-sanity-lc page-name)])]
(or
(:block/whiteboard? page)
(when-let [file (:block/file page)]
(when-let [path (:file/path (db-utils/entity (:db/id file)))]
(gp-config/whiteboard? path))))))