Skip to content

Retain pinned participants after holding call #4319

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
mgamis-msft merged 7 commits into from
Mar 23, 2024
Merged

Retain pinned participants after holding call #4319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
873acdd
Retain pinned participants after holding call in CallComposite and Ca…
mgamis-msft Mar 22, 2024
739a8b4
Change files
mgamis-msft Mar 22, 2024
43e6ff2
Duplicate change files for beta release
mgamis-msft Mar 22, 2024
749e4ed
remove unused import
mgamis-msft Mar 22, 2024
a2ae71e
Merge branch 'main' into mgamis/retain-pinned-participants-after-hold
mgamis-msft Mar 22, 2024
d80f29d
fix cc
mgamis-msft Mar 22, 2024
46e32eb
Merge branch 'main' into mgamis/retain-pinned-participants-after-hold
mgamis-msft Mar 23, 2024
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
9 changes: 9 additions & 0 deletions change-beta/@azure-communication-react-cf18a9f7-2e70-480c-98dc-0c0987c79dcc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "Pinned participants",
"comment": "Retain pinned participants after holding call in CallComposite and CallWithChatComposite",
"packageName": "@azure/communication-react",
"email": "79475487+mgamis-msft@users.noreply.github.com",
"dependentChangeType": "patch"
}
9 changes: 9 additions & 0 deletions change/@azure-communication-react-cf18a9f7-2e70-480c-98dc-0c0987c79dcc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "Pinned participants",
"comment": "Retain pinned participants after holding call in CallComposite and CallWithChatComposite",
"packageName": "@azure/communication-react",
"email": "79475487+mgamis-msft@users.noreply.github.com",
"dependentChangeType": "patch"
}
3 changes: 3 additions & 0 deletions packages/react-composites/src/composites/CallComposite/CallComposite.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@ const MainScreen = (props: MainScreenProps): JSX.Element => {
const alternateCallerId = adapter.getState().alternateCallerId;
const leavePageStyle = useMemo(() => leavingPageStyle(palette), [palette]);
let pageElement: JSX.Element | undefined;
const [pinnedParticipants, setPinnedParticipants] = useState<string[]>([]);
switch (page) {
case 'configuration':
pageElement = (
Expand Down Expand Up @@ -590,6 +591,8 @@ const MainScreen = (props: MainScreenProps): JSX.Element => {
userSetOverflowGalleryPosition={userSetOverflowGalleryPosition}
/* @conditional-compile-remove(capabilities) */
capabilitiesChangedNotificationBarProps={capabilitiesChangedNotificationBarProps}
pinnedParticipants={pinnedParticipants}
setPinnedParticipants={setPinnedParticipants}
/>
);
break;
Expand Down
35 changes: 33 additions & 2 deletions packages/react-composites/src/composites/CallComposite/components/MediaGallery.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ export interface MediaGalleryProps {
localVideoTileOptions?: boolean | LocalVideoTileOptions;
userSetOverflowGalleryPosition?: 'Responsive' | 'horizontalTop';
userSetGalleryLayout: VideoGalleryLayout;
pinnedParticipants?: string[];
setPinnedParticipants?: (pinnedParticipants: string[]) => void;
/* @conditional-compile-remove(spotlight) */
setIsPromptOpen: (isOpen: boolean) => void;
/* @conditional-compile-remove(spotlight) */
Expand All @@ -73,8 +75,13 @@ export interface MediaGalleryProps {
* @private
*/
export const MediaGallery = (props: MediaGalleryProps): JSX.Element => {
/* @conditional-compile-remove(spotlight) */
const { setIsPromptOpen, setPromptProps, hideSpotlightButtons } = props;
const {
pinnedParticipants = [],
setPinnedParticipants,
/* @conditional-compile-remove(spotlight) */ setIsPromptOpen,
/* @conditional-compile-remove(spotlight) */ setPromptProps,
/* @conditional-compile-remove(spotlight) */ hideSpotlightButtons
} = props;

const videoGalleryProps = usePropsFor(VideoGallery);
const cameraSwitcherCameras = useSelector(localVideoCameraCycleButtonSelector);
Expand Down Expand Up @@ -159,6 +166,24 @@ export const MediaGallery = (props: MediaGalleryProps): JSX.Element => {
setPromptProps
);

const onPinParticipant = useMemo(() => {
return setPinnedParticipants
? (userId: string) => {
if (!pinnedParticipants.includes(userId)) {
setPinnedParticipants(pinnedParticipants.concat(userId));
}
}
: undefined;
}, [setPinnedParticipants, pinnedParticipants]);

const onUnpinParticipant = useMemo(() => {
return setPinnedParticipants
? (userId: string) => {
setPinnedParticipants(pinnedParticipants.filter((participantId) => participantId !== userId));
}
: undefined;
}, [setPinnedParticipants, pinnedParticipants]);

const VideoGalleryMemoized = useMemo(() => {
const layoutBasedOnUserSelection = (): VideoGalleryLayout => {
return props.localVideoTileOptions ? layoutBasedOnTilePosition : props.userSetGalleryLayout;
Expand All @@ -184,6 +209,9 @@ export const MediaGallery = (props: MediaGalleryProps): JSX.Element => {
? '9:16'
: '16:9'
}
pinnedParticipants={pinnedParticipants}
onPinParticipant={onPinParticipant}
onUnpinParticipant={onUnpinParticipant}
/* @conditional-compile-remove(reaction) */
reactionResources={reactionResources}
/* @conditional-compile-remove(spotlight) */
Expand All @@ -209,6 +237,9 @@ export const MediaGallery = (props: MediaGalleryProps): JSX.Element => {
containerAspectRatio,

props.userSetGalleryLayout,
pinnedParticipants,
onPinParticipant,
onUnpinParticipant,
layoutBasedOnTilePosition,
/* @conditional-compile-remove(reaction) */
reactionResources,
Expand Down
8 changes: 7 additions & 1 deletion packages/react-composites/src/composites/CallComposite/pages/CallPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ export interface CallPageProps {
userSetOverflowGalleryPosition?: 'Responsive' | 'horizontalTop';
onSetUserSetOverflowGalleryPosition?: (position: 'Responsive' | 'horizontalTop') => void;
onCloseChatPane?: () => void;
pinnedParticipants?: string[];
setPinnedParticipants?: (pinnedParticipants: string[]) => void;
}

/**
Expand All @@ -71,7 +73,9 @@ export const CallPage = (props: CallPageProps): JSX.Element => {
onUserSetGalleryLayoutChange,
userSetOverflowGalleryPosition = 'Responsive',
onSetUserSetOverflowGalleryPosition,
onCloseChatPane
onCloseChatPane,
pinnedParticipants,
setPinnedParticipants
} = props;

// To use useProps to get these states, we need to create another file wrapping Call,
Expand Down Expand Up @@ -129,6 +133,8 @@ export const CallPage = (props: CallPageProps): JSX.Element => {
localVideoTileOptions={options?.localVideoTile}
userSetOverflowGalleryPosition={userSetOverflowGalleryPosition}
userSetGalleryLayout={galleryLayout}
pinnedParticipants={pinnedParticipants}
setPinnedParticipants={setPinnedParticipants}
/* @conditional-compile-remove(spotlight) */
setIsPromptOpen={setIsPromptOpen}
/* @conditional-compile-remove(spotlight) */
Expand Down
⚡