fix: visibility helper - unregister only registered listeners

seznam · Jul 30, 2018 · 01d911c · 01d911c
1 parent 39f9344
commit 01d911c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/src/iframe/HtmlIframe.jsx b/src/iframe/HtmlIframe.jsx
@@ -28,6 +28,7 @@ export default class HtmlIframe extends React.PureComponent {
     this._registeredVisibilityId = null;
 
     this._onVisibilityWriter = this.onVisibilityWriter.bind(this);
+    this._visibilityWriterRegistered = false;
 
     this._rootElement = React.createRef();
   }
@@ -136,9 +137,12 @@ export default class HtmlIframe extends React.PureComponent {
   }
 
   _unregisterToCheckingVisibility() {
-    this.utils.$UIComponentHelper.visibility.unregister(
-      this._registeredVisibilityId
-    );
+    if (this._visibilityWriterRegistered) {
+      this.utils.$UIComponentHelper.visibility.unregister(
+        this._registeredVisibilityId
+      );
+      this._visibilityWriterRegistered = false;
+    }
   }
 
   _registerToCheckingVisibility() {
@@ -157,5 +161,6 @@ export default class HtmlIframe extends React.PureComponent {
       }),
       $UIComponentHelper.wrapVisibilityWriter(this._onVisibilityWriter)
     );
+    this._visibilityWriterRegistered = true;
   }
 }
diff --git a/src/image/HtmlImage.jsx b/src/image/HtmlImage.jsx
@@ -50,6 +50,7 @@ export default class HtmlImage extends React.PureComponent {
     this._registeredVisibilityId = null;
 
     this._onVisibilityWriter = this.onVisibilityWriter.bind(this);
+    this._visibilityWriterRegistered = false;
 
     this._rootElement = React.createRef();
   }
@@ -160,9 +161,12 @@ export default class HtmlImage extends React.PureComponent {
   }
 
   _unregisterToCheckingVisibility() {
-    this.utils.$UIComponentHelper.visibility.unregister(
-      this._registeredVisibilityId
-    );
+    if (this._visibilityWriterRegistered) {
+      this.utils.$UIComponentHelper.visibility.unregister(
+        this._registeredVisibilityId
+      );
+      this._visibilityWriterRegistered = false;
+    }
   }
 
   _registerToCheckingVisibility() {
@@ -186,6 +190,7 @@ export default class HtmlImage extends React.PureComponent {
       }),
       $UIComponentHelper.wrapVisibilityWriter(this._onVisibilityWriter)
     );
+    this._visibilityWriterRegistered = true;    
   }
 
   _preLoadImage() {

diff --git a/src/video/HtmlVideo.jsx b/src/video/HtmlVideo.jsx
@@ -31,6 +31,7 @@ export default class HtmlVideo extends React.PureComponent {
     this._registeredVisibilityId = null;
 
     this._onVisibilityWriter = this.onVisibilityWriter.bind(this);
+    this._visibilityWriterRegistered = false;
 
     this._rootElement = React.createRef();
   }
@@ -130,9 +131,12 @@ export default class HtmlVideo extends React.PureComponent {
   }
 
   _unregisterToCheckingVisibility() {
-    this.utils.$UIComponentHelper.visibility.unregister(
-      this._registeredVisibilityId
-    );
+    if (this._visibilityWriterRegistered) {
+      this.utils.$UIComponentHelper.visibility.unregister(
+        this._registeredVisibilityId
+      );
+      this._visibilityWriterRegistered = false;
+    }
   }
 
   _registerToCheckingVisibility() {
@@ -152,6 +156,7 @@ export default class HtmlVideo extends React.PureComponent {
       }),
       $UIComponentHelper.wrapVisibilityWriter(this._onVisibilityWriter)
     );
+    this._visibilityWriterRegistered = true;
   }
 
   _preLoadPosterImage() {