Skip to content

Stateful client changes#2826

Merged
carocao-msft merged 71 commits intocaptions-featurefrom
carocao/captions_statefulo
Mar 23, 2023
Merged

Stateful client changes#2826
carocao-msft merged 71 commits intocaptions-featurefrom
carocao/captions_statefulo

Conversation

@carocao-msft
Copy link
Copy Markdown
Contributor

What

Why

How Tested

Process & policy checklist

  • I have updated the project documentation to reflect my changes if necessary.
  • I have read the CONTRIBUTING documentation.

Is this a breaking change?

  • This change causes current functionality to break.

dmceachernmsft and others added 30 commits February 23, 2023 16:14
* Create component

* add component for control bar

* Add some base styles, add bucketize

* add CC label and nav button icons

* update API docs for initial component

* Change files

* Duplicate change files for beta release

* extract bucketize to utils file

* update useEffect deps

* fix lint

* update styles comment

* Make style private

* fix cc comment
* Create component

* add component for control bar

* Add some base styles, add bucketize

* add CC label and nav button icons

* update API docs for initial component

* Change files

* Duplicate change files for beta release

* extract bucketize to utils file

* update useEffect deps

* fix lint

* update styles comment

* create component

* start calculateChildren helper

* add child calc function

* update children styles application VerticalGallery

* Change files

* Duplicate change files for beta release

* fix comment

* fix linting errors

* create style sheet file for responsive container

* simplifiy key and update comment

* update to track min tile via constant

* memoized styles

* rename styles file to be right type

* update first calculation to be without controls

* fix lint

* im bad at spelling

* Make style private

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
* Add more url parameters for chat sample

---------

Signed-off-by: Patrick Latter <73612854+palatter@users.noreply.github.com>
Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: James Burnside <2684369+JamesBurnside@users.noreply.github.com>
…2775)

* Add setting file for extension

* Add settings extensions.json

---------

Co-authored-by: Nan Jiang <jinan@microsoft.com>
* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* VerticalGallery container should maintain a min width in case no room is available for any video tiles

* created props interface for FloatingLocalVideo component

---------

Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* update CSS for proper button placement.

* update css for larger page counts

* fix up styles bottom out control bar

* Change files

* Duplicate change files for beta release

* memoize styles in verticalGallery

* update style name

* fix lint

* update per comments

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: mgamis-msft <79475487+mgamis-msft@users.noreply.github.com>
* added VideoGallery unit tests for vertical overflow gallery

* Change files

* Duplicate change files for beta release

* conditional compilation in VideoGallery.test.tsx for VerticalGallery

* added test for video participant in grid and the rest bucketized in vertical gallery
…2785)

* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* update CSS for proper button placement.

* update css for larger page counts

* fix up styles bottom out control bar

* Change files

* Duplicate change files for beta release

* memoize styles in verticalGallery

* update style name

* fix lint

* update per comments

* update styles to allow tile vertical resizing

* Change files

* Duplicate change files for beta release

* fix pagination label bug

