From 4118e53d7d9f68531479a460a904efbd7dd66c1c Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Mon, 10 May 2021 16:48:26 +0200 Subject: [PATCH 1/2] :bug: Fix problem with undo --- frontend/src/app/main/data/workspace/changes.cljs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/main/data/workspace/changes.cljs b/frontend/src/app/main/data/workspace/changes.cljs index 37a95099a..7153223b3 100644 --- a/frontend/src/app/main/data/workspace/changes.cljs +++ b/frontend/src/app/main/data/workspace/changes.cljs @@ -69,6 +69,7 @@ (watch [_ state stream] (let [page-id (:current-page-id state) objects (get-in state [:workspace-data :pages-index page-id :objects]) + objects' (get-in state [:workspace-file :data :pages-index page-id :objects]) reg-objects {:type :reg-objects :page-id page-id :shapes (vec ids)}] (loop [ids (seq ids) rch [] @@ -84,8 +85,9 @@ (let [id (first ids) obj1 (get objects id) obj2 (f obj1) + obj3 (get objects' id) rch-operations (generate-operations obj1 obj2) - uch-operations (generate-operations obj2 obj1 true) + uch-operations (generate-operations obj2 obj3 true) rchg {:type :mod-obj :page-id page-id :operations rch-operations From ab799c83ee162295e32c8b8c95d67a3a680b308d Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 10 May 2021 16:57:06 +0200 Subject: [PATCH 2/2] :books: Update changelog and set version to 1.5.3-alpha. --- CHANGES.md | 6 ++++++ version.txt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index d7c96478f..536b4b5dd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,12 @@ ### :boom: Breaking changes ### :heart: Community contributions by (Thank you!) +## 1.5.3-alpha + +### :bug: Bugs fixed + +- Fix problem undo/redo. + ## 1.5.2-alpha ### :bug: Bugs fixed diff --git a/version.txt b/version.txt index 32b4157fc..1cc282582 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.5.2-alpha +1.5.3-alpha