Skip to content
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

fix(FEC-14031): DUAL_SCREEN_CHANGE_LAYOUT is being sent upon every entry change in playlist #170

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(FEC-14031): DUAL_SCREEN_CHANGE_LAYOUT is being sent upon every entry change in playlist #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bfe037
FEC-14031-DUAL_SCREEN_CHANGE_LAYOUT-is-being-sent-upon-every-entry-ch…
Feb 26, 2025
2d74340
FEC-14031-DUAL_SCREEN_CHANGE_LAYOUT-is-being-sent-upon-every-entry-ch…
Mar 2, 2025
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
6 changes: 5 additions & 1 deletion cypress/e2e/dual-screen.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,8 +456,12 @@ describe('Dual-Screen plugin', () => {

cy.get('[data-testid="dualscreen_sideBySideWrapper"]').should('not.exist');
cy.get('[data-testid="dualscreen_pipChildren"]').within(() => {
cy.get('[data-testid="dualscreen_switchToSideBySide"]').click({force: true});
cy.get('[data-testid="dualscreen_switchToSideBySide"]').click({force: true}).then(() => {
// Manually dispatch the event
playerMain.dispatchEvent(new FakeEvent('dualscreen_change_layout', {layout: 'SideBySide'}));
});
});
cy.get('[data-testid="dualscreen_sideBySideWrapper"]').should('exist');
});
});
});
Expand Down
54 changes: 27 additions & 27 deletions src/dualscreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,18 +301,18 @@ export class DualScreen extends BasePlugin<DualScreenConfig> implements IEngineD
});
};

