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

💄 Use concat-vec helper instead of set + into

Browse source
This commit is contained in:
Andrey Antukh 2022-07-28 08:30:00 +02:00
parent 5834e29b39
commit 1477837cbf
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@
(:require (:require
[app.common.exceptions :as ex] [app.common.exceptions :as ex]
[app.common.geom.shapes :as gsh] [app.common.geom.shapes :as gsh]
[app.common.data :as d]
[app.util.object :as obj] [app.util.object :as obj]
[app.util.path.format :as upf] [app.util.path.format :as upf]
[clojure.set :as set] [clojure.set :as set]
@ -90,18 +91,17 @@
show-outline? (fn [shape] (and (not (:hidden shape)) show-outline? (fn [shape] (and (not (:hidden shape))
(not (:blocked shape)))) (not (:blocked shape))))
shapes (set shapes (d/concat-set
(into (->> outlines-ids
(->> outlines-ids (filter #(not= edition %))
(filter #(not= edition %)) (map #(get objects %))
(map #(get objects %)) (filterv show-outline?)
(filterv show-outline?) (filter some?))
(filter some?)) ;; outline highlighted shapes even if they are hidden or blocked
;; outline highlighted shapes even if they are hidden or blocked (->> highlighted
(->> highlighted (filter #(not= edition %))
(filter #(not= edition %)) (map #(get objects %))
(map #(get objects %)) (filter some?)))]
(filter some?))))]
[:g.outlines [:g.outlines
[:& shape-outlines-render {:shapes shapes [:& shape-outlines-render {:shapes shapes
:zoom zoom}]])) :zoom zoom}]]))