Skip to content
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

Together mode cherry picks to release/1.26.0-beta.1 #5747

Merged
merged 2 commits into from
Mar 27, 2025
Merged

Together mode cherry picks to release/1.26.0-beta.1 #5747

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
df9e681
Fix issues where together mode stream keeps loading unitl views are c…
cn0151 Mar 26, 2025
43874d8
Revert back to beta in main (#5742)
cn0151 Mar 27, 2025
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
8 changes: 8 additions & 0 deletions change-beta/@azure-communication-react-f284b77c-7245-43ab-a075-70286742e975.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "prerelease",
"area": "feature",
"workstream": "together-mode",
"comment": "Revert back to beta in main",
"packageName": "@azure/communication-react",
"dependentChangeType": "patch"
}
7 changes: 4 additions & 3 deletions common/config/babel/features.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,16 @@ module.exports = {
// feature for tracking the callParticipantsLocator
"call-participants-locator",
// Feature for RTT
"rtt"
"rtt",
// Feature for together mode
"together-mode"
],
stable: [
// Demo feature. Used in live-documentation of conditional compilation.
// Do not use in production code.
"stabilizedDemo",
// Feature for breakout rooms
"breakout-rooms",
// Feature for together mode
"together-mode"

]
}
5 changes: 5 additions & 0 deletions packages/calling-component-bindings/src/utils/videoGalleryUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,3 +262,8 @@ export const memoizeTogetherModeStreams = memoizeOne((togetherModeStreams) => ({
streamSize: togetherModeStreams?.mainVideoStream?.streamSize
}
}));

/** @private */
export const memoizeTogetherModeSeatingPositions = memoizeOne(
(togetherModeSeatingCoordinates) => togetherModeSeatingCoordinates
);
5 changes: 3 additions & 2 deletions packages/calling-component-bindings/src/videoGallerySelector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ import {
_dominantSpeakersWithFlatId,
convertRemoteParticipantToVideoGalleryRemoteParticipant,
memoizeLocalParticipant,
/* @conditional-compile-remove(together-mode) */ memoizeTogetherModeStreams
/* @conditional-compile-remove(together-mode) */ memoizeTogetherModeStreams,
/* @conditional-compile-remove(together-mode) */ memoizeTogetherModeSeatingPositions
} from './utils/videoGalleryUtils';
import { memoizeSpotlightedParticipantIds } from './utils/videoGalleryUtils';
import { getLocalParticipantRaisedHand } from './baseSelectors';
Expand Down Expand Up @@ -165,7 +166,7 @@ export const videoGallerySelector: VideoGallerySelector = createSelector(
/* @conditional-compile-remove(together-mode) */
togetherModeStreams: memoizeTogetherModeStreams(togetherModeCallFeature?.streams),
/* @conditional-compile-remove(together-mode) */
togetherModeSeatingCoordinates: togetherModeCallFeature?.seatingPositions,
togetherModeSeatingCoordinates: memoizeTogetherModeSeatingPositions(togetherModeCallFeature?.seatingPositions),
/* @conditional-compile-remove(together-mode) */
isTogetherModeActive: togetherModeCallFeature?.isActive,
/* @conditional-compile-remove(together-mode) */
Expand Down
8 changes: 8 additions & 0 deletions packages/communication-react/review/beta/communication-react.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,12 +438,14 @@ export interface CallAdapterCallOperations {
addParticipant(participant: CommunicationUserIdentifier): Promise<void>;
allowUnsupportedBrowserVersion(): void;
createStreamView(remoteUserId?: string, options?: VideoStreamOptions): Promise<void | CreateVideoStreamViewResult>;
// @beta
createTogetherModeStreamView(options?: TogetherModeStreamOptions): Promise<void | TogetherModeStreamViewResult>;
disposeLocalVideoStreamView(): Promise<void>;
disposeRemoteVideoStreamView(remoteUserId: string): Promise<void>;
disposeScreenShareStreamView(remoteUserId: string): Promise<void>;
// @deprecated
disposeStreamView(remoteUserId?: string, options?: VideoStreamOptions): Promise<void>;
// @beta
disposeTogetherModeStreamView(): Promise<void>;
forbidAudio(userIds: string[]): Promise<void>;
forbidOthersAudio(): Promise<void>;
Expand All @@ -469,12 +471,14 @@ export interface CallAdapterCallOperations {
sendRealTimeText: (text: string, isFinalized: boolean) => Promise<void>;
setCaptionLanguage(language: string): Promise<void>;
setSpokenLanguage(language: string): Promise<void>;
// @beta
setTogetherModeSceneSize(width: number, height: number): void;
startCamera(options?: VideoStreamOptions): Promise<void>;
startCaptions(options?: StartCaptionsAdapterOptions): Promise<void>;
startNoiseSuppressionEffect(): Promise<void>;
startScreenShare(): Promise<void>;
startSpotlight(userIds?: string[]): Promise<void>;
// @beta
startTogetherMode(): Promise<void>;
startVideoBackgroundEffect(videoBackgroundEffect: VideoBackgroundEffect): Promise<void>;
stopAllSpotlight(): Promise<void>;
Expand Down Expand Up @@ -1270,6 +1274,7 @@ export interface CallWithChatAdapterManagement {
allowUnsupportedBrowserVersion(): void;
askDevicePermission(constrain: PermissionConstraints): Promise<DeviceAccess>;
createStreamView(remoteUserId?: string, options?: VideoStreamOptions): Promise<void | CreateVideoStreamViewResult>;
// @beta
createTogetherModeStreamView(options?: TogetherModeStreamOptions): Promise<void | TogetherModeStreamViewResult>;
// @beta
deleteImage(imageId: string): Promise<void>;
Expand All @@ -1278,6 +1283,7 @@ export interface CallWithChatAdapterManagement {
disposeRemoteVideoStreamView(remoteUserId: string): Promise<void>;
disposeScreenShareStreamView(remoteUserId: string): Promise<void>;
disposeStreamView(remoteUserId?: string, options?: VideoStreamOptions): Promise<void>;
// @beta
disposeTogetherModeStreamView(): Promise<void>;
// (undocumented)
downloadResourceToCache(resourceDetails: ResourceDetails): Promise<void>;
Expand Down Expand Up @@ -1321,6 +1327,7 @@ export interface CallWithChatAdapterManagement {
setMicrophone(sourceInfo: AudioDeviceInfo): Promise<void>;
setSpeaker(sourceInfo: AudioDeviceInfo): Promise<void>;
setSpokenLanguage(language: string): Promise<void>;
// @beta
setTogetherModeSceneSize(width: number, height: number): void;
startCall(participants: string[], options?: StartCallOptions): Call | undefined;
startCall(participants: (MicrosoftTeamsAppIdentifier | PhoneNumberIdentifier | CommunicationUserIdentifier | MicrosoftTeamsUserIdentifier | UnknownIdentifier)[], options?: StartCallOptions): Call | undefined;
Expand All @@ -1329,6 +1336,7 @@ export interface CallWithChatAdapterManagement {
startNoiseSuppressionEffect(): Promise<void>;
startScreenShare(): Promise<void>;
startSpotlight(userIds?: string[]): Promise<void>;
// @beta
startTogetherMode(): Promise<void>;
startVideoBackgroundEffect(videoBackgroundEffect: VideoBackgroundEffect): Promise<void>;
stopAllSpotlight(): Promise<void>;
Expand Down
Loading
Loading