Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions frontend/src/hooks/useLobbyDevices/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ export function useLobbyDevices(meetingReady: boolean): LobbyDeviceState {
handleDismissPrompt: deviceLifecycle.handleDismissPrompt,
clearError: mediaStream.clearError,
clearDeviceError: mediaStream.clearDeviceError,
enableListenerMode: deviceLifecycle.enableListenerMode,
retryDeviceAccess: setupDevicesAndEnumerate,
cleanup: useCallback(() => {
mediaStream.stopStream();
Expand Down
1 change: 1 addition & 0 deletions frontend/src/hooks/useLobbyDevices/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export interface LobbyDeviceState {
handleDismissPrompt: () => void;
clearError: () => void;
clearDeviceError: () => void;
enableListenerMode: () => void;
retryDeviceAccess: () => void;
cleanup: () => void;
}
Expand Down
7 changes: 7 additions & 0 deletions frontend/src/hooks/useLobbyDevices/useDeviceLifecycle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export interface DeviceLifecycleReturn {
listenerMode: boolean;
handleAllowPermissions: () => void;
handleDismissPrompt: () => void;
enableListenerMode: () => void;
}

/**
Expand Down Expand Up @@ -70,10 +71,16 @@ export function useDeviceLifecycle({
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [meetingReady]);

const enableListenerMode = () => {
setListenerMode(true);
enumerateDevices().catch(() => {});
};

return {
showPermissionPrompt,
listenerMode,
handleAllowPermissions,
handleDismissPrompt,
enableListenerMode,
};
}
7 changes: 6 additions & 1 deletion frontend/src/pages/MeetingLobby/ErrorDisplay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ interface ErrorDisplayProps {
onClearDeviceError: () => void;
onRetryDeviceAccess: () => void;
onClearError: () => void;
onEnableListenerMode: () => void;
}

export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({
Expand All @@ -14,6 +15,7 @@ export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({
onClearDeviceError,
onRetryDeviceAccess,
onClearError,
onEnableListenerMode,
}) => {
if (deviceError) {
return (
Expand All @@ -27,7 +29,10 @@ export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({
// dialog appears on top of the modal, so the user keeps context.
onRetryDeviceAccess();
}}
onDismiss={onClearDeviceError}
onDismiss={() => {
onClearDeviceError();
onEnableListenerMode();
}}
/>
</div>
);
Expand Down
1 change: 1 addition & 0 deletions frontend/src/pages/MeetingLobby/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ export const MeetingLobby: React.FC<MeetingLobbyProps> = ({
deviceError={devices.deviceError}
error={displayError}
onClearDeviceError={devices.clearDeviceError}
onEnableListenerMode={devices.enableListenerMode}
onRetryDeviceAccess={async () => {
// Browsers require getUserMedia to be called synchronously within the
// user gesture (click). Calling it here directly — before any async
Expand Down