* fix pagination label issues

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: mgamis-msft <79475487+mgamis-msft@users.noreply.github.com>
…function properly (#2790)

* disable the selectivity of a text in video gallery for long touch to function properly

* Change files

* Duplicate change files for beta release
* caption

* Change files

* Duplicate change files for beta release

* build file
… identifier (#2799)

* Update Custom Data Model Example userId identifier
…ding on aspect ratio (#2786)

* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* update CSS for proper button placement.

* update css for larger page counts

* fix up styles bottom out control bar

* Change files

* Duplicate change files for beta release

* memoize styles in verticalGallery

* update style name

* fix lint

* update per comments

* Observe width and height of MediaGallery to switch between horizontal and vertical overflow gallery

* Change files

* Duplicate change files for beta release

* > changed to >=

* Fix local video tile size logic

* let -> const

* fix floating local video tile size logic

* viewport adjusted in horizontal gallery snapshot tests

* Update packages/react-composites CallComposite browser test snapshots

* viewport adjusted in horizontal gallery snapshot tests for Desktop only

* Update packages/react-composites CallComposite browser test snapshots

* update so optimize for mobile

* Added playwright config project to test vertical gallery and horizontal gallery on Desktop

* Change files

* Duplicate change files for beta release

* test.use to assign viewport to HorizontalGallery snapshot tests

* remove unused variable

* lint fix

* use testMatch and testIgnore for HorizontalGallery.test.ts

* Revert changes to HorizontalGallery.test.ts

* shorten name project name

* Update packages/react-composites CallComposite browser test snapshots

* Changed HorizontalGallery button identifiers to be more generic

* stable api update

* Update packages/react-composites CallComposite browser test snapshots

* hermetic IDS fixed

* delete unused snapshot

* delete unused stable flavor snapshots

---------

Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…rops (#2796)

* update styles to be passed in properly

* add aria strings to nav buttons

* Change files

* Duplicate change files for beta release

* fix lint

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* update CSS for proper button placement.

* update css for larger page counts

* fix up styles bottom out control bar

* Change files

* Duplicate change files for beta release

* memoize styles in verticalGallery

* update style name

* fix lint

* update per comments

* Observe width and height of MediaGallery to switch between horizontal and vertical overflow gallery

* Change files

* Duplicate change files for beta release

* > changed to >=

* Fix local video tile size logic

* let -> const

* fix floating local video tile size logic

* viewport adjusted in horizontal gallery snapshot tests

* Update packages/react-composites CallComposite browser test snapshots

* viewport adjusted in horizontal gallery snapshot tests for Desktop only

* Update packages/react-composites CallComposite browser test snapshots

* update so optimize for mobile

* Added playwright config project to test vertical gallery and horizontal gallery on Desktop

* Change files

* Duplicate change files for beta release

* test.use to assign viewport to HorizontalGallery snapshot tests

* remove unused variable

* lint fix

* use testMatch and testIgnore for HorizontalGallery.test.ts

* Revert changes to HorizontalGallery.test.ts

* shorten name project name

* Update packages/react-composites CallComposite browser test snapshots

* Add data-ui-id's for verticalGallery nav buttons

* Changed HorizontalGallery button identifiers to be more generic

* create initial tests and first size check test

* stable api update

* await on window resize

* finish tests for vertical resizing

* Change files

* Duplicate change files for beta release

* fix conflicts

* updating test ids

---------

Co-authored-by: mgamis-msft <79475487+mgamis-msft@users.noreply.github.com>
Co-authored-by: mgamis-msft <miguelgamis@microsoft.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Create logging function for simplification

* finish creating logging functions

* mvoe logging to new file

* remote renderer removed from state after dispose

* Change files

* Duplicate change files for beta release

* fix lint

* update logger

* fix switch statements

* fix lint

* fix lint logging

* fix lint

* Update packages/calling-stateful-client/src/StreamUtilsLogging.ts

Co-authored-by: James Burnside <2684369+JamesBurnside@users.noreply.github.com>
Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* Fix typing issue

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: James Burnside <2684369+JamesBurnside@users.noreply.github.com>
* Create logging function for simplification

* finish creating logging functions

* mvoe logging to new file

* remote renderer removed from state after dispose

* Change files

* Duplicate change files for beta release

* fix lint

* create generic createViewVideo function

* remove comments

* remove console

* fix bad comparison

* Change files

* Duplicate change files for beta release

* update stream type detection

* update test logic for determining stream type

* update logger

* update to use new logging functions

* fix logging fall through

* fix switch statements

* fix lint

* fix lint logging

* fix lint

* update to use const on stream and participant info
* Create logging function for simplification

* finish creating logging functions

* mvoe logging to new file

* remote renderer removed from state after dispose

* Change files

* Duplicate change files for beta release

* fix lint

* create generic createViewVideo function

* remove comments

* remove console

* fix bad comparison

* Change files

* Duplicate change files for beta release

* update stream type detection

* create general disposeView for local and remote

* Change files

* Duplicate change files for beta release

* update test logic for determining stream type

* update logger

* update to use new logging functions

* update disposeViewVideo to use new logging

* fix switch

* fix logging fall through

* fix switch statements

* fix lint

* fix lint logging

* fix lint

* update to use const on stream and participant info

* update participant info and stream info to const

* remove commented code
…rge group (#2707)

* Fix message status is hidden for large group

* Change files

* Duplicate change files for beta release

* Update embed html bundle snapshots

* Change default showMessageStatus to true

* Update embed html bundle snapshots

---------
* Added snapshot tests for the VerticalGallery

* fix rtl style of local video tile container

* Change files

* Duplicate change files for beta release

* Remove test.only

* delete misplaced file

* Remove test.only

* Update packages/react-composites CallComposite browser test snapshots

* remove setViewPort call in test

* Update packages/react-composites CallComposite browser test snapshots

* conditionally run VerticalGallery.test.ts

* delete stable VerticalGallery snapshots

* do not run VerticalGallery snapshots for mobile portrait

* Update packages/react-composites CallComposite browser test snapshots

* HorizontalGallery.test.ts -> OverflowGallery.test.ts

* Update packages/react-composites CallComposite browser test snapshots

* Update packages/react-composites CallComposite browser test snapshots

* Remove vertical gallery specific snapshots

* Add rtl test

* Update packages/react-composites CallComposite browser test snapshots

* Update packages/react-composites CallComposite browser test snapshots

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
* wire isShort into OverflowGallery

* update styles to be responsive to isShort

* Change files

* Duplicate change files for beta release

* fix lint

* remove console log

* update tile size bounds

* fix CC

* fix test.only

* update responsive height.

* update client height in tests

* Update packages/react-composites CallComposite browser test snapshots

* Update @azure-communication-react-492eb6e4-0fa6-4fd0-9e47-28cef19d15ef.json

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
prabhjot-msft and others added 8 commits March 21, 2023 15:29
* Update webpack to 5.76.0

* minor change

* Change files

* Duplicate change files for beta release

* updated stable pnpm-lock.yaml

---------

Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
* Update webpack to 5.76.0

* minor change

* Change files

* Duplicate change files for beta release

* updated stable pnpm-lock.yaml

---------

Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
@carocao-msft carocao-msft changed the base branch from captions-feature to main March 21, 2023 22:39
@carocao-msft carocao-msft changed the base branch from main to captions-feature March 21, 2023 22:39
Signed-off-by: carocao-msft <96077406+carocao-msft@users.noreply.github.com>
@carocao-msft carocao-msft changed the base branch from captions-feature to main March 22, 2023 17:43
@carocao-msft carocao-msft changed the base branch from main to captions-feature March 22, 2023 17:43
@carocao-msft carocao-msft changed the title [in progress] Stateful client changes Stateful client changes Mar 22, 2023
toFlatCommunicationIdentifier(captionInfo.speaker.identifier)
latestCaption.resultType !== 'Final' &&
latestCaption.timestamp.getTime() === newCaption.timestamp.getTime() &&
latestCaption.speaker.identifier === newCaption.speaker.identifier
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These 2 are objects, which we cannot directly compare (which is comparing ref),
Do

toFlatCommunicationIdentifier(latestCaption.speaker.identifier) ===
        toFlatCommunicationIdentifier(newCaption.speaker.identifier)

Instead

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@@ -98,23 +83,26 @@ export abstract class ProxyCallCommon implements ProxyHandler<CallCommon> {
this._context.setIsCaptionActive(target.id, true);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: fix ...args issues here

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

_isTeamsMeetingCall(this._call)
? this._call.feature(Features.TeamsCaptions)
: this._call.feature(Features.AcsCaptions)
this._call.feature(Features.TeamsCaptions)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: don't create captionSubscribre here when it is ACS call

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

this._context.addCaption(this._callIdRef.callId, caption);
};

private isCaptionsActiveChanged: PropertyChangedEvent = (): void => {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we register this somewhere? If not, remove this, there is an event from sdk, then we should subscribe it

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NVM, I see the event named isCaptionsActiveChanged


// REMOVE THIS< TEST PURPOSES ONLY
call.feature(Features.AcsCaptions).startCaptions();
if (_isTeamsCall(call) || (_isACSCall(call) && !call.info.groupId && !call.info.roomId)) {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a one time checker here

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will target in next PR

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or let's remove this since these lines are not working well in this PR

@carocao-msft carocao-msft merged commit ec85da3 into captions-feature Mar 23, 2023
@carocao-msft carocao-msft deleted the carocao/captions_statefulo branch March 23, 2023 19:23
carocao-msft added a commit that referenced this pull request Apr 17, 2023
* Stateful client code check in

* Merge main into captions feature  (#2829)

* [VerticalGalleries] vertical gallery component (#2764)

* Create component

* add component for control bar

* Add some base styles, add bucketize

* add CC label and nav button icons

* update API docs for initial component

* Change files

* Duplicate change files for beta release

* extract bucketize to utils file

* update useEffect deps

* fix lint

* update styles comment

* Make style private

* fix cc comment

* [VerticalGallery] Responsive vertical gallery wrapper (#2770)

* Create component

* add component for control bar

* Add some base styles, add bucketize

* add CC label and nav button icons

* update API docs for initial component

* Change files

* Duplicate change files for beta release

* extract bucketize to utils file

* update useEffect deps

* fix lint

* update styles comment

* create component

* start calculateChildren helper

* add child calc function

* update children styles application VerticalGallery

* Change files

* Duplicate change files for beta release

* fix comment

* fix linting errors

* create style sheet file for responsive container

* simplifiy key and update comment

* update to track min tile via constant

* memoized styles

* rename styles file to be right type

* update first calculation to be without controls

* fix lint

* im bad at spelling

* Make style private

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* Add more url parameters for chat sample (#2752)

* Add more url parameters for chat sample

---------

Signed-off-by: Patrick Latter <73612854+palatter@users.noreply.github.com>
Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: James Burnside <2684369+JamesBurnside@users.noreply.github.com>

* 1.5.1-beta.1 pre-release branch (#2699)

Update Changelogs

* Fix: Permission Error in Chat after leaving a Teams Interop meeting (#2777)

* Update `@azure/communication-chat` to 1.3.0 (#2762)

* Update beta version of @azure/communication-calling to 1.11.0-beta.1 (#2763)

* Conditional compilation vscode extension settings and documentation (#2775)

* Add setting file for extension

* Add settings extensions.json

---------

Co-authored-by: Nan Jiang <jinan@microsoft.com>

* Added overflowGalleryLayout prop to VideoGallery (#2774)

* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* VerticalGallery container should maintain a min width in case no room is available for any video tiles

* created props interface for FloatingLocalVideo component

---------

Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* [Vertical Galleries] Vertical gallery CSS updates (#2781)

* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* update CSS for proper button placement.

* update css for larger page counts

* fix up styles bottom out control bar

* Change files

* Duplicate change files for beta release

* memoize styles in verticalGallery

* update style name

* fix lint

* update per comments

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: mgamis-msft <79475487+mgamis-msft@users.noreply.github.com>

* Vertical overflow gallery layout unit tests (#2783)

* added VideoGallery unit tests for vertical overflow gallery

* Change files

* Duplicate change files for beta release

* conditional compilation in VideoGallery.test.tsx for VerticalGallery

* added test for video participant in grid and the rest bucketized in vertical gallery

* [GitHub] Update code owners (#2737)

* [Vertical Galleries] Update styles to allow tile vertical resizing (#2785)

* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* update CSS for proper button placement.

* update css for larger page counts

* fix up styles bottom out control bar

* Change files

* Duplicate change files for beta release

* memoize styles in verticalGallery

* update style name

* fix lint

* update per comments

* update styles to allow tile vertical resizing

* Change files

* Duplicate change files for beta release

* fix pagination label bug

* fix pagination label issues

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: mgamis-msft <79475487+mgamis-msft@users.noreply.github.com>

* Disable the selectivity of a text in video gallery for long touch to function properly (#2790)

* disable the selectivity of a text in video gallery for long touch to function properly

* Change files

* Duplicate change files for beta release

* Storybook messages loading issue fix (#2784)

* Caption component (#2794)

* caption

* Change files

* Duplicate change files for beta release

* build file

* [bugfix][storybook] Update Calling Custom Data Model Example's userId identifier (#2799)

* Update Custom Data Model Example userId identifier

* Call composite switches between vertical and horizontal gallery depending on aspect ratio (#2786)

* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* update CSS for proper button placement.

* update css for larger page counts

* fix up styles bottom out control bar

* Change files

* Duplicate change files for beta release

* memoize styles in verticalGallery

* update style name

* fix lint

* update per comments

* Observe width and height of MediaGallery to switch between horizontal and vertical overflow gallery

* Change files

* Duplicate change files for beta release

* > changed to >=

* Fix local video tile size logic

* let -> const

* fix floating local video tile size logic

* viewport adjusted in horizontal gallery snapshot tests

* Update packages/react-composites CallComposite browser test snapshots

* viewport adjusted in horizontal gallery snapshot tests for Desktop only

* Update packages/react-composites CallComposite browser test snapshots

* update so optimize for mobile

* Added playwright config project to test vertical gallery and horizontal gallery on Desktop

* Change files

* Duplicate change files for beta release

* test.use to assign viewport to HorizontalGallery snapshot tests

* remove unused variable

* lint fix

* use testMatch and testIgnore for HorizontalGallery.test.ts

* Revert changes to HorizontalGallery.test.ts

* shorten name project name

* Update packages/react-composites CallComposite browser test snapshots

* Changed HorizontalGallery button identifiers to be more generic

* stable api update

* Update packages/react-composites CallComposite browser test snapshots

* hermetic IDS fixed

* delete unused snapshot

* delete unused stable flavor snapshots

---------

Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [VerticalGallery] A11y updates and styling vertical gallery through props (#2796)

* update styles to be passed in properly

* add aria strings to nav buttons

* Change files

* Duplicate change files for beta release

* fix lint

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* [Chat][BugFix] Updated Local Participant Text Label Colour (#2795)

* [Vertical Galleries] Vertical gallery resize tests (#2798)

* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* update CSS for proper button placement.

* update css for larger page counts

* fix up styles bottom out control bar

* Change files

* Duplicate change files for beta release

* memoize styles in verticalGallery

* update style name

* fix lint

* update per comments

* Observe width and height of MediaGallery to switch between horizontal and vertical overflow gallery

* Change files

* Duplicate change files for beta release

* > changed to >=

* Fix local video tile size logic

* let -> const

* fix floating local video tile size logic

* viewport adjusted in horizontal gallery snapshot tests

* Update packages/react-composites CallComposite browser test snapshots

* viewport adjusted in horizontal gallery snapshot tests for Desktop only

* Update packages/react-composites CallComposite browser test snapshots

* update so optimize for mobile

* Added playwright config project to test vertical gallery and horizontal gallery on Desktop

* Change files

* Duplicate change files for beta release

* test.use to assign viewport to HorizontalGallery snapshot tests

* remove unused variable

* lint fix

* use testMatch and testIgnore for HorizontalGallery.test.ts

* Revert changes to HorizontalGallery.test.ts

* shorten name project name

* Update packages/react-composites CallComposite browser test snapshots

* Add data-ui-id's for verticalGallery nav buttons

* Changed HorizontalGallery button identifiers to be more generic

* create initial tests and first size check test

* stable api update

* await on window resize

* finish tests for vertical resizing

* Change files

* Duplicate change files for beta release

* fix conflicts

* updating test ids

---------

Co-authored-by: mgamis-msft <79475487+mgamis-msft@users.noreply.github.com>
Co-authored-by: mgamis-msft <miguelgamis@microsoft.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [StreamUtils updates] Move logging out of stream utils (#2753)

* Create logging function for simplification

* finish creating logging functions

* mvoe logging to new file

* remote renderer removed from state after dispose

* Change files

* Duplicate change files for beta release

* fix lint

* update logger

* fix switch statements

* fix lint

* fix lint logging

* fix lint

* Update packages/calling-stateful-client/src/StreamUtilsLogging.ts

Co-authored-by: James Burnside <2684369+JamesBurnside@users.noreply.github.com>
Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* Fix typing issue

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: James Burnside <2684369+JamesBurnside@users.noreply.github.com>

* [StreamUtils updates] one CreateView to rule them all (#2755)

* Create logging function for simplification

* finish creating logging functions

* mvoe logging to new file

* remote renderer removed from state after dispose

* Change files

* Duplicate change files for beta release

* fix lint

* create generic createViewVideo function

* remove comments

* remove console

* fix bad comparison

* Change files

* Duplicate change files for beta release

* update stream type detection

* update test logic for determining stream type

* update logger

* update to use new logging functions

* fix logging fall through

* fix switch statements

* fix lint

* fix lint logging

* fix lint

* update to use const on stream and participant info

* [StreamUtils updates] One disposeView to rule them all (#2758)

* Create logging function for simplification

* finish creating logging functions

* mvoe logging to new file

* remote renderer removed from state after dispose

* Change files

* Duplicate change files for beta release

* fix lint

* create generic createViewVideo function

* remove comments

* remove console

* fix bad comparison

* Change files

* Duplicate change files for beta release

* update stream type detection

* create general disposeView for local and remote

* Change files

* Duplicate change files for beta release

* update test logic for determining stream type

* update logger

* update to use new logging functions

* update disposeViewVideo to use new logging

* fix switch

* fix logging fall through

* fix switch statements

* fix lint

* fix lint logging

* fix lint

* update to use const on stream and participant info

* update participant info and stream info to const

* remove commented code

* Add stateful handlers for background effects (#2793)

* [UI Components & Story] Add clickable video effect items (#2789)

* [Chat][Bugfix] Sendbox Triggers Duplicate Typing Event (#2745)

* [Bugfix] Fix sending/delivered/failed message status is hidden for large group (#2707)

* Fix message status is hidden for large group

* Change files

* Duplicate change files for beta release

* Update embed html bundle snapshots

* Change default showMessageStatus to true

* Update embed html bundle snapshots

---------

* Call composite overflow gallery snapshot tests (#2804)

* Added snapshot tests for the VerticalGallery

* fix rtl style of local video tile container

* Change files

* Duplicate change files for beta release

* Remove test.only

* delete misplaced file

* Remove test.only

* Update packages/react-composites CallComposite browser test snapshots

* remove setViewPort call in test

* Update packages/react-composites CallComposite browser test snapshots

* conditionally run VerticalGallery.test.ts

* delete stable VerticalGallery snapshots

* do not run VerticalGallery snapshots for mobile portrait

* Update packages/react-composites CallComposite browser test snapshots

* HorizontalGallery.test.ts -> OverflowGallery.test.ts

* Update packages/react-composites CallComposite browser test snapshots

* Update packages/react-composites CallComposite browser test snapshots

* Remove vertical gallery specific snapshots

* Add rtl test

* Update packages/react-composites CallComposite browser test snapshots

* Update packages/react-composites CallComposite browser test snapshots

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* [Vertical Gallery] isShort styling (#2803)

* wire isShort into OverflowGallery

* update styles to be responsive to isShort

* Change files

* Duplicate change files for beta release

* fix lint

* remove console log

* update tile size bounds

* fix CC

* fix test.only

* update responsive height.

* update client height in tests

* Update packages/react-composites CallComposite browser test snapshots

* Update @azure-communication-react-492eb6e4-0fa6-4fd0-9e47-28cef19d15ef.json

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [Storybook bugfix] remove beta `formFactor` prop from storybook ChatComposite snippets (#2735)

* remove beta formFactor from storybook snippet

* Change files

* Duplicate change files for beta release

* [Component and Story] Add background picker component (#2792)

* Responsive vertical gallery unit tests (#2800)

* Added unit tests for ResponsiveVerticalGallery

* Change files

* Duplicate change files for beta release

* fix helper function comment and expected value for one test

* updated based on new prop isShort

---------

Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* Correct MessageThread API definition (#2812)


---------

Signed-off-by: Emlyn Bolton <3941071+emlynmac@users.noreply.github.com>
Co-authored-by: Porter Nan <jiangnanhello@live.com>

* Call with chat composite overflow gallery snapshot tests (#2806)

* Added snapshot tests for the VerticalGallery

* fix rtl style of local video tile container

* Change files

* Duplicate change files for beta release

* Remove test.only

* delete misplaced file

* Remove test.only

* Update packages/react-composites CallComposite browser test snapshots

* remove setViewPort call in test

* Update packages/react-composites CallComposite browser test snapshots

* conditionally run VerticalGallery.test.ts

* delete stable VerticalGallery snapshots

* do not run VerticalGallery snapshots for mobile portrait

* Update packages/react-composites CallComposite browser test snapshots

* HorizontalGallery.test.ts -> OverflowGallery.test.ts

* Update packages/react-composites CallComposite browser test snapshots

* Update packages/react-composites CallComposite browser test snapshots

* Remove vertical gallery specific snapshots

* Add rtl test

* Update packages/react-composites CallComposite browser test snapshots

* Update packages/react-composites CallComposite browser test snapshots

* Added overflow gallery tests for callWithChat composite

* Change files

* Duplicate change files for beta release

* removed focused test

* Update packages/react-composites CallWithChatComposite browser test snapshots

* Update packages/react-composites CallWithChatComposite browser test snapshots

* lint fix. differentiate rtl snapshot file names.

* fix import

* skip callWithChat overflow gallery tests for mobile platforms

* eslint disable no return type

* delete unneeded snapshots

* Update packages/react-composites CallWithChatComposite browser test snapshots

* Update packages/react-composites CallWithChatComposite browser test snapshots

* Update packages/react-composites CallWithChatComposite browser test snapshots

* wait for horizontal or vertical gallery to be present

* removed test focus

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* [Vertical Gallery] Storybook updates (#2802)

* update stories for first draft

* add images to docs

* Change files

* Duplicate change files for beta release

* fix image name

* update paragraph per comment

* update story to refer to overflow layout

* [Bug fix] add error string for when remote your view is frozen for others (#2808)

* add error string for when remote view is frozen

* Change files

* Duplicate change files for beta release

* stop gaslighting me github

* Update packages/react-composites CallComposite browser test snapshots

* Update packages/react-composites CallComposite browser test snapshots

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [BugFix] Split button Primary action for Camera and Mic buttons (#2773)

* Update split buttons to have primary action

* Change files

* Duplicate change files for beta release

* update strings

* add localization

* fix icons merge error

* update mic logic for no speaker selection devices

* update API files

* lower case title name

* update menus to have sub menus

* Update packages/react-composites CallComposite browser test snapshots

* Update packages/react-composites CallComposite browser test snapshots

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [Bug Fixes] Sample app PSTN updates (#2807)

* Update apps to provide more info about prop

* fix cc

* more cc

* Change files

* Duplicate change files for beta release

* remove new place holders for formats

* update wordage to be less verbose and not use ACS

* Update Webpack dependency to 5.76.0 (#2815)

* Update webpack to 5.76.0

* minor change

* Change files

* Duplicate change files for beta release

* updated stable pnpm-lock.yaml

---------

Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* Captions component (#2816)

* caption component

* caption component

* scroll to bottom

* Change files

* Duplicate change files for beta release

* scroll to bottom

* Video gallery show local tile and horizontal/vertical gallery when screensharing with no participant (#2822)

* video gallery show local tile when screensharing

* Change files

* Duplicate change files for beta release

* [VerticalGallery Bugfix] Video tile rendering controlled by index (#2818)

* calculate indexes in verticalGallery

* update logic to horizontal galleries using indexes

* add logic to scrollable gallery 1D array

* Change files

* Duplicate change files for beta release

* add to default layout

* fix lint

* generate paginated children from indexes array

* remove the use of useCallBack

* fix test throw error

* remove console

* [Vertical Gallery] Calculate children utils (#2823)

* mock children calc functions

* update index array to be created with values

* Change files

* Duplicate change files for beta release

* fix lint

* update max streams default

* update comments

* update comments

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Signed-off-by: Patrick Latter <73612854+palatter@users.noreply.github.com>
Signed-off-by: Emlyn Bolton <3941071+emlynmac@users.noreply.github.com>
Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: Patrick Latter <73612854+palatter@users.noreply.github.com>
Co-authored-by: James Burnside <2684369+JamesBurnside@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Porter Nan <jiangnanhello@live.com>
Co-authored-by: Nan Jiang <jinan@microsoft.com>
Co-authored-by: mgamis-msft <79475487+mgamis-msft@users.noreply.github.com>
Co-authored-by: JoshuaLai <9044372+JoshuaLai@users.noreply.github.com>
Co-authored-by: prabhjot-msft <97124699+prabhjot-msft@users.noreply.github.com>
Co-authored-by: vhuseinova-msft <98852890+vhuseinova-msft@users.noreply.github.com>
Co-authored-by: edwardlee-msft <edwardlee@microsoft.com>
Co-authored-by: John <109105353+jpeng-ms@users.noreply.github.com>
Co-authored-by: mgamis-msft <miguelgamis@microsoft.com>
Co-authored-by: Leah Xia <107075081+Leah-Xia-Microsoft@users.noreply.github.com>
Co-authored-by: Emlyn Bolton <3941071+emlynmac@users.noreply.github.com>

* Stateful client changes (#2826)

* [VerticalGalleries] vertical gallery component (#2764)

* Create component

* add component for control bar

* Add some base styles, add bucketize

* add CC label and nav button icons

* update API docs for initial component

* Change files

* Duplicate change files for beta release

* extract bucketize to utils file

* update useEffect deps

* fix lint

* update styles comment

* Make style private

* fix cc comment

* [VerticalGallery] Responsive vertical gallery wrapper (#2770)

* Create component

* add component for control bar

* Add some base styles, add bucketize

* add CC label and nav button icons

* update API docs for initial component

* Change files

* Duplicate change files for beta release

* extract bucketize to utils file

* update useEffect deps

* fix lint

* update styles comment

* create component

* start calculateChildren helper

* add child calc function

* update children styles application VerticalGallery

* Change files

* Duplicate change files for beta release

* fix comment

* fix linting errors

* create style sheet file for responsive container

* simplifiy key and update comment

* update to track min tile via constant

* memoized styles

* rename styles file to be right type

* update first calculation to be without controls

* fix lint

* im bad at spelling

* Make style private

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* Add more url parameters for chat sample (#2752)

* Add more url parameters for chat sample

---------

Signed-off-by: Patrick Latter <73612854+palatter@users.noreply.github.com>
Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: James Burnside <2684369+JamesBurnside@users.noreply.github.com>

* 1.5.1-beta.1 pre-release branch (#2699)

Update Changelogs

* Fix: Permission Error in Chat after leaving a Teams Interop meeting (#2777)

* Update `@azure/communication-chat` to 1.3.0 (#2762)

* Update beta version of @azure/communication-calling to 1.11.0-beta.1 (#2763)

* Conditional compilation vscode extension settings and documentation (#2775)

* Add setting file for extension

* Add settings extensions.json

---------

Co-authored-by: Nan Jiang <jinan@microsoft.com>

* Added overflowGalleryLayout prop to VideoGallery (#2774)

* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* VerticalGallery container should maintain a min width in case no room is available for any video tiles

* created props interface for FloatingLocalVideo component

---------

Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* [Vertical Galleries] Vertical gallery CSS updates (#2781)

* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* update CSS for proper button placement.

* update css for larger page counts

* fix up styles bottom out control bar

* Change files

* Duplicate change files for beta release

* memoize styles in verticalGallery

* update style name

* fix lint

* update per comments

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: mgamis-msft <79475487+mgamis-msft@users.noreply.github.com>

* Vertical overflow gallery layout unit tests (#2783)

* added VideoGallery unit tests for vertical overflow gallery

* Change files

* Duplicate change files for beta release

* conditional compilation in VideoGallery.test.tsx for VerticalGallery

* added test for video participant in grid and the rest bucketized in vertical gallery

* [GitHub] Update code owners (#2737)

* [Vertical Galleries] Update styles to allow tile vertical resizing (#2785)

* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* update CSS for proper button placement.

* update css for larger page counts

* fix up styles bottom out control bar

* Change files

* Duplicate change files for beta release

* memoize styles in verticalGallery

* update style name

* fix lint

* update per comments

* update styles to allow tile vertical resizing

* Change files

* Duplicate change files for beta release

* fix pagination label bug

* fix pagination label issues

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: mgamis-msft <79475487+mgamis-msft@users.noreply.github.com>

* Disable the selectivity of a text in video gallery for long touch to function properly (#2790)

* disable the selectivity of a text in video gallery for long touch to function properly

* Change files

* Duplicate change files for beta release

* Storybook messages loading issue fix (#2784)

* Caption component (#2794)

* caption

* Change files

* Duplicate change files for beta release

* build file

* [bugfix][storybook] Update Calling Custom Data Model Example's userId identifier (#2799)

* Update Custom Data Model Example userId identifier

* Call composite switches between vertical and horizontal gallery depending on aspect ratio (#2786)

* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* update CSS for proper button placement.

* update css for larger page counts

* fix up styles bottom out control bar

* Change files

* Duplicate change files for beta release

* memoize styles in verticalGallery

* update style name

* fix lint

* update per comments

* Observe width and height of MediaGallery to switch between horizontal and vertical overflow gallery

* Change files

* Duplicate change files for beta release

* > changed to >=

* Fix local video tile size logic

* let -> const

* fix floating local video tile size logic

* viewport adjusted in horizontal gallery snapshot tests

* Update packages/react-composites CallComposite browser test snapshots

* viewport adjusted in horizontal gallery snapshot tests for Desktop only

* Update packages/react-composites CallComposite browser test snapshots

* update so optimize for mobile

* Added playwright config project to test vertical gallery and horizontal gallery on Desktop

* Change files

* Duplicate change files for beta release

* test.use to assign viewport to HorizontalGallery snapshot tests

* remove unused variable

* lint fix

* use testMatch and testIgnore for HorizontalGallery.test.ts

* Revert changes to HorizontalGallery.test.ts

* shorten name project name

* Update packages/react-composites CallComposite browser test snapshots

* Changed HorizontalGallery button identifiers to be more generic

* stable api update

* Update packages/react-composites CallComposite browser test snapshots

* hermetic IDS fixed

* delete unused snapshot

* delete unused stable flavor snapshots

---------

Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [VerticalGallery] A11y updates and styling vertical gallery through props (#2796)

* update styles to be passed in properly

* add aria strings to nav buttons

* Change files

* Duplicate change files for beta release

* fix lint

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* [Chat][BugFix] Updated Local Participant Text Label Colour (#2795)

* [Vertical Galleries] Vertical gallery resize tests (#2798)

* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* update CSS for proper button placement.

* update css for larger page counts

* fix up styles bottom out control bar

* Change files

* Duplicate change files for beta release

* memoize styles in verticalGallery

* update style name

* fix lint

* update per comments

* Observe width and height of MediaGallery to switch between horizontal and vertical overflow gallery

* Change files

* Duplicate change files for beta release

* > changed to >=

* Fix local video tile size logic

* let -> const

* fix floating local video tile size logic

* viewport adjusted in horizontal gallery snapshot tests

* Update packages/react-composites CallComposite browser test snapshots

* viewport adjusted in horizontal gallery snapshot tests for Desktop only

* Update packages/react-composites CallComposite browser test snapshots

* update so optimize for mobile

* Added playwright config project to test vertical gallery and horizontal gallery on Desktop

* Change files

* Duplicate change files for beta release

* test.use to assign viewport to HorizontalGallery snapshot tests

* remove unused variable

* lint fix

* use testMatch and testIgnore for HorizontalGallery.test.ts

* Revert changes to HorizontalGallery.test.ts

* shorten name project name

* Update packages/react-composites CallComposite browser test snapshots

* Add data-ui-id's for verticalGallery nav buttons

* Changed HorizontalGallery button identifiers to be more generic

* create initial tests and first size check test

* stable api update

* await on window resize

* finish tests for vertical resizing

* Change files

* Duplicate change files for beta release

* fix conflicts

* updating test ids

---------

Co-authored-by: mgamis-msft <79475487+mgamis-msft@users.noreply.github.com>
Co-authored-by: mgamis-msft <miguelgamis@microsoft.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [StreamUtils updates] Move logging out of stream utils (#2753)

* Create logging function for simplification

* finish creating logging functions

* mvoe logging to new file

* remote renderer removed from state after dispose

* Change files

* Duplicate change files for beta release

* fix lint

* update logger

* fix switch statements

* fix lint

* fix lint logging

* fix lint

* Update packages/calling-stateful-client/src/StreamUtilsLogging.ts

Co-authored-by: James Burnside <2684369+JamesBurnside@users.noreply.github.com>
Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* Fix typing issue

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: James Burnside <2684369+JamesBurnside@users.noreply.github.com>

* [StreamUtils updates] one CreateView to rule them all (#2755)

* Create logging function for simplification

* finish creating logging functions

* mvoe logging to new file

* remote renderer removed from state after dispose

* Change files

* Duplicate change files for beta release

* fix lint

* create generic createViewVideo function

* remove comments

* remove console

* fix bad comparison

* Change files

* Duplicate change files for beta release

* update stream type detection

* update test logic for determining stream type

* update logger

* update to use new logging functions

* fix logging fall through

* fix switch statements

* fix lint

* fix lint logging

* fix lint

* update to use const on stream and participant info

* [StreamUtils updates] One disposeView to rule them all (#2758)

* Create logging function for simplification

* finish creating logging functions

* mvoe logging to new file

* remote renderer removed from state after dispose

* Change files

* Duplicate change files for beta release

* fix lint

* create generic createViewVideo function

* remove comments

* remove console

* fix bad comparison

* Change files

* Duplicate change files for beta release

* update stream type detection

* create general disposeView for local and remote

* Change files

* Duplicate change files for beta release

* update test logic for determining stream type

* update logger

* update to use new logging functions

* update disposeViewVideo to use new logging

* fix switch

* fix logging fall through

* fix switch statements

* fix lint

* fix lint logging

* fix lint

* update to use const on stream and participant info

* update participant info and stream info to const

* remove commented code

* Add stateful handlers for background effects (#2793)

* [UI Components & Story] Add clickable video effect items (#2789)

* [Chat][Bugfix] Sendbox Triggers Duplicate Typing Event (#2745)

* [Bugfix] Fix sending/delivered/failed message status is hidden for large group (#2707)

* Fix message status is hidden for large group

* Change files

* Duplicate change files for beta release

* Update embed html bundle snapshots

* Change default showMessageStatus to true

* Update embed html bundle snapshots

---------

* Call composite overflow gallery snapshot tests (#2804)

* Added snapshot tests for the VerticalGallery

* fix rtl style of local video tile container

* Change files

* Duplicate change files for beta release

* Remove test.only

* delete misplaced file

* Remove test.only

* Update packages/react-composites CallComposite browser test snapshots

* remove setViewPort call in test

* Update packages/react-composites CallComposite browser test snapshots

* conditionally run VerticalGallery.test.ts

* delete stable VerticalGallery snapshots

* do not run VerticalGallery snapshots for mobile portrait

* Update packages/react-composites CallComposite browser test snapshots

* HorizontalGallery.test.ts -> OverflowGallery.test.ts

* Update packages/react-composites CallComposite browser test snapshots

* Update packages/react-composites CallComposite browser test snapshots

* Remove vertical gallery specific snapshots

* Add rtl test

* Update packages/react-composites CallComposite browser test snapshots

* Update packages/react-composites CallComposite browser test snapshots

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* [Vertical Gallery] isShort styling (#2803)

* wire isShort into OverflowGallery

* update styles to be responsive to isShort

* Change files

* Duplicate change files for beta release

* fix lint

* remove console log

* update tile size bounds

* fix CC

* fix test.only

* update responsive height.

* update client height in tests

* Update packages/react-composites CallComposite browser test snapshots

* Update @azure-communication-react-492eb6e4-0fa6-4fd0-9e47-28cef19d15ef.json

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [Storybook bugfix] remove beta `formFactor` prop from storybook ChatComposite snippets (#2735)

* remove beta formFactor from storybook snippet

* Change files

* Duplicate change files for beta release

* [Component and Story] Add background picker component (#2792)

* Responsive vertical gallery unit tests (#2800)

* Added unit tests for ResponsiveVerticalGallery

* Change files

* Duplicate change files for beta release

* fix helper function comment and expected value for one test

* updated based on new prop isShort

---------

Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* Correct MessageThread API definition (#2812)


---------

Signed-off-by: Emlyn Bolton <3941071+emlynmac@users.noreply.github.com>
Co-authored-by: Porter Nan <jiangnanhello@live.com>

* Call with chat composite overflow gallery snapshot tests (#2806)

* Added snapshot tests for the VerticalGallery

* fix rtl style of local video tile container

* Change files

* Duplicate change files for beta release

* Remove test.only

* delete misplaced file

* Remove test.only

* Update packages/react-composites CallComposite browser test snapshots

* remove setViewPort call in test

* Update packages/react-composites CallComposite browser test snapshots

* conditionally run VerticalGallery.test.ts

* delete stable VerticalGallery snapshots

* do not run VerticalGallery snapshots for mobile portrait

* Update packages/react-composites CallComposite browser test snapshots

* HorizontalGallery.test.ts -> OverflowGallery.test.ts

* Update packages/react-composites CallComposite browser test snapshots

* Update packages/react-composites CallComposite browser test snapshots

* Remove vertical gallery specific snapshots

* Add rtl test

* Update packages/react-composites CallComposite browser test snapshots

* Update packages/react-composites CallComposite browser test snapshots

* Added overflow gallery tests for callWithChat composite

* Change files

* Duplicate change files for beta release

* removed focused test

* Update packages/react-composites CallWithChatComposite browser test snapshots

* Update packages/react-composites CallWithChatComposite browser test snapshots

* lint fix. differentiate rtl snapshot file names.

* fix import

* skip callWithChat overflow gallery tests for mobile platforms

* eslint disable no return type

* delete unneeded snapshots

* Update packages/react-composites CallWithChatComposite browser test snapshots

* Update packages/react-composites CallWithChatComposite browser test snapshots

* Update packages/react-composites CallWithChatComposite browser test snapshots

* wait for horizontal or vertical gallery to be present

* removed test focus

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* [Vertical Gallery] Storybook updates (#2802)

* update stories for first draft

* add images to docs

* Change files

* Duplicate change files for beta release

* fix image name

* update paragraph per comment

* update story to refer to overflow layout

* [Bug fix] add error string for when remote your view is frozen for others (#2808)

* add error string for when remote view is frozen

* Change files

* Duplicate change files for beta release

* stop gaslighting me github

* Update packages/react-composites CallComposite browser test snapshots

* Update packages/react-composites CallComposite browser test snapshots

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [BugFix] Split button Primary action for Camera and Mic buttons (#2773)

* Update split buttons to have primary action

* Change files

* Duplicate change files for beta release

* update strings

* add localization

* fix icons merge error

* update mic logic for no speaker selection devices

* update API files

* lower case title name

* update menus to have sub menus

* Update packages/react-composites CallComposite browser test snapshots

* Update packages/react-composites CallComposite browser test snapshots

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [Bug Fixes] Sample app PSTN updates (#2807)

* Update apps to provide more info about prop

* fix cc

* more cc

* Change files

* Duplicate change files for beta release

* remove new place holders for formats

* update wordage to be less verbose and not use ACS

* Update Webpack dependency to 5.76.0 (#2815)

* Update webpack to 5.76.0

* minor change

* Change files

* Duplicate change files for beta release

* updated stable pnpm-lock.yaml

---------

Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* Captions component (#2816)

* caption component

* caption component

* scroll to bottom

* Change files

* Duplicate change files for beta release

* scroll to bottom

* Video gallery show local tile and horizontal/vertical gallery when screensharing with no participant (#2822)

* video gallery show local tile when screensharing

* Change files

* Duplicate change files for beta release

* Stateful client code check in

* stateful

* Stateful client code check in

* 1.5.1-beta.1 pre-release branch (#2699)

Update Changelogs

* Update `@azure/communication-chat` to 1.3.0 (#2762)

* Update beta version of @azure/communication-calling to 1.11.0-beta.1 (#2763)

* Add stateful handlers for background effects (#2793)

* Update Webpack dependency to 5.76.0 (#2815)

* Update webpack to 5.76.0

* minor change

* Change files

* Duplicate change files for beta release

* updated stable pnpm-lock.yaml

---------

Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* stateful

* Stateful client code check in

* 1.5.1-beta.1 pre-release branch (#2699)

Update Changelogs

* Update `@azure/communication-chat` to 1.3.0 (#2762)

* Update beta version of @azure/communication-calling to 1.11.0-beta.1 (#2763)

* Add stateful handlers for background effects (#2793)

* Update Webpack dependency to 5.76.0 (#2815)

* Update webpack to 5.76.0

* minor change

* Change files

* Duplicate change files for beta release

* updated stable pnpm-lock.yaml

---------

Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* stateful

* 1.5.1-beta.1 pre-release branch (#2699)

Update Changelogs

* Update `@azure/communication-chat` to 1.3.0 (#2762)

* Update beta version of @azure/communication-calling to 1.11.0-beta.1 (#2763)

* Add stateful handlers for background effects (#2793)

* Update Webpack dependency to 5.76.0 (#2815)

* Update webpack to 5.76.0

* minor change

* Change files

* Duplicate change files for beta release

* updated stable pnpm-lock.yaml

---------

Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* merge

* merge

* merge

* captions fix

* tgz

* call context

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Signed-off-by: Patrick Latter <73612854+palatter@users.noreply.github.com>
Signed-off-by: Emlyn Bolton <3941071+emlynmac@users.noreply.github.com>
Signed-off-by: carocao-msft <96077406+carocao-msft@users.noreply.github.com>
Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: Patrick Latter <73612854+palatter@users.noreply.github.com>
Co-authored-by: James Burnside <2684369+JamesBurnside@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Porter Nan <jiangnanhello@live.com>
Co-authored-by: Nan Jiang <jinan@microsoft.com>
Co-authored-by: mgamis-msft <79475487+mgamis-msft@users.noreply.github.com>
Co-authored-by: JoshuaLai <9044372+JoshuaLai@users.noreply.github.com>
Co-authored-by: prabhjot-msft <97124699+prabhjot-msft@users.noreply.github.com>
Co-authored-by: vhuseinova-msft <98852890+vhuseinova-msft@users.noreply.github.com>
Co-authored-by: edwardlee-msft <edwardlee@microsoft.com>
Co-authored-by: John <109105353+jpeng-ms@users.noreply.github.com>
Co-authored-by: mgamis-msft <miguelgamis@microsoft.com>
Co-authored-by: Leah Xia <107075081+Leah-Xia-Microsoft@users.noreply.github.com>
Co-authored-by: Emlyn Bolton <3941071+emlynmac@users.noreply.github.com>

* Captions selectors (#2840)

* selectors

* build

* Captions Handlers + adapters (#2841)

* selectors

* build

* handlers

* adapter

* pr fix

---------

Signed-off-by: carocao-msft <96077406+carocao-msft@users.noreply.github.com>

* Captions component in composite (#2843)

* add captions banner to composite

* cpr fix

* style fix

* Update packages/react-composites/src/composites/CallComposite/components/CallArrangement.tsx

Co-authored-by: Porter Nan <jiangnanhello@live.com>
Signed-off-by: carocao-msft <96077406+carocao-msft@users.noreply.github.com>

---------

Signed-off-by: carocao-msft <96077406+carocao-msft@users.noreply.github.com>
Co-authored-by: Porter Nan <jiangnanhello@live.com>

* Merge main into captions feature branch (#2853)

* [VerticalGalleries] vertical gallery component (#2764)

* Create component

* add component for control bar

* Add some base styles, add bucketize

* add CC label and nav button icons

* update API docs for initial component

* Change files

* Duplicate change files for beta release

* extract bucketize to utils file

* update useEffect deps

* fix lint

* update styles comment

* Make style private

* fix cc comment

* [VerticalGallery] Responsive vertical gallery wrapper (#2770)

* Create component

* add component for control bar

* Add some base styles, add bucketize

* add CC label and nav button icons

* update API docs for initial component

* Change files

* Duplicate change files for beta release

* extract bucketize to utils file

* update useEffect deps

* fix lint

* update styles comment

* create component

* start calculateChildren helper

* add child calc function

* update children styles application VerticalGallery

* Change files

* Duplicate change files for beta release

* fix comment

* fix linting errors

* create style sheet file for responsive container

* simplifiy key and update comment

* update to track min tile via constant

* memoized styles

* rename styles file to be right type

* update first calculation to be without controls

* fix lint

* im bad at spelling

* Make style private

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* Add more url parameters for chat sample (#2752)

* Add more url parameters for chat sample

---------

Signed-off-by: Patrick Latter <73612854+palatter@users.noreply.github.com>
Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: James Burnside <2684369+JamesBurnside@users.noreply.github.com>

* 1.5.1-beta.1 pre-release branch (#2699)

Update Changelogs

* Fix: Permission Error in Chat after leaving a Teams Interop meeting (#2777)

* Update `@azure/communication-chat` to 1.3.0 (#2762)

* Update beta version of @azure/communication-calling to 1.11.0-beta.1 (#2763)

* Conditional compilation vscode extension settings and documentation (#2775)

* Add setting file for extension

* Add settings extensions.json

---------

Co-authored-by: Nan Jiang <jinan@microsoft.com>

* Added overflowGalleryLayout prop to VideoGallery (#2774)

* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* VerticalGallery container should maintain a min width in case no room is available for any video tiles

* created props interface for FloatingLocalVideo component

---------

Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* [Vertical Galleries] Vertical gallery CSS updates (#2781)

* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* update CSS for proper button placement.

* update css for larger page counts

* fix up styles bottom out control bar

* Change files

* Duplicate change files for beta release

* memoize styles in verticalGallery

* update style name

* fix lint

* update per comments

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: mgamis-msft <79475487+mgamis-msft@users.noreply.github.com>

* Vertical overflow gallery layout unit tests (#2783)

* added VideoGallery unit tests for vertical overflow gallery

* Change files

* Duplicate change files for beta release

* conditional compilation in VideoGallery.test.tsx for VerticalGallery

* added test for video participant in grid and the rest bucketized in vertical gallery

* [GitHub] Update code owners (#2737)

* [Vertical Galleries] Update styles to allow tile vertical resizing (#2785)

* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* update CSS for proper button placement.

* update css for larger page counts

* fix up styles bottom out control bar

* Change files

* Duplicate change files for beta release

* memoize styles in verticalGallery

* update style name

* fix lint

* update per comments

* update styles to allow tile vertical resizing

* Change files

* Duplicate change files for beta release

* fix pagination label bug

* fix pagination label issues

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: mgamis-msft <79475487+mgamis-msft@users.noreply.github.com>

* Disable the selectivity of a text in video gallery for long touch to function properly (#2790)

* disable the selectivity of a text in video gallery for long touch to function properly

* Change files

* Duplicate change files for beta release

* Storybook messages loading issue fix (#2784)

* Caption component (#2794)

* caption

* Change files

* Duplicate change files for beta release

* build file

* [bugfix][storybook] Update Calling Custom Data Model Example's userId identifier (#2799)

* Update Custom Data Model Example userId identifier

* Call composite switches between vertical and horizontal gallery depending on aspect ratio (#2786)

* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* update CSS for proper button placement.

* update css for larger page counts

* fix up styles bottom out control bar

* Change files

* Duplicate change files for beta release

* memoize styles in verticalGallery

* update style name

* fix lint

* update per comments

* Observe width and height of MediaGallery to switch between horizontal and vertical overflow gallery

* Change files

* Duplicate change files for beta release

* > changed to >=

* Fix local video tile size logic

* let -> const

* fix floating local video tile size logic

* viewport adjusted in horizontal gallery snapshot tests

* Update packages/react-composites CallComposite browser test snapshots

* viewport adjusted in horizontal gallery snapshot tests for Desktop only

* Update packages/react-composites CallComposite browser test snapshots

* update so optimize for mobile

* Added playwright config project to test vertical gallery and horizontal gallery on Desktop

* Change files

* Duplicate change files for beta release

* test.use to assign viewport to HorizontalGallery snapshot tests

* remove unused variable

* lint fix

* use testMatch and testIgnore for HorizontalGallery.test.ts

* Revert changes to HorizontalGallery.test.ts

* shorten name project name

* Update packages/react-composites CallComposite browser test snapshots

* Changed HorizontalGallery button identifiers to be more generic

* stable api update

* Update packages/react-composites CallComposite browser test snapshots

* hermetic IDS fixed

* delete unused snapshot

* delete unused stable flavor snapshots

---------

Co-authored-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [VerticalGallery] A11y updates and styling vertical gallery through props (#2796)

* update styles to be passed in properly

* add aria strings to nav buttons

* Change files

* Duplicate change files for beta release

* fix lint

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* [Chat][BugFix] Updated Local Participant Text Label Colour (#2795)

* [Vertical Galleries] Vertical gallery resize tests (#2798)

* Added overflowGalleryLayout prop to VideoGallery to control component for overflow participants

* Refactor FloatingLocalVideo props

* renamed VideoGalleryResponsiveHorizontalGallery -> OverflowGallery

* Change files

* Duplicate change files for beta release

* remove ScrollableHorizontalGallery from DefaultLayout

* lint fix

* overflowGalleryLayout = 'HorizontalBottom' as default for VIdeoGallery

* update CSS for proper button placement.

* update css for larger page counts

* fix up styles bottom out control bar

* Change files

* Duplicate change files for beta release

* memoize styles in verticalGallery

* update style name

* fix lint

* update per comments

* Observe width and height of MediaGallery to switch between horizontal and vertical overflow gallery

* Change files

* Duplicate change files for beta release

* > changed to >=

* Fix local video tile size logic

* let -> const

* fix floating local video tile size logic

* viewport adjusted in horizontal gallery snapshot tests

* Update packages/react-composites CallComposite browser test snapshots

* viewport adjusted in horizontal gallery snapshot tests for Desktop only

* Update packages/react-composites CallComposite browser test snapshots

* update so optimize for mobile

* Added playwright config project to test vertical gallery and horizontal gallery on Desktop

* Change files

* Duplicate change files for beta release

* test.use to assign viewport to HorizontalGallery snapshot tests

* remove unused variable

* lint fix

* use testMatch and testIgnore for HorizontalGallery.test.ts

* Revert changes to HorizontalGallery.test.ts

* shorten name project name

* Update packages/react-composites CallComposite browser test snapshots

* Add data-ui-id's for verticalGallery nav buttons

* Changed HorizontalGallery button identifiers to be more generic

* create initial tests and first size check test

* stable api update

* await on window resize

* finish tests for vertical resizing

* Change files

* Duplicate change files for beta release

* fix conflicts

* updating test ids

---------

Co-authored-by: mgamis-msft <79475487+mgamis-msft@users.noreply.github.com>
Co-authored-by: mgamis-msft <miguelgamis@microsoft.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [StreamUtils updates] Move logging out of stream utils (#2753)

* Create logging function for simplification

* finish creating logging functions

* mvoe logging to new file

* remote renderer removed from state after dispose

* Change files

* Duplicate change files for beta release

* fix lint

* update logger

* fix switch statements

* fix lint

* fix lint logging

* fix lint

* Update packages/calling-stateful-client/src/StreamUtilsLogging.ts

Co-authored-by: James Burnside <2684369+JamesBurnside@users.noreply.github.com>
Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>

* Fix typing issue

---------

Signed-off-by: Donald McEachern <94866715+dmceachernmsft@users.noreply.github.com>
Co-authored-by: James Burnside <2684369+JamesBurnside@users.noreply.github.com>

* [StreamUtils updates] one CreateView to rule them all (#2755)

* Create logging function for simplification

* finish creating logging functions

* mvoe logging to new file

* remote renderer removed from state after dispose

* Change files

* Duplicate change files for beta release

* fix lint

* create generic createViewVideo function

* remove comments

* remove console

* fix bad comparison

* Change files

* Duplicate change files for beta release

* update stream type detection

* update test logic for determining stream type

* update logger

* update to use new logging functions

* fix logging fall through

* fix switch statements

* fix lint

* fix lint logging

* fix lint

* update to use const on stream and participant info

* [StreamUtils updates] One disposeView to rule them all (#2758)

* Create logging function for simplification

* finish creating logging functions

* mvoe logging to new file

* remote renderer removed from state after dispose

* Change files

* Duplicate change files for beta release

* fix lint

* create generic createViewVideo function

* remove comments

* remove console

* fix bad comparison

* Change files

* Duplicate change files for beta release

* update stream type detection

* create general disposeView for local and remote

* Change files

* Duplicate change files for beta release

* update test logic for determining stream type

* update logger

* update to use new logging functions

* update disposeViewVideo to use new logging

* fix switch

* fix logging fall through

* fix switch statements

* fix lint

* fix lint logging

* fix lint

* update to use const on stream and participant info

* update participant info and stream info to const

* remove commented code

* Add stateful handlers for background effects (#2793)

* [UI Components & Story] Add clickable video effect ite…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.