Open source video conferencing app powered by LiveKit. Built with Django and React.
♻️(frontend) simplify videoconference layout and clarify component roles
lebaudantoine416411b843a6
diff --git a/src/frontend/src/features/layout/components/LayoutWrapper.tsx b/src/frontend/src/features/layout/components/LayoutWrapper.tsxdeleted file mode 100644index 7e012a1b..00000000--- a/src/frontend/src/features/layout/components/LayoutWrapper.tsx+++ /dev/null@@ -1,24 +0,0 @@-import { styled } from '@/styled-system/jsx'-import { cva } from '@/styled-system/css'--export const LayoutWrapper = styled(- 'div',- cva({- base: {- position: 'relative',- display: 'flex',- width: '100%',- transition: 'height .5s cubic-bezier(0.4,0,0.2,1) 5ms',- },- variants: {- areSubtitlesOpen: {- true: {- height: 'calc(100% - 12rem)',- },- false: {- height: '100%',- },- },- },- })-)diff --git a/src/frontend/src/features/layout/components/RoomContentArea.tsx b/src/frontend/src/features/layout/components/RoomContentArea.tsxnew file mode 100644index 00000000..bc60ccb8--- /dev/null+++ b/src/frontend/src/features/layout/components/RoomContentArea.tsx@@ -0,0 +1,72 @@+// RoomContentArea.tsx++import React from 'react'+import { styled } from '@/styled-system/jsx'+import { cva } from '@/styled-system/css'+import { useSubtitles } from '@/features/subtitle/hooks/useSubtitles'+import { useSidePanel } from '@/features/rooms/livekit/hooks/useSidePanel'+import {Subtitles} from "@/features/subtitle/component/Subtitles";+import {MainNotificationToast} from "@/features/notifications/MainNotificationToast";+++const RoomViewport = styled(+ 'div',+ cva({+ base: {+ position: 'absolute',+ maxHeight: '100%',+ transition: 'inset .5s cubic-bezier(0.4,0,0.2,1) 5ms',+ },+ variants: {+ isSidePanelOpen: {+ true: {+ inset: `var(--lk-grid-gap) calc(358px + 3rem) calc(80px + var(--lk-grid-gap)) 16px`,+ },+ false: {+ inset: `var(--lk-grid-gap) var(--lk-grid-gap) calc(80px + var(--lk-grid-gap))`,+ },+ },+ },+ })+)++const TrackAreaContainer = styled(+ 'div',+ cva({+ base: {+ position: 'relative',+ display: 'flex',+ width: '100%',+ transition: 'height .5s cubic-bezier(0.4,0,0.2,1) 5ms',+ },+ variants: {+ areSubtitlesOpen: {+ true: {+ height: 'calc(100% - 12rem)',+ },+ false: {+ height: '100%',+ },+ },+ },+ })+)++interface RoomContentAreaProps {+ children: React.ReactNode+}++export function RoomContentArea({ children }: RoomContentAreaProps) {+ const { isSidePanelOpen } = useSidePanel()+ const { areSubtitlesOpen } = useSubtitles()++ return (+ <RoomViewport isSidePanelOpen={isSidePanelOpen}>+ <TrackAreaContainer areSubtitlesOpen={areSubtitlesOpen}>+ {children}+ </TrackAreaContainer>+ <Subtitles />+ <MainNotificationToast />+ </RoomViewport>+ )+}diff --git a/src/frontend/src/features/rooms/livekit/prefabs/VideoConference.tsx b/src/frontend/src/features/rooms/livekit/prefabs/VideoConference.tsxindex b7d8247d..42e1e17b 100644--- a/src/frontend/src/features/rooms/livekit/prefabs/VideoConference.tsx+++ b/src/frontend/src/features/rooms/livekit/prefabs/VideoConference.tsx@@ -20,11 +20,9 @@ import {import { useTranslation } from 'react-i18next'import { ControlBar } from './ControlBar/ControlBar'-import { MainNotificationToast } from '@/features/notifications/MainNotificationToast'import { FocusLayout } from '../components/FocusLayout'import { ParticipantTile } from '../components/ParticipantTile'import { SidePanel } from '../components/SidePanel'-import { useSidePanel } from '../hooks/useSidePanel'import { RecordingProvider } from '@/features/recording'import { ScreenShareErrorModal } from '../components/ScreenShareErrorModal'import { useConnectionObserver } from '../hooks/useConnectionObserver'@@ -35,15 +33,15 @@ import { useSettingsDialog } from '@/features/settings'import { SettingsDialogExtendedKey } from '@/features/settings/type'import { useVideoResolutionSubscription } from '../hooks/useVideoResolutionSubscription'import { SettingsDialogProvider } from '@/features/settings/components/SettingsDialogProvider'-import { useSubtitles } from '@/features/subtitle/hooks/useSubtitles'-import { Subtitles } from '@/features/subtitle/component/Subtitles'import { IsIdleDisconnectModal } from '../components/IsIdleDisconnectModal'import { getParticipantName } from '@/features/rooms/utils/getParticipantName'import { useScreenReaderAnnounce } from '@/hooks/useScreenReaderAnnounce'import { ReactionPortals } from '@/features/reactions/components/ReactionPortals'import { CarouselLayout } from '@/features/layout/components/CarouselLayout'import { GridLayout } from '@/features/layout/components/GridLayout'-import { LayoutWrapper } from '@/features/layout/components/LayoutWrapper'+import {+ RoomContentArea,+} from '@/features/layout/components/RoomContentArea'/*** @public@@ -231,9 +229,6 @@ export function VideoConference({ ...props }: VideoConferenceProps) {])/* eslint-enable react-hooks/exhaustive-deps */- const { isSidePanelOpen } = useSidePanel()- const { areSubtitlesOpen } = useSubtitles()-const [isShareErrorVisible, setIsShareErrorVisible] = useState(false)return (@@ -254,57 +249,36 @@ export function VideoConference({ ...props }: VideoConferenceProps) {onClose={() => setIsShareErrorVisible(false)}/><IsIdleDisconnectModal />- <div- // todo - extract these magic values into constant- style={{- position: 'absolute',- inset: isSidePanelOpen- ? `var(--lk-grid-gap) calc(358px + 3rem) calc(80px + var(--lk-grid-gap)) 16px`- : `var(--lk-grid-gap) var(--lk-grid-gap) calc(80px + var(--lk-grid-gap))`,- transition: 'inset .5s cubic-bezier(0.4,0,0.2,1) 5ms',- maxHeight: '100%',- }}+ <RoomContentArea>- <LayoutWrapper areSubtitlesOpen={areSubtitlesOpen}>- <div- style={{- display: 'flex',- position: 'relative',- width: '100%',- }}- >- {!focusTrack ? (- <div- className="lk-grid-layout-wrapper"- style={{ height: 'auto' }}- >- <GridLayout tracks={tracks} style={{ padding: 0 }}>+ {!focusTrack ? (+ <div+ className="lk-grid-layout-wrapper"+ style={{ height: 'auto' }}+ >+ <GridLayout tracks={tracks} style={{ padding: 0 }}>+ <ParticipantTile />+ </GridLayout>+ </div>+ ) : (+ <div+ className="lk-focus-layout-wrapper"+ style={{ height: 'auto' }}+ >+ <FocusLayoutContainer style={{ padding: 0 }}>+ <CarouselLayout+ tracks={carouselTracks}+ style={{+ minWidth: '200px',+ }}+ ><ParticipantTile />- </GridLayout>- </div>- ) : (- <div- className="lk-focus-layout-wrapper"- style={{ height: 'auto' }}- >- <FocusLayoutContainer style={{ padding: 0 }}>- <CarouselLayout- tracks={carouselTracks}- style={{- minWidth: '200px',- }}- >- <ParticipantTile />- </CarouselLayout>- {focusTrack && <FocusLayout trackRef={focusTrack} />}- </FocusLayoutContainer>- </div>- )}- </div>- </LayoutWrapper>- <Subtitles />- <MainNotificationToast />- </div>+ </CarouselLayout>+ {focusTrack && <FocusLayout trackRef={focusTrack} />}+ </FocusLayoutContainer>+ </div>+ )}+ </RoomContentArea><ControlBaronDeviceError={(e) => {console.error(e)