Skip to content

armgit / meet

Public Imported from GitHub
0

Open source video conferencing app powered by LiveKit. Built with Django and React.

🚸(frontend) refactor participant tile while being hovered

lebaudantoine17f8ec63190d
diff --git a/src/frontend/src/features/rooms/livekit/components/ParticipantTile.tsx b/src/frontend/src/features/rooms/livekit/components/ParticipantTile.tsx
index 076ea42f..c745c00d 100644
--- a/src/frontend/src/features/rooms/livekit/components/ParticipantTile.tsx
+++ b/src/frontend/src/features/rooms/livekit/components/ParticipantTile.tsx
@@ -1,7 +1,6 @@
import {
AudioTrack,
ConnectionQualityIndicator,
- FocusToggle,
LockLockedIcon,
ParticipantName,
ParticipantTileProps,
@@ -23,11 +22,12 @@ import {
TrackReferenceOrPlaceholder,
} from '@livekit/components-core'
import { Track } from 'livekit-client'
-import { ParticipantPlaceholder } from '@/features/rooms/livekit/components/ParticipantPlaceholder'
import { RiHand } from '@remixicon/react'
-import { useRaisedHand } from '@/features/rooms/livekit/hooks/useRaisedHand'
+import { useRaisedHand } from '../hooks/useRaisedHand'
import { HStack } from '@/styled-system/jsx'
-import { MutedMicIndicator } from '@/features/rooms/livekit/components/MutedMicIndicator'
+import { MutedMicIndicator } from './MutedMicIndicator'
+import { ParticipantPlaceholder } from './ParticipantPlaceholder'
+import { ParticipantTileFocus } from './ParticipantTileFocus'
export function TrackRefContextIfNeeded(
props: React.PropsWithChildren<{
@@ -173,7 +173,9 @@ export const ParticipantTile: (
)}
</>
)}
- {!disableMetadata && <FocusToggle trackRef={trackReference} />}
+ {!disableMetadata && (
+ <ParticipantTileFocus trackRef={trackReference} />
+ )}
</ParticipantContextIfNeeded>
</TrackRefContextIfNeeded>
</div>
diff --git a/src/frontend/src/features/rooms/livekit/components/ParticipantTileFocus.tsx b/src/frontend/src/features/rooms/livekit/components/ParticipantTileFocus.tsx
new file mode 100644
index 00000000..babec88a
--- /dev/null
+++ b/src/frontend/src/features/rooms/livekit/components/ParticipantTileFocus.tsx
@@ -0,0 +1,97 @@
+import { css } from '@/styled-system/css'
+import { HStack } from '@/styled-system/jsx'
+import { Button } from '@/primitives'
+import { RiPushpin2Line, RiUnpinLine } from '@remixicon/react'
+import { useFocusToggle } from '@livekit/components-react'
+import { useTranslation } from 'react-i18next'
+import { TrackReferenceOrPlaceholder } from '@livekit/components-core'
+import { useEffect, useState } from 'react'
+
+const FocusButton = ({
+ trackRef,
+}: {
+ trackRef: TrackReferenceOrPlaceholder
+}) => {
+ const { t } = useTranslation('rooms', { keyPrefix: 'participantTileFocus' })
+ const { mergedProps, inFocus } = useFocusToggle({
+ trackRef,
+ props: {},
+ })
+ return (
+ <Button
+ size="sm"
+ variant="primaryTextDark"
+ square
+ tooltip={inFocus ? t('pin.disable') : t('pin.enable')}
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ onPress={(event) => mergedProps?.onClick?.(event as any)}
+ >
+ {inFocus ? <RiUnpinLine /> : <RiPushpin2Line />}
+ </Button>
+ )
+}
+
+export const ParticipantTileFocus = ({
+ trackRef,
+}: {
+ trackRef: TrackReferenceOrPlaceholder
+}) => {
+ const [hovered, setHovered] = useState(false)
+ const [opacity, setOpacity] = useState(0)
+
+ useEffect(() => {
+ if (hovered) {
+ // Wait for next frame to ensure element is mounted
+ requestAnimationFrame(() => {
+ setOpacity(0.6)
+ })
+ } else {
+ setOpacity(0)
+ }
+ }, [hovered])
+
+ return (
+ <div
+ className={css({
+ position: 'absolute',
+ left: '0',
+ top: '0',
+ display: 'flex',
+ justifyContent: 'center',
+ alignItems: 'center',
+ width: '100%',
+ height: '100%',
+ })}
+ onMouseEnter={() => setHovered(true)}
+ onMouseLeave={() => setHovered(false)}
+ >
+ {hovered && (
+ <div
+ className={css({
+ backgroundColor: 'primaryDark.50',
+ transition: 'opacity 200ms linear',
+ zIndex: 1,
+ borderRadius: '0.25rem',
+ display: 'flex',
+ _hover: {
+ opacity: '0.95 !important',
+ },
+ })}
+ style={{ opacity }}
+ >
+ <HStack
+ gap={0.5}
+ className={css({
+ padding: '0.5rem',
+ _hover: {
+ opacity: '1 !important',
+ },
+ })}
+ >
+ <FocusButton trackRef={trackRef} />
+ </HStack>
+ </div>
+ )}
+ </div>
+ )
+}
diff --git a/src/frontend/src/locales/de/rooms.json b/src/frontend/src/locales/de/rooms.json
index 5812c476..3193aed6 100644
--- a/src/frontend/src/locales/de/rooms.json
+++ b/src/frontend/src/locales/de/rooms.json
@@ -189,5 +189,11 @@
},
"recording": {
"label": ""
+ },
+ "participantTileFocus": {
+ "pin": {
+ "enable": "",
+ "disable": ""
+ }
}
}
diff --git a/src/frontend/src/locales/en/rooms.json b/src/frontend/src/locales/en/rooms.json
index 3e7e19ce..6aaf96b4 100644
--- a/src/frontend/src/locales/en/rooms.json
+++ b/src/frontend/src/locales/en/rooms.json
@@ -188,5 +188,11 @@
},
"recording": {
"label": "Recording"
+ },
+ "participantTileFocus": {
+ "pin": {
+ "enable": "Pin",
+ "disable": "Unpin"
+ }
}
}
diff --git a/src/frontend/src/locales/fr/rooms.json b/src/frontend/src/locales/fr/rooms.json
index 4583a618..4e80b75e 100644
--- a/src/frontend/src/locales/fr/rooms.json
+++ b/src/frontend/src/locales/fr/rooms.json
@@ -188,5 +188,11 @@
},
"recording": {
"label": "Enregistrement"
+ },
+ "participantTileFocus": {
+ "pin": {
+ "enable": "Épingler",
+ "disable": "Annuler l'épinglage"
+ }
}
}