From 0193e8f0c8e189c89d8b8a45248943e6bfc4d13a Mon Sep 17 00:00:00 2001 From: Jip Fr Date: Thu, 9 Feb 2023 12:56:16 +0100 Subject: [PATCH] Fix scrolling to center if the element is on the low end of the thingy --- src/video/components/popouts/PopoutUtils.tsx | 41 ++++++++++++++++---- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/src/video/components/popouts/PopoutUtils.tsx b/src/video/components/popouts/PopoutUtils.tsx index d20f2353..3420e77f 100644 --- a/src/video/components/popouts/PopoutUtils.tsx +++ b/src/video/components/popouts/PopoutUtils.tsx @@ -13,10 +13,17 @@ interface PopoutListEntryTypes { errored?: boolean; } -export function PopoutSection(props: { +interface ScrollToActiveProps { + children: React.ReactNode; + className?: string; +} + +interface PopoutSectionProps { children?: React.ReactNode; className?: string; -}) { +} + +export function ScrollToActive(props: ScrollToActiveProps) { const ref = createRef(); const inited = useRef(false); @@ -43,10 +50,14 @@ export function PopoutSection(props: { inline: "nearest", }); - const activeYPositionCentered = - active.getBoundingClientRect().top - - wrapper.getBoundingClientRect().top + - active.offsetHeight / 2; + let activeYPositionCentered = 0; + const setActiveYPositionCentered = () => { + activeYPositionCentered = + active.getBoundingClientRect().top - + wrapper.getBoundingClientRect().top + + active.offsetHeight / 2; + }; + setActiveYPositionCentered(); if (activeYPositionCentered >= wrapper.offsetHeight / 2) { // Check if the active element is below the vertical center line, then scroll it into center @@ -54,17 +65,33 @@ export function PopoutSection(props: { top: activeYPositionCentered - wrapper.offsetHeight / 2, }); } + + setActiveYPositionCentered(); + if (activeYPositionCentered > wrapper.offsetHeight / 2) { + // If the element is over the vertical center line, scroll to the end + wrapper.scrollTo({ + top: wrapper.scrollHeight, + }); + } } inited.current = true; }, [ref]); return ( -
+
{props.children}
); } +export function PopoutSection(props: PopoutSectionProps) { + return ( + + {props.children} + + ); +} + export function PopoutListEntry(props: PopoutListEntryTypes) { const bg = props.isOnDarkBackground ? "bg-ash-200" : "bg-ash-400"; const hover = props.isOnDarkBackground