mirror of
https://github.com/penpot/penpot.git
synced 2025-03-15 17:21:17 -05:00
Merge remote-tracking branch 'origin/staging' into develop
This commit is contained in:
commit
1d69cb2580
3 changed files with 15 additions and 7 deletions
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
export PENPOT_HOST=devenv
|
export PENPOT_HOST=devenv
|
||||||
export PENPOT_TENANT=dev
|
export PENPOT_TENANT=dev
|
||||||
export PENPOT_FLAGS="$PENPOT_FLAGS enable-backend-asserts enable-audit-log enable-cors enable-transit-readable-response enable-demo-users"
|
export PENPOT_FLAGS="$PENPOT_FLAGS enable-backend-asserts enable-audit-log enable-cors enable-transit-readable-response enable-demo-users disable-secure-session-cookies"
|
||||||
|
|
||||||
set -ex
|
set -ex
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,9 @@
|
||||||
|
|
||||||
(ns app.main.ui.components.dropdown
|
(ns app.main.ui.components.dropdown
|
||||||
(:require
|
(:require
|
||||||
|
[app.config :as cfg]
|
||||||
[app.util.dom :as dom]
|
[app.util.dom :as dom]
|
||||||
|
[app.util.globals :as globals]
|
||||||
[app.util.keyboard :as kbd]
|
[app.util.keyboard :as kbd]
|
||||||
[goog.events :as events]
|
[goog.events :as events]
|
||||||
[goog.object :as gobj]
|
[goog.object :as gobj]
|
||||||
|
@ -22,8 +24,13 @@
|
||||||
|
|
||||||
on-click
|
on-click
|
||||||
(fn [event]
|
(fn [event]
|
||||||
(let [target (dom/get-target event)]
|
(let [target (dom/get-target event)
|
||||||
(when-not (.-data-no-close ^js target)
|
|
||||||
|
;; 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
|
(if ref
|
||||||
(let [parent (mf/ref-val ref)]
|
(let [parent (mf/ref-val ref)]
|
||||||
(when-not (or (not parent) (.contains parent target))
|
(when-not (or (not parent) (.contains parent target))
|
||||||
|
@ -37,9 +44,9 @@
|
||||||
|
|
||||||
on-mount
|
on-mount
|
||||||
(fn []
|
(fn []
|
||||||
(let [keys [(events/listen js/document EventType.CLICK on-click)
|
(let [keys [(events/listen globals/document EventType.CLICK on-click)
|
||||||
(events/listen js/document EventType.CONTEXTMENU on-click)
|
(events/listen globals/document EventType.CONTEXTMENU on-click)
|
||||||
(events/listen js/document EventType.KEYUP on-keyup)]]
|
(events/listen globals/document EventType.KEYUP on-keyup)]]
|
||||||
#(doseq [key keys]
|
#(doseq [key keys]
|
||||||
(events/unlistenByKey key))))]
|
(events/unlistenByKey key))))]
|
||||||
|
|
||||||
|
|
|
@ -379,6 +379,7 @@
|
||||||
(dom/stop-propagation event)
|
(dom/stop-propagation event)
|
||||||
(let [pt (->> (dom/get-client-position event)
|
(let [pt (->> (dom/get-client-position event)
|
||||||
(utils/translate-point-to-viewport viewport zoom))
|
(utils/translate-point-to-viewport viewport zoom))
|
||||||
|
ctrl? (kbd/ctrl? event)
|
||||||
|
|
||||||
delta-mode (.-deltaMode ^js event)
|
delta-mode (.-deltaMode ^js event)
|
||||||
|
|
||||||
|
@ -394,7 +395,7 @@
|
||||||
delta-x (-> (.-deltaX ^js event)
|
delta-x (-> (.-deltaX ^js event)
|
||||||
(* unit)
|
(* unit)
|
||||||
(/ zoom))]
|
(/ zoom))]
|
||||||
(if mod?
|
(if (or ctrl? mod?)
|
||||||
(let [delta (* -1 (+ (.-deltaY ^js event) (.-deltaX ^js event)))
|
(let [delta (* -1 (+ (.-deltaY ^js event) (.-deltaX ^js event)))
|
||||||
scale (-> (+ 1 (/ delta 100)) (mth/clamp 0.77 1.3))]
|
scale (-> (+ 1 (/ delta 100)) (mth/clamp 0.77 1.3))]
|
||||||
(st/emit! (dw/set-zoom pt scale)))
|
(st/emit! (dw/set-zoom pt scale)))
|
||||||
|
|
Loading…
Add table
Reference in a new issue