From c66b483fbaa9e65006bf0fab73f7558f9dbe90cc Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 23 Mar 2020 15:26:40 +0100 Subject: [PATCH] :bug: Fix ordering on undo operation on adding/duplicating shape. --- frontend/src/uxbox/main/data/workspace.cljs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/frontend/src/uxbox/main/data/workspace.cljs b/frontend/src/uxbox/main/data/workspace.cljs index ff36c3bf6..310d615f9 100644 --- a/frontend/src/uxbox/main/data/workspace.cljs +++ b/frontend/src/uxbox/main/data/workspace.cljs @@ -1046,14 +1046,12 @@ {:type :add-obj :id (:id obj) :frame-id frame-id - :obj (assoc obj :frame-id frame-id) - :session-id (:session-id state)})) + :obj (assoc obj :frame-id frame-id)})) (:shapes frame)) uchanges (mapv (fn [rch] {:type :del-obj - :id (:id rch) - :session-id (:session-id state)}) + :id (:id rch)}) rchanges) shapes (mapv :id rchanges) @@ -1071,7 +1069,7 @@ :id frame-id :session-id (:session-id state)}] (rx/of (commit-changes (d/concat [rchange] rchanges) - (d/concat [uchange] uchanges) + (d/concat [] uchanges [uchange]) {:commit-local? true}))))))