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

🐛 Fix problem with boolean and children objects

Browse source
This commit is contained in:
alonso.torres 2022-03-28 17:03:04 +02:00 • committed by Andrés Moya
parent 61c111d5ae
commit af22fee0c1
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
common/src/app/common/path/shapes_to_path.cljc
View file

@ -22,7 +22,7 @@
(def dissoc-attrs (def dissoc-attrs
[:x :y :width :height [:x :y :width :height
:rx :ry :r1 :r2 :r3 :r4 :rx :ry :r1 :r2 :r3 :r4
:metadata :shapes]) :metadata])
(def allowed-transform-types (def allowed-transform-types
#{:rect #{:rect
@ -199,7 +199,6 @@
(map #(convert-to-path % objects))) (map #(convert-to-path % objects)))
bool-type (:bool-type shape) bool-type (:bool-type shape)
content (pb/content-bool bool-type (mapv :content children))] content (pb/content-bool bool-type (mapv :content children))]
(-> shape (-> shape
(assoc :type :path) (assoc :type :path)
(assoc :content content) (assoc :content content)

5
frontend/src/app/main/data/workspace/changes.cljs
View file

@ -104,8 +104,9 @@
(update-in state path cp/process-changes redo-changes false) (update-in state path cp/process-changes redo-changes false)
(catch :default e (catch :default err
(vreset! error e) (log/error :js/error err)
(vreset! error err)
state)))) state))))
ptk/WatchEvent ptk/WatchEvent

4
frontend/src/app/main/data/workspace/path/shapes_to_path.cljs
View file

@ -30,7 +30,7 @@
changes changes
(-> (pcb/empty-changes it page-id) (-> (pcb/empty-changes it page-id)
(pcb/with-objects objects) (pcb/with-objects objects)
(pcb/remove-objects children-ids) (pcb/update-shapes selected #(upsp/convert-to-path % objects))
(pcb/update-shapes selected #(upsp/convert-to-path % objects)))] (pcb/remove-objects children-ids))]
(rx/of (dch/commit-changes changes)))))) (rx/of (dch/commit-changes changes))))))