Skip to content

Fix sidebar flicker #402

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

Merged
timmydoza merged 2 commits into from
Feb 2, 2021
Merged

Fix sidebar flicker #402

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
4e26346
Fix sidebar flicker
Jan 19, 2021
48341c8
Update snapshot tests
Jan 20, 2021
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
42 changes: 25 additions & 17 deletions src/components/ParticipantList/ParticipantList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import useScreenShareParticipant from '../../hooks/useScreenShareParticipant/use
const useStyles = makeStyles((theme: Theme) =>
createStyles({
container: {
padding: '2em',
overflowY: 'auto',
background: 'rgb(79, 83, 85)',
gridArea: '1 / 2 / 1 / 3',
Expand All @@ -21,14 +20,21 @@ const useStyles = makeStyles((theme: Theme) =>
overflowY: 'initial',
overflowX: 'auto',
display: 'flex',
padding: `${theme.sidebarMobilePadding}px`,
},
},
transparentBackground: {
background: 'transparent',
},
scrollContainer: {
display: 'flex',
justifyContent: 'center',
},
innerScrollContainer: {
width: `calc(${theme.sidebarWidth}px - 4em)`,
padding: '2em 0',
[theme.breakpoints.down('sm')]: {
width: 'auto',
padding: `${theme.sidebarMobilePadding}px`,
display: 'flex',
},
},
Expand All @@ -55,21 +61,23 @@ export default function ParticipantList() {
})}
>
<div className={classes.scrollContainer}>
<Participant participant={localParticipant} isLocalParticipant={true} />
{participants.map(participant => {
const isSelected = participant === selectedParticipant;
const hideParticipant =
participant === mainParticipant && participant !== screenShareParticipant && !isSelected;
return (
<Participant
key={participant.sid}
participant={participant}
isSelected={participant === selectedParticipant}
onClick={() => setSelectedParticipant(participant)}
hideParticipant={hideParticipant}
/>
);
})}
<div className={classes.innerScrollContainer}>
<Participant participant={localParticipant} isLocalParticipant={true} />
{participants.map(participant => {
const isSelected = participant === selectedParticipant;
const hideParticipant =
participant === mainParticipant && participant !== screenShareParticipant && !isSelected;
return (
<Participant
key={participant.sid}
participant={participant}
isSelected={participant === selectedParticipant}
onClick={() => setSelectedParticipant(participant)}
hideParticipant={hideParticipant}
/>
);
})}
</div>
</div>
</aside>
);
Expand Down
72 changes: 38 additions & 34 deletions src/components/ParticipantList/__snapshots__/ParticipantList.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,43 +7,47 @@ exports[`the ParticipantList component should correctly render Participant compo
<div
className="makeStyles-scrollContainer-3"
>
<Participant
isLocalParticipant={true}
participant="localParticipant"
/>
<Participant
hideParticipant={false}
isSelected={false}
key="0"
onClick={[Function]}
participant={
Object {
"sid": 0,
<div
className="makeStyles-innerScrollContainer-4"
>
<Participant
isLocalParticipant={true}
participant="localParticipant"
/>
<Participant
hideParticipant={false}
isSelected={false}
key="0"
onClick={[Function]}
participant={
Object {
"sid": 0,
}
}
}
/>
<Participant
hideParticipant={false}
isSelected={false}
key="1"
onClick={[Function]}
participant={
Object {
"sid": 1,
/>
<Participant
hideParticipant={false}
isSelected={false}
key="1"
onClick={[Function]}
participant={
Object {
"sid": 1,
}
}
}
/>
<Participant
hideParticipant={false}
isSelected={true}
key="2"
onClick={[Function]}
participant={
Object {
"sid": 2,
/>
<Participant
hideParticipant={false}
isSelected={true}
key="2"
onClick={[Function]}
participant={
Object {
"sid": 2,
}
}
}
/>
/>
</div>
</div>
</aside>
`;