Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-15 03:28:25 -05:00
Code Issues Activity

⚡ Optimize general case of without-nils

Browse source 
Performance gains up to x6
This commit is contained in:
Andrey Antukh 2024-01-17 23:40:15 +01:00
parent 944d167bbb
commit 161a55e166
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/src/app/common/data.cljc
View file

@ -216,12 +216,19 @@
[coll] [coll]
(into [] (remove nil?) coll)) (into [] (remove nil?) coll))
(defn without-nils (defn without-nils
"Given a map, return a map removing key-value "Given a map, return a map removing key-value
pairs when value is `nil`." pairs when value is `nil`."
([] (remove (comp nil? val))) ([]
(remove (comp nil? val)))
([data] ([data]
(into {} (without-nils) data))) (reduce-kv (fn [data k v]
(if (nil? v)
(dissoc data k)
data))
data
data)))
(defn without-qualified (defn without-qualified
([] ([]

7
common/src/app/common/types/shape.cljc
View file

@ -491,7 +491,12 @@
the shape. The props must have :x :y :width :height." the shape. The props must have :x :y :width :height."
[{:keys [type] :as props}] [{:keys [type] :as props}]
(let [shape (make-minimal-shape type) (let [shape (make-minimal-shape type)
shape (merge shape (d/without-nils props))
;; The props can be custom records that does not
;; work properly with without-nils, so we first make
;; it plain map for proceed
props (d/without-nils (into {} props))
shape (merge shape (d/without-nils (into {} props)))
shape (case (:type shape) shape (case (:type shape)
(:bool :path) (setup-path shape) (:bool :path) (setup-path shape)
:image (-> shape setup-rect setup-image) :image (-> shape setup-rect setup-image)