Skip to content

Commit 7add059

Browse files
[BugFix] Add missing composite options to CallWithChatComposite (#3565)
* Add missing composite options * build stable * remove console * Change files * Duplicate change files for beta release * Update @azure-communication-react-5027666e-56a5-4502-a203-3a671c79dfa2.json Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com> * Update @azure-communication-react-5027666e-56a5-4502-a203-3a671c79dfa2.json Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com> --------- Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
1 parent 6f3f451 commit 7add059

8 files changed

Lines changed: 60 additions & 4 deletions

File tree

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"type": "patch",
3+
"area": "fix",
4+
"workstream": "Bugfix",
5+
"comment": "Introduces missing composite options to the CallWithChat composite",
6+
"packageName": "@azure/communication-react",
7+
"email": "94866715+dmceachernmsft@users.noreply.github.com",
8+
"dependentChangeType": "patch"
9+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"type": "patch",
3+
"area": "fix",
4+
"workstream": "Bugfix",
5+
"comment": "Introduces missing composite options to the CallWithChat composite",
6+
"packageName": "@azure/communication-react",
7+
"email": "94866715+dmceachernmsft@users.noreply.github.com",
8+
"dependentChangeType": "patch"
9+
}

packages/communication-react/review/beta/communication-react.api.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,6 +1166,8 @@ export type CallWithChatCompositeOptions = {
11661166
}) => void;
11671167
onNetworkingTroubleShootingClick?: () => void;
11681168
onEnvironmentInfoTroubleshootingClick?: () => void;
1169+
remoteVideoTileMenuOptions?: RemoteVideoTileMenuOptions;
1170+
localVideoTile?: boolean | LocalVideoTileOptions;
11691171
galleryOptions?: {
11701172
layout?: VideoGalleryLayout;
11711173
};

packages/communication-react/review/stable/communication-react.api.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -898,6 +898,7 @@ export type CallWithChatCompositeIcons = {
898898
// @public
899899
export type CallWithChatCompositeOptions = {
900900
callControls?: boolean | CallWithChatControlOptions;
901+
remoteVideoTileMenuOptions?: RemoteVideoTileMenuOptions;
901902
};
902903

903904
// @public

packages/react-composites/review/beta/react-composites.api.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -864,6 +864,8 @@ export type CallWithChatCompositeOptions = {
864864
}) => void;
865865
onNetworkingTroubleShootingClick?: () => void;
866866
onEnvironmentInfoTroubleshootingClick?: () => void;
867+
remoteVideoTileMenuOptions?: RemoteVideoTileMenuOptions;
868+
localVideoTile?: boolean | LocalVideoTileOptions;
867869
galleryOptions?: {
868870
layout?: VideoGalleryLayout;
869871
};

