diff --git a/src/frontend/src/features/rooms/livekit/components/ScreenShareZoomControls.tsx b/src/frontend/src/features/rooms/livekit/components/ScreenShareZoomControls.tsx
index b0dcfa41..8a36c49b 100644
--- a/src/frontend/src/features/rooms/livekit/components/ScreenShareZoomControls.tsx
+++ b/src/frontend/src/features/rooms/livekit/components/ScreenShareZoomControls.tsx
@@ -2,8 +2,9 @@ import { css } from '@/styled-system/css'
import { HStack } from '@/styled-system/jsx'
import { Button } from '@/primitives'
import {
+ RiCollapseDiagonalLine,
+ RiExpandDiagonalLine,
RiFullscreenExitLine,
- RiFullscreenLine,
RiZoomInLine,
RiZoomOutLine,
} from '@remixicon/react'
@@ -36,7 +37,8 @@ export const ScreenShareZoomControls = ({
const announce = useScreenReaderAnnounce()
const [isFullscreen, setIsFullscreen] = useState(false)
- const wasOwnFullscreen = useRef(false)
+ // Tracks whether this tile's container triggered fullscreen (vs another share's).
+ const wasThisTileFullscreen = useRef(false)
const [isFullscreenAvailable] = useState(
() => typeof document !== 'undefined' && document.fullscreenEnabled
)
@@ -50,10 +52,10 @@ export const ScreenShareZoomControls = ({
setIsFullscreen(isThisTileFullscreen)
if (isThisTileFullscreen) {
- wasOwnFullscreen.current = true
+ wasThisTileFullscreen.current = true
announce(t('fullScreenEntered'), 'assertive')
- } else if (wasOwnFullscreen.current) {
- wasOwnFullscreen.current = false
+ } else if (wasThisTileFullscreen.current) {
+ wasThisTileFullscreen.current = false
announce(t('fullScreenExited'), 'assertive')
}
}
@@ -163,9 +165,9 @@ export const ScreenShareZoomControls = ({
onPress={toggleFullScreen}
>
{isFullscreen ? (
-
+
) : (
-
+
)}
)}
diff --git a/src/frontend/src/features/rooms/livekit/components/controls/Options/FullScreenMenuItem.tsx b/src/frontend/src/features/rooms/livekit/components/controls/Options/FullScreenMenuItem.tsx
index 97e62416..86042141 100644
--- a/src/frontend/src/features/rooms/livekit/components/controls/Options/FullScreenMenuItem.tsx
+++ b/src/frontend/src/features/rooms/livekit/components/controls/Options/FullScreenMenuItem.tsx
@@ -1,4 +1,4 @@
-import { RiFullscreenExitLine, RiFullscreenLine } from '@remixicon/react'
+import { RiCollapseDiagonalLine, RiExpandDiagonalLine } from '@remixicon/react'
import { MenuItem } from 'react-aria-components'
import { useTranslation } from 'react-i18next'
import { menuRecipe } from '@/primitives/menuRecipe'
@@ -20,12 +20,12 @@ export const FullScreenMenuItem = () => {
>
{isCurrentlyFullscreen ? (
<>
-
+
{t('fullscreen.exit')}
>
) : (
<>
-
+
{t('fullscreen.enter')}
>
)}