Skip to content

Commit

Permalink
au moins ça marche mais pas de stack
Browse files Browse the repository at this point in the history
  • Loading branch information
RVassili committed Apr 4, 2022
1 parent 694c6c6 commit 980d5ba
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
13 changes: 6 additions & 7 deletions src/frontend/components/Button/ButtonLayout/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useContext } from 'react';
import { Box, Text, ResponsiveContext, Stack } from 'grommet';
import { Box, Text, ResponsiveContext } from 'grommet';
import styled from 'styled-components';

import { SvgProps } from 'components/SVGIcons';
Expand Down Expand Up @@ -67,12 +67,10 @@ export const ButtonLayout = ({
const rectColor = reversed ? tintColor : undefined;

return (
<Box align="center" fill>
<Box align="center" flex height="100%">
{Icon && (
<Stack anchor="bottom-right" fill>
<IconBox screenSize={size}>
<Icon focusColor={rectColor} height="100%" iconColor={iconColor} />
</IconBox>
<IconBox screenSize={size}>
<Icon iconColor={iconColor} focusColor={rectColor} height="100%" />
{badge && (
<Box
align="center"
Expand All @@ -83,13 +81,14 @@ export const ButtonLayout = ({
}}
pad={{ horizontal: '3px', vertical: '1px' }}
round="6px"
style={{ position: 'absolute', bottom: '0px', right: '0px' }}
>
<StyledTextBadge color={tintColor} size="0.688rem">
{badge}
</StyledTextBadge>
</Box>
)}
</Stack>
</IconBox>
)}

{label && (
Expand Down
6 changes: 3 additions & 3 deletions src/frontend/components/LiveControls/ViewersWrapper/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ interface ViewersWrapperProps {
video?: Video;
}

export const ViewersWrapper = ({ video }: ViewersWrapperProps) => {
export const ViewersWrapper = ({}: ViewersWrapperProps) => {
const { currentItem, isPanelVisible } = useLivePanelState((state) => ({
currentItem: state.currentItem,
isPanelVisible: state.isPanelVisible,
}));

const nbrOfOnStageRequests =
video && video.participants_asking_to_join.length;
const nbrOfOnStageRequests = 6;
// video && video.participants_asking_to_join.length;

if (currentItem === LivePanelItem.VIEWERS_LIST && isPanelVisible) {
return (
Expand Down

0 comments on commit 980d5ba

Please sign in to comment.