unmount prior root when remounted root

night · Oct 4, 2021 · 97c4694 · 97c4694
1 parent 10fb8e3
commit 97c4694
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/modules/emote_menu/EmoteMenu.jsx b/src/modules/emote_menu/EmoteMenu.jsx
@@ -47,6 +47,8 @@ class SafeEmoteMenuButton extends React.Component {
   }
 }
 
+let mountedNode;
+
 export default class EmoteMenuModule {
   constructor() {
     domObserver.on(CHAT_SETTINGS_BUTTON_CONTAINER_SELECTOR, (node, isConnected) => {
@@ -78,6 +80,10 @@ export default class EmoteMenuModule {
       buttonContainer.setAttribute('data-a-target', 'legacy-bttv-emote-picker-button-container');
       rightContainer.insertBefore(buttonContainer, rightContainer.lastChild);
 
+      if (mountedNode != null) {
+        ReactDOM.unmountComponentAtNode(mountedNode);
+      }
+
       ReactDOM.render(
         <SafeEmoteMenuButton
           onError={() => this.show(false)}
@@ -88,6 +94,7 @@ export default class EmoteMenuModule {
         />,
         buttonContainer
       );
+      mountedNode = buttonContainer;
     }
 
     this.show(true);

diff --git a/src/modules/settings/Settings.jsx b/src/modules/settings/Settings.jsx
@@ -9,6 +9,8 @@ function setHandleOpen(newHandleOpen) {
   handleOpen = newHandleOpen;
 }
 
+let mountedNode;
+
 export default class SettingsModule {
   constructor() {
     this.renderSettings();
@@ -22,7 +24,11 @@ export default class SettingsModule {
     const panel = document.createElement('div');
     panel.setAttribute('id', 'bttvSettingsPanel');
     $('body').append(panel);
+    if (mountedNode != null) {
+      ReactDOM.unmountComponentAtNode(mountedNode);
+    }
     ReactDOM.render(<Modal setHandleOpen={setHandleOpen} />, panel);
+    mountedNode = panel;
   }
 
   renderSettingsMenuOption() {