Skip to content

fix(react): Restore isIntersecting and unsubscribed on unmount (#1325) #1326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
M-Blobby wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(react): Restore isIntersecting and unsubscribed on unmount (#1325) #1326

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 35 additions & 4 deletions packages/react/src/components/participant/VideoTrack.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,26 @@ export const VideoTrack: (
) {
const trackReference = useEnsureTrackRef(trackRef);

const mediaEl = React.useRef<HTMLVideoElement>(null);
const mediaEl = React.useRef<HTMLVideoElement | null>(null);
React.useImperativeHandle(ref, () => mediaEl.current as HTMLVideoElement);

const intersectionEntry = useHooks.useIntersectionObserver({ root: mediaEl.current });
const { ref: intersectionRef, entry: intersectionEntry } = useHooks.useIntersectionObserver({
root: null,
});

const [debouncedIntersectionEntry] = useHooks.useDebounceValue(intersectionEntry, 3000);

const managedPublicationRef = React.useRef<RemoteTrackPublication | null>(null);
const manageSubscriptionRef = React.useRef(false);

React.useEffect(() => {
manageSubscriptionRef.current = !!manageSubscription;
managedPublicationRef.current =
trackReference.publication instanceof RemoteTrackPublication
? trackReference.publication
: null;
}, [trackReference.publication, manageSubscription]);

React.useEffect(() => {
if (
manageSubscription &&
Expand All @@ -57,7 +70,7 @@ export const VideoTrack: (
) {
trackReference.publication.setSubscribed(false);
}
}, [debouncedIntersectionEntry, trackReference, manageSubscription]);
}, [debouncedIntersectionEntry, intersectionEntry, trackReference, manageSubscription]);

React.useEffect(() => {
if (
Expand All @@ -69,6 +82,14 @@ export const VideoTrack: (
}
}, [intersectionEntry, trackReference, manageSubscription]);

React.useEffect(() => {
return () => {
if (manageSubscriptionRef.current) {
managedPublicationRef.current?.setSubscribed(false);
}
};
}, []);

const {
elementProps,
publication: pub,
Expand All @@ -87,6 +108,16 @@ export const VideoTrack: (
onTrackClick?.({ participant: trackReference?.participant, track: pub });
};

return <video ref={mediaEl} {...elementProps} muted={true} onClick={clickHandler}></video>;
return (
<video
ref={(el) => {
mediaEl.current = el;
intersectionRef(el);
}}
{...elementProps}
muted={true}
onClick={clickHandler}
></video>
);
},
);
Loading