diff --git a/change-beta/@azure-communication-react-a67a4239-b169-42a1-a80e-e4283bad5628.json b/change-beta/@azure-communication-react-a67a4239-b169-42a1-a80e-e4283bad5628.json new file mode 100644 index 00000000000..e7b808742db --- /dev/null +++ b/change-beta/@azure-communication-react-a67a4239-b169-42a1-a80e-e4283bad5628.json @@ -0,0 +1,9 @@ +{ + "type": "minor", + "area": "fix", + "workstream": "Captions and Raised hands", + "comment": "Fix string typo for captions dropdown info. Fix usePropsFor return type for RaiseHandButton.", + "packageName": "@azure/communication-react", + "email": "79475487+mgamis-msft@users.noreply.github.com", + "dependentChangeType": "patch" +} diff --git a/change/@azure-communication-react-a67a4239-b169-42a1-a80e-e4283bad5628.json b/change/@azure-communication-react-a67a4239-b169-42a1-a80e-e4283bad5628.json new file mode 100644 index 00000000000..e7b808742db --- /dev/null +++ b/change/@azure-communication-react-a67a4239-b169-42a1-a80e-e4283bad5628.json @@ -0,0 +1,9 @@ +{ + "type": "minor", + "area": "fix", + "workstream": "Captions and Raised hands", + "comment": "Fix string typo for captions dropdown info. Fix usePropsFor return type for RaiseHandButton.", + "packageName": "@azure/communication-react", + "email": "79475487+mgamis-msft@users.noreply.github.com", + "dependentChangeType": "patch" +} diff --git a/packages/calling-component-bindings/src/hooks/usePropsFor.ts b/packages/calling-component-bindings/src/hooks/usePropsFor.ts index 56da6051058..8b88ae0e95a 100644 --- a/packages/calling-component-bindings/src/hooks/usePropsFor.ts +++ b/packages/calling-component-bindings/src/hooks/usePropsFor.ts @@ -18,7 +18,7 @@ import { Dialpad } from '@internal/react-components'; import { HoldButton } from '@internal/react-components'; import { RaiseHandButton } from '@internal/react-components'; -import { raiseHandButtonSelector } from '../callControlSelectors'; +import { RaiseHandButtonSelector, raiseHandButtonSelector } from '../callControlSelectors'; import { CameraButtonSelector, cameraButtonSelector, @@ -123,8 +123,10 @@ export type GetSelector JSX.Element | undefine : AreEqual extends true ? IncomingCallStackSelector : AreEqual extends true - ? EmptySelector - : undefined; + ? RaiseHandButtonSelector + : AreEqual extends true + ? EmptySelector + : undefined; /** * Get the selector for a specified component. diff --git a/packages/communication-react/review/beta/communication-react.api.md b/packages/communication-react/review/beta/communication-react.api.md index d08747ff42f..8f334905a47 100644 --- a/packages/communication-react/review/beta/communication-react.api.md +++ b/packages/communication-react/review/beta/communication-react.api.md @@ -3287,7 +3287,7 @@ export interface FluentThemeProviderProps { export const fromFlatCommunicationIdentifier: (id: string) => CommunicationIdentifier; // @public -export type GetCallingSelector JSX.Element | undefined> = AreEqual extends true ? VideoGallerySelector : AreEqual extends true ? DevicesButtonSelector : AreEqual extends true ? MicrophoneButtonSelector : AreEqual extends true ? CameraButtonSelector : AreEqual extends true ? ScreenShareButtonSelector : AreEqual extends true ? ParticipantListSelector : AreEqual extends true ? ParticipantsButtonSelector : AreEqual extends true ? EmptySelector : AreEqual extends true ? CallErrorBarSelector : AreEqual extends true ? EmptySelector : AreEqual extends true ? HoldButtonSelector : AreEqual extends true ? NotificationStackSelector : AreEqual extends true ? IncomingCallStackSelector : AreEqual extends true ? EmptySelector : undefined; +export type GetCallingSelector JSX.Element | undefined> = AreEqual extends true ? VideoGallerySelector : AreEqual extends true ? DevicesButtonSelector : AreEqual extends true ? MicrophoneButtonSelector : AreEqual extends true ? CameraButtonSelector : AreEqual extends true ? ScreenShareButtonSelector : AreEqual extends true ? ParticipantListSelector : AreEqual extends true ? ParticipantsButtonSelector : AreEqual extends true ? EmptySelector : AreEqual extends true ? CallErrorBarSelector : AreEqual extends true ? EmptySelector : AreEqual extends true ? HoldButtonSelector : AreEqual extends true ? NotificationStackSelector : AreEqual extends true ? IncomingCallStackSelector : AreEqual extends true ? RaiseHandButtonSelector : AreEqual extends true ? EmptySelector : undefined; // @public export const getCallingSelector: JSX.Element | undefined>(component: Component) => GetCallingSelector; diff --git a/packages/communication-react/review/stable/communication-react.api.md b/packages/communication-react/review/stable/communication-react.api.md index 20a2b72bcf9..0103a11aeaa 100644 --- a/packages/communication-react/review/stable/communication-react.api.md +++ b/packages/communication-react/review/stable/communication-react.api.md @@ -2846,7 +2846,7 @@ export interface FluentThemeProviderProps { export const fromFlatCommunicationIdentifier: (id: string) => CommunicationIdentifier; // @public -export type GetCallingSelector JSX.Element | undefined> = AreEqual extends true ? VideoGallerySelector : AreEqual extends true ? DevicesButtonSelector : AreEqual extends true ? MicrophoneButtonSelector : AreEqual extends true ? CameraButtonSelector : AreEqual extends true ? ScreenShareButtonSelector : AreEqual extends true ? ParticipantListSelector : AreEqual extends true ? ParticipantsButtonSelector : AreEqual extends true ? EmptySelector : AreEqual extends true ? CallErrorBarSelector : AreEqual extends true ? EmptySelector : AreEqual extends true ? HoldButtonSelector : AreEqual extends true ? NotificationStackSelector : AreEqual extends true ? IncomingCallStackSelector : AreEqual extends true ? EmptySelector : undefined; +export type GetCallingSelector JSX.Element | undefined> = AreEqual extends true ? VideoGallerySelector : AreEqual extends true ? DevicesButtonSelector : AreEqual extends true ? MicrophoneButtonSelector : AreEqual extends true ? CameraButtonSelector : AreEqual extends true ? ScreenShareButtonSelector : AreEqual extends true ? ParticipantListSelector : AreEqual extends true ? ParticipantsButtonSelector : AreEqual extends true ? EmptySelector : AreEqual extends true ? CallErrorBarSelector : AreEqual extends true ? EmptySelector : AreEqual extends true ? HoldButtonSelector : AreEqual extends true ? NotificationStackSelector : AreEqual extends true ? IncomingCallStackSelector : AreEqual extends true ? RaiseHandButtonSelector : AreEqual extends true ? EmptySelector : undefined; // @public export const getCallingSelector: JSX.Element | undefined>(component: Component) => GetCallingSelector; diff --git a/packages/react-composites/src/composites/CallComposite/components/CallControls.tsx b/packages/react-composites/src/composites/CallComposite/components/CallControls.tsx index e813726a3d2..30b156aa31c 100644 --- a/packages/react-composites/src/composites/CallComposite/components/CallControls.tsx +++ b/packages/react-composites/src/composites/CallComposite/components/CallControls.tsx @@ -24,7 +24,7 @@ import { useAdapter } from '../adapter/CallAdapterProvider'; import { isDisabled } from '../utils'; import { callControlsContainerStyles } from '../styles/CallPage.styles'; import { RaiseHand } from './buttons/RaiseHand'; -import { RaiseHandButton, RaiseHandButtonProps } from '@internal/react-components'; +import { RaiseHandButton } from '@internal/react-components'; import { _generateDefaultDeviceMenuProps } from '@internal/react-components'; import { CUSTOM_BUTTON_OPTIONS, @@ -150,7 +150,7 @@ export const CallControls = (props: CallControlsProps & ContainerRectProps): JSX const holdButtonProps = usePropsFor(HoldButton); - const raiseHandButtonProps = usePropsFor(RaiseHandButton) as RaiseHandButtonProps; + const raiseHandButtonProps = usePropsFor(RaiseHandButton); const capabilitiesSelector = useSelector(capabilitySelector); const callState = useSelector(callStatusSelector); diff --git a/packages/react-composites/src/composites/CallComposite/components/buttons/RaiseHand.tsx b/packages/react-composites/src/composites/CallComposite/components/buttons/RaiseHand.tsx index d6abe7e184f..4d19ef6efbd 100644 --- a/packages/react-composites/src/composites/CallComposite/components/buttons/RaiseHand.tsx +++ b/packages/react-composites/src/composites/CallComposite/components/buttons/RaiseHand.tsx @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -import { ControlBarButtonStyles, RaiseHandButton, RaiseHandButtonProps } from '@internal/react-components'; +import { ControlBarButtonStyles, RaiseHandButton } from '@internal/react-components'; import React, { useMemo } from 'react'; import { CallControlDisplayType } from '../../../common/types/CommonCallControlOptions'; import { usePropsFor } from '../../hooks/usePropsFor'; @@ -18,7 +18,7 @@ export const RaiseHand = (props: { styles?: ControlBarButtonStyles; disabled?: boolean; }): JSX.Element => { - const raiseHandButtonProps = usePropsFor(RaiseHandButton) as RaiseHandButtonProps; + const raiseHandButtonProps = usePropsFor(RaiseHandButton); const callStatus = useSelector(getCallStatus); const styles = useMemo(() => concatButtonBaseStyles(props.styles ?? {}), [props.styles]); diff --git a/packages/react-composites/src/composites/localization/locales/en-US/strings.json b/packages/react-composites/src/composites/localization/locales/en-US/strings.json index 27343e4af99..d719bb1fc38 100644 --- a/packages/react-composites/src/composites/localization/locales/en-US/strings.json +++ b/packages/react-composites/src/composites/localization/locales/en-US/strings.json @@ -118,7 +118,7 @@ "captionsSettingsSpokenLanguageDropdownLabel": "Spoken language", "captionsSettingsCaptionLanguageDropdownLabel": "Captions language", "captionsSettingsSpokenLanguageDropdownInfoText": "Language that everyone on this call is speaking.", - "captionsSettingsCaptionLanguageDropdownInfoText": "Captions will appear in this langugage.", + "captionsSettingsCaptionLanguageDropdownInfoText": "Captions will appear in this language.", "captionsSettingsConfirmButtonLabel": "Confirm", "captionsSettingsCancelButtonLabel": "Cancel", "captionsSettingsModalAriaLabel": "Captions Setting Modal", diff --git a/packages/react-composites/tests/browser/snapshots/beta/tests/browser/call/hermetic/TeamsClosedCaptions.test.ts-snapshots/teams-caption-settings-Desktop-Chrome-linux.png b/packages/react-composites/tests/browser/snapshots/beta/tests/browser/call/hermetic/TeamsClosedCaptions.test.ts-snapshots/teams-caption-settings-Desktop-Chrome-linux.png index 1307a8adfcc..9561783b502 100644 Binary files a/packages/react-composites/tests/browser/snapshots/beta/tests/browser/call/hermetic/TeamsClosedCaptions.test.ts-snapshots/teams-caption-settings-Desktop-Chrome-linux.png and b/packages/react-composites/tests/browser/snapshots/beta/tests/browser/call/hermetic/TeamsClosedCaptions.test.ts-snapshots/teams-caption-settings-Desktop-Chrome-linux.png differ diff --git a/packages/react-composites/tests/browser/snapshots/beta/tests/browser/call/hermetic/TeamsClosedCaptions.test.ts-snapshots/trigger-teams-captions-settings-from-banner-Desktop-Chrome-linux.png b/packages/react-composites/tests/browser/snapshots/beta/tests/browser/call/hermetic/TeamsClosedCaptions.test.ts-snapshots/trigger-teams-captions-settings-from-banner-Desktop-Chrome-linux.png index 1307a8adfcc..9561783b502 100644 Binary files a/packages/react-composites/tests/browser/snapshots/beta/tests/browser/call/hermetic/TeamsClosedCaptions.test.ts-snapshots/trigger-teams-captions-settings-from-banner-Desktop-Chrome-linux.png and b/packages/react-composites/tests/browser/snapshots/beta/tests/browser/call/hermetic/TeamsClosedCaptions.test.ts-snapshots/trigger-teams-captions-settings-from-banner-Desktop-Chrome-linux.png differ diff --git a/packages/react-composites/tests/browser/snapshots/beta/tests/browser/callwithchat/hermetic/TeamsClosedCaptions.test.ts-snapshots/trigger-teams-captions-settings-from-banner-Desktop-Chrome-linux.png b/packages/react-composites/tests/browser/snapshots/beta/tests/browser/callwithchat/hermetic/TeamsClosedCaptions.test.ts-snapshots/trigger-teams-captions-settings-from-banner-Desktop-Chrome-linux.png index f5baf9ca734..8d09b1ea5ca 100644 Binary files a/packages/react-composites/tests/browser/snapshots/beta/tests/browser/callwithchat/hermetic/TeamsClosedCaptions.test.ts-snapshots/trigger-teams-captions-settings-from-banner-Desktop-Chrome-linux.png and b/packages/react-composites/tests/browser/snapshots/beta/tests/browser/callwithchat/hermetic/TeamsClosedCaptions.test.ts-snapshots/trigger-teams-captions-settings-from-banner-Desktop-Chrome-linux.png differ diff --git a/packages/react-composites/tests/browser/snapshots/stable/tests/browser/call/hermetic/TeamsClosedCaptions.test.ts-snapshots/teams-caption-settings-Desktop-Chrome-linux.png b/packages/react-composites/tests/browser/snapshots/stable/tests/browser/call/hermetic/TeamsClosedCaptions.test.ts-snapshots/teams-caption-settings-Desktop-Chrome-linux.png index 1307a8adfcc..9561783b502 100644 Binary files a/packages/react-composites/tests/browser/snapshots/stable/tests/browser/call/hermetic/TeamsClosedCaptions.test.ts-snapshots/teams-caption-settings-Desktop-Chrome-linux.png and b/packages/react-composites/tests/browser/snapshots/stable/tests/browser/call/hermetic/TeamsClosedCaptions.test.ts-snapshots/teams-caption-settings-Desktop-Chrome-linux.png differ diff --git a/packages/react-composites/tests/browser/snapshots/stable/tests/browser/call/hermetic/TeamsClosedCaptions.test.ts-snapshots/trigger-teams-captions-settings-from-banner-Desktop-Chrome-linux.png b/packages/react-composites/tests/browser/snapshots/stable/tests/browser/call/hermetic/TeamsClosedCaptions.test.ts-snapshots/trigger-teams-captions-settings-from-banner-Desktop-Chrome-linux.png index 1307a8adfcc..9561783b502 100644 Binary files a/packages/react-composites/tests/browser/snapshots/stable/tests/browser/call/hermetic/TeamsClosedCaptions.test.ts-snapshots/trigger-teams-captions-settings-from-banner-Desktop-Chrome-linux.png and b/packages/react-composites/tests/browser/snapshots/stable/tests/browser/call/hermetic/TeamsClosedCaptions.test.ts-snapshots/trigger-teams-captions-settings-from-banner-Desktop-Chrome-linux.png differ diff --git a/packages/react-composites/tests/browser/snapshots/stable/tests/browser/callwithchat/hermetic/TeamsClosedCaptions.test.ts-snapshots/trigger-teams-captions-settings-from-banner-Desktop-Chrome-linux.png b/packages/react-composites/tests/browser/snapshots/stable/tests/browser/callwithchat/hermetic/TeamsClosedCaptions.test.ts-snapshots/trigger-teams-captions-settings-from-banner-Desktop-Chrome-linux.png index f5baf9ca734..8d09b1ea5ca 100644 Binary files a/packages/react-composites/tests/browser/snapshots/stable/tests/browser/callwithchat/hermetic/TeamsClosedCaptions.test.ts-snapshots/trigger-teams-captions-settings-from-banner-Desktop-Chrome-linux.png and b/packages/react-composites/tests/browser/snapshots/stable/tests/browser/callwithchat/hermetic/TeamsClosedCaptions.test.ts-snapshots/trigger-teams-captions-settings-from-banner-Desktop-Chrome-linux.png differ