mirror of
https://github.com/suitenumerique/meet.git
synced 2026-09-04 14:45:40 +00:00
♻️(refactor) remove PiP subtitles controls and align PiP toast container
Drop subtitles actions from PiP controls and reuse main toast container style.
This commit is contained in:
@@ -7,7 +7,6 @@ import { AudioDevicesControl } from '@/features/rooms/livekit/components/control
|
|||||||
import { VideoDeviceControl } from '@/features/rooms/livekit/components/controls/Device/VideoDeviceControl'
|
import { VideoDeviceControl } from '@/features/rooms/livekit/components/controls/Device/VideoDeviceControl'
|
||||||
import { ScreenShareToggle } from '@/features/rooms/livekit/components/controls/ScreenShareToggle'
|
import { ScreenShareToggle } from '@/features/rooms/livekit/components/controls/ScreenShareToggle'
|
||||||
import { LeaveButton } from '@/features/rooms/livekit/components/controls/LeaveButton'
|
import { LeaveButton } from '@/features/rooms/livekit/components/controls/LeaveButton'
|
||||||
import { SubtitlesToggle } from '@/features/rooms/livekit/components/controls/SubtitlesToggle'
|
|
||||||
import { HandToggle } from '@/features/rooms/livekit/components/controls/HandToggle'
|
import { HandToggle } from '@/features/rooms/livekit/components/controls/HandToggle'
|
||||||
import { StartMediaButton } from '@/features/rooms/livekit/components/controls/StartMediaButton'
|
import { StartMediaButton } from '@/features/rooms/livekit/components/controls/StartMediaButton'
|
||||||
import { usePipElementSize } from '../hooks/usePipElementSize'
|
import { usePipElementSize } from '../hooks/usePipElementSize'
|
||||||
@@ -16,7 +15,6 @@ import { PipReactionsToggle } from './PipReactionsToggle'
|
|||||||
|
|
||||||
export const CollapsibleControls = {
|
export const CollapsibleControls = {
|
||||||
HAND: 'hand',
|
HAND: 'hand',
|
||||||
SUBTITLES: 'subtitles',
|
|
||||||
SCREEN_SHARE: 'screenShare',
|
SCREEN_SHARE: 'screenShare',
|
||||||
REACTIONS: 'reactions',
|
REACTIONS: 'reactions',
|
||||||
} as const
|
} as const
|
||||||
@@ -26,7 +24,6 @@ export type CollapsibleControl =
|
|||||||
|
|
||||||
const COLLAPSE_ORDER: CollapsibleControl[] = [
|
const COLLAPSE_ORDER: CollapsibleControl[] = [
|
||||||
CollapsibleControls.HAND,
|
CollapsibleControls.HAND,
|
||||||
CollapsibleControls.SUBTITLES,
|
|
||||||
CollapsibleControls.SCREEN_SHARE,
|
CollapsibleControls.SCREEN_SHARE,
|
||||||
CollapsibleControls.REACTIONS,
|
CollapsibleControls.REACTIONS,
|
||||||
]
|
]
|
||||||
@@ -90,7 +87,6 @@ export const PipControlBar = ({
|
|||||||
<VideoDeviceControl hideMenu />
|
<VideoDeviceControl hideMenu />
|
||||||
{!hidden.has(CollapsibleControls.REACTIONS) && <PipReactionsToggle />}
|
{!hidden.has(CollapsibleControls.REACTIONS) && <PipReactionsToggle />}
|
||||||
{showScreenShare && !hidden.has(CollapsibleControls.SCREEN_SHARE) && <ScreenShareToggle />}
|
{showScreenShare && !hidden.has(CollapsibleControls.SCREEN_SHARE) && <ScreenShareToggle />}
|
||||||
{!hidden.has(CollapsibleControls.SUBTITLES) && <SubtitlesToggle />}
|
|
||||||
{!hidden.has(CollapsibleControls.HAND) && <HandToggle />}
|
{!hidden.has(CollapsibleControls.HAND) && <HandToggle />}
|
||||||
<PipOptionsMenu overflowControls={hidden} />
|
<PipOptionsMenu overflowControls={hidden} />
|
||||||
<LeaveButton />
|
<LeaveButton />
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import React from 'react'
|
|||||||
import { MenuItem } from 'react-aria-components'
|
import { MenuItem } from 'react-aria-components'
|
||||||
import {
|
import {
|
||||||
RiHand,
|
RiHand,
|
||||||
RiClosedCaptioningLine,
|
|
||||||
RiArrowUpLine,
|
RiArrowUpLine,
|
||||||
RiEmotionLine,
|
RiEmotionLine,
|
||||||
} from '@remixicon/react'
|
} from '@remixicon/react'
|
||||||
@@ -12,8 +11,6 @@ import { pipLayoutStore } from '@/features/pip/stores/pipLayoutStore'
|
|||||||
import { menuRecipe } from '@/primitives/menuRecipe'
|
import { menuRecipe } from '@/primitives/menuRecipe'
|
||||||
import { useRoomContext, useTrackToggle } from '@livekit/components-react'
|
import { useRoomContext, useTrackToggle } from '@livekit/components-react'
|
||||||
import { useRaisedHand } from '@/features/rooms/livekit/hooks/useRaisedHand'
|
import { useRaisedHand } from '@/features/rooms/livekit/hooks/useRaisedHand'
|
||||||
import { useSubtitles } from '@/features/subtitle/hooks/useSubtitles'
|
|
||||||
import { useAreSubtitlesAvailable } from '@/features/subtitle/hooks/useAreSubtitlesAvailable'
|
|
||||||
import { useSnapshot } from 'valtio'
|
import { useSnapshot } from 'valtio'
|
||||||
import { CollapsibleControls, type CollapsibleControl } from '../PipControlBar'
|
import { CollapsibleControls, type CollapsibleControl } from '../PipControlBar'
|
||||||
|
|
||||||
@@ -29,8 +26,6 @@ export const PipOverflowItems = ({
|
|||||||
const { isHandRaised, toggleRaisedHand } = useRaisedHand({
|
const { isHandRaised, toggleRaisedHand } = useRaisedHand({
|
||||||
participant: room.localParticipant,
|
participant: room.localParticipant,
|
||||||
})
|
})
|
||||||
const { areSubtitlesOpen, toggleSubtitles } = useSubtitles()
|
|
||||||
const areSubtitlesAvailable = useAreSubtitlesAvailable()
|
|
||||||
const { buttonProps: screenShareProps, enabled: isScreenSharing } =
|
const { buttonProps: screenShareProps, enabled: isScreenSharing } =
|
||||||
useTrackToggle({
|
useTrackToggle({
|
||||||
source: Track.Source.ScreenShare,
|
source: Track.Source.ScreenShare,
|
||||||
@@ -59,14 +54,6 @@ export const PipOverflowItems = ({
|
|||||||
{t(isScreenSharing ? 'controls.screenShare.stop' : 'controls.screenShare.start')}
|
{t(isScreenSharing ? 'controls.screenShare.stop' : 'controls.screenShare.start')}
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
)}
|
)}
|
||||||
{overflowControls.has(CollapsibleControls.SUBTITLES) && areSubtitlesAvailable && (
|
|
||||||
<MenuItem onAction={toggleSubtitles} className={itemClass}>
|
|
||||||
<RiClosedCaptioningLine size={20} />
|
|
||||||
{areSubtitlesOpen
|
|
||||||
? t('controls.subtitles.open')
|
|
||||||
: t('controls.subtitles.closed')}
|
|
||||||
</MenuItem>
|
|
||||||
)}
|
|
||||||
{overflowControls.has(CollapsibleControls.HAND) && (
|
{overflowControls.has(CollapsibleControls.HAND) && (
|
||||||
<MenuItem onAction={toggleRaisedHand} className={itemClass}>
|
<MenuItem onAction={toggleRaisedHand} className={itemClass}>
|
||||||
<RiHand size={20} />
|
<RiHand size={20} />
|
||||||
|
|||||||
Reference in New Issue
Block a user