fix: dont add when helmetdata already has same instance

staylor · Jul 11, 2022 · 82c6bbb · 82c6bbb
1 parent b1ee658
commit 82c6bbb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/Dispatcher.js b/src/Dispatcher.js
@@ -22,12 +22,6 @@ export default class Dispatcher extends Component {
     this.emitChange();
   }
 
-  componentWillUnmount() {
-    const { helmetInstances } = this.props.context;
-    helmetInstances.remove(this);
-    this.emitChange();
-  }
-
   emitChange() {
     const { helmetInstances, setHelmet } = this.props.context;
     let serverState = null;

diff --git a/src/HelmetData.js b/src/HelmetData.js
@@ -16,6 +16,14 @@ export default class HelmetData {
     helmetInstances: {
       get: () => (this.canUseDOM ? instances : this.instances),
       add: instance => {
+        const alreadyHasSameInstance = (this.canUseDOM ? instances : this.instances).filter(instance => {
+          const a = Object.entries({...instance.props, context: undefined}).sort();
+          const b = Object.entries({...this.props, context: undefined}).sort();
+          return JSON.stringify(a) === JSON.stringify(b);
+        }).length > 0;
+        if  (alreadyHasSameInstance) {
+          return;
+        }
         (this.canUseDOM ? instances : this.instances).push(instance);
       },
       remove: instance => {