Open source video conferencing app powered by LiveKit. Built with Django and React.
🚸(frontend) improve share screen UX
lebaudantoine31051cd6c483
diff --git a/src/frontend/src/features/rooms/livekit/components/controls/ScreenShareToggle.tsx b/src/frontend/src/features/rooms/livekit/components/controls/ScreenShareToggle.tsxnew file mode 100644index 00000000..f66b4838--- /dev/null+++ b/src/frontend/src/features/rooms/livekit/components/controls/ScreenShareToggle.tsx@@ -0,0 +1,54 @@+import { Div, ToggleButton } from '@/primitives'+import { RiArrowUpLine, RiCloseFill, RiRectangleLine } from '@remixicon/react'+import { useTranslation } from 'react-i18next'+import { useTrackToggle, UseTrackToggleProps } from '@livekit/components-react'+import { Track } from 'livekit-client'+import React from 'react'++export const ScreenShareToggle = (+ props: Omit<+ UseTrackToggleProps<Track.Source.ScreenShare>,+ 'source' | 'captureOptions'+ >+) => {+ const { t } = useTranslation('rooms', { keyPrefix: 'controls' })+ const { buttonProps, enabled } = useTrackToggle({+ ...props,+ source: Track.Source.ScreenShare,+ captureOptions: { audio: true, selfBrowserSurface: 'include' },+ })++ const Icon = enabled ? RiCloseFill : RiArrowUpLine++ // fixme - remove ToggleButton custom styles when we design a proper icon+ return (+ <ToggleButton+ isSelected={enabled}+ square+ legacyStyle+ tooltip={t(enabled ? 'stopScreenShare' : 'shareScreen')}+ onPress={(e) =>+ buttonProps.onClick?.(+ e as unknown as React.MouseEvent<HTMLButtonElement, MouseEvent>+ )+ }+ style={{+ maxWidth: '46px',+ maxHeight: '46px',+ }}+ >+ <Div position="relative">+ <RiRectangleLine size={28} />+ <Icon+ size={16}+ style={{+ position: 'absolute',+ top: '50%',+ left: '50%',+ transform: 'translate(-50%, -50%)',+ }}+ />+ </Div>+ </ToggleButton>+ )+}diff --git a/src/frontend/src/features/rooms/livekit/prefabs/ControlBar.tsx b/src/frontend/src/features/rooms/livekit/prefabs/ControlBar.tsxindex 77a16bd5..f71bc53d 100644--- a/src/frontend/src/features/rooms/livekit/prefabs/ControlBar.tsx+++ b/src/frontend/src/features/rooms/livekit/prefabs/ControlBar.tsx@@ -4,7 +4,6 @@ import * as React from 'react'import { supportsScreenSharing } from '@livekit/components-core'import {- TrackToggle,useMaybeLayoutContext,usePersistentUserChoices,} from '@livekit/components-react'@@ -12,13 +11,13 @@ import {import { mergeProps } from '@/utils/mergeProps.ts'import { StartMediaButton } from '../components/controls/StartMediaButton'import { useMediaQuery } from '../hooks/useMediaQuery'-import { useTranslation } from 'react-i18next'import { OptionsButton } from '../components/controls/Options/OptionsButton'import { ParticipantsToggle } from '../components/controls/Participants/ParticipantsToggle'import { ChatToggle } from '../components/controls/ChatToggle'import { HandToggle } from '../components/controls/HandToggle'import { SelectToggleDevice } from '../components/controls/SelectToggleDevice'import { LeaveButton } from '../components/controls/LeaveButton'+import { ScreenShareToggle } from '../components/controls/ScreenShareToggle'/** @public */export type ControlBarControls = {@@ -66,7 +65,6 @@ export function ControlBar({onDeviceError,...props}: ControlBarProps) {- const { t } = useTranslation('rooms', { keyPrefix: 'controls' })const [isChatOpen, setIsChatOpen] = React.useState(false)const layoutContext = useMaybeLayoutContext()React.useEffect(() => {@@ -82,26 +80,8 @@ export function ControlBar({const defaultVariation = isTooLittleSpace ? 'minimal' : 'verbose'variation ??= defaultVariation- const showIcon = React.useMemo(- () => variation === 'minimal' || variation === 'verbose',- [variation]- )- const showText = React.useMemo(- () => variation === 'textOnly' || variation === 'verbose',- [variation]- )-const browserSupportsScreenSharing = supportsScreenSharing()- const [isScreenShareEnabled, setIsScreenShareEnabled] = React.useState(false)-- const onScreenShareChange = React.useCallback(- (enabled: boolean) => {- setIsScreenShareEnabled(enabled)- },- [setIsScreenShareEnabled]- )-const htmlProps = mergeProps({ className: 'lk-control-bar' }, props)const {@@ -146,18 +126,11 @@ export function ControlBar({}/>{browserSupportsScreenSharing && (- <TrackToggle- source={Track.Source.ScreenShare}- captureOptions={{ audio: true, selfBrowserSurface: 'include' }}- showIcon={showIcon}- onChange={onScreenShareChange}+ <ScreenShareToggleonDeviceError={(error) =>onDeviceError?.({ source: Track.Source.ScreenShare, error })}- >- {showText &&- t(isScreenShareEnabled ? 'stopScreenShare' : 'shareScreen')}- </TrackToggle>+ />)}<HandToggle /><ChatToggle />