Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-09 16:48:16 -05:00
Code Issues Activity

Merge pull request #3344 from penpot/alotor-fix-viewer-scroll

Browse source 
🐛 Fix problem with scroll in viewer mode
This commit is contained in:
Alejandro 2023-06-23 13:12:23 +02:00 • committed by GitHub
commit 921ea61e6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
frontend/src/app/main/ui/viewer.cljs
View file

@ -313,22 +313,25 @@
(mf/use-fn
(fn [event]
(let [event (.getBrowserEvent ^js event)
norm-event ^js (nw/normalize-wheel event)
mod? (kbd/mod? event)
shift? (kbd/shift? event)
delta (.-pixelY norm-event)
viewer-section (.target event)
scroll-pos (if shift?
(dom/get-h-scroll-pos viewer-section)
(dom/get-scroll-pos viewer-section))
new-scroll-pos (+ scroll-pos delta)]
(when-not mod?
(do
(dom/prevent-default event)
(dom/stop-propagation event)
(if shift?
(dom/set-h-scroll-pos! viewer-section new-scroll-pos)
(dom/set-scroll-pos! viewer-section new-scroll-pos)))))))
wrapper (dom/get-element-by-class "inspect-svg-wrapper")
section (dom/get-element-by-class "inspect-svg-container")
target (.-target event)]
(when (or (dom/child? target wrapper) (dom/class? target "inspect-svg-container"))
(let [norm-event ^js (nw/normalize-wheel event)
mod? (kbd/mod? event)
shift? (kbd/shift? event)
delta (.-pixelY norm-event)
scroll-pos (if shift?
(dom/get-h-scroll-pos section)
(dom/get-scroll-pos section))
new-scroll-pos (+ scroll-pos delta)]
(when-not mod?
(do
(dom/prevent-default event)
(dom/stop-propagation event)
(if shift?
(dom/set-h-scroll-pos! section new-scroll-pos)
(dom/set-scroll-pos! section new-scroll-pos)))))))))
on-exit-fullscreen
(mf/use-callback

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

@ -493,7 +493,7 @@
(.remove ^js class-list class-name))))
(defn child? [^js node1 ^js node2]
(when (some? node1)
(when (and (some? node1) (some? node2))
(.contains ^js node2 ^js node1)))
(defn get-user-agent []