clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-06-01 19:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

enhance(ui): add support for the shui popup as mask from the target

Browse Source
This commit is contained in:
charlie
2025-04-27 10:53:04 +08:00
parent d9ecf1aa7a
commit 5454d821a0
2 changed files with 65 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
src/main/frontend/components/views.cljs
View File

@@ -211,35 +211,36 @@
:else
(p/do!
(shui/popup-show!
(.-target e)
(fn []
(let [width (-> (max 160 width)
(- 18))]
[:div.ls-table-block.flex.flex-row.items-start
{:style {:width width :max-width width}
:on-click util/stop-propagation}
(block-container {:popup? true
:view? true
:table-block-title? true} block)
(shui/button
{:variant :ghost
:title "Open node"
:on-click (fn [e]
(util/stop-propagation e)
(shui/popup-hide!)
(redirect!))
:class (str "h-6 w-6 !p-0 text-muted-foreground transition-opacity duration-100 ease-in bg-gray-01 "
"opacity-" opacity)}
(ui/icon "arrow-right"))]))
{:align :start})
(editor-handler/edit-block! block :max {:container-id :unknown-container}))))))}
(.closest (.-target e) ".ls-table-cell")
(fn []
(let [width (-> (max 160 width)
(- 18))]
[:div.ls-table-block.flex.flex-row.items-start
{:style {:width width :max-width width :margin-right "6px"}
:on-click util/stop-propagation}
(block-container {:popup? true
:view? true
:table-block-title? true} block)
(shui/button
{:variant :ghost
:title "Open node"
:on-click (fn [e]
(util/stop-propagation e)
(shui/popup-hide!)
(redirect!))
:class (str "h-6 w-6 !p-0 text-muted-foreground transition-opacity duration-100 ease-in bg-gray-01 "
"opacity-" opacity)}
(ui/icon "arrow-right"))]))
{:id :ls-table-block-editor
:as-mask? true})
(editor-handler/edit-block! block :max {:container-id :unknown-container}))))))}
(if block
[:div
(inline-title
(some->> (:block/title block)
string/trim
string/split-lines
first))]
(some->> (:block/title block)
string/trim
string/split-lines
first))]
[:div])
[:div.absolute.right-0.p-1
@@ -248,11 +249,11 @@
(add-to-sidebar!))}
[:div.flex.items-center
(shui/button
{:variant :ghost
:title "Open in sidebar"
:class (str "h-5 w-5 !p-0 text-muted-foreground transition-opacity duration-100 ease-in bg-gray-01 "
"opacity-" opacity)}
(ui/icon "layout-sidebar-right"))]]]))
{:variant :ghost
:title "Open in sidebar"
:class (str "h-5 w-5 !p-0 text-muted-foreground transition-opacity duration-100 ease-in bg-gray-01 "
"opacity-" opacity)}
(ui/icon "layout-sidebar-right"))]]]))
(defn build-columns
[config properties & {:keys [with-object-name? with-id? add-tags-column?]
@@ -262,30 +263,30 @@
(let [;; FIXME: Shouldn't file graphs have :block/tags?
add-tags-column?' (and (config/db-based-graph? (state/get-current-repo)) add-tags-column?)
properties' (->>
(if (or (some #(= (:db/ident %) :block/tags) properties) (not add-tags-column?'))
properties
(conj properties (db/entity :block/tags)))
(remove nil?))]
(if (or (some #(= (:db/ident %) :block/tags) properties) (not add-tags-column?'))
properties
(conj properties (db/entity :block/tags)))
(remove nil?))]
(->> (concat
[{:id :select
:name "Select"
:header (fn [table _column] (header-checkbox table))
:cell (fn [table row column]
(row-checkbox table row column))
:column-list? false
:resizable? false}
(when with-id?
{:id :id
:name "ID"
:header (fn [_table _column] (header-index))
:cell (fn [table row _column]
(inc (.indexOf (:rows table) (:db/id row))))
:resizable? false})
(when with-object-name?
{:id :block/title
:name "Name"
:type :string
:header header-cp
[{:id :select
:name "Select"
:header (fn [table _column] (header-checkbox table))
:cell (fn [table row column]
(row-checkbox table row column))
:column-list? false
:resizable? false}
(when with-id?
{:id :id
:name "ID"
:header (fn [_table _column] (header-index))
:cell (fn [table row _column]
(inc (.indexOf (:rows table) (:db/id row))))
:resizable? false})
(when with-object-name?
{:id :block/title
:name "Name"
:type :string
:header header-cp
:cell (fn [_table row _column style]
(block-title row {:property-ident :block/title
:sidebar? (:sidebar? config)