Skip to content

fix: Mux - conditionally render MuxPlayer only when data is ready [] #10710

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
Renzo Delfino (R-Delfino95) wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Mux - conditionally render MuxPlayer only when data is ready [] #10710

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
40 changes: 25 additions & 15 deletions apps/mux/frontend/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,16 @@ export class App extends React.Component<AppProps, AppState> {
return this.state.value && this.state.value.drmPlaybackId ? true : false;
};

isPlayerReady = (): boolean => {
if (!this.state.playerPlaybackId) return false;

const isPublicReady = !!this.state.value?.ready && !!this.state.value?.playbackId;
const isSignedReady =
this.isUsingSigned() && !this.state.isTokenLoading && !!this.state.playbackToken;

return isPublicReady || isSignedReady;
};

getSwitchCheckedState = (): boolean => {
// If there are pending actions of playback, use the state of the pending action
if (this.state.value?.pendingActions?.create) {
Expand Down Expand Up @@ -538,12 +548,9 @@ export class App extends React.Component<AppProps, AppState> {
const parsedBody = JSON.parse(body);
if (!parsedBody.ok) throw new Error(parsedBody.error);

const tokens = parsedBody.data as SignedTokens;
this.setState({ isTokenLoading: false });
return tokens;
return parsedBody.data as SignedTokens;
} catch (e) {
console.error(e);
this.setState({ isTokenLoading: false });
return {
licenseToken: undefined,
playbackToken: 'playback-token-not-found',
Expand All @@ -568,7 +575,13 @@ export class App extends React.Component<AppProps, AppState> {
const { playbackToken, posterToken, storyboardToken, licenseToken } =
await this.fetchSignedTokens(signedPlaybackId, isDRM);

this.setState({ playbackToken, posterToken, storyboardToken, drmLicenseToken: licenseToken });
this.setState({
playbackToken,
posterToken,
storyboardToken,
drmLicenseToken: licenseToken,
isTokenLoading: false,
});
};

getAsset = async (assetId: string) => {
Expand Down Expand Up @@ -1331,9 +1344,7 @@ export class App extends React.Component<AppProps, AppState> {
) {
const { muxDomain } = this.props.sdk.parameters.installation as InstallationParams;

const showPlayer =
(this.state.value.ready && this.state.value.playbackId) ||
(this.isUsingSigned() && !this.state.isTokenLoading);
const showPlayer = this.isPlayerReady();

return (
<>
Expand Down Expand Up @@ -1419,17 +1430,16 @@ export class App extends React.Component<AppProps, AppState> {
</Box>
)}

<section
className="player"
style={{ ...this.getPlayerAspectRatio(), display: showPlayer ? undefined : 'none' }}>
{this.state.playerPlaybackId !== 'playback-test-123' && (
{showPlayer && (
<section
className="player"
style={this.getPlayerAspectRatio()}>
<MuxPlayer
ref={this.muxPlayerRef}
data-testid="muxplayer"
style={{ height: '100%', width: '100%' }}
playbackId={this.state.playerPlaybackId}
streamType={this.getPlayerType()}
poster={this.state.value.audioOnly ? '#' : undefined}
customDomain={muxDomain && muxDomain !== 'mux.com' ? muxDomain : undefined}
audio={this.state.value.audioOnly}
metadata={{
Expand All @@ -1448,8 +1458,8 @@ export class App extends React.Component<AppProps, AppState> {
: undefined
}
/>
)}
</section>
</section>
)}

{showPlayer && this.isLive() && (
<Box marginBottom="spacingM" marginTop="spacingM">
Expand Down
Loading