Fix: Bottom scroll boundary for every season and fullscreen infinite loop

dist/plex-meets-homeassistant.js

@@ -19157,11 +19157,11 @@ const getOffset = (el) => {
     }
     return { top: y, left: x };
 };
-const getDetailsBottom = (seasonContainers, episodeContainers) => {
+const getDetailsBottom = (seasonContainers, episodeContainers, activeElem) => {
     const lastSeasonContainer = seasonContainers[seasonContainers.length - 1];
     const lastEpisodeContainer = episodeContainers[episodeContainers.length - 1];
     let detailBottom = false;
-    if (seasonContainers.length > 0 && parseInt(lastSeasonContainer.style.top, 10) > 0) {
+    if (seasonContainers.length > 0 && parseInt(activeElem.style.top, 10) > 0) {
         detailBottom = getHeight(lastSeasonContainer) + parseInt(getOffset(lastSeasonContainer).top, 10) + 10;
     }
     else if (episodeContainers.length > 0) {
@@ -20040,18 +20040,19 @@ class PlexMeetsHomeAssistant extends HTMLElement {
                             return false;
                         }
                     });
-                    if (this.getTop() < parseInt(getOffset(activeElem).top, 10) - 70) {
+                    const detailTop = parseInt(getOffset(activeElem).top, 10) - 70;
+                    const detailBottom = getDetailsBottom(seasonContainers, episodeContainers, activeElem);
+                    if (this.getTop() < detailTop) {
                         window.scroll({
-                            top: getOffset(activeElem).top - 70
+                            top: detailTop
                         });
                     }
-                    else {
+                    else if (detailBottom &&
-                        const detailBottom = getDetailsBottom(seasonContainers, episodeContainers);
+                        window.innerHeight < detailBottom - detailTop &&
-                        if (detailBottom && this.getTop() + window.innerHeight > detailBottom) {
+                        this.getTop() + window.innerHeight > detailBottom) {
-                            window.scroll({
+                        window.scroll({
-                                top: detailBottom - window.innerHeight
+                            top: detailBottom - window.innerHeight
-                            });
+                        });
-                        }
                     }
                 }
                 this.renderNewElementsIfNeeded();

src/modules/utils.ts

@@ -49,13 +49,14 @@ const getOffset = (el: Element): Record<string, any> => {
 
 const getDetailsBottom = (
 	seasonContainers: HTMLCollectionOf<HTMLElement>,
-	episodeContainers: HTMLCollectionOf<HTMLElement>
+	episodeContainers: HTMLCollectionOf<HTMLElement>,
+	activeElem: HTMLElement
 ): number | false => {
 	const lastSeasonContainer = seasonContainers[seasonContainers.length - 1];
 	const lastEpisodeContainer = episodeContainers[episodeContainers.length - 1];
 	let detailBottom: number | false = false;
 
-	if (seasonContainers.length > 0 && parseInt(lastSeasonContainer.style.top, 10) > 0) {
+	if (seasonContainers.length > 0 && parseInt(activeElem.style.top, 10) > 0) {
 		detailBottom = getHeight(lastSeasonContainer) + parseInt(getOffset(lastSeasonContainer).top, 10) + 10;
 	} else if (episodeContainers.length > 0) {
 		detailBottom = getHeight(lastEpisodeContainer) + parseInt(getOffset(lastEpisodeContainer).top, 10) + 10;

src/plex-meets-homeassistant.ts

@@ -163,17 +163,21 @@ class PlexMeetsHomeAssistant extends HTMLElement {
 					}
 				});
 
-				if (this.getTop() < parseInt(getOffset(activeElem as Element).top, 10) - 70) {
+				const detailTop = parseInt(getOffset(activeElem as Element).top, 10) - 70;
+				const detailBottom = getDetailsBottom(seasonContainers, episodeContainers, activeElem);
+
+				if (this.getTop() < detailTop) {
 					window.scroll({
-						top: getOffset(activeElem as Element).top - 70
+						top: detailTop
+					});
+				} else if (
+					detailBottom &&
+					window.innerHeight < detailBottom - detailTop &&
+					this.getTop() + window.innerHeight > detailBottom
+				) {
+					window.scroll({
+						top: detailBottom - window.innerHeight
 					});
-				} else {
-					const detailBottom = getDetailsBottom(seasonContainers, episodeContainers);
-					if (detailBottom && this.getTop() + window.innerHeight > detailBottom) {
-						window.scroll({
-							top: detailBottom - window.innerHeight
-						});
-					}
 				}
 			}