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

enhance(mobile): use the popup actions sheet for the switch graphs modal

Browse Source
This commit is contained in:
charlie
2025-08-06 16:17:38 +08:00
parent 87acee4ed2
commit 2c0affde1b
2 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/main/mobile/components/header.cljs
View File

@@ -48,37 +48,37 @@
{:text (some-> (:url repo) (string/replace #"^logseq_db_" ""))
:role (:url repo)})
(remove (fn [{:keys [text]}] (string/blank? text))))
[{:text [:div.text-gray-09.pb-4.active:opacity-80.flex.flex-row.items-center
(ui/icon "plus")
"Add new graph"]
[{:text [:div.text-gray-09.pb-4.active:opacity-80.flex.justify-center
"+ Add new graph"]
:role "add-new-graph"}])]
(ui-component/open-modal! "Switch graph"
{:type :action-sheet
:buttons buttons
:on-action (fn [e]
(when-let [role (:role e)]
(if (= "add-new-graph" role)
(state/pub-event! [:graph/new-db-graph])
(when (string/starts-with? role "logseq_db_")
(state/pub-event! [:graph/switch role])))))
:modal-props {:class "graph-switcher"}})))}
[:span.flex.items-center.gap-2.pt-1
[:strong.overflow-hidden.text-ellipsis.block.font-medium
{:style {:max-width "40vw"}}
short-repo-name]])]))
(ui-component/open-popup! "Switch graph"
{:modal-props {:class "graph-switcher"}
:buttons buttons
:on-action (fn [e]
(when-let [role (:role e)]
(if (= "add-new-graph" role)
(state/pub-event! [:graph/new-db-graph])
(when (string/starts-with? role "logseq_db_")
(state/pub-event! [:graph/switch role]))))
(ui-component/close-popup!))
:type :action-sheet})))}
[:span.flex.items-center.gap-2.pt-1
[:strong.overflow-hidden.text-ellipsis.block.font-medium
{:style {:max-width "40vw"}}
short-repo-name]])]))
(rum/defc journal-calendar-btn
[]
(shui/button
{:variant :text
:size :sm
:on-click (fn []
(let [apply-date! (fn [date]
(let [page-name (date/journal-name (gdate/Date. (js/Date. date)))]
(if-let [journal (db/get-page page-name)]
(mobile-state/open-block-modal! journal)
(-> (page-handler/<create! page-name {:redirect? false})
(p/then #(mobile-state/open-block-modal! (db/get-page page-name)))))))]
{:variant :text
:size :sm
:on-click (fn []
(let [apply-date! (fn [date]
(let [page-name (date/journal-name (gdate/Date. (js/Date. date)))]
(if-let [journal (db/get-page page-name)]
(mobile-state/open-block-modal! journal)
(-> (page-handler/<create! page-name {:redirect? false})
(p/then #(mobile-state/open-block-modal! (db/get-page page-name)))))))]
(-> (.showDatePicker mobile-util/ui-local)
(p/then (fn [^js e] (some-> e (.-value) (apply-date!)))))))}
[:span.mt-1

18
src/main/mobile/components/popup.cljs
View File

@@ -2,6 +2,7 @@
"Mobile popup"
(:require [frontend.handler.editor :as editor-handler]
[frontend.state :as state]
[frontend.ui :as ui]
[goog.object :as gobj]
[logseq.shui.popup.core :as shui-popup]
[logseq.shui.silkhq :as silkhq]
@@ -97,7 +98,16 @@
(silkhq/bottom-sheet-content
{:class "flex flex-col items-center p-2"}
(silkhq/bottom-sheet-handle)
[:div.w-full.app-silk-popup-content-inner.p-2
(when-let [title (:title opts)]
[:h2.py-2.opacity-40 title])
(if (fn? content-fn) (content-fn) content-fn)]))))))
(let [title (or (:title opts) (when (string? content-fn) content-fn))
content (if (fn? content-fn) (content-fn)
(if-let [buttons (and (= :action-sheet (:type opts))
(:buttons opts))]
[:div.-mx-2
(for [{:keys [role text]} buttons]
(ui/menu-link {:on-click #(some-> (:on-action opts) (apply [{:role role}]))
:data-role role}
[:span.text-lg.flex.items-center text]))]
(when-not (string? content-fn) content-fn)))]
[:div.w-full.app-silk-popup-content-inner.p-2
(when title [:h2.py-2.opacity-40 title])
content])))))))