Skip to content

fix(filmstrip): sync remoteParticipants between itemKey and ThumbnailWrapper #17251

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
JangJuMyeong wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −3
Open

fix(filmstrip): sync remoteParticipants between itemKey and ThumbnailWrapper #17251

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion react/features/filmstrip/components/web/Filmstrip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,6 +996,7 @@ class Filmstrip extends PureComponent <IProps, IState> {
_filmstripWidth,
_hasScroll,
_isVerticalFilmstrip,
_remoteParticipants,
_remoteParticipantsLength,
_resizableFilmstrip,
_rows,
Expand All @@ -1020,7 +1021,7 @@ class Filmstrip extends PureComponent <IProps, IState> {
height = { _filmstripHeight }
initialScrollLeft = { 0 }
initialScrollTop = { 0 }
itemData = {{ filmstripType }}
itemData = {{ filmstripType, remoteParticipants: _remoteParticipants }}
itemKey = { this._gridItemKey }
onItemsRendered = { this._onGridItemsRendered }
overscanRowCount = { 1 }
Expand All @@ -1039,6 +1040,7 @@ class Filmstrip extends PureComponent <IProps, IState> {
itemCount: _remoteParticipantsLength,
className: `filmstrip__videos remote-videos ${_resizableFilmstrip ? '' : 'height-transition'}`,
height: _filmstripHeight,
itemData: { remoteParticipants: _remoteParticipants },
itemKey: this._listItemKey,
itemSize: 0,
onItemsRendered: this._onListItemsRendered,
Expand Down
13 changes: 11 additions & 2 deletions react/features/filmstrip/components/web/ThumbnailWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class ThumbnailWrapper extends Component<IProps> {
* @returns {IProps}
*/
function _mapStateToProps(state: IReduxState, ownProps: { columnIndex: number;
data: { filmstripType: string; }; index?: number; rowIndex: number; }) {
data: { filmstripType: string; remoteParticipants?: string[]; }; index?: number; rowIndex: number; }) {
const _currentLayout = getCurrentLayout(state);
const { remoteParticipants: remote } = state['features/filmstrip'];
const activeParticipants = getActiveParticipantsIds(state);
Expand All @@ -145,7 +145,16 @@ function _mapStateToProps(state: IReduxState, ownProps: { columnIndex: number;
const filmstripType = ownProps.data?.filmstripType;
const stageFilmstrip = filmstripType === FILMSTRIP_TYPE.STAGE;
const sortedActiveParticipants = activeParticipants.sort();
const remoteParticipants = stageFilmstrip ? sortedActiveParticipants : remote;

// Use the remoteParticipants snapshot passed via itemData to ensure
// consistency with Filmstrip's itemKey functions, which reference
// the same array from the parent's render cycle. Reading directly
// from Redux could yield a newer array if the store updated between
// the parent render and this selector call, causing key/participant
// mismatches (wrong video shown in a tile).
const remoteParticipants = stageFilmstrip
? sortedActiveParticipants
: (ownProps.data?.remoteParticipants ?? remote);
const remoteParticipantsLength = remoteParticipants.length;
const localId = getLocalParticipant(state)?.id;

Expand Down