Cherry-pick #5328 to 1.20.0 (#5332)

* Make environmentInfo stable - fixes safari speaker issue in stable (#5328)

* update changelog

* update changelog

Author: JamesBurnside

change-beta/@azure-communication-react-601fa9cc-a5ef-444f-ba11-fcfbce7c9a70.json

@@ -0,0 +1,9 @@
+{
+  "type": "patch",
+  "area": "fix",
+  "workstream": "",
+  "comment": "Expose environmentInfo in callClient state and callAdapter state",
+  "packageName": "@azure/communication-react",
+  "email": "2684369+JamesBurnside@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}

change-beta/@azure-communication-react-deda54f5-fac2-4f69-82ac-ac90b00c63f7.json

@@ -0,0 +1,9 @@
+{
+  "type": "patch",
+  "area": "improvement",
+  "workstream": "",
+  "comment": "On safari, do not show speaker dropdown",
+  "packageName": "@azure/communication-react",
+  "email": "2684369+JamesBurnside@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}

change/@azure-communication-react-601fa9cc-a5ef-444f-ba11-fcfbce7c9a70.json

@@ -0,0 +1,9 @@
+{
+  "type": "patch",
+  "area": "fix",
+  "workstream": "",
+  "comment": "Expose environmentInfo in callClient state and callAdapter state",
+  "packageName": "@azure/communication-react",
+  "email": "2684369+JamesBurnside@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}

change/@azure-communication-react-deda54f5-fac2-4f69-82ac-ac90b00c63f7.json

@@ -0,0 +1,9 @@
+{
+  "type": "patch",
+  "area": "improvement",
+  "workstream": "",
+  "comment": "On safari, do not show speaker dropdown",
+  "packageName": "@azure/communication-react",
+  "email": "2684369+JamesBurnside@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}

packages/calling-component-bindings/src/baseSelectors.ts

@@ -1,11 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { CallState, DominantSpeakersInfo } from '@azure/communication-calling';
+import { CallState, DominantSpeakersInfo, EnvironmentInfo } from '@azure/communication-calling';
 /* @conditional-compile-remove(breakout-rooms) */
 import { BreakoutRoom } from '@azure/communication-calling';
 import { ParticipantCapabilities } from '@azure/communication-calling';
-/* @conditional-compile-remove(unsupported-browser) */
-import { EnvironmentInfo } from '@azure/communication-calling';
 import { ParticipantRole } from '@azure/communication-calling';
 import { toFlatCommunicationIdentifier } from '@internal/acs-ui-common';
 import {
@@ -195,12 +193,8 @@ export const getCallState = (state: CallClientState, props: CallingBaseSelectorP
 /**
  * @private
  */
-export const getEnvironmentInfo = (
-  state: CallClientState
-): undefined | /* @conditional-compile-remove(unsupported-browser) */ EnvironmentInfo => {
-  /* @conditional-compile-remove(unsupported-browser) */
+export const getEnvironmentInfo = (state: CallClientState): undefined | EnvironmentInfo => {
   return state.environmentInfo;
-  return undefined;
 };
 
 /** @private */

packages/calling-component-bindings/src/index.ts

@@ -58,9 +58,13 @@ export type { GetSelector as GetCallingSelector, EmptySelector } from './hooks/u
 export { useSelector as useCallingSelector } from './hooks/useSelector';
 export { useHandlers as useCallingHandlers } from './hooks/useHandlers';
 
-export { _isInCall, _isPreviewOn, _isInLobbyOrConnecting, _updateUserDisplayNames } from './utils/callUtils';
-/* @conditional-compile-remove(unsupported-browser) */
-export { _getEnvironmentInfo } from './utils/callUtils';
+export {
+  _isInCall,
+  _isPreviewOn,
+  _isInLobbyOrConnecting,
+  _updateUserDisplayNames,
+  _getEnvironmentInfo
+} from './utils/callUtils';
 
 export { _videoGalleryRemoteParticipantsMemo, _dominantSpeakersWithFlatId } from './utils/videoGalleryUtils';
 export type { _VideoGalleryRemoteParticipantsMemoFn } from './utils/videoGalleryUtils';

packages/calling-component-bindings/src/utils/callUtils.ts

@@ -2,9 +2,13 @@
 // Licensed under the MIT License.
 
 import { DeviceManagerState, RemoteParticipantState, StatefulCallClient } from '@internal/calling-stateful-client';
-import { CallState as CallStatus, LocalVideoStream, ParticipantRole } from '@azure/communication-calling';
-/* @conditional-compile-remove(unsupported-browser) */
-import { Features, EnvironmentInfo } from '@azure/communication-calling';
+import {
+  CallState as CallStatus,
+  EnvironmentInfo,
+  Features,
+  LocalVideoStream,
+  ParticipantRole
+} from '@azure/communication-calling';
 import {
   CommunicationIdentifier,
   CommunicationUserIdentifier,
@@ -104,7 +108,6 @@ const memoizedUpdateDisplayName = memoizeFnAll((participantId: string, participa
   }
 });
 
-/* @conditional-compile-remove(unsupported-browser) */
 /**
  * Check whether the call is in a supported browser
  *

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

@@ -39,7 +39,6 @@ import { CaptionsKind } from '@azure/communication-calling';
 import { VideoEffectName } from '@azure/communication-calling';
 /* @conditional-compile-remove(teams-identity-support) */
 import { CallKind } from '@azure/communication-calling';
-/* @conditional-compile-remove(unsupported-browser) */
 import { EnvironmentInfo } from '@azure/communication-calling';
 import { CommunicationIdentifierKind } from '@azure/communication-common';
 import { ReactionMessage } from '@azure/communication-calling';
@@ -962,7 +961,6 @@ export interface CallClientState {
    * be used as the caller id in the PSTN call.
    */
   alternateCallerId?: string;
-  /* @conditional-compile-remove(unsupported-browser) */
   /**
    * state to track the environment that the stateful client was made in is supported
    */
@@ -1052,7 +1050,7 @@ export type CallErrorTarget =
   | 'CallClient.createTeamsCallAgent'
   | 'CallClient.feature'
   | 'CallClient.getDeviceManager'
-  | /* @conditional-compile-remove(calling-beta-sdk) */ 'CallClient.getEnvironmentInfo'
+  | 'CallClient.getEnvironmentInfo'
   | 'DeviceManager.askDevicePermission'
   | 'DeviceManager.getCameras'
   | 'DeviceManager.getMicrophones'

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

@@ -21,7 +21,6 @@ import { CapabilitiesChangeInfo, ParticipantCapabilities } from '@azure/communic
 import { TeamsCaptionsInfo } from '@azure/communication-calling';
 
 import { CaptionsKind, CaptionsInfo as AcsCaptionsInfo } from '@azure/communication-calling';
-/* @conditional-compile-remove(unsupported-browser) */
 import { EnvironmentInfo } from '@azure/communication-calling';
 /* @conditional-compile-remove(together-mode) */
 import { TogetherModeVideoStream } from '@azure/communication-calling';
@@ -110,7 +109,7 @@ export class CallContext {
       },
       callAgent: undefined,
       userId: userId,
-      /* @conditional-compile-remove(unsupported-browser) */ environmentInfo: undefined,
+      environmentInfo: undefined,
       latestErrors: {} as CallErrors,
       /* @conditional-compile-remove(breakout-rooms) */ latestNotifications: {} as CallNotifications
     };
@@ -257,7 +256,6 @@ export class CallContext {
     });
   }
 
-  /* @conditional-compile-remove(unsupported-browser) */
   public setEnvironmentInfo(envInfo: EnvironmentInfo): void {
     this.modifyState((draft: CallClientState) => {
       draft.environmentInfo = envInfo;

packages/calling-stateful-client/src/StatefulCallClient.test.ts

@@ -576,7 +576,7 @@ describe('errors should be reported correctly from StatefulCallClient when', ()
     await expect(client.createCallAgent(stubCommunicationTokenCredential())).rejects.toThrow(
       new CallError('CallClient.createCallAgent', new Error('injected error'))
     );
-    expect(listener.onChangeCalledCount).toBe(1);
+    expect(listener.onChangeCalledCount).toBe(2);
     expect(client.getState().latestErrors['CallClient.createCallAgent']).toBeDefined();
   });
 
@@ -592,7 +592,7 @@ describe('errors should be reported correctly from StatefulCallClient when', ()
     await expect(client.getDeviceManager()).rejects.toThrow(
       new CallError('CallClient.getDeviceManager', new Error('injected error'))
     );
-    expect(listener.onChangeCalledCount).toBe(1);
+    expect(listener.onChangeCalledCount).toBe(2);
     expect(client.getState().latestErrors['CallClient.getDeviceManager']).toBeDefined();
   });
 });