packages/react-composites/review/stable/react-composites.api.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -697,6 +697,7 @@ export type CallWithChatCompositeIcons = {
697697
// @public
698698
export type CallWithChatCompositeOptions = {
699699
callControls?: boolean | CallWithChatControlOptions;
700+
remoteVideoTileMenuOptions?: RemoteVideoTileMenuOptions;
700701
};
701702

702703
// @public

packages/react-composites/src/composites/CallComposite/CallComposite.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ export interface LocalVideoTileOptions {
136136
* @remarks 'grid' - local video tile will be rendered in the grid view of the videoGallery.
137137
* 'floating' - local video tile will be rendered in the floating position and will observe overflow gallery
138138
* local video tile rules and be docked in the bottom corner.
139-
* 'hidden' - local video tile will not be rendered.
140139
* This does not affect the Configuration screen or the side pane Picture in Picture in Picture view.
141140
*/
142141
position?: 'grid' | 'floating';

packages/react-composites/src/composites/CallWithChatComposite/CallWithChatComposite.tsx

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ import { FileSharingOptions } from '../ChatComposite';
2727
import { containerDivStyles } from '../common/ContainerRectProps';
2828
import { useCallWithChatCompositeStrings } from './hooks/useCallWithChatCompositeStrings';
2929
import { CallCompositeInner, CallCompositeOptions } from '../CallComposite/CallComposite';
30+
/* @conditional-compile-remove(pinned-participants) */
31+
import { RemoteVideoTileMenuOptions } from '../CallComposite/CallComposite';
32+
/* @conditional-compile-remove(click-to-call) */
33+
import { LocalVideoTileOptions } from '../CallComposite/CallComposite';
3034
/* @conditional-compile-remove(call-readiness) */
3135
import { DeviceCheckOptions } from '../CallComposite/CallComposite';
3236
import {
@@ -159,6 +163,18 @@ export type CallWithChatCompositeOptions = {
159163
* if this is not supplied, the composite will not show a unsupported browser page.
160164
*/
161165
onEnvironmentInfoTroubleshootingClick?: () => void;
166+
/* @conditional-compile-remove(pinned-participants) */
167+
/**
168+
* Remote participant video tile menu options
169+
*/
170+
remoteVideoTileMenuOptions?: RemoteVideoTileMenuOptions;
171+
/* @conditional-compile-remove(click-to-call) */
172+
/**
173+
* Options for controlling the local video tile.
174+
*
175+
* @remarks if 'false' the local video tile will not be rendered.
176+
*/
177+
localVideoTile?: boolean | LocalVideoTileOptions;
162178
/* @conditional-compile-remove(gallery-layouts) */
163179
/**
164180
* Options for controlling the starting layout of the composite's video gallery
@@ -193,6 +209,10 @@ type CallWithChatScreenProps = {
193209
onNetworkingTroubleShootingClick?: () => void;
194210
/* @conditional-compile-remove(unsupported-browser) */
195211
onEnvironmentInfoTroubleshootingClick?: () => void;
212+
/* @conditional-compile-remove(pinned-participants) */
213+
remoteVideoTileMenuOptions?: RemoteVideoTileMenuOptions;
214+
/* @conditional-compile-remove(click-to-call) */
215+
localVideoTile?: boolean | LocalVideoTileOptions;
196216
/* @conditional-compile-remove(gallery-layouts) */
197217
galleryOptions?: {
198218
layout?: VideoGalleryLayout;
@@ -368,8 +388,12 @@ const CallWithChatScreen = (props: CallWithChatScreenProps): JSX.Element => {
368388
onPermissionsTroubleshootingClick: props.onPermissionsTroubleshootingClick,
369389
/* @conditional-compile-remove(unsupported-browser) */
370390
onEnvironmentInfoTroubleshootingClick: props.onEnvironmentInfoTroubleshootingClick,
391+
/* @conditional-compile-remove(pinned-participants) */
392+
remoteVideoTileMenuOptions: props.remoteVideoTileMenuOptions,
371393
/* @conditional-compile-remove(gallery-layouts) */
372-
galleryOptions: props.galleryOptions
394+
galleryOptions: props.galleryOptions,
395+
/* @conditional-compile-remove(click-to-call) */
396+
localVideoTile: props.localVideoTile
373397
}),
374398
[
375399
props.callControls,
@@ -386,7 +410,11 @@ const CallWithChatScreen = (props: CallWithChatScreenProps): JSX.Element => {
386410
/* @conditional-compile-remove(call-readiness) */
387411
props.onPermissionsTroubleshootingClick,
388412
/* @conditional-compile-remove(gallery-layouts) */
389-
props.galleryOptions
413+
props.galleryOptions,
414+
/* @conditional-compile-remove(click-to-call) */
415+
props.localVideoTile,
416+
/* @conditional-compile-remove(pinned-participants) */
417+
props.remoteVideoTileMenuOptions
390418
]
391419
);
392420

@@ -457,7 +485,6 @@ const CallWithChatScreen = (props: CallWithChatScreenProps): JSX.Element => {
457485
},
458486
[closeChat]
459487
);
460-
461488
return (
462489
<div ref={containerRef} className={mergeStyles(containerDivStyles)}>
463490
<Stack verticalFill grow styles={compositeOuterContainerStyles} id={compositeParentDivId}>
@@ -499,8 +526,14 @@ export const CallWithChatComposite = (props: CallWithChatCompositeProps): JSX.El
499526
callControls={options?.callControls}
500527
joinInvitationURL={joinInvitationURL}
501528
fluentTheme={fluentTheme}
529+
/* @conditional-compile-remove(pinned-participants) */
530+
remoteVideoTileMenuOptions={options?.remoteVideoTileMenuOptions}
502531
/* @conditional-compile-remove(file-sharing) */
503532
fileSharing={options?.fileSharing}
533+
/* @conditional-compile-remove(click-to-call) */
534+
localVideoTile={options?.localVideoTile}
535+
/* @conditional-compile-remove(gallery-layouts) */
536+
galleryOptions={options?.galleryOptions}
504537
/>
505538
</BaseProvider>
506539
);

0 commit comments

Comments
 (0)