Improve unobserve

aws · Feb 24, 2025 · 52141ee · 52141ee
1 parent 5bc9828
commit 52141ee
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/src/videotile/DefaultVideoElementResolutionMonitor.ts b/src/videotile/DefaultVideoElementResolutionMonitor.ts
@@ -33,14 +33,15 @@ export default class DefaultVideoElementResolutionMonitor implements VideoElemen
   }
 
   bindVideoElement(newElement: HTMLVideoElement | null): void {
-    if (!newElement) {
-      if (this.element) {
-        this.resizeObserver.unobserve(this.element);
-      }
-      this.element = newElement;
+    if (this.element === newElement) {
       return;
     }
+    if (this.element) {
+      this.resizeObserver.unobserve(this.element);
+    }
     this.element = newElement;
-    this.resizeObserver.observe(this.element);
+    if (this.element) {
+      this.resizeObserver.observe(this.element);
+    }
   }
 }
diff --git a/test/videotile/DefaultVideoElementResolutionMonitor.test.ts b/test/videotile/DefaultVideoElementResolutionMonitor.test.ts
@@ -85,7 +85,22 @@ describe('DefaultVideoElementResolutionMonitor', () => {
       const videoElement = videoElementFactory.create();
       expect(() => monitor.bindVideoElement(videoElement)).to.not.throw();
       expect(observeCalled).to.be.true;
+      expect(unobserveCalled).to.be.false;
+      observeCalled = false;
+      unobserveCalled = false;
+      expect(() => monitor.bindVideoElement(videoElement)).to.not.throw();
+      expect(observeCalled).to.be.false;
+      expect(unobserveCalled).to.be.false;
+      observeCalled = false;
+      unobserveCalled = false;
+      const newVideoElement = videoElementFactory.create();
+      expect(() => monitor.bindVideoElement(newVideoElement)).to.not.throw();
+      expect(observeCalled).to.be.true;
+      expect(unobserveCalled).to.be.true;
+      observeCalled = false;
+      unobserveCalled = false;
       expect(() => monitor.bindVideoElement(null)).to.not.throw();
+      expect(observeCalled).to.be.false;
       expect(unobserveCalled).to.be.true;
     });