3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-07 13:01:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse source
This commit is contained in:
Alejandro Alonso 2022-04-20 06:31:19 +02:00
commit 1d69cb2580
3 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
frontend/src/app/main/ui/components/dropdown.cljs
View file

@ -6,7 +6,9 @@
(ns app.main.ui.components.dropdown
(:require
[app.config :as cfg]
[app.util.dom :as dom]
[app.util.globals :as globals]
[app.util.keyboard :as kbd]
[goog.events :as events]
[goog.object :as gobj]
@ -22,8 +24,13 @@
on-click
(fn [event]
(let [target (dom/get-target event)]
(when-not (.-data-no-close ^js target)
(let [target (dom/get-target event)
;; MacOS ctrl+click sends two events: context-menu and click.
;; In order to not have two handlings we ignore ctrl+click for this platform
mac-ctrl-click? (and (cfg/check-platform? :macos) (kbd/ctrl? event))]
(when (and (not mac-ctrl-click?)
(not (.-data-no-close ^js target)))
(if ref
(let [parent (mf/ref-val ref)]
(when-not (or (not parent) (.contains parent target))
@ -37,9 +44,9 @@
on-mount
(fn []
(let [keys [(events/listen js/document EventType.CLICK on-click)
(events/listen js/document EventType.CONTEXTMENU on-click)
(events/listen js/document EventType.KEYUP on-keyup)]]
(let [keys [(events/listen globals/document EventType.CLICK on-click)
(events/listen globals/document EventType.CONTEXTMENU on-click)
(events/listen globals/document EventType.KEYUP on-keyup)]]
#(doseq [key keys]
(events/unlistenByKey key))))]