greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: don't show closed value editing in publishing 

Also allow class and page properties to be styled differently
feat/datascript-storage-test
Gabriel Horner 2023-12-05 11:16:37 -05:00
parent 1b2a3cc1c1
commit 34d2b3c234
2 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -695,9 +695,9 @@
(empty? class->properties)
(not new-property?)
(not (:page-configure? opts)))
[:div.ls-properties-area (cond-> {}
[:div.ls-properties-area (cond-> {:class [(if class-schema? "class-properties" "page-properties")]}
(:selected? opts)
(assoc :class "select-none"))
(update :class conj "select-none"))
(properties-section block (if class-schema? properties own-properties) opts)
(when (and (seq full-hidden-properties) (not class-schema?) (not config/publishing?))

48
src/main/frontend/components/property/closed_value.cljs
View File

@ -10,6 +10,7 @@
[frontend.components.property.util :as pu-component]
[frontend.handler.property :as property-handler]
[frontend.handler.db-based.property :as db-property-handler]
[frontend.config :as config]
[frontend.components.property.value :as property-value]
[frontend.db :as db]
[frontend.state :as state]
@ -31,12 +32,14 @@
(if icon
(icon-component/icon icon)
[:span.bullet-container.cursor [:span.bullet]])])
(fn [{:keys [toggle-fn]}]
[:div.p-4
(icon-component/icon-search
{:on-chosen (fn [e icon]
(on-chosen e icon)
(toggle-fn))})])
(if config/publishing?
(constantly [])
(fn [{:keys [toggle-fn]}]
[:div.p-4
(icon-component/icon-search
{:on-chosen (fn [e icon]
(on-chosen e icon)
(toggle-fn))})]))
{:modal-class (util/hiccup->class
"origin-top-right.absolute.left-0.rounded-md.shadow-lg")}))
@ -138,16 +141,18 @@
:update-icon
(fn [icon]
(property-handler/set-block-property! (state/get-current-repo) (:block/uuid block) :icon icon)))))
(fn [opts]
(item-config
property
block
(assoc opts :on-save
(fn [value icon description]
(upsert-closed-value! property {:id uuid
:value value
:description description
:icon icon})))))
(if config/publishing?
(constantly [])
(fn [opts]
(item-config
property
block
(assoc opts :on-save
(fn [value icon description]
(upsert-closed-value! property {:id uuid
:value value
:description description
:icon icon}))))))
dropdown-opts)))
(rum/defc add-existing-values
@ -186,10 +191,12 @@
(swap! *property-schema assoc :values new-values)
(pu-component/update-property! property @*property-name @*property-schema)))}))
(ui/dropdown
(fn [{:keys [toggle-fn]}]
[:a.fade-link.flex.flex-row.items-center.gap-1.leading-8 {:on-click toggle-fn}
(ui/icon "plus" {:size 16})
"Add choice"])
(if config/publishing?
(constantly [])
(fn [{:keys [toggle-fn]}]
[:a.fade-link.flex.flex-row.items-center.gap-1.leading-8 {:on-click toggle-fn}
(ui/icon "plus" {:size 16})
"Add choice"]))
(fn [opts]
(if (= :page property-type)
(property-value/select-page property
@ -204,6 +211,7 @@
(remove uuid?)
(remove string/blank?)
distinct)]
(if (seq values)
(add-existing-values property *property-schema values opts)
(item-config