Merge branch 'main' into dmceachernmsft/ubuntu-test

Azure · Jan 17, 2025 · f1a64d6 · f1a64d6
2 parents 55c12b1 + 6a438d3
commit f1a64d6
Show file tree

Hide file tree

Showing 11 changed files with 4,991 additions and 4,925 deletions.
diff --git a/change-beta/@azure-communication-react-12eaa2c3-a391-4f29-bc58-056af9550adf.json b/change-beta/@azure-communication-react-12eaa2c3-a391-4f29-bc58-056af9550adf.json
@@ -0,0 +1,9 @@
+{
+  "type": "patch",
+  "area": "fix",
+  "workstream": "Hard mute",
+  "comment": "Fix acs room audio video enabled notifications. when acs user just joined room, should not show the audio video enabled notifications",
+  "packageName": "@azure/communication-react",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change-beta/@azure-communication-react-92d6175e-e981-4378-a9ac-0541a5d0ff1a.json b/change-beta/@azure-communication-react-92d6175e-e981-4378-a9ac-0541a5d0ff1a.json
@@ -0,0 +1,9 @@
+{
+  "type": "patch",
+  "area": "fix",
+  "workstream": "A11y",
+  "comment": "Live announcement update when a message is received/edited from/by other users",
+  "packageName": "@azure/communication-react",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-communication-react-12eaa2c3-a391-4f29-bc58-056af9550adf.json b/change/@azure-communication-react-12eaa2c3-a391-4f29-bc58-056af9550adf.json
@@ -0,0 +1,9 @@
+{
+  "type": "patch",
+  "area": "fix",
+  "workstream": "Hard mute",
+  "comment": "Fix acs room audio video enabled notifications. when acs user just joined room, should not show the audio video enabled notifications",
+  "packageName": "@azure/communication-react",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-communication-react-92d6175e-e981-4378-a9ac-0541a5d0ff1a.json b/change/@azure-communication-react-92d6175e-e981-4378-a9ac-0541a5d0ff1a.json
@@ -0,0 +1,9 @@
+{
+  "type": "patch",
+  "area": "fix",
+  "workstream": "A11y",
+  "comment": "Live announcement update when a message is received/edited from/by other users",
+  "packageName": "@azure/communication-react",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/calling-stateful-client/src/CapabilitiesSubscriber.ts b/packages/calling-stateful-client/src/CapabilitiesSubscriber.ts
@@ -14,6 +14,8 @@ export class CapabilitiesSubscriber {
   private _callIdRef: CallIdRef;
   private _context: CallContext;
   private _capabilitiesFeature: CapabilitiesFeature;
+  /* @conditional-compile-remove(media-access) */
+  private _capabilitiesInitialized: boolean = false;
 
   constructor(callIdRef: CallIdRef, context: CallContext, capabilities: CapabilitiesFeature) {
     this._callIdRef = callIdRef;
@@ -38,12 +40,19 @@ export class CapabilitiesSubscriber {
     }
     /* @conditional-compile-remove(media-access) */
     this.setUnmuteMicAndTurnVideoOnNotification(data);
+
+    /* @conditional-compile-remove(media-access) */
+    this._capabilitiesInitialized = true;
   };
 
   /* @conditional-compile-remove(media-access) */
   private setUnmuteMicAndTurnVideoOnNotification = (data: CapabilitiesChangeInfo): void => {
     if (data.oldValue.turnVideoOn?.isPresent !== data.newValue.turnVideoOn?.isPresent) {
-      if (data.oldValue.turnVideoOn?.isPresent === false && data.newValue.turnVideoOn?.isPresent) {
+      if (
+        data.oldValue.turnVideoOn?.isPresent === false &&
+        data.newValue.turnVideoOn?.isPresent &&
+        this._capabilitiesInitialized
+      ) {
         const capabilityTurnVideoOnAbsent = this._context.getState().latestNotifications.capabilityTurnVideoOnAbsent;
         if (capabilityTurnVideoOnAbsent) {
           this._context.deleteLatestNotification(this._callIdRef.callId, 'capabilityTurnVideoOnAbsent');
@@ -72,7 +81,11 @@ export class CapabilitiesSubscriber {
       }
     }
     if (data.oldValue.unmuteMic?.isPresent !== data.newValue.unmuteMic?.isPresent) {
-      if (data.oldValue.unmuteMic?.isPresent === false && data.newValue.unmuteMic?.isPresent) {
+      if (
+        data.oldValue.unmuteMic?.isPresent === false &&
+        data.newValue.unmuteMic?.isPresent &&
+        this._capabilitiesInitialized
+      ) {
         const capabilityUnmuteMicAbsent = this._context.getState().latestNotifications.capabilityUnmuteMicAbsent;
         if (capabilityUnmuteMicAbsent) {
           this._context.deleteLatestNotification(this._callIdRef.callId, 'capabilityUnmuteMicAbsent');

diff --git a/packages/communication-react/review/beta/communication-react.api.md b/packages/communication-react/review/beta/communication-react.api.md
@@ -3979,6 +3979,8 @@ export interface MessageThreadStrings {
     editBoxPlaceholderText: string;
     editBoxSubmitButton: string;
     editBoxTextLimit: string;
+    editedMessageLiveAuthorIntro: string;
+    editedMessageLocalUserLiveAuthorIntro: string;
     editedTag: string;
     editMessage: string;
     failToSendTag?: string;