Skip to content
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

fix: bugs for equal prominence #1591

Merged
merged 6 commits into from
Aug 10, 2023
Merged

fix: bugs for equal prominence #1591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5bc0b9e
fix: set letter boxing when needed
raviteja83 Aug 10, 2023
6b7c399
fix: uncomment hls
raviteja83 Aug 10, 2023
14f7991
fix: hls streaming ui
raviteja83 Aug 10, 2023
5d15d0c
fix: useeffect deps
KaustubhKumar05 Aug 10, 2023
08beda8
fix: pagination
raviteja83 Aug 10, 2023
79a331d
fix: resolve conflict
KaustubhKumar05 Aug 10, 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
1 change: 1 addition & 0 deletions packages/roomkit-react/src/Prebuilt/components/EqualProminence.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ export function EqualProminence() {
peerId={tile.peer?.id}
trackId={tile.track?.id}
rootCSS={{ padding: 0 }}
objectFit="contain"
/>
);
})}
Expand Down
3 changes: 1 addition & 2 deletions ...ges/roomkit-react/src/Prebuilt/components/IconButtonWithOptions/IconButtonWithOptions.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,12 @@ export const IconButtonWithOptions = ({
onClick = () => {
return;
},
key = '',
}) => {
const bgCss = { backgroundColor: active ? '$transparent' : '$secondary_dim' };
const iconCss = { color: active ? '$on_surface_high' : '$on_primary_high' };
return (
<Flex>
<IconSection css={bgCss} onClick={onClick} key={key}>
<IconSection css={bgCss} onClick={onClick}>
<Tooltip disabled={!tooltipMessage} title={tooltipMessage}>
<Flex align="center" justify="center" css={iconCss}>
{icon}
Expand Down
2 changes: 1 addition & 1 deletion packages/roomkit-react/src/Prebuilt/components/VideoList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const List = ({ maxTileCount, peers, maxColCount, maxRowCount, includeScreenShar
: null}
</StyledVideoList.Container>
{!isHeadless && pagesWithTiles.length > 1 ? (
<Pagination page={page} setPage={setPage} numPages={pagesWithTiles.length} />
<Pagination page={page} onPageChange={setPage} numPages={pagesWithTiles.length} />
) : null}
</StyledVideoList.Root>
);
Expand Down
1 change: 1 addition & 0 deletions packages/roomkit-react/src/Prebuilt/layouts/SidePane.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const SidePane = ({ css = {} }) => {
bg: '$surface_default',
r: '$1',
ml: '$8',
position: 'relative',
...css,
'@lg': {
w: '100%',
Expand Down
5 changes: 3 additions & 2 deletions packages/roomkit-react/src/Prebuilt/layouts/mainView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,12 @@ export const ConferenceMainView = () => {
!isHLSRunning &&
joinForm.join_btn_type === JoinForm_JoinBtnType.JOIN_BTN_TYPE_JOIN_AND_GO_LIVE
) {
// startHLS();
startHLS();
}

hmsActions.sessionStore.observe([SESSION_STORE_KEY.PINNED_MESSAGE, SESSION_STORE_KEY.SPOTLIGHT]);
}, [isConnected, hmsActions, permissions, joinForm, isHLSRunning]);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [isConnected, hmsActions, permissions, joinForm]);

if (!localPeerRole) {
// we don't know the role yet to decide how to render UI
Expand Down
2 changes: 1 addition & 1 deletion packages/roomkit-react/src/Video/Video.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export const StyledVideo = styled('video', {
justifyContent: 'center',
alignItems: 'center',
borderRadius: '$2',
objectFit: 'contain',
objectFit: 'cover',
background: '$background_default',
variants: {
mirror: {
Expand Down