Skip to content

Commit 258fb0a

Browse files
committed
fix close other documents fx
1 parent d8f0ab6 commit 258fb0a

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

src/renderer/document/events.cljs

+4-6
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,11 @@
112112
(let [saved (filter #(h/saved? db %) (:document-tabs db))]
113113
(reduce h/close db saved))))
114114

115-
(rf/reg-event-db
115+
(rf/reg-event-fx
116116
::close-others
117-
(fn [db [_ key]]
118-
(-> db
119-
(assoc :document-tabs [key]
120-
:active-document key)
121-
(assoc-in [:documents key] (get-in db [:documents key])))))
117+
(fn [{:keys [db]} [_ k]]
118+
(let [to-be-closed (disj (set (keys (:documents db))) k)]
119+
{:fx (mapv (fn [k] [:dispatch [::close k true]]) to-be-closed)})))
122120

123121
(rf/reg-event-db
124122
::close-all

src/renderer/document/views.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
[{:label "Close"
8383
:action [::document.e/close key true]}
8484
{:label "Close others"
85-
:action [::document.e/close-others]
85+
:action [::document.e/close-others key]
8686
:disabled? (empty? (rest document-tabs))}
8787
{:label "Close all"
8888
:action [::document.e/close-all]}

src/renderer/utils/keyboard.cljs

-4
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,6 @@
210210
[{:keyCode (key-codes "W")
211211
:ctrlKey true
212212
:altKey true}]]
213-
[[::document.e/close-others]
214-
[{:keyCode (key-codes "W")
215-
:ctrlKey true
216-
:shiftKey true}]]
217213
[[::window.e/toggle-fullscreen]
218214
[{:keyCode (key-codes "F11")}]]
219215
[[::dialog.e/cmdk]

0 commit comments

Comments
 (0)