From efb5faa2ee7dbcb1e9e32527c39f90c3dd25f7bc Mon Sep 17 00:00:00 2001
From: arimieandreea <arimie_andreea@yahoo.com>
Date: Tue, 16 Jun 2026 15:02:54 +0300
Subject: [PATCH] fix: nulling root in case consumer triggers recreation of the
 component on update PIE-672

---
 packages/complex-rubric/configure/src/index.js | 1 +
 packages/rubric/configure/src/index.js         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/complex-rubric/configure/src/index.js b/packages/complex-rubric/configure/src/index.js
index 99b9a18042..43465b9561 100644
--- a/packages/complex-rubric/configure/src/index.js
+++ b/packages/complex-rubric/configure/src/index.js
@@ -164,6 +164,7 @@ export default class ComplexRubricConfigureElement extends HTMLElement {
     this.removeEventListener(MODEL_UPDATED, this.onModelUpdated);
     if (this._root) {
       this._root.unmount();
+      this._root = null;
     }
   }
 }
diff --git a/packages/rubric/configure/src/index.js b/packages/rubric/configure/src/index.js
index 2c25ae33da..09d97d57bb 100644
--- a/packages/rubric/configure/src/index.js
+++ b/packages/rubric/configure/src/index.js
@@ -134,6 +134,7 @@ export default class RubricElement extends HTMLElement {
   disconnectedCallback() {
     if (this._root) {
       this._root.unmount();
+      this._root = null;
     }
   }
 }