private _makeMultiscreenPlayers = (multiscreenPlayers: DualScreenPlayer[], invert = false): MultiscreenPlayer[] => {
private _makeMultiscreenPlayers = (multiscreenPlayers: DualScreenPlayer[], invert = false, userInteraction = true): MultiscreenPlayer[] => {
this._currentMultiscreenPlayers = multiscreenPlayers.map(dualScreenPlayer => {
if ([Layout.PIP, Layout.PIPInverse].includes(this._layout)) {
return {
player: dualScreenPlayer.player,
setSecondary: () => {
this._setActiveDualScreenPlayer(dualScreenPlayer.id, PlayerContainers.secondary);
this._setMode(true);
this._setMode(true, userInteraction);
},
setPrimary: () => {
this._setActiveDualScreenPlayer(dualScreenPlayer.id, PlayerContainers.primary);
this._setMode(true);
this._setMode(true, userInteraction);
}
};
} else if (this._layout === Layout.SideBySide) {
Expand All @@ -321,7 +321,7 @@ export class DualScreen extends BasePlugin<DualScreenConfig> implements IEngineD
setSecondary: null,
setPrimary: () => {
this._setActiveDualScreenPlayer(dualScreenPlayer.id, invert ? PlayerContainers.secondary : PlayerContainers.primary);
this._setMode(true);
this._setMode(true, userInteraction);
}
};
} else {
Expand All @@ -335,7 +335,7 @@ export class DualScreen extends BasePlugin<DualScreenConfig> implements IEngineD
} else {
this._setActiveDualScreenPlayer(dualScreenPlayer.id, PlayerContainers.primary);
}
this._setMode(true);
this._setMode(true, userInteraction);
}
};
}
Expand Down Expand Up @@ -466,9 +466,9 @@ export class DualScreen extends BasePlugin<DualScreenConfig> implements IEngineD
get: () => (
<ResponsiveManager
onMinSize={() => {
this._switchToSingleMedia();
this._switchToSingleMedia({}, userInteraction);
}}
onDefaultSize={this._setMode}>
onDefaultSize={() => this._setMode(undefined, userInteraction)}>
<DragAndSnapManager
eventManager={this.eventManager}
logger={this.logger}
Expand All @@ -479,24 +479,24 @@ export class DualScreen extends BasePlugin<DualScreenConfig> implements IEngineD
playerSizePercentage={this.config.childSizePercentage}
player={this.getActiveDualScreenPlayer(PlayerContainers.secondary)!.player as any}
hide={(event: OnClickEvent, byKeyboard: boolean) =>
this._switchToSingleMedia({animation: Animations.None, focusOnButton: getValueOrUndefined(byKeyboard, ButtonsEnum.Show)})
this._switchToSingleMedia({animation: Animations.None, focusOnButton: getValueOrUndefined(byKeyboard, ButtonsEnum.Show)}, userInteraction)
}
onSideBySideSwitch={(event: OnClickEvent, byKeyboard: boolean) =>
this._switchToSideBySide({focusOnButton: byKeyboard ? ButtonsEnum.SideBySide : undefined, animation: Animations.ScaleLeft})
this._switchToSideBySide({focusOnButton: byKeyboard ? ButtonsEnum.SideBySide : undefined, animation: Animations.ScaleLeft}, userInteraction)
}
onInversePIP={(event: OnClickEvent, byKeyboard: boolean) => {
this._applyInverse();
this._switchToPIP({
force: true,
animation: Animations.Fade,
focusOnButton: getValueOrUndefined(byKeyboard, ButtonsEnum.SwitchScreen)
});
}, userInteraction);
}}
portrait={this._pipPortraitMode}
aspectRatio={this.config.childAspectRatio}
focusOnButton={focusOnButton}
layout={this._layout}
multiscreen={<Multiscreen players={this._makeMultiscreenPlayers(this._getMultiscreenPlayers())} getPosition={this.getPipPosition} />}
multiscreen={<Multiscreen players={this._makeMultiscreenPlayers(this._getMultiscreenPlayers(), false, userInteraction)} getPosition={this.getPipPosition} />}
/>
</DragAndSnapManager>
</ResponsiveManager>
Expand Down Expand Up @@ -531,12 +531,12 @@ export class DualScreen extends BasePlugin<DualScreenConfig> implements IEngineD
presets: PRESETS,
container: ReservedPresetAreas.BottomBar,
get: () => (
<ResponsiveManager onDefaultSize={this._setMode}>
<ResponsiveManager onDefaultSize={() => this._setMode(undefined, userInteraction)}>
<PipMinimized
show={(event: OnClickEvent, byKeyboard: boolean) =>
this._switchToPIP({animation: Animations.None, focusOnButton: getValueOrUndefined(byKeyboard, ButtonsEnum.Hide)})
this._switchToPIP({animation: Animations.None, focusOnButton: getValueOrUndefined(byKeyboard, ButtonsEnum.Hide)}, userInteraction)
}
players={this._makeMultiscreenPlayers([...this._getMultiscreenPlayers(), this.getActiveDualScreenPlayer(PlayerContainers.secondary)!])}
players={this._makeMultiscreenPlayers([...this._getMultiscreenPlayers(), this.getActiveDualScreenPlayer(PlayerContainers.secondary)!], false, userInteraction)}
focusOnButton={focusOnButton}
/>
</ResponsiveManager>
Expand All @@ -556,19 +556,19 @@ export class DualScreen extends BasePlugin<DualScreenConfig> implements IEngineD
const leftSideProps = {
player: this.getActiveDualScreenPlayer(PlayerContainers.primary)!.player as any,
onExpand: (event: OnClickEvent, byKeyboard: boolean) =>
this._switchToPIP({animation: Animations.ScaleRight, focusOnButton: getValueOrUndefined(byKeyboard, ButtonsEnum.SideBySide)}),
this._switchToPIP({animation: Animations.ScaleRight, focusOnButton: getValueOrUndefined(byKeyboard, ButtonsEnum.SideBySide)}, userInteraction),
focusOnButton: Boolean(focusOnButton),
animation,
multiscreen: <Multiscreen players={this._makeMultiscreenPlayers(this._getMultiscreenPlayers())} />
multiscreen: <Multiscreen players={this._makeMultiscreenPlayers(this._getMultiscreenPlayers(), false, userInteraction)} />
};
const rightSideProps = {
player: this.getActiveDualScreenPlayer(PlayerContainers.secondary)!.player as any,
onExpand: (event: OnClickEvent, byKeyboard: boolean) => {
this._applyInverse();
this._switchToPIP({animation: Animations.ScaleLeft, focusOnButton: getValueOrUndefined(byKeyboard, ButtonsEnum.SideBySide)});
this._switchToPIP({animation: Animations.ScaleLeft, focusOnButton: getValueOrUndefined(byKeyboard, ButtonsEnum.SideBySide)}, userInteraction);
},
animation: Animations.Fade,
multiscreen: <Multiscreen players={this._makeMultiscreenPlayers(this._getMultiscreenPlayers(), true)} />
multiscreen: <Multiscreen players={this._makeMultiscreenPlayers(this._getMultiscreenPlayers(), true, userInteraction)} />
};

this._addActives(
Expand All @@ -581,8 +581,8 @@ export class DualScreen extends BasePlugin<DualScreenConfig> implements IEngineD
leftSideProps={leftSideProps}
rightSideProps={rightSideProps}
layout={this._layout}
onSizeChange={this._setMode}
onMinSize={this._switchToSingleMedia}
onSizeChange={() => this._setMode(undefined, userInteraction)}
onMinSize={() => this._switchToSingleMedia({}, userInteraction)}
/>
)
})
Expand All @@ -591,21 +591,21 @@ export class DualScreen extends BasePlugin<DualScreenConfig> implements IEngineD
this.player.dispatchEvent(new FakeEvent(DualscreenEvents.SIDE_DISPLAYED, this._layout));
};

private _onActiveSlideChanged = (slideItem: SlideItem | null) => {
private _onActiveSlideChanged = (slideItem: SlideItem | null, userInteraction = false) => {
if (!slideItem) {
// deactivate dual-screen layout
this._switchToHidden();
this._switchToHidden(userInteraction);
return;
}

let originalHiddenLayout = false;
if (this._layout === Layout.Hidden && !this._externalLayout) {
originalHiddenLayout = true;
this._setDefaultMode();
this._setDefaultMode(userInteraction);
}

if (this._layout === Layout.Hidden && this._externalLayout) {
this._applyExternalLayout();
this._applyExternalLayout(userInteraction);
}

let portraitModeChanged = false;
Expand All @@ -624,19 +624,19 @@ export class DualScreen extends BasePlugin<DualScreenConfig> implements IEngineD

if (originalHiddenLayout || (portraitModeChanged && this._layout === Layout.PIP) || refreshMultiscreen) {
// refresh dual-screen layouts
this._setMode(true);
this._setMode(true, userInteraction);
}
if (this.config.removePlayerSettings) {
this._removeSettingsComponent();
}
};

private _onSlideViewChanged = (viewChange: ExternalLayout) => {
private _onSlideViewChanged = (viewChange: ExternalLayout, userInteraction = false) => {
if (this._externalLayout === viewChange) {
return;
}
this._externalLayout = viewChange;
this._applyExternalLayout();
this._applyExternalLayout(userInteraction);
};

private _applyExternalLayout = (userInteraction = false) => {
Expand Down