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

fix: avoid circle block ref

Browse Source
This commit is contained in:
Tienson Qin
2023-08-07 21:12:21 +08:00
parent 3a530496e3
commit 61a6232bd4
3 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/frontend/components/property.cljs
View File

@@ -218,6 +218,7 @@
(defn- select-block
[block property opts]
(let [blocks (->> (model/get-all-block-contents)
(remove (fn [b] (= (:db/id block) (:db/id b))))
(map (fn [b]
(assoc b :value (:block/content b)))))]
(select/select {:items blocks
@@ -463,19 +464,17 @@
[:div#edit-new-property
(property-input block *property-key *property-value opts)]
(or (and (seq properties)
(not (pu/all-built-in-properties? (keys (:block/properties block)))))
(:page-configure? opts))
[:a {:style {:margin-left 2}
:title "Add another property"
:on-click (fn []
(property-handler/set-editing-new-property! edit-input-id)
(reset! *property-key nil)
(reset! *property-value nil))}
[:div.block {:style {:height 20
:width 20}}
[:a.add-button-link.block.mt-1 {:style {:margin-left -4}}
(ui/icon "circle-plus")]]])))
(or (:page-configure? opts)
(and (seq properties)
(not (pu/all-built-in-properties? (keys (:block/properties block))))))
[:div
[:a.add-button-link
{:title "Add another property"
:on-click (fn []
(property-handler/set-editing-new-property! edit-input-id)
(reset! *property-key nil)
(reset! *property-value nil))}
(ui/icon "circle-plus" {:size 15})]])))
(rum/defcs property-key
[state block property {:keys [class-schema?]}]
@@ -572,11 +571,9 @@
:else
[:div.rounded-sm.ml-1 {:on-click (fn [] (reset! *editing? true))}
[:div.flex.flex-row
[:div.block {:style {:height 20
:width 20}}
[:a.add-button-link.block {:title "Add another value"
:style {:margin-left -4}}
(ui/icon "circle-plus")]]]])])
[:a.add-button-link.inline-flex {:title "Add another value"
:style {:margin-left -3}}
(ui/icon "circle-plus")]]])])
:else
[:div.flex.flex-1.items-center.property-value-content
@@ -645,6 +642,6 @@
(if (:class-schema? opts)
[:div.property-description.col-span-3.font-light
(get-in property [:block/schema :description])]
[:div.property-value.col-span-3
[:div.property-value.col-span-3.inline-grid
(property-value block property v opts)])]))))
(new-property block edit-input-id properties new-property? opts)])))

2
src/main/frontend/components/property.css
View File

@@ -80,8 +80,6 @@
.block-main-container .ls-properties-area {
margin-top: 0.25em;
gap: 0;
.property-pair {
gap: 0;
}

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

@@ -3361,6 +3361,8 @@
(and (config/db-based-graph? repo)
(seq (:block/properties block))
(not (pu/all-built-in-properties? (keys (:block/properties block)))))
(and (config/db-based-graph? repo)
(seq (:block/tags block)))
(and
(:outliner/block-title-collapse-enabled? (state/get-config))
(block-with-title? (:block/format block)