Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-18 02:32:13 -05:00
Code Issues Activity

Fix wrong behavior of page packing and unpacking.

Browse source 
Bug introduced in previous state attribute naming refactor.
This commit is contained in:
Andrey Antukh 2016-11-09 10:21:50 +01:00
parent c8683ea0ba
commit 7acfcbe09c
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/uxbox/main/data/pages.cljs
View file

@ -27,13 +27,13 @@
(defn dissoc-page-shapes
[state id]
(let [shapes (get-in state [:shapes])]
(let [shapes (get state :shapes)]
(assoc state :shapes (reduce-kv (fn [acc k v]
(if (= (:page v) id)
(dissoc acc k)
acc))
shapes
shapes))))
(if (= (:page v) id)
(dissoc acc k)
acc))
shapes
shapes))))
(defn pack-page
"Return a packed version of page object ready
@ -44,22 +44,21 @@
shapes (into {} xf (:shapes state))]
(-> page
(assoc-in [:data :shapes] (into [] (:shapes page)))
(assoc-in [:data :shapes] shapes)
(update-in [:data] dissoc :items)
(assoc-in [:data :shapes-map] shapes)
(dissoc :shapes))))
(defn unpack-page
"Unpacks packed page object and assocs it to the
provided state."
[state page]
(let [data (:data page)
shapes (:shapes data)
shapes-by-id (:shapes data)
page (-> (dissoc page :data)
[state {:keys [id data] :as page}]
(let [shapes (:shapes data)
shapes-map (:shapes-map data)
page (-> page
(dissoc :data)
(assoc :shapes shapes))]
(-> state
(update :shapes merge shapes-by-id)
(update :pages assoc (:id page) page))))
(update :shapes merge shapes-map)
(update :pages assoc id page))))
(defn purge-page
"Remove page and all related stuff from the state."