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] starting conferences with mic and cam on their default states do not sync the state with the provider #26966

Merged
merged 5 commits into from
Oct 21, 2022
Merged

[FIX] starting conferences with mic and cam on their default states do not sync the state with the provider #26966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7357477
fix: videoconf cam preference on manager
dougfabris Sep 27, 2022
58c3b79
Merge branch 'develop' into chore/videoconf-preferences
dougfabris Sep 27, 2022
410c6da
Merge branch 'develop' into chore/videoconf-preferences
dougfabris Oct 11, 2022
915e1e2
Merge branch 'develop' into chore/videoconf-preferences
dougfabris Oct 20, 2022
0fcbc6a
fix: color name
dougfabris Oct 20, 2022
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
2 changes: 1 addition & 1 deletion apps/meteor/client/lib/VideoConfManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export const VideoConfManager = new (class VideoConfManager extends Emitter<Vide
constructor() {
super();
this.incomingDirectCalls = new Map<string, IncomingDirectCall>();
this._preferences = { mic: true };
this._preferences = { mic: true, cam: false };
this._capabilities = {};
}

Expand Down
2 changes: 1 addition & 1 deletion ...m/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/VideoConfPopupRoomInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const VideoConfPopupRoomInfo = ({ room }: { room: IRoom }): ReactElement => {

return (
<VideoConfPopupInfo avatar={avatar} icon={<RoomIcon placement='default' room={room} />}>
{room.fname}
{room.fname || room.name}
</VideoConfPopupInfo>
);
};
Expand Down
6 changes: 4 additions & 2 deletions packages/ui-video-conf/src/VideoConfPopup/VideoConfPopup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Box } from '@rocket.chat/fuselage';
import { Box, Palette } from '@rocket.chat/fuselage';
import styled from '@rocket.chat/styled';
import { forwardRef } from 'react';
import type { ReactNode, ReactElement, HTMLAttributes, Ref } from 'react';
Expand All @@ -7,6 +7,8 @@ export const VideoConfPopupContainer = styled('div', ({ position: _position, ...
width: 100%;
position: absolute;
box-shadow: 0px 4px 32px rgba(0, 0, 0, 0.15);
background-color: ${Palette.surface['surface-light'].toString()};
border-radius: 0.25rem;
top: ${(p): string => (p.position ? `${p.position}px` : '0')};
left: -${(p): string => (p.position ? `${p.position}px` : '0')};
`;
Expand All @@ -22,7 +24,7 @@ const VideoConfPopup = forwardRef(function VideoConfPopup(
): ReactElement {
return (
<VideoConfPopupContainer ref={ref} position={position}>
<Box p='x24' maxWidth='x276' backgroundColor='white'>
<Box p='x24' maxWidth='x276'>
{children}
</Box>
</VideoConfPopupContainer>
Expand Down