Skip to content

[Rooms] Fix overflow gallery to use all available space when you are a consumer #3825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgamis-msft merged 5 commits into from
Nov 23, 2023
Merged

[Rooms] Fix overflow gallery to use all available space when you are a consumer #3825

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c49556
Fix overflow gallery to use all available space when there is no loca…
mgamis-msft Nov 23, 2023
908d9d3
Change files
mgamis-msft Nov 23, 2023
8c3377e
Duplicate change files for beta release
mgamis-msft Nov 23, 2023
c5c8d45
remove unneeded layout prop from OverflowGallery
mgamis-msft Nov 23, 2023
d7f4388
Merge branch 'main' into mgamis/fix-overflow-gallery-use-all-availabl…
mgamis-msft Nov 23, 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
9 changes: 9 additions & 0 deletions change-beta/@azure-communication-react-55786f13-dd46-4777-b741-2880e3575a01.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "Overflow gallery",
"comment": "Fix overflow gallery to use all available space when there is no local video",
"packageName": "@azure/communication-react",
"email": "79475487+mgamis-msft@users.noreply.github.com",
"dependentChangeType": "patch"
}
9 changes: 9 additions & 0 deletions change/@azure-communication-react-55786f13-dd46-4777-b741-2880e3575a01.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "Overflow gallery",
"comment": "Fix overflow gallery to use all available space when there is no local video",
"packageName": "@azure/communication-react",
"email": "79475487+mgamis-msft@users.noreply.github.com",
"dependentChangeType": "patch"
}
5 changes: 3 additions & 2 deletions packages/react-components/src/components/VideoGallery/FloatingLocalVideoLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ export const FloatingLocalVideoLayout = (props: FloatingLocalVideoLayoutProps):
isShort={isShort}
onFetchTilesToRender={setIndexesToRender}
isNarrow={isNarrow}
shouldFloatLocalVideo={true}
shouldFloatLocalVideo={!!localVideoComponent}
Copy link
Copy Markdown
Member

@JamesBurnside JamesBurnside Nov 23, 2023

Choose a reason for hiding this comment

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

Is localVideoComponent valid when the video is turned off but the local video avatar shows in the floating form?

Copy link
Copy Markdown
Contributor Author

@mgamis-msft mgamis-msft Nov 23, 2023

Choose a reason for hiding this comment

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

Yup. It is valid when the local video stream is turned off.

overflowGalleryElements={overflowGalleryTiles}
horizontalGalleryStyles={styles?.horizontalGallery}
/* @conditional-compile-remove(vertical-gallery) */
Expand All @@ -230,7 +230,8 @@ export const FloatingLocalVideoLayout = (props: FloatingLocalVideoLayoutProps):
/* @conditional-compile-remove(vertical-gallery) */ overflowGalleryPosition,
setIndexesToRender,
/* @conditional-compile-remove(vertical-gallery) */ styles?.verticalGallery,
parentWidth
parentWidth,
localVideoComponent
]);

return (
Expand Down
9 changes: 4 additions & 5 deletions packages/react-components/src/components/VideoGallery/OverflowGallery.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,13 @@ export const OverflowGallery = (props: {
const scrollableHorizontalGalleryContainerStyles = useMemo(() => {
if (isNarrow && parentWidth) {
return {
width:
props.layout === 'default'
? `${_convertPxToRem(parentWidth) - 1}rem`
: `${_convertPxToRem(parentWidth) - SMALL_FLOATING_MODAL_SIZE_REM.width - 1}rem`
width: shouldFloatLocalVideo
? `${_convertPxToRem(parentWidth) - SMALL_FLOATING_MODAL_SIZE_REM.width - 1}rem`
: `${_convertPxToRem(parentWidth) - 1}rem`
};
}
return undefined;
}, [isNarrow, parentWidth, props.layout]);
Comment thread
mgamis-msft marked this conversation as resolved.
}, [isNarrow, parentWidth, shouldFloatLocalVideo]);

/* @conditional-compile-remove(vertical-gallery) */
if (overflowGalleryPosition === 'verticalRight') {
Expand Down
5 changes: 3 additions & 2 deletions packages/react-components/src/components/VideoGallery/SpeakerVideoLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ export const SpeakerVideoLayout = (props: SpeakerVideoLayoutProps): JSX.Element
isShort={isShort}
onFetchTilesToRender={setIndexesToRender}
isNarrow={isNarrow}
shouldFloatLocalVideo={true}
shouldFloatLocalVideo={!!localVideoComponent}
overflowGalleryElements={overflowGalleryTiles}
horizontalGalleryStyles={styles?.horizontalGallery}
/* @conditional-compile-remove(vertical-gallery) */
Expand All @@ -205,7 +205,8 @@ export const SpeakerVideoLayout = (props: SpeakerVideoLayoutProps): JSX.Element
/* @conditional-compile-remove(vertical-gallery) */ overflowGalleryPosition,
setIndexesToRender,
/* @conditional-compile-remove(vertical-gallery) */ styles?.verticalGallery,
parentWidth
parentWidth,
localVideoComponent
]);

return (
Expand Down
⚡