diff --git a/frontend/src/app/main/ui/viewer.cljs b/frontend/src/app/main/ui/viewer.cljs index d33d9efd8..a9823e025 100644 --- a/frontend/src/app/main/ui/viewer.cljs +++ b/frontend/src/app/main/ui/viewer.cljs @@ -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 diff --git a/frontend/src/app/util/dom.cljs b/frontend/src/app/util/dom.cljs index b78227180..b07888181 100644 --- a/frontend/src/app/util/dom.cljs +++ b/frontend/src/app/util/dom.cljs @@ -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 []