From b88dedac381c53bbbe364cd00530fef424e589e7 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Fri, 4 Dec 2020 00:36:43 +0100
Subject: [PATCH] Prevent losing component id on undo/redo

---
 src/dom_components/model/Component.js        | 2 +-
 src/dom_components/view/ComponentTextView.js | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/dom_components/model/Component.js b/src/dom_components/model/Component.js
index 9e9e9a335..186ea2c47 100644
--- a/src/dom_components/model/Component.js
+++ b/src/dom_components/model/Component.js
@@ -1247,7 +1247,7 @@ const Component = Backbone.Model.extend(Styleable).extend(
       const list = Component.getList(this);
 
       // If the ID already exists I need to rollback to the old one
-      if (list[id]) {
+      if (list[id] || (!id && idPrev)) {
         return this.setId(idPrev, { idUpdate: 1 });
       }
 
diff --git a/src/dom_components/view/ComponentTextView.js b/src/dom_components/view/ComponentTextView.js
index f331f6d1a..ebdfafd7c 100644
--- a/src/dom_components/view/ComponentTextView.js
+++ b/src/dom_components/view/ComponentTextView.js
@@ -131,8 +131,6 @@ export default ComponentView.extend({
         model.get('components').each(model => clean(model));
       };
 
-      // Avoid re-render on reset with silent option
-      !opts.silent && model.trigger('change:content', model, '', contentOpt);
       comps.reset(content, opts);
       comps.each(model => clean(model));
       comps.trigger('resetNavigator');