diff --git a/src/frontend/src/features/rooms/livekit/components/ScreenShareZoomControls.tsx b/src/frontend/src/features/rooms/livekit/components/ScreenShareZoomControls.tsx index 7cb35142..78eab045 100644 --- a/src/frontend/src/features/rooms/livekit/components/ScreenShareZoomControls.tsx +++ b/src/frontend/src/features/rooms/livekit/components/ScreenShareZoomControls.tsx @@ -1,5 +1,4 @@ import { css } from '@/styled-system/css' -import { HStack } from '@/styled-system/jsx' import { Button } from '@/primitives' import { RiCollapseDiagonalLine, @@ -9,6 +8,7 @@ import { RiZoomOutLine, } from '@remixicon/react' import { useTranslation } from 'react-i18next' +import { Toolbar } from 'react-aria-components' import { useCallback, useEffect, useRef, useState } from 'react' import { useScreenReaderAnnounce } from '@/hooks/useScreenReaderAnnounce' import { isMacintosh } from '@/utils/livekit' @@ -100,15 +100,16 @@ export const ScreenShareZoomControls = ({ pointerEvents: 'auto', })} > - )} - + ) } diff --git a/src/frontend/src/features/rooms/livekit/hooks/useScreenShareZoom.ts b/src/frontend/src/features/rooms/livekit/hooks/useScreenShareZoom.ts index 1dbabf9d..9fb5ccb3 100644 --- a/src/frontend/src/features/rooms/livekit/hooks/useScreenShareZoom.ts +++ b/src/frontend/src/features/rooms/livekit/hooks/useScreenShareZoom.ts @@ -233,6 +233,8 @@ export const useScreenShareZoom = () => { const isZoomed = zoomRef.current > MIN_ZOOM if (!isZoomed && e.key !== '+' && e.key !== '=') return + if (e.key.startsWith('Arrow') && e.target !== e.currentTarget) return + switch (e.key) { case 'ArrowLeft': e.preventDefault() diff --git a/src/frontend/src/locales/de/rooms.json b/src/frontend/src/locales/de/rooms.json index f2a13ccd..4f23a043 100644 --- a/src/frontend/src/locales/de/rooms.json +++ b/src/frontend/src/locales/de/rooms.json @@ -770,7 +770,7 @@ "fullScreen": "Vollbild", "exitFullScreen": "Vollbild beenden", "currentZoomLevel": "Zoom {{level}} %", - "panHint": "Zoom {{level}} %. Mit der Maus ziehen oder Pfeiltasten zum Navigieren verwenden.", + "panHint": "Zoom {{level}} %. Mit der Maus ziehen oder den Fokus zurück auf die Bildschirmfreigabe setzen und mit den Pfeiltasten im Bild navigieren.", "fullScreenEntered": "Vollbild aktiviert", "fullScreenExited": "Vollbild deaktiviert" }, diff --git a/src/frontend/src/locales/en/rooms.json b/src/frontend/src/locales/en/rooms.json index 8baff00b..2f1fe60e 100644 --- a/src/frontend/src/locales/en/rooms.json +++ b/src/frontend/src/locales/en/rooms.json @@ -770,7 +770,7 @@ "fullScreen": "Full screen", "exitFullScreen": "Exit full screen", "currentZoomLevel": "Zoom {{level}} %", - "panHint": "Zoom {{level}} %. Drag with mouse or use arrow keys to navigate.", + "panHint": "Zoom {{level}} %. Drag with mouse, or move focus back to the screen share and use arrow keys to navigate the picture.", "fullScreenEntered": "Full screen enabled", "fullScreenExited": "Full screen disabled" }, diff --git a/src/frontend/src/locales/fr/rooms.json b/src/frontend/src/locales/fr/rooms.json index 366b68d9..16d006e3 100644 --- a/src/frontend/src/locales/fr/rooms.json +++ b/src/frontend/src/locales/fr/rooms.json @@ -770,7 +770,7 @@ "fullScreen": "Plein écran", "exitFullScreen": "Quitter le plein écran", "currentZoomLevel": "Zoom {{level}} %", - "panHint": "Zoom {{level}} %. Glissez avec la souris ou utilisez les touches fléchées pour naviguer.", + "panHint": "Zoom {{level}} %. Glissez avec la souris, ou revenez sur le partage d'écran et utilisez les touches fléchées pour naviguer dans l'image.", "fullScreenEntered": "Plein écran activé", "fullScreenExited": "Plein écran désactivé" }, diff --git a/src/frontend/src/locales/nl/rooms.json b/src/frontend/src/locales/nl/rooms.json index fb1e57a3..52ae6e35 100644 --- a/src/frontend/src/locales/nl/rooms.json +++ b/src/frontend/src/locales/nl/rooms.json @@ -770,7 +770,7 @@ "fullScreen": "Volledig scherm", "exitFullScreen": "Volledig scherm verlaten", "currentZoomLevel": "Zoom {{level}} %", - "panHint": "Zoom {{level}} %. Sleep met de muis of gebruik de pijltjestoetsen om te navigeren.", + "panHint": "Zoom {{level}} %. Sleep met de muis, of zet de focus terug op de schermdeling en gebruik de pijltjestoetsen om door het beeld te navigeren.", "fullScreenEntered": "Volledig scherm ingeschakeld", "fullScreenExited": "Volledig scherm uitgeschakeld" },