Skip to content

Commit 01a0fc9

Browse files
authored
Merge branch 'main' into cnwankwo/TogetherModeStream_Impl
2 parents 4e72d3c + 7cdaf40 commit 01a0fc9

10 files changed

+4992
-4925
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"type": "patch",
3+
"area": "fix",
4+
"workstream": "Hard mute",
5+
"comment": "Fix acs room audio video enabled notifications. when acs user just joined room, should not show the audio video enabled notifications",
6+
"packageName": "@azure/communication-react",
7+
"email": "[email protected]",
8+
"dependentChangeType": "patch"
9+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"type": "patch",
3+
"area": "fix",
4+
"workstream": "A11y",
5+
"comment": "Live announcement update when a message is received/edited from/by other users",
6+
"packageName": "@azure/communication-react",
7+
"email": "[email protected]",
8+
"dependentChangeType": "patch"
9+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"type": "patch",
3+
"area": "fix",
4+
"workstream": "Hard mute",
5+
"comment": "Fix acs room audio video enabled notifications. when acs user just joined room, should not show the audio video enabled notifications",
6+
"packageName": "@azure/communication-react",
7+
"email": "[email protected]",
8+
"dependentChangeType": "patch"
9+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"type": "patch",
3+
"area": "fix",
4+
"workstream": "A11y",
5+
"comment": "Live announcement update when a message is received/edited from/by other users",
6+
"packageName": "@azure/communication-react",
7+
"email": "[email protected]",
8+
"dependentChangeType": "patch"
9+
}

packages/calling-stateful-client/src/CapabilitiesSubscriber.ts

+15-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ export class CapabilitiesSubscriber {
1414
private _callIdRef: CallIdRef;
1515
private _context: CallContext;
1616
private _capabilitiesFeature: CapabilitiesFeature;
17+
/* @conditional-compile-remove(media-access) */
18+
private _capabilitiesInitialized: boolean = false;
1719

1820
constructor(callIdRef: CallIdRef, context: CallContext, capabilities: CapabilitiesFeature) {
1921
this._callIdRef = callIdRef;
@@ -38,12 +40,19 @@ export class CapabilitiesSubscriber {
3840
}
3941
/* @conditional-compile-remove(media-access) */
4042
this.setUnmuteMicAndTurnVideoOnNotification(data);
43+
44+
/* @conditional-compile-remove(media-access) */
45+
this._capabilitiesInitialized = true;
4146
};
4247

4348
/* @conditional-compile-remove(media-access) */
4449
private setUnmuteMicAndTurnVideoOnNotification = (data: CapabilitiesChangeInfo): void => {
4550
if (data.oldValue.turnVideoOn?.isPresent !== data.newValue.turnVideoOn?.isPresent) {
46-
if (data.oldValue.turnVideoOn?.isPresent === false && data.newValue.turnVideoOn?.isPresent) {
51+
if (
52+
data.oldValue.turnVideoOn?.isPresent === false &&
53+
data.newValue.turnVideoOn?.isPresent &&
54+
this._capabilitiesInitialized
55+
) {
4756
const capabilityTurnVideoOnAbsent = this._context.getState().latestNotifications.capabilityTurnVideoOnAbsent;
4857
if (capabilityTurnVideoOnAbsent) {
4958
this._context.deleteLatestNotification(this._callIdRef.callId, 'capabilityTurnVideoOnAbsent');
@@ -72,7 +81,11 @@ export class CapabilitiesSubscriber {
7281
}
7382
}
7483
if (data.oldValue.unmuteMic?.isPresent !== data.newValue.unmuteMic?.isPresent) {
75-
if (data.oldValue.unmuteMic?.isPresent === false && data.newValue.unmuteMic?.isPresent) {
84+
if (
85+
data.oldValue.unmuteMic?.isPresent === false &&
86+
data.newValue.unmuteMic?.isPresent &&
87+
this._capabilitiesInitialized
88+
) {
7689
const capabilityUnmuteMicAbsent = this._context.getState().latestNotifications.capabilityUnmuteMicAbsent;
7790
if (capabilityUnmuteMicAbsent) {
7891
this._context.deleteLatestNotification(this._callIdRef.callId, 'capabilityUnmuteMicAbsent');

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

+2
Original file line numberDiff line numberDiff line change
@@ -3979,6 +3979,8 @@ export interface MessageThreadStrings {
39793979
editBoxPlaceholderText: string;
39803980
editBoxSubmitButton: string;
39813981
editBoxTextLimit: string;
3982+
editedMessageLiveAuthorIntro: string;
3983+
editedMessageLocalUserLiveAuthorIntro: string;
39823984
editedTag: string;
39833985
editMessage: string;
39843986
failToSendTag?: string;

0 commit comments

Comments
 (0)