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

Merge pull request #1768 from penpot/alotor/bugfixes

Browse source 
Bugfixing
This commit is contained in:
Alejandro 2022-04-01 11:06:59 +02:00 • committed by GitHub
commit b2b221516c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 55 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/app/main/ui/shapes/attrs.cljs
View file

@ -175,12 +175,12 @@
(obj/set! styles "fill" (str "url(#fill-0-" render-id ")")) (obj/set! styles "fill" (str "url(#fill-0-" render-id ")"))
;; imported svgs can have fill and fill-opacity attributes ;; imported svgs can have fill and fill-opacity attributes
(obj/contains? svg-styles "fill") (and (some? svg-styles) (obj/contains? svg-styles "fill"))
(-> styles (-> styles
(obj/set! "fill" (obj/get svg-styles "fill")) (obj/set! "fill" (obj/get svg-styles "fill"))
(obj/set! "fillOpacity" (obj/get svg-styles "fillOpacity"))) (obj/set! "fillOpacity" (obj/get svg-styles "fillOpacity")))
(obj/contains? svg-attrs "fill") (and (some? svg-attrs) (obj/contains? svg-attrs "fill"))
(-> styles (-> styles
(obj/set! "fill" (obj/get svg-attrs "fill")) (obj/set! "fill" (obj/get svg-attrs "fill"))
(obj/set! "fillOpacity" (obj/get svg-attrs "fillOpacity"))) (obj/set! "fillOpacity" (obj/get svg-attrs "fillOpacity")))

4
frontend/src/app/main/ui/shapes/custom_stroke.cljs
View file

@ -350,7 +350,7 @@
(obj/without ["fill" "fillOpacity"])))] (obj/without ["fill" "fillOpacity"])))]
(obj/set! props "fill" (dm/fmt "url(#fill-0-%)" render-id))) (obj/set! props "fill" (dm/fmt "url(#fill-0-%)" render-id)))
(obj/contains? svg-styles "fill") (and (some? svg-styles) (obj/contains? svg-styles "fill"))
(let [style (let [style
(-> (obj/get props "style") (-> (obj/get props "style")
(obj/clone) (obj/clone)
@ -359,7 +359,7 @@
(-> props (-> props
(obj/set! "style" style))) (obj/set! "style" style)))
(obj/contains? svg-attrs "fill") (and (some? svg-attrs) (obj/contains? svg-attrs "fill"))
(let [style (let [style
(-> (obj/get props "style") (-> (obj/get props "style")
(obj/clone) (obj/clone)

36
frontend/src/app/main/ui/shapes/svg_defs.cljs
View file

@ -43,24 +43,24 @@
transform-mask? (and (= :mask tag) transform-mask? (and (= :mask tag)
(= "userSpaceOnUse" (get attrs :maskUnits "objectBoundingBox"))) (= "userSpaceOnUse" (get attrs :maskUnits "objectBoundingBox")))
attrs (-> attrs attrs
(usvg/update-attr-ids prefix-id) (-> attrs
(usvg/clean-attrs) (usvg/update-attr-ids prefix-id)
;; This clasname will be used to change the transform on the viewport (usvg/clean-attrs)
;; only necessary for groups because shapes have their own transform ;; This clasname will be used to change the transform on the viewport
(cond-> (and (or transform-gradient? ;; only necessary for groups because shapes have their own transform
transform-pattern? (cond-> (and (or transform-gradient?
transform-clippath? transform-pattern?
transform-filter? transform-clippath?
transform-mask?) transform-filter?
(= :group type)) transform-mask?)
(update :className #(if % (dm/str % " svg-def") "svg-def"))) (= :group type))
(cond-> (update :className #(if % (dm/str % " svg-def") "svg-def")))
transform-gradient? (add-matrix :gradientTransform transform) (cond->
transform-pattern? (add-matrix :patternTransform transform) transform-gradient? (add-matrix :gradientTransform transform)
transform-clippath? (add-matrix :transform transform) transform-pattern? (add-matrix :patternTransform transform)
(or transform-filter? transform-clippath? (add-matrix :transform transform)
transform-mask?) (merge attrs bounds))) (or transform-filter? transform-mask?) (merge bounds)))
[wrapper wrapper-props] (if (= tag :mask) [wrapper wrapper-props] (if (= tag :mask)
["g" #js {:className "svg-mask-wrapper" ["g" #js {:className "svg-mask-wrapper"

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

@ -9,9 +9,12 @@
[app.common.data :as d] [app.common.data :as d]
[app.common.exceptions :as ex] [app.common.exceptions :as ex]
[app.common.geom.point :as gpt] [app.common.geom.point :as gpt]
[app.common.pages.helpers :as cph]
[app.common.text :as txt]
[app.main.data.comments :as dcm] [app.main.data.comments :as dcm]
[app.main.data.viewer :as dv] [app.main.data.viewer :as dv]
[app.main.data.viewer.shortcuts :as sc] [app.main.data.viewer.shortcuts :as sc]
[app.main.fonts :as fonts]
[app.main.refs :as refs] [app.main.refs :as refs]
[app.main.store :as st] [app.main.store :as st]
[app.main.ui.hooks :as hooks] [app.main.ui.hooks :as hooks]
@ -75,6 +78,12 @@
(fn [] (fn []
(get-in data [:pages page-id]))) (get-in data [:pages page-id])))
text-shapes
(hooks/use-equal-memo
(->> (:objects page)
(vals)
(filter cph/text-shape?)))
zoom (:zoom local) zoom (:zoom local)
frames (:frames page) frames (:frames page)
frame (get frames index) frame (get frames index)
@ -219,6 +228,13 @@
nil)))) nil))))
(mf/use-effect
(mf/deps text-shapes)
(fn []
(let [text-nodes (->> text-shapes (mapcat #(txt/node-seq txt/is-text-node? (:content %))))
fonts (into #{} (keep :font-id) text-nodes)]
(run! fonts/ensure-loaded! fonts))))
[:div#viewer-layout {:class (dom/classnames [:div#viewer-layout {:class (dom/classnames
:force-visible (:show-thumbnails local) :force-visible (:show-thumbnails local)
:viewer-layout (not= section :handoff) :viewer-layout (not= section :handoff)

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)))