diff --git a/common/src/app/common/path/shapes_to_path.cljc b/common/src/app/common/path/shapes_to_path.cljc index bb4e439c3..37bc286a2 100644 --- a/common/src/app/common/path/shapes_to_path.cljc +++ b/common/src/app/common/path/shapes_to_path.cljc @@ -22,7 +22,7 @@ (def dissoc-attrs [:x :y :width :height :rx :ry :r1 :r2 :r3 :r4 - :metadata :shapes]) + :metadata]) (def allowed-transform-types #{:rect @@ -199,7 +199,6 @@ (map #(convert-to-path % objects))) bool-type (:bool-type shape) content (pb/content-bool bool-type (mapv :content children))] - (-> shape (assoc :type :path) (assoc :content content) diff --git a/frontend/src/app/main/data/workspace/changes.cljs b/frontend/src/app/main/data/workspace/changes.cljs index 67fe9cb10..0336f2bab 100644 --- a/frontend/src/app/main/data/workspace/changes.cljs +++ b/frontend/src/app/main/data/workspace/changes.cljs @@ -104,8 +104,9 @@ (update-in state path cp/process-changes redo-changes false) - (catch :default e - (vreset! error e) + (catch :default err + (log/error :js/error err) + (vreset! error err) state)))) ptk/WatchEvent diff --git a/frontend/src/app/main/data/workspace/path/shapes_to_path.cljs b/frontend/src/app/main/data/workspace/path/shapes_to_path.cljs index d0d7b6ce8..6e9fb0b26 100644 --- a/frontend/src/app/main/data/workspace/path/shapes_to_path.cljs +++ b/frontend/src/app/main/data/workspace/path/shapes_to_path.cljs @@ -30,7 +30,7 @@ changes (-> (pcb/empty-changes it page-id) (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))))))