Open source video conferencing app powered by LiveKit. Built with Django and React.
✨(frontend) introduce in-app toast notification
lebaudantoine3d615fa58226
diff --git a/src/frontend/src/features/notifications/MainNotificationToast.tsx b/src/frontend/src/features/notifications/MainNotificationToast.tsxnew file mode 100644index 00000000..ac1c00d7--- /dev/null+++ b/src/frontend/src/features/notifications/MainNotificationToast.tsx@@ -0,0 +1,35 @@+import { useEffect } from 'react'+import { useRoomContext } from '@livekit/components-react'+import { Participant, RoomEvent } from 'livekit-client'+import { ToastProvider, toastQueue } from './components/ToastProvider'+import { NotificationType } from './NotificationType'+import { Div } from '@/primitives'++export const MainNotificationToast = () => {+ const room = useRoomContext()+ // fixme - remove toast if the user quit room in the 5s she joined+ // fixme - don't show toast on mobile screen+ useEffect(() => {+ const showJoinNotification = (participant: Participant) => {+ toastQueue.add(+ {+ participant,+ type: NotificationType.Joined,+ },+ {+ timeout: 5000,+ }+ )+ }+ room.on(RoomEvent.ParticipantConnected, showJoinNotification)+ return () => {+ room.off(RoomEvent.ParticipantConnected, showJoinNotification)+ }+ }, [room])++ return (+ <Div position="absolute" bottom={20} right={5} zIndex={1000}>+ <ToastProvider />+ </Div>+ )+}diff --git a/src/frontend/src/features/notifications/NotificationType.ts b/src/frontend/src/features/notifications/NotificationType.tsnew file mode 100644index 00000000..2f965016--- /dev/null+++ b/src/frontend/src/features/notifications/NotificationType.ts@@ -0,0 +1,4 @@+export enum NotificationType {+ Joined = 'joined',+ Default = 'default',+}diff --git a/src/frontend/src/features/notifications/components/Toast.tsx b/src/frontend/src/features/notifications/components/Toast.tsxnew file mode 100644index 00000000..59b5c1f3--- /dev/null+++ b/src/frontend/src/features/notifications/components/Toast.tsx@@ -0,0 +1,58 @@+import { useToast } from '@react-aria/toast'+import { Button } from '@/primitives'+import { RiCloseLine } from '@remixicon/react'+import { ToastState } from '@react-stately/toast'+import { styled } from '@/styled-system/jsx'+import { useRef } from 'react'+import { ToastData } from './ToastProvider'+import type { QueuedToast } from '@react-stately/toast'++export const StyledToastContainer = styled('div', {+ base: {+ margin: 0.5,+ boxShadow:+ 'rgba(0, 0, 0, 0.5) 0px 4px 8px 0px, rgba(0, 0, 0, 0.3) 0px 6px 20px 4px',+ backgroundColor: '#494c4f',+ color: 'white',+ borderRadius: '8px',+ '&[data-entering]': { animation: 'fade 200ms' },+ '&[data-exiting]': { animation: 'fade 150ms reverse ease-in' },+ width: 'fit-content',+ marginLeft: 'auto',+ },+})++const StyledToast = styled('div', {+ base: {+ display: 'flex',+ justifyContent: 'space-between',+ alignItems: 'center',+ gap: '1rem',+ padding: '10px',+ },+})++export interface ToastProps {+ key: string+ toast: QueuedToast<ToastData>+ state: ToastState<ToastData>+}++export function Toast({ state, ...props }: ToastProps) {+ const ref = useRef(null)+ const { toastProps, contentProps, closeButtonProps } = useToast(+ props,+ state,+ ref+ )+ return (+ <StyledToastContainer {...toastProps} ref={ref}>+ <StyledToast>+ <div {...contentProps}>{props.toast.content?.message} machine a</div>+ <Button square size="sm" invisible {...closeButtonProps}>+ <RiCloseLine color="white" />+ </Button>+ </StyledToast>+ </StyledToastContainer>+ )+}diff --git a/src/frontend/src/features/notifications/components/ToastJoined.tsx b/src/frontend/src/features/notifications/components/ToastJoined.tsxnew file mode 100644index 00000000..eee9d277--- /dev/null+++ b/src/frontend/src/features/notifications/components/ToastJoined.tsx@@ -0,0 +1,73 @@+import { useToast } from '@react-aria/toast'+import { useRef } from 'react'+import { Button as RACButton } from 'react-aria-components'+import { Track } from 'livekit-client'+import Source = Track.Source++import { useMaybeLayoutContext } from '@livekit/components-react'+import { ParticipantTile } from '@/features/rooms/livekit/components/ParticipantTile'+import { StyledToastContainer, ToastProps } from './Toast'+import { HStack, styled } from '@/styled-system/jsx'+import { Div } from '@/primitives'+import { useTranslation } from 'react-i18next'++const ClickableToast = styled(RACButton, {+ base: {+ cursor: 'pointer',+ display: 'flex',+ borderRadius: 'inherit',+ },+})++export function ToastJoined({ state, ...props }: ToastProps) {+ const { t } = useTranslation('notifications')+ const ref = useRef(null)+ const { toastProps, contentProps, titleProps, closeButtonProps } = useToast(+ props,+ state,+ ref+ )+ const layoutContext = useMaybeLayoutContext()+ const participant = props.toast.content.participant+ const trackReference = {+ participant,+ publication: participant.getTrackPublication(Source.Camera),+ source: Source.Camera,+ }+ const pinParticipant = () => {+ layoutContext?.pin.dispatch?.({+ msg: 'set_pin',+ trackReference,+ })+ }+ return (+ <StyledToastContainer {...toastProps} ref={ref}>+ <ClickableToast+ ref={ref}+ onPress={(e) => {+ pinParticipant()+ closeButtonProps.onPress?.(e)+ }}+ >+ <HStack justify="center" alignItems="center" {...contentProps}>+ <Div display="flex" overflow="hidden" width="128" height="72">+ <ParticipantTile+ trackRef={trackReference}+ disableSpeakingIndicator={true}+ disableMetadata={true}+ style={{+ borderRadius: '7px 0 0 7px',+ width: '100%',+ }}+ />+ </Div>+ <Div padding={20} {...titleProps}>+ {t('joined.description', {+ name: participant.name || t('defaultName'),+ })}+ </Div>+ </HStack>+ </ClickableToast>+ </StyledToastContainer>+ )+}diff --git a/src/frontend/src/features/notifications/components/ToastProvider.tsx b/src/frontend/src/features/notifications/components/ToastProvider.tsxnew file mode 100644index 00000000..2ddf22e9--- /dev/null+++ b/src/frontend/src/features/notifications/components/ToastProvider.tsx@@ -0,0 +1,28 @@+/* eslint-disable react-refresh/only-export-components */+import { ToastQueue, useToastQueue } from '@react-stately/toast'+import { ToastRegion } from './ToastRegion'+import { Participant } from 'livekit-client'+import { NotificationType } from '../NotificationType'++export interface ToastData {+ participant: Participant+ type: NotificationType+ message?: string+}++// Using a global queue for toasts allows for centralized management and queuing of notifications+// from anywhere in the app, providing greater flexibility in complex scenarios.+export const toastQueue = new ToastQueue<ToastData>({+ maxVisibleToasts: 5,+})++export const ToastProvider = ({ ...props }) => {+ const state = useToastQueue<ToastData>(toastQueue)+ return (+ <>+ {state.visibleToasts.length > 0 && (+ <ToastRegion {...props} state={state} />+ )}+ </>+ )+}diff --git a/src/frontend/src/features/notifications/components/ToastRegion.tsx b/src/frontend/src/features/notifications/components/ToastRegion.tsxnew file mode 100644index 00000000..b27ffc1c--- /dev/null+++ b/src/frontend/src/features/notifications/components/ToastRegion.tsx@@ -0,0 +1,26 @@+import { AriaToastRegionProps, useToastRegion } from '@react-aria/toast'+import type { ToastState } from '@react-stately/toast'+import { Toast } from './Toast'+import { useRef } from 'react'+import { NotificationType } from '../NotificationType'+import { ToastJoined } from './ToastJoined'+import { ToastData } from './ToastProvider'++interface ToastRegionProps extends AriaToastRegionProps {+ state: ToastState<ToastData>+}++export function ToastRegion({ state, ...props }: ToastRegionProps) {+ const ref = useRef(null)+ const { regionProps } = useToastRegion(props, state, ref)+ return (+ <div {...regionProps} ref={ref} className="toast-region">+ {state.visibleToasts.map((toast) => {+ if (toast.content?.type === NotificationType.Joined) {+ return <ToastJoined key={toast.key} toast={toast} state={state} />+ }+ return <Toast key={toast.key} toast={toast} state={state} />+ })}+ </div>+ )+}diff --git a/src/frontend/src/features/rooms/livekit/prefabs/VideoConference.tsx b/src/frontend/src/features/rooms/livekit/prefabs/VideoConference.tsxindex f6b36f2d..80fd924c 100644--- a/src/frontend/src/features/rooms/livekit/prefabs/VideoConference.tsx+++ b/src/frontend/src/features/rooms/livekit/prefabs/VideoConference.tsx@@ -35,6 +35,7 @@ import { useSnapshot } from 'valtio'import { participantsStore } from '@/stores/participants'import { FocusLayout } from '../components/FocusLayout'import { ParticipantTile } from '../components/ParticipantTile'+import { MainNotificationToast } from '@/features/notifications/MainNotificationToast'const LayoutWrapper = styled('div',@@ -184,25 +185,33 @@ export function VideoConference({><div className="lk-video-conference-inner"><LayoutWrapper>- {!focusTrack ? (- <div- className="lk-grid-layout-wrapper"- style={{ height: 'auto' }}- >- <GridLayout tracks={tracks}>- <ParticipantTile />- </GridLayout>- </div>- ) : (- <div className="lk-focus-layout-wrapper">- <FocusLayoutContainer>- <CarouselLayout tracks={carouselTracks}>+ <div+ style={{ display: 'flex', position: 'relative', width: '100%' }}+ >+ {!focusTrack ? (+ <div+ className="lk-grid-layout-wrapper"+ style={{ height: 'auto' }}+ >+ <GridLayout tracks={tracks}><ParticipantTile />- </CarouselLayout>- {focusTrack && <FocusLayout trackRef={focusTrack} />}- </FocusLayoutContainer>- </div>- )}+ </GridLayout>+ </div>+ ) : (+ <div+ className="lk-focus-layout-wrapper"+ style={{ height: 'auto' }}+ >+ <FocusLayoutContainer>+ <CarouselLayout tracks={carouselTracks}>+ <ParticipantTile />+ </CarouselLayout>+ {focusTrack && <FocusLayout trackRef={focusTrack} />}+ </FocusLayoutContainer>+ </div>+ )}+ <MainNotificationToast />+ </div><Chatstyle={{ display: widgetState.showChat ? 'grid' : 'none' }}messageFormatter={chatMessageFormatter}diff --git a/src/frontend/src/locales/de/notifications.json b/src/frontend/src/locales/de/notifications.jsonnew file mode 100644index 00000000..a173f1ed--- /dev/null+++ b/src/frontend/src/locales/de/notifications.json@@ -0,0 +1,6 @@+{+ "defaultName": "",+ "joined": {+ "description": ""+ }+}diff --git a/src/frontend/src/locales/en/notifications.json b/src/frontend/src/locales/en/notifications.jsonnew file mode 100644index 00000000..82351f11--- /dev/null+++ b/src/frontend/src/locales/en/notifications.json@@ -0,0 +1,6 @@+{+ "defaultName": "A contributor",+ "joined": {+ "description": "{{name}} join the room"+ }+}diff --git a/src/frontend/src/locales/fr/notifications.json b/src/frontend/src/locales/fr/notifications.jsonnew file mode 100644index 00000000..1449a497--- /dev/null+++ b/src/frontend/src/locales/fr/notifications.json@@ -0,0 +1,6 @@+{+ "defaultName": "Un contributeur",+ "joined": {+ "description": "{{name}} participe à l'appel"+ }+}