Skip to content

dual pinning #255

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
merged 1 commit into from
Jan 14, 2025
Merged

dual pinning #255

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
65 changes: 33 additions & 32 deletions Project/src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@ div.ms-Checkbox>input[type="checkbox"]+label.ms-Checkbox-label>span.ms-Checkbox-
display: flex;
padding-bottom: 25px;
flex-flow: row wrap;
justify-content: center;
}

@media screen and (max-width: 1024px){
Expand All @@ -401,11 +402,31 @@ div.ms-Checkbox>input[type="checkbox"]+label.ms-Checkbox-label>span.ms-Checkbox-
}
}

.pptLive {
display: block;
padding: 2vh 2vw;
width: 100%;
height: 50vh;
.stream-container.pinned {
order: 0;
flex: 0 100% !important;
}

.stream-container {
order: 1;
display: none;
position: relative;
flex: 0 20%;
}

.stream-container.stream-count-1,
.stream-container.stream-count-2,
.stream-container.stream-count-3,
.stream-container.stream-count-4 {
flex: 0 49%;
}

.stream-container.stream-count-5,
.stream-container.stream-count-6,
.stream-container.stream-count-7,
.stream-container.stream-count-8,
.stream-container.stream-count-9 {
flex: 0 33%;
}

.video-title {
Expand Down Expand Up @@ -473,6 +494,13 @@ div.ms-Checkbox>input[type="checkbox"]+label.ms-Checkbox-label>span.ms-Checkbox-
transform: translate(-50%, -50%);
}

.pptLive {
display: block;
padding: 2vh 2vw;
width: 100%;
height: 50vh;
}

.icon-text-large {
vertical-align: middle;
font-size: large;
Expand Down Expand Up @@ -1111,33 +1139,6 @@ div.volumeVisualizer::before {
padding: 8px;
}

.stream-container {
order: 1;
display: none;
position: relative;
flex: 1 20%;
}

.stream-container.stream-count-1,
.stream-container.stream-count-2,
.stream-container.stream-count-3,
.stream-container.stream-count-4 {
flex: 1 49%;
}

.stream-container.stream-count-5,
.stream-container.stream-count-6,
.stream-container.stream-count-7,
.stream-container.stream-count-8,
.stream-container.stream-count-9 {
flex: 1 33%;
}

.stream-container[id*="ScreenSharing"] {
order: 0;
grid-column: span 3 !important;
}

.scrollable-captions-container {
overflow: auto;
max-height: 300px;
Expand Down
135 changes: 93 additions & 42 deletions Project/src/MakeCall/CallCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ export default class CallCard extends React.Component {
meetingMediaAccess: {
isAudioPermitted: meetingMediaAccess?.isAudioPermitted,
isVideoPermitted: meetingMediaAccess?.isVideoPermitted,
}
},
showPin2VideosList: false,
};
this.selectedRemoteParticipants = new Set();
this.dataChannelRef = React.createRef();
Expand Down Expand Up @@ -1387,6 +1388,27 @@ export default class CallCard extends React.Component {
this.call.setConstraints(constraints);
}

handleVideoPin = (streamTuple, e) => {
// e.preventDefault();
const checked = e.target.checked;
const allRemoteParticipantStreams = this.state.allRemoteParticipantStreams;
if (allRemoteParticipantStreams.filter(streamTuple => streamTuple.isPinned).length >= 2 && checked) {
return;
}

allRemoteParticipantStreams.forEach(v => {
if (streamTuple === v) {
v.isPinned = checked;
} else {
v.isPinned = !!v.isPinned;
}
});

this.setState({ allRemoteParticipantStreams: allRemoteParticipantStreams }, () => {
this.updateListOfParticipantsToRender('Pinned videos changed');
});
}

render() {
const emojis = ['👍', '❤️', '😂', '👏', '😲'];
const streamCount = this.state.allRemoteParticipantStreams.length;
Expand Down Expand Up @@ -1433,7 +1455,7 @@ export default class CallCard extends React.Component {
<div className="ms-Grid-row">
{
this.state.callState === 'Connected' && this.state.isShowParticipants &&
<div className="ms-Grid-col ms-lg4">
<div className="ms-Grid-col ms-lg12">
<div>
{ this.state.showAddParticipantPanel &&
<AddParticipantPopover call={this.call} />
Expand Down Expand Up @@ -1473,47 +1495,46 @@ export default class CallCard extends React.Component {

</div>
}
<div className={this.state.isShowParticipants ? "ms-Grid-col ms-lg8" : undefined}>
<div className="video-grid-row">
{
(this.state.callState === 'Connected' ||
this.state.callState === 'LocalHold' ||
this.state.callState === 'RemoteHold') &&
this.state.allRemoteParticipantStreams.map(v =>
<StreamRenderer
key={`${utils.getIdentifierText(v.participant.identifier)}-${v.stream.mediaStreamType}-${v.stream.id}`}
ref={v.streamRendererComponentRef}
stream={v.stream}
remoteParticipant={v.participant}
dominantSpeakerMode={this.state.dominantSpeakerMode}
dominantRemoteParticipant={this.state.dominantRemoteParticipant}
call={this.call}
showMediaStats={this.state.logMediaStats}
streamCount={streamCount}
/>
)
}
{
(
this.state.remoteScreenShareStream &&
<StreamRenderer
key={`${utils.getIdentifierText(this.state.remoteScreenShareStream.participant.identifier)}-${this.state.remoteScreenShareStream.stream.mediaStreamType}-${this.state.remoteScreenShareStream.stream.id}`}
ref={this.state.remoteScreenShareStream.streamRendererComponentRef}
stream={this.state.remoteScreenShareStream.stream}
remoteParticipant={this.state.remoteScreenShareStream.participant}
dominantSpeakerMode={this.state.dominantSpeakerMode}
dominantRemoteParticipant={this.state.dominantRemoteParticipant}
call={this.call}
showMediaStats={this.state.logMediaStats}
streamCount={streamCount}
/>
)
}
</div>
<div>
{
this.state.remoteScreenShareStream &&
<StreamRenderer
key={`${utils.getIdentifierText(this.state.remoteScreenShareStream.participant.identifier)}-${this.state.remoteScreenShareStream.stream.mediaStreamType}-${this.state.remoteScreenShareStream.stream.id}`}
ref={this.state.remoteScreenShareStream.streamRendererComponentRef}
stream={this.state.remoteScreenShareStream.stream}
remoteParticipant={this.state.remoteScreenShareStream.participant}
dominantSpeakerMode={this.state.dominantSpeakerMode}
dominantRemoteParticipant={this.state.dominantRemoteParticipant}
call={this.call}
showMediaStats={this.state.logMediaStats}
streamCount={streamCount}
/>
}
</div>
<div className="video-grid-row">
{
(this.state.callState === 'Connected' ||
this.state.callState === 'LocalHold' ||
this.state.callState === 'RemoteHold') &&
this.state.allRemoteParticipantStreams.map(v =>
<StreamRenderer
key={`${utils.getIdentifierText(v.participant.identifier)}-${v.stream.mediaStreamType}-${v.stream.id}`}
ref={v.streamRendererComponentRef}
stream={v.stream}
isPinned={v.isPinned}
remoteParticipant={v.participant}
dominantSpeakerMode={this.state.dominantSpeakerMode}
dominantRemoteParticipant={this.state.dominantRemoteParticipant}
call={this.call}
showMediaStats={this.state.logMediaStats}
streamCount={streamCount}
/>
)
}
</div>
</div>
<div className="ms-Grid-row">
<div className="text-center">
<div className="text-center mt-4">
<span className="in-call-button"
title = {`${this.state.canOnVideo ? (this.state.videoOn ? 'Turn your video off' : 'Turn your video on') : 'Video is disabled'}`}
variant="secondary"
Expand Down Expand Up @@ -1748,7 +1769,15 @@ export default class CallCard extends React.Component {
variant="secondary"
onClick={() => this.handleRaiseHand()}>
<Icon iconName="HandsFree" className={this.state.isHandRaised ? "callFeatureEnabled" : ``}/>
</span>
</span>
}
{
<span className="in-call-button"
title={`Pin 2 videos`}
variant="secondary"
onClick={() => this.setState({showPin2VideosList: !this.state.showPin2VideosList})}>
<Icon iconName="Pinned"/>
</span>
}
<span className="in-call-button"
title='Like Reaction'
Expand Down Expand Up @@ -2076,7 +2105,29 @@ export default class CallCard extends React.Component {
</div>
</div>
}
{
this.state.showPin2VideosList &&
<div className="mt-5">
<div>
<h3>
Pin 2 videos
</h3>
</div>
<div>
{this.state.allRemoteParticipantStreams.map((streamTuple) => (
<div key={utils.getIdentifierText(streamTuple.participant.identifier)}>
<input
type="checkbox"
checked={streamTuple.isPinned}
onChange={(e) => this.handleVideoPin(streamTuple, e)}
/>
{utils.getIdentifierText(streamTuple.participant.identifier)}
</div>
))}
</div>
</div>
}
</div>
);
}
}
}
3 changes: 2 additions & 1 deletion Project/src/MakeCall/FunctionalStreamRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import VideoReceiveStats from './VideoReceiveStats';
export const FunctionalStreamRenderer = forwardRef(({
remoteParticipant,
stream,
isPinned,
dominantRemoteParticipant,
dominantSpeakerMode,
call,
Expand Down Expand Up @@ -143,7 +144,7 @@ export const FunctionalStreamRenderer = forwardRef(({

if (stream.isAvailable) {
return (
<div id={componentId} ref={componentContainer} className={`stream-container stream-count-${streamCount} ${stream.mediaStreamType === 'ScreenSharing' ? `ms-xxl12` : ``} ${stream.isAvailable ? 'rendering' : ''}`}>
<div id={componentId} ref={componentContainer} className={`stream-container stream-count-${streamCount} ${stream.mediaStreamType === 'ScreenSharing' ? `ms-xxl12` : ``} ${stream.isAvailable ? 'rendering' : ''} ${isPinned ? 'pinned' : ''}`}>
<div className={`remote-video-container ${isSpeaking && !isMuted ? `speaking-border-for-video` : ``}`} id={videoContainerId} ref={videoContainer}>
<h4 className="video-title">
{displayName ? displayName : remoteParticipant.displayName ? remoteParticipant.displayName : utils.getIdentifierText(remoteParticipant.identifier)}
Expand Down
Loading