Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
48feab7
Stateful client code check in
communication-ui-bot Feb 24, 2023
56e2f51
Merge main into captions feature (#2829)
carocao-msft Mar 22, 2023
ec85da3
Stateful client changes (#2826)
carocao-msft Mar 23, 2023
d14c281
Captions selectors (#2840)
carocao-msft Mar 24, 2023
42bd563
Captions Handlers + adapters (#2841)
carocao-msft Mar 27, 2023
1047f60
Captions component in composite (#2843)
carocao-msft Mar 28, 2023
6646e29
Merge main into captions feature branch (#2853)
carocao-msft Mar 29, 2023
a31bf65
Merge branch 'main' into captions-feature
carocao-msft Mar 29, 2023
87e5671
merge
carocao-msft Mar 29, 2023
9ac3c33
build file
carocao-msft Mar 29, 2023
8e10e39
Merge branch 'main' into captions-feature
carocao-msft Mar 29, 2023
0c83bdd
build file
carocao-msft Mar 29, 2023
8b0e64a
Merge branch 'main' into captions-feature
carocao-msft Mar 30, 2023
6805084
build fix
carocao-msft Mar 30, 2023
d445814
Merge branch 'main' into captions-feature
carocao-msft Mar 30, 2023
aedfb1d
Merge branch 'main' into captions-feature
carocao-msft Mar 31, 2023
98e1b15
Merge branch 'main' into captions-feature
carocao-msft Apr 1, 2023
6594087
Merge branch 'main' into captions-feature
carocao-msft Apr 1, 2023
e89f502
Merge branch 'main' into captions-feature
carocao-msft Apr 4, 2023
92012d7
Fix bug where non final captions are displayed as final captions (#2…
carocao-msft Apr 5, 2023
162a08f
Initial commit to close captions (#2906)
PorterNan Apr 10, 2023
168592f
Use proxy for caption feature in stateful client (#2875)
PorterNan Apr 10, 2023
6004654
Close caption Merge main 4/10th (#2910)
PorterNan Apr 11, 2023
e19de19
Revert "Close caption Merge main 4/10th (#2910)"
PorterNan Apr 11, 2023
d6b751b
Merge branch 'main' into captions-feature
PorterNan Apr 11, 2023
b5ae531
Update babel-conditional-preprocess.js
PorterNan Apr 11, 2023
9482bec
Start captions button in control bar (#2877)
carocao-msft Apr 11, 2023
2828271
Modal to set spoken language (#2886)
carocao-msft Apr 11, 2023
c753875
More button on captions banner (#2889)
carocao-msft Apr 11, 2023
7502c8a
Captions on mobile (#2893)
carocao-msft Apr 12, 2023
94b71f3
Fixed bug where getting error when joining call, and bug when users c…
carocao-msft Apr 12, 2023
ffec9cf
Add language mapping for captions (#2918)
carocao-msft Apr 12, 2023
67d7091
Merge remote-tracking branch 'origin/main' into captions-feature
PorterNan Apr 12, 2023
b4d8d3f
Api update, update event property name
PorterNan Apr 12, 2023
d05ca8b
Fix type naming
PorterNan Apr 12, 2023
4458ef6
Bubble up the caption event (#2925)
PorterNan Apr 12, 2023
1d54a7e
Add missing CC
PorterNan Apr 13, 2023
c33dc6d
Use alpha package instead of local one
PorterNan Apr 13, 2023
875f6f7
Merge branch 'captions-feature' of https://github.com/Azure/communica…
PorterNan Apr 13, 2023
bfa0adf
Merge branch 'main' into captions-feature
PorterNan Apr 13, 2023
7559411
Remove leaking api on stable
PorterNan Apr 13, 2023
d71af1b
Update fixture type
PorterNan Apr 13, 2023
485df7c
Fix UT
PorterNan Apr 13, 2023
567eed3
Captions hermetic test for call composite (Ready for review) (#2926)
PorterNan Apr 13, 2023
71e35df
Captions hermetic test for call composite (Ready for review) (#2926)
PorterNan Apr 13, 2023
4822a46
Captions banner should not show up when on local hold (#2920)
carocao-msft Apr 13, 2023
e4a5ce5
Fix captions ui bug (#2921)
carocao-msft Apr 13, 2023
9de32af
Fix caption events subscription (#2932)
PorterNan Apr 13, 2023
cc5795a
Fix captions dropdown (#2931)
PorterNan Apr 13, 2023
2933462
Merge branch 'main' into captions-feature
PorterNan Apr 13, 2023
86ed446
Fix stable build
PorterNan Apr 13, 2023
af00645
Merge branch 'main' into captions-feature
PorterNan Apr 13, 2023
4b2fcb8
Update packages/react-composites CallComposite browser test snapshots
github-actions[bot] Apr 14, 2023
10cdc36
Closed Captions hermetic tests for callwithchat (#2936)
PorterNan Apr 14, 2023
9acd78f
Captions API changes (#2938)
carocao-msft Apr 14, 2023
34d1db6
ARB review - options name change (#2941)
carocao-msft Apr 14, 2023
5ac16f3
fix bug (#2943)
carocao-msft Apr 15, 2023
b693c54
tab through captions line by line (#2945)
carocao-msft Apr 17, 2023
45c6e01
fix captions storybook (#2946)
carocao-msft Apr 17, 2023
df1d5c6
Update dependency version to beta
PorterNan Apr 17, 2023
8cfdc77
Revert ci changes
PorterNan Apr 17, 2023
f35bf3f
Merge remote-tracking branch 'origin/main' into captions-feature
PorterNan Apr 17, 2023
612af88
Update yaml
PorterNan Apr 17, 2023
4e0dea7
Regenerate lock.yaml file
PorterNan Apr 17, 2023
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "Closed caption hermetic tests in callwithchat",
"packageName": "@azure/communication-react",
"email": "jiangnanhello@live.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Fixed join call error bug and bug when participants can not receive latest spoken language",
"packageName": "@azure/communication-react",
"email": "carolinecao@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "Hermetic tests for closed caption feature",
"packageName": "@azure/communication-react",
"email": "jiangnanhello@live.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "Use proxy for features",
"packageName": "@azure/communication-react",
"email": "jiangnanhello@live.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "Closed caption hermetic tests in callwithchat",
"packageName": "@azure/communication-react",
"email": "jiangnanhello@live.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Fixed join call error bug and bug when participants can not receive latest spoken language",
"packageName": "@azure/communication-react",
"email": "carolinecao@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "Hermetic tests for closed caption feature",
"packageName": "@azure/communication-react",
"email": "jiangnanhello@live.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "Use proxy for features",
"packageName": "@azure/communication-react",
"email": "jiangnanhello@live.com",
"dependentChangeType": "none"
}
2 changes: 2 additions & 0 deletions common/config/babel/.babelrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ process.env['COMMUNICATION_REACT_FLAVOR'] === 'stable' &&
'calling-beta-sdk',
// Participant pane in the `ChatComposite`.
'chat-composite-participant-pane',
// Close captions feature
'close-captions',
// API for injecting custom buttons in he control bar for
// `CallComposite` and `CallWithChatComposite`.
'control-bar-button-injection',
Expand Down
4 changes: 2 additions & 2 deletions common/config/rush/common-versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* instead of the latest version.
*/
// "some-library": "1.2.3"
"@azure/communication-calling": "1.12.0-beta.2",
"@azure/communication-calling": "1.13.0-beta.4",
"@azure/communication-chat": "1.3.2-beta.1"
},

Expand Down Expand Up @@ -53,7 +53,7 @@
* This design avoids unnecessary churn in this file.
*/
"allowedAlternativeVersions": {
"@azure/communication-calling": ["1.12.0-beta.2"],
"@azure/communication-calling": ["1.13.0-beta.4"],
"@azure/communication-chat": ["1.3.2-beta.1"],
"webpack": [
// All projects should use this version by default
Expand Down
48 changes: 24 additions & 24 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/calling-component-bindings/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
"reselect": "~4.0.0"
},
"peerDependencies": {
"@azure/communication-calling": "1.12.0-beta.2 || >=1.12.1",
"@azure/communication-calling": "1.13.0-beta.4 || >=1.12.1",
"@azure/communication-calling-effects": "1.0.0-beta.2",
"@types/react": ">=16.8.0 <18.0.0",
"react": ">=16.8.0 <18.0.0"
},
"devDependencies": {
"@azure/communication-calling": "1.12.0-beta.2 || >=1.12.1",
"@azure/communication-calling": "1.13.0-beta.4 || >=1.12.1",
"@azure/communication-calling-effects": "1.0.0-beta.2",
"@babel/cli": "~7.16.0",
"@babel/core": "~7.16.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { CallClientState } from '@internal/calling-stateful-client';
import { CallParticipantListParticipant } from '@internal/react-components';
import { CallState } from '@azure/communication-calling';
import { CameraButton } from '@internal/react-components';
import { _CaptionsInfo } from '@internal/react-components';
import { Common } from '@internal/acs-ui-common';
import { CommunicationIdentifier } from '@azure/communication-common';
import { CommunicationUserIdentifier } from '@azure/communication-common';
Expand Down Expand Up @@ -107,6 +108,30 @@ export type CameraButtonSelector = (state: CallClientState, props: CallingBaseSe
// @public
export const cameraButtonSelector: CameraButtonSelector;

// @internal
export type _CaptionsBannerSelector = (state: CallClientState, props: CallingBaseSelectorProps) => {
captions: _CaptionsInfo[];
isCaptionsOn: boolean;
};

// @internal
export const _captionsBannerSelector: _CaptionsBannerSelector;

// @beta
export type CaptionsOptions = {
spokenLanguage: string;
};

// @internal
export type _ChangeSpokenLanguageSelector = (state: CallClientState, props: CallingBaseSelectorProps) => {
supportedSpokenLanguages: string[];
currentSpokenLanguage: string;
isCaptionsFeatureActive: boolean;
};

// @internal
export const _changeSpokenLanguageSelector: _ChangeSpokenLanguageSelector;

// @public
export interface CommonCallingHandlers {
// (undocumented)
Expand Down Expand Up @@ -144,12 +169,20 @@ export interface CommonCallingHandlers {
// (undocumented)
onSendDtmfTone: (dtmfTone: DtmfTone) => Promise<void>;
// (undocumented)
onSetCaptionLanguage: (language: string) => Promise<void>;
// (undocumented)
onSetSpokenLanguage: (language: string) => Promise<void>;
// (undocumented)
onStartCall: (participants: (CommunicationUserIdentifier | PhoneNumberIdentifier | UnknownIdentifier)[], options?: StartCallOptions) => void;
// (undocumented)
onStartCaptions: (options?: CaptionsOptions) => Promise<void>;
// (undocumented)
onStartLocalVideo: () => Promise<void>;
// (undocumented)
onStartScreenShare: () => Promise<void>;
// (undocumented)
onStopCaptions: () => Promise<void>;
// (undocumented)
onStopScreenShare: () => Promise<void>;
// (undocumented)
onToggleCamera: (options?: VideoStreamOptions) => Promise<void>;
Expand Down Expand Up @@ -251,6 +284,16 @@ export type ScreenShareButtonSelector = (state: CallClientState, props: CallingB
// @public
export const screenShareButtonSelector: ScreenShareButtonSelector;

// @internal
export type _StartCaptionsButtonSelector = (state: CallClientState, props: CallingBaseSelectorProps) => {
checked: boolean;
currentCaptionLanguage: string;
currentSpokenLanguage: string;
};

// @internal
export const _startCaptionsButtonSelector: _StartCaptionsButtonSelector;

// @beta
export interface TeamsCallingHandlers extends CommonCallingHandlers {
// (undocumented)
Expand Down
Loading