mirror of https://github.com/logseq/logseq
fix: lint
parent
05425667b9
commit
bbb454a7d7
|
@ -2431,7 +2431,7 @@
|
||||||
(when-not edit?
|
(when-not edit?
|
||||||
[:div.more (ui/icon "dots-circle-horizontal" {:size 18})])]])
|
[:div.more (ui/icon "dots-circle-horizontal" {:size 18})])]])
|
||||||
|
|
||||||
(rum/defcs block-content-or-editor < rum/reactive
|
(rum/defcs ^:large-vars/cleanup-todo block-content-or-editor < rum/reactive
|
||||||
{:init (fn [state]
|
{:init (fn [state]
|
||||||
(let [block (second (:rum/args state))
|
(let [block (second (:rum/args state))
|
||||||
config (first (:rum/args state))
|
config (first (:rum/args state))
|
||||||
|
|
|
@ -758,7 +758,7 @@
|
||||||
(outliner-op/delete-blocks! blocks {}))))))
|
(outliner-op/delete-blocks! blocks {}))))))
|
||||||
|
|
||||||
(defn- move-to-prev-block
|
(defn- move-to-prev-block
|
||||||
[repo edit-block sibling-block format value]
|
[repo sibling-block format value]
|
||||||
(when (and repo sibling-block)
|
(when (and repo sibling-block)
|
||||||
(when-let [sibling-block-id (dom/attr sibling-block "blockid")]
|
(when-let [sibling-block-id (dom/attr sibling-block "blockid")]
|
||||||
(when-let [sibling-entity (db/entity [:block/uuid (uuid sibling-block-id)])]
|
(when-let [sibling-entity (db/entity [:block/uuid (uuid sibling-block-id)])]
|
||||||
|
@ -829,7 +829,7 @@
|
||||||
block-parent
|
block-parent
|
||||||
{:container (util/rec-get-blocks-container block-parent)})
|
{:container (util/rec-get-blocks-container block-parent)})
|
||||||
(util/get-prev-block-non-collapsed-non-embed block-parent))
|
(util/get-prev-block-non-collapsed-non-embed block-parent))
|
||||||
{:keys [prev-block new-content]} (move-to-prev-block repo block-e sibling-block format value)
|
{:keys [prev-block new-content]} (move-to-prev-block repo sibling-block format value)
|
||||||
concat-prev-block? (boolean (and prev-block new-content))
|
concat-prev-block? (boolean (and prev-block new-content))
|
||||||
transact-opts (cond-> {:outliner-op :delete-blocks}
|
transact-opts (cond-> {:outliner-op :delete-blocks}
|
||||||
(and concat-prev-block? (seq (:block/_refs block-e)))
|
(and concat-prev-block? (seq (:block/_refs block-e)))
|
||||||
|
@ -870,7 +870,7 @@
|
||||||
{:outliner-op :delete-blocks}
|
{:outliner-op :delete-blocks}
|
||||||
(outliner-op/delete-blocks! blocks' nil))
|
(outliner-op/delete-blocks! blocks' nil))
|
||||||
(when sibling-block
|
(when sibling-block
|
||||||
(move-to-prev-block repo (state/get-edit-block) sibling-block
|
(move-to-prev-block repo sibling-block
|
||||||
(:block/format block)
|
(:block/format block)
|
||||||
""))))))
|
""))))))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue