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

enhance: able to switch into another graph when multi-tabs access

Browse Source
This commit is contained in:
Tienson Qin
2023-12-15 13:46:55 +08:00
parent 755cf64a4c
commit 24fb0d2cfe
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/frontend/components/repo.cljs
View File

@@ -150,7 +150,7 @@
(p/let [multiple-windows? (ipc/ipc "graphHasMultipleWindows" (state/get-current-repo))]
(reset! (::electron-multiple-windows? state) multiple-windows?))))
(defn- repos-dropdown-links [repos current-repo *multiple-windows?]
(defn- repos-dropdown-links [repos current-repo *multiple-windows? & {:as opts}]
(let [switch-repos (if-not (nil? current-repo)
(remove (fn [repo] (= current-repo (:url repo))) repos) repos) ; exclude current repo
repo-links (mapv
@@ -171,6 +171,8 @@
(ui/icon "cloud" {:size 18})])]
:hover-detail repo-url ;; show full path on hover
:options {:on-click (fn [e]
(when-let [on-click (:on-click opts)]
(on-click e))
(if (gobj/get e "shiftKey")
(state/pub-event! [:graph/open-new-window url])
(if (or local? db-only?)
@@ -208,7 +210,7 @@
(rum/defcs repos-dropdown < rum/reactive
(rum/local false ::electron-multiple-windows?)
[state]
[state & {:as opts}]
(let [multiple-windows? (::electron-multiple-windows? state)
current-repo (state/sub :git/current-repo)
login? (boolean (state/sub :auth/id-token))
@@ -218,7 +220,7 @@
remotes (state/sub [:file-sync/remote-graphs :graphs])
repos (if (and (seq remotes) login?)
(repo-handler/combine-local-&-remote-graphs repos remotes) repos)
links (repos-dropdown-links repos current-repo multiple-windows?)
links (repos-dropdown-links repos current-repo multiple-windows? opts)
render-content (fn [{:keys [toggle-fn]}]
(let [remote? (:remote? (first (filter #(= current-repo (:url %)) repos)))
repo-name (db/get-repo-name current-repo)
@@ -227,7 +229,7 @@
"Select a Graph")]
[:a.item.group.flex.items-center.p-2.text-sm.font-medium.rounded-md
{:on-click (fn []
{:on-click (fn [_e]
(check-multiple-windows? state)
(toggle-fn))
:title repo-name} ;; show full path on hover

13
src/main/frontend/handler/events.cljs
View File

@@ -953,17 +953,20 @@
(rum/defc multi-tabs-dialog
[]
(let [word (if (util/electron?) "window" "tab")]
[:div.flex.p-4.flex-col.gap-4
[:div.flex.p-4.flex-col.gap-4.h-64
[:span.warning.text-lg
(util/format "Logseq doesn't support multiple %ss access to the same graph yet, please close this %s."
word word)]
;; (ui/button (str "Close this " word)
;; {:on-click (fn [] (.close js/window))})
]))
[:div.text-lg
[:p "Switch to another repo: "]
(repo/repos-dropdown {:on-click (fn [e]
(util/stop e)
(state/set-state! :error/multiple-tabs-access-opfs? false)
(state/close-modal!))})]]))
(defmethod handle :show/multiple-tabs-error-dialog [_]
(state/set-state! :error/multiple-tabs-access-opfs? true)
(state/set-modal! multi-tabs-dialog))
(state/set-modal! multi-tabs-dialog {:container-overflow-visible? true}))
(defn run!
[]