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

⚡ Don't render not visible shapes on workspace

Browse source
This commit is contained in:
Andrey Antukh 2023-09-13 15:48:16 +02:00
parent c667d3ad46
commit ac4343dafd
8 changed files with 66 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

18
common/src/app/common/geom/rect.cljc
View file

@ -275,21 +275,19 @@
[a b] [a b]
(mth/almost-zero? (- a b))) (mth/almost-zero? (- a b)))
;; FIXME: performance
(defn overlaps-rects? (defn overlaps-rects?
"Check for two rects to overlap. Rects won't overlap only if "Check for two rects to overlap. Rects won't overlap only if
one of them is fully to the left or the top" one of them is fully to the left or the top"
[rect-a rect-b] [rect-a rect-b]
(let [x1a (dm/get-prop rect-a :x)
y1a (dm/get-prop rect-a :y)
x2a (+ x1a (dm/get-prop rect-a :width))
y2a (+ y1a (dm/get-prop rect-a :height))
(let [x1a (:x rect-a) x1b (dm/get-prop rect-b :x)
y1a (:y rect-a) y1b (dm/get-prop rect-b :y)
x2a (+ (:x rect-a) (:width rect-a)) x2b (+ x1b (dm/get-prop rect-b :width))
y2a (+ (:y rect-a) (:height rect-a)) y2b (+ y1b (dm/get-prop rect-b :height))]
x1b (:x rect-b)
y1b (:y rect-b)
x2b (+ (:x rect-b) (:width rect-b))
y2b (+ (:y rect-b) (:height rect-b))]
(and (or (> x2a x1b) (s= x2a x1b)) (and (or (> x2a x1b) (s= x2a x1b))
(or (>= x2b x1a) (s= x2b x1a)) (or (>= x2b x1a) (s= x2b x1a))

12
common/src/app/common/geom/shapes/intersect.cljc
View file

@ -307,12 +307,12 @@
(defn overlaps? (defn overlaps?
"General case to check for overlapping between shapes and a rectangle" "General case to check for overlapping between shapes and a rectangle"
[shape rect] [shape rect]
(let [stroke-width (/ (or (:stroke-width shape) 0) 2) (let [swidth (/ (or (:stroke-width shape) 0) 2)
rect (-> rect rect (-> rect
(update :x - stroke-width) (update :x - swidth)
(update :y - stroke-width) (update :y - swidth)
(update :width + (* 2 stroke-width)) (update :width + (* 2 swidth))
(update :height + (* 2 stroke-width)))] (update :height + (* 2 swidth)))]
(or (not shape) (or (not shape)
(cond (cond
(cph/path-shape? shape) (cph/path-shape? shape)

1
frontend/src/app/main/ui/context.cljs
View file

@ -16,6 +16,7 @@
(def current-project-id (mf/create-context nil)) (def current-project-id (mf/create-context nil))
(def current-page-id (mf/create-context nil)) (def current-page-id (mf/create-context nil))
(def current-file-id (mf/create-context nil)) (def current-file-id (mf/create-context nil))
(def current-vbox (mf/create-context nil))
(def active-frames (mf/create-context nil)) (def active-frames (mf/create-context nil))
(def render-thumbnails (mf/create-context nil)) (def render-thumbnails (mf/create-context nil))

16
frontend/src/app/main/ui/workspace/shapes.cljs
View file

@ -13,6 +13,7 @@
common." common."
(:require (:require
[app.common.data.macros :as dm] [app.common.data.macros :as dm]
[app.common.geom.rect :as grc]
[app.common.pages.helpers :as cph] [app.common.pages.helpers :as cph]
[app.common.uuid :as uuid] [app.common.uuid :as uuid]
[app.main.ui.context :as ctx] [app.main.ui.context :as ctx]
@ -49,15 +50,14 @@
(let [objects (obj/get props "objects") (let [objects (obj/get props "objects")
active-frames (obj/get props "active-frames") active-frames (obj/get props "active-frames")
shapes (cph/get-immediate-children objects) shapes (cph/get-immediate-children objects)
vbox (mf/use-ctx ctx/current-vbox)
;; vbox (mf/use-ctx ctx/current-vbox) shapes (mf/with-memo [shapes vbox]
;; shapes (mf/with-memo [shapes vbox] (if (some? vbox)
;; (if (some? vbox) (filter (fn [shape]
;; (filter (fn [shape] (grc/overlaps-rects? vbox (dm/get-prop shape :selrect)))
;; (grc/overlaps-rects? vbox (dm/get-prop shape :selrect))) shapes)
;; shapes) shapes))]
;; shapes))
]
[:g {:id (dm/str "shape-" uuid/zero)} [:g {:id (dm/str "shape-" uuid/zero)}
[:& (mf/provider ctx/active-frames) {:value active-frames} [:& (mf/provider ctx/active-frames) {:value active-frames}

6
frontend/src/app/main/ui/workspace/shapes/frame.cljs
View file

@ -73,6 +73,7 @@
(fdm/use-dynamic-modifiers objects (mf/ref-val node-ref) modifiers) (fdm/use-dynamic-modifiers objects (mf/ref-val node-ref) modifiers)
[:& frame-shape {:shape shape :ref node-ref}])))) [:& frame-shape {:shape shape :ref node-ref}]))))
(defn root-frame-wrapper-factory (defn root-frame-wrapper-factory
[shape-wrapper] [shape-wrapper]
@ -86,9 +87,9 @@
thumbnail? (unchecked-get props "thumbnail?") thumbnail? (unchecked-get props "thumbnail?")
page-id (mf/use-ctx ctx/current-page-id) page-id (mf/use-ctx ctx/current-page-id)
frame-id (:id shape) frame-id (dm/get-prop shape :id)
objects (wsh/lookup-page-objects @st/state) objects (wsh/lookup-page-objects @st/state page-id)
node-ref (mf/use-ref nil) node-ref (mf/use-ref nil)
root-ref (mf/use-ref nil) root-ref (mf/use-ref nil)
@ -114,6 +115,7 @@
on-frame-load on-frame-load
(fns/use-node-store node-ref rendered-ref thumbnail? render-frame?) (fns/use-node-store node-ref rendered-ref thumbnail? render-frame?)
] ]
(fdm/use-dynamic-modifiers objects (mf/ref-val node-ref) modifiers) (fdm/use-dynamic-modifiers objects (mf/ref-val node-ref) modifiers)

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

@ -88,6 +88,8 @@
show-distances? show-distances?
picking-color?]} wglobal picking-color?]} wglobal
vbox' (mf/use-debounce 100 vbox)
;; CONTEXT ;; CONTEXT
page-id (mf/use-ctx ctx/current-page-id) page-id (mf/use-ctx ctx/current-page-id)
@ -323,12 +325,13 @@
:y (:y vbox 0) :y (:y vbox 0)
:fill background}] :fill background}]
[:& (mf/provider use/include-metadata-ctx) {:value (debug? :show-export-metadata)} [:& (mf/provider ctx/current-vbox) {:value vbox'}
[:& (mf/provider embed/context) {:value true} [:& (mf/provider use/include-metadata-ctx) {:value (debug? :show-export-metadata)}
;; Render root shape [:& (mf/provider embed/context) {:value true}
[:& shapes/root-shape {:key page-id ;; Render root shape
:objects base-objects [:& shapes/root-shape {:key page-id
:active-frames @active-frames}]]]] :objects base-objects
:active-frames @active-frames}]]]]]
[:svg.viewport-controls [:svg.viewport-controls
{:xmlns "http://www.w3.org/2000/svg" {:xmlns "http://www.w3.org/2000/svg"

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

@ -409,10 +409,11 @@
(defn bounding-rect->rect (defn bounding-rect->rect
[rect] [rect]
(when (some? rect) (when (some? rect)
{:x (or (.-left rect) (:left rect) 0) (grc/make-rect
:y (or (.-top rect) (:top rect) 0) (or (.-left rect) (:left rect) 0)
:width (or (.-width rect) (:width rect) 1) (or (.-top rect) (:top rect) 0)
:height (or (.-height rect) (:height rect) 1)})) (or (.-width rect) (:width rect) 1)
(or (.-height rect) (:height rect) 1))))
(defn get-window-size (defn get-window-size
[] []

50
frontend/src/app/util/text_svg_position.cljs
View file

@ -88,28 +88,28 @@
(defn calc-position-data (defn calc-position-data
[shape-id] [shape-id]
(when (some? shape-id) (letfn [(get-prop [styles prop]
(p/let [text-data (calc-text-node-positions shape-id)] (let [value (.getPropertyValue styles prop)]
(->> text-data (when (and (some? value) (not= value ""))
(mapv (fn [{:keys [node position text direction]}] value)))
(let [{:keys [x y width height]} position
styles (js/getComputedStyle ^js node) (transform-data [{:keys [node position text direction]}]
get (fn [prop] (let [styles (js/getComputedStyle ^js node)
(let [value (.getPropertyValue styles prop)] position (assoc position :y (+ (dm/get-prop position :y)
(when (and value (not= value "")) (dm/get-prop position :height)))]
value)))] (into position (filter val)
(d/without-nils {:direction direction
{:x x :font-family (dm/str (get-prop styles "font-family"))
:y (+ y height) :font-size (dm/str (get-prop styles "font-size"))
:width width :font-weight (dm/str (get-prop styles "font-weight"))
:height height :text-transform (dm/str (get-prop styles "text-transform"))
:direction direction :text-decoration (dm/str (get-prop styles "text-decoration"))
:font-family (str (get "font-family")) :letter-spacing (dm/str (get-prop styles "letter-spacing"))
:font-size (str (get "font-size")) :font-style (dm/str (get-prop styles "font-style"))
:font-weight (str (get "font-weight")) :fills (transit/decode-str (get-prop styles "--fills"))
:text-transform (str (get "text-transform")) :text text})))]
:text-decoration (str (get "text-decoration"))
:letter-spacing (str (get "letter-spacing")) (when (some? shape-id)
:font-style (str (get "font-style")) (->> (calc-text-node-positions shape-id)
:fills (transit/decode-str (get "--fills")) (p/fmap (fn [text-data]
:text text})))))))) (mapv transform-data text-data)))))))