3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-12 22:38:25 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix problem with wheel-zoom on an editing text

Browse source
This commit is contained in:
alonso.torres 2022-03-30 15:49:38 +02:00
parent 4a3fb55b30
commit 9f19676dc2
4 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
frontend/src/app/main/ui/workspace/viewport.cljs
View file

@ -88,6 +88,7 @@
;; REFS ;; REFS
viewport-ref (mf/use-ref nil) viewport-ref (mf/use-ref nil)
overlays-ref (mf/use-ref nil)
;; VARS ;; VARS
disable-paste (mf/use-var false) disable-paste (mf/use-var false)
@ -169,7 +170,7 @@
disabled-guides? (or drawing-tool transform)] disabled-guides? (or drawing-tool transform)]
(hooks/setup-dom-events viewport-ref zoom disable-paste in-viewport?) (hooks/setup-dom-events viewport-ref overlays-ref zoom disable-paste in-viewport?)
(hooks/setup-viewport-size viewport-ref) (hooks/setup-viewport-size viewport-ref)
(hooks/setup-cursor cursor alt? mod? space? panning drawing-tool drawing-path? node-editing?) (hooks/setup-cursor cursor alt? mod? space? panning drawing-tool drawing-path? node-editing?)
(hooks/setup-keyboard alt? mod? space?) (hooks/setup-keyboard alt? mod? space?)
@ -179,7 +180,7 @@
(hooks/setup-active-frames base-objects vbox hover active-frames) (hooks/setup-active-frames base-objects vbox hover active-frames)
[:div.viewport [:div.viewport
[:div.viewport-overlays [:div.viewport-overlays {:ref overlays-ref}
[:& wtr/frame-renderer {:objects base-objects [:& wtr/frame-renderer {:objects base-objects
:background background}] :background background}]

12
frontend/src/app/main/ui/workspace/viewport/actions.cljs
View file

@ -363,21 +363,23 @@
pt (utils/translate-point-to-viewport viewport zoom raw-pt)] pt (utils/translate-point-to-viewport viewport zoom raw-pt)]
(rx/push! move-stream pt))))) (rx/push! move-stream pt)))))
(defn on-mouse-wheel [viewport-ref zoom] (defn on-mouse-wheel [viewport-ref overlays-ref zoom]
(mf/use-callback (mf/use-callback
(mf/deps zoom) (mf/deps zoom)
(fn [event] (fn [event]
(let [viewport (mf/ref-val viewport-ref) (let [viewport (mf/ref-val viewport-ref)
overlays (mf/ref-val overlays-ref)
event (.getBrowserEvent ^js event) event (.getBrowserEvent ^js event)
target (dom/get-target event)] target (dom/get-target event)
(when (.contains ^js viewport target) mod? (kbd/mod? event)]
(when (or (dom/is-child? viewport target)
(dom/is-child? overlays target))
(dom/prevent-default event) (dom/prevent-default event)
(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))
mod? (kbd/mod? event)
delta-mode (.-deltaMode ^js event) delta-mode (.-deltaMode ^js event)
unit (cond unit (cond

4
frontend/src/app/main/ui/workspace/viewport/hooks.cljs
View file

@ -27,11 +27,11 @@
[rumext.alpha :as mf]) [rumext.alpha :as mf])
(:import goog.events.EventType)) (:import goog.events.EventType))
(defn setup-dom-events [viewport-ref zoom disable-paste in-viewport?] (defn setup-dom-events [viewport-ref overlays-ref zoom disable-paste in-viewport?]
(let [on-key-down (actions/on-key-down) (let [on-key-down (actions/on-key-down)
on-key-up (actions/on-key-up) on-key-up (actions/on-key-up)
on-mouse-move (actions/on-mouse-move viewport-ref zoom) on-mouse-move (actions/on-mouse-move viewport-ref zoom)
on-mouse-wheel (actions/on-mouse-wheel viewport-ref zoom) on-mouse-wheel (actions/on-mouse-wheel viewport-ref overlays-ref zoom)
on-paste (actions/on-paste disable-paste in-viewport?)] on-paste (actions/on-paste disable-paste in-viewport?)]
(mf/use-layout-effect (mf/use-layout-effect
(mf/deps on-key-down on-key-up on-mouse-move on-mouse-wheel on-paste) (mf/deps on-key-down on-key-up on-mouse-move on-mouse-wheel on-paste)

5
frontend/src/app/util/dom.cljs
View file

@ -530,3 +530,8 @@
(when onfinish (when onfinish
(set! (.-onfinish animation) onfinish))))) (set! (.-onfinish animation) onfinish)))))
(defn is-child?
[^js node ^js candidate]
(and (some? node)
(some? candidate)
(.contains node candidate)))