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

Only enable selection bindings when there's a selection

pull/645/head
Tienson Qin 2020-05-13 10:00:15 +08:00
parent d41b4046c4
commit 5a79ae3d13
2 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
web/src/main/frontend/components/content.cljs
View File

@ -37,7 +37,26 @@
;; 2000)
)))
(rum/defc hiccup-content <
;; TODO: content could be changed
;; Also, keyboard bindings should only be activated after
;; headings were already selected.
(defn- cut-headings-and-clear-selections!
[]
(handler/cut-selection-headings)
(handler/clear-selection!))
(rum/defc hidden-selection < rum/reactive
(mixins/keyboard-mixin "ctrl+c"
(fn []
(handler/copy-selection-headings)
(handler/clear-selection!)))
(mixins/keyboard-mixin "ctrl+x" cut-headings-and-clear-selections!)
(mixins/keyboard-mixin "backspace" cut-headings-and-clear-selections!)
(mixins/keyboard-mixin "delete" cut-headings-and-clear-selections!)
[]
[:div#selection.hidden])
(rum/defc hiccup-content < rum/reactive
(mixins/event-mixin
(fn [state]
(mixins/listen state js/window "mouseup"
@ -80,7 +99,11 @@
:left (str client-x "px")
:top (str client-y "px")))))))))
[id hiccup]
[:div {:id id} hiccup])
(let [in-selection-mode? (state/sub :selection/mode)]
[:div {:id id}
hiccup
(when in-selection-mode?
(hidden-selection))]))
(rum/defc non-hiccup-content < rum/reactive
[id content on-click on-hide config format]

24
web/src/main/frontend/components/sidebar.cljs
View File

@ -13,7 +13,8 @@
[frontend.state :as state]
[frontend.handler :as handler]
[frontend.config :as config]
[dommy.core :as d]))
[dommy.core :as d]
[clojure.string :as string]))
(rum/defc logo-or-repos < rum/reactive
[current-repo close-modal-fn]
@ -24,7 +25,8 @@
(util/distinct-by :url))]
[:div.flex.flex-row.align-center.whitespace-no-wrap
[:a.hover:text-gray-300.text-gray-400
{:style {:margin-right 13}
{:style {:margin-right 17
:margin-top -1}
:on-click (fn []
(d/add-class! (d/by-id "menu")
"md:block")
@ -39,7 +41,7 @@
(ui/dropdown-with-links
(fn [{:keys [toggle-fn]}]
[:a.hover:text-gray-300.text-gray-400.font-bold {:on-click toggle-fn}
[:span (util/take-at-most (db/get-repo-name current-repo) 20)]
[:span (string/capitalize (util/take-at-most (db/get-repo-name current-repo) 20))]
[:span.dropdown-caret.ml-1 {:style {:border-top-color "#6b7280"}}]])
(mapv
(fn [{:keys [id url]}]
@ -52,7 +54,7 @@
[:a.hover:text-gray-300.text-gray-400.font-bold
{:href current-repo
:target "_blank"}
(util/take-at-most (db/get-repo-name current-repo) 18)])])
(string/capitalize (util/take-at-most (db/get-repo-name current-repo) 20))])])
[:img.h-8.w-auto
{:alt "Logseq",
@ -174,21 +176,7 @@
:on-click handler/copy-selection-headings}
"Copy")]])
;; TODO: content could be changed
;; Also, keyboard bindings should only be activated after
;; headings were already selected.
(defn cut-headings-and-clear-selections!
[]
(handler/cut-selection-headings)
(handler/clear-selection!))
(rum/defc custom-context-menu < rum/reactive
(mixins/keyboard-mixin "ctrl+c"
(fn []
(handler/copy-selection-headings)
(handler/clear-selection!)))
(mixins/keyboard-mixin "ctrl+x" cut-headings-and-clear-selections!)
(mixins/keyboard-mixin "backspace" cut-headings-and-clear-selections!)
(mixins/keyboard-mixin "delete" handler/cut-selection-headings)
[]
(when (state/sub :custom-context-menu/show?)
(ui/css-transition