Fix: confirm screen_element is not null

CodeCrowCorp · May 1, 2024 · cc020a5 · cc020a5
1 parent bc74eaf
commit cc020a5
Showing 1 changed file with 43 additions and 34 deletions.
diff --git a/src/lib/components/Channel/Stream/VideoItem.svelte b/src/lib/components/Channel/Stream/VideoItem.svelte
@@ -130,16 +130,18 @@
 						trackType: `screen`
 					})
 					screenWhip.addEventListener(`isScreenLive`, (ev: any) => (isScreenLive = ev.detail))
-					screen_element.addEventListener('dblclick', (event: any) => {
-						if (document.fullscreenElement) {
-							document.exitFullscreen()
-						} else {
-							screen_element.requestFullscreen()
-						}
-					})
-					screenWhip.addEventListener(`localStreamStopped-screen`, () => {
-						$is_sharing_screen = undefined
-					})
+					if (screen_element) {
+						screen_element.addEventListener('dblclick', (event: any) => {
+							if (document.fullscreenElement) {
+								document.exitFullscreen()
+							} else {
+								screen_element.requestFullscreen()
+							}
+						})
+						screenWhip.addEventListener(`localStreamStopped-screen`, () => {
+							$is_sharing_screen = undefined
+						})
+					}
 				} else {
 					if (value === false) screenWhip?.disconnectStream()
 					if (screen_element) screen_element.srcObject = null
@@ -155,16 +157,18 @@
 						videoElement: webcam_element,
 						trackType: `webcam`
 					})
-					webcam_element.addEventListener('dblclick', (event: any) => {
-						if (document.fullscreenElement) {
-							document.exitFullscreen()
-						} else {
-							webcam_element.requestFullscreen()
-						}
-					})
-					webcamWhip.addEventListener(`localStreamStopped-webcam`, () => {
-						$is_sharing_webcam = undefined
-					})
+					if (webcam_element) {
+						webcam_element.addEventListener('dblclick', (event: any) => {
+							if (document.fullscreenElement) {
+								document.exitFullscreen()
+							} else {
+								webcam_element.requestFullscreen()
+							}
+						})
+						webcamWhip.addEventListener(`localStreamStopped-webcam`, () => {
+							$is_sharing_webcam = undefined
+						})
+					}
 				} else {
 					if (value === false) webcamWhip?.disconnectStream()
 					if (webcam_element) webcam_element.srcObject = null
@@ -221,13 +225,15 @@
 					if (video.screen?.isConnected) {
 						screenWhep = new WHEPClient(video.screen?.webRTCPlayback.url, screen_element, `screen`)
 						screenWhep.addEventListener(`isScreenLive`, (ev: any) => (isScreenLive = ev.detail))
-						screen_element.addEventListener('dblclick', (event: any) => {
-							if (document.fullscreenElement) {
-								document.exitFullscreen()
-							} else {
-								screen_element.requestFullscreen()
-							}
-						})
+						if (screen_element) {
+							screen_element.addEventListener('dblclick', (event: any) => {
+								if (document.fullscreenElement) {
+									document.exitFullscreen()
+								} else {
+									screen_element.requestFullscreen()
+								}
+							})
+						}
 					} else {
 						if (screen_element) screen_element.srcObject = null
 						isScreenLive = false
@@ -236,13 +242,15 @@
 				case 'webcam':
 					if (video.webcam?.isConnected) {
 						webcamWhep = new WHEPClient(video.webcam?.webRTCPlayback.url, webcam_element, `webcam`)
-						webcam_element.addEventListener('dblclick', (event: any) => {
-							if (document.fullscreenElement) {
-								document.exitFullscreen()
-							} else {
-								webcam_element.requestFullscreen()
-							}
-						})
+						if (webcam_element) {
+							webcam_element.addEventListener('dblclick', (event: any) => {
+								if (document.fullscreenElement) {
+									document.exitFullscreen()
+								} else {
+									webcam_element.requestFullscreen()
+								}
+							})
+						}
 					} else {
 						if (webcam_element) webcam_element.srcObject = null
 					}
@@ -392,6 +400,7 @@
 </script>
 
 <div
+	aria-roledescription="video item"
 	class={video.rtmps?.isConnected || video.screen?.isConnected || video.webcam?.isConnected
 		? 'w-full h-full'
 		: 'w-[500px] max-h-80'}