clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-28 16:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into whiteboards

Browse Source
This commit is contained in:
Peng Xiao
2022-09-28 10:29:20 +08:00
parent c3460b45a8 dc90bcf32e
commit 4520399ddf
130 changed files with 348 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
(ns frontend.handler.editor
(ns ^:no-doc frontend.handler.editor
(:require ["path" :as path]
[clojure.set :as set]
[clojure.string :as string]
@@ -317,9 +317,10 @@
(block/parse-title-and-body uuid format pre-block? (:block/content block)))
properties (:block/properties block)
real-content (:block/content block)
content (if (and (seq properties) real-content (not= real-content content))
(property/with-built-in-properties properties content format)
content)
content (let [properties (if (= format :markdown) (dissoc properties :heading) properties)]
(if (and (seq properties) real-content (not= real-content content))
(property/with-built-in-properties properties content format)
content))
content (drawer/with-logbook block content)
content (with-timetracking block content)
first-block? (= left page)
@@ -614,7 +615,7 @@
(when edit-block?
(if (and replace-empty-target?
(string/blank? (:block/content last-block)))
;; 20ms of waiting for DOM to load the block, to avoid race condition.
;; 20ms of waiting for DOM to load the block, to avoid race condition.
;; It's ensuring good response under M1 pro
;; Used to be 10ms before, but is causing occasional failure on M1 pro with a full page of blocks,
;; or failing E2E with a small number of blocks.
@@ -3479,3 +3480,21 @@
;; has children
(first (:block/_parent (db/entity (:db/id block)))))
(util/collapsed? block)))
(defn set-heading!
[block-id format heading]
(if (= format :markdown)
(let [repo (state/get-current-repo)
block (db/entity [:block/uuid block-id])
content' (commands/set-markdown-heading (:block/content block) heading)]
(save-block! repo block-id content'))
(set-block-property! block-id "heading" heading)))
(defn remove-heading!
[block-id format]
(remove-block-property! block-id "heading")
(when (= format :markdown)
(let [repo (state/get-current-repo)
block (db/entity [:block/uuid block-id])
content' (commands/clear-markdown-heading (:block/content block))]
(save-block! repo block-id content'))))