feat: add useEnsureRoom in a few more places

Author: 1egoman

packages/react/src/components/controls/StartAudio.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { useMaybeRoomContext } from '../../context';
+import { useEnsureRoom } from '../../context';
 import { useStartAudio } from '../../hooks';
 import { Room } from 'livekit-client';
 
@@ -28,9 +28,8 @@ export const StartAudio: (
   props: AllowAudioPlaybackProps & React.RefAttributes<HTMLButtonElement>,
 ) => React.ReactNode = /* @__PURE__ */ React.forwardRef<HTMLButtonElement, AllowAudioPlaybackProps>(
   function StartAudio({ label = 'Allow Audio', ...props }: AllowAudioPlaybackProps, ref) {
-    const room = useMaybeRoomContext();
-    const roomFallback = React.useMemo(() => props.room ?? room ?? new Room(), []);
-    const { mergedProps } = useStartAudio({ room: roomFallback, props });
+    const room = useEnsureRoom(props.room);
+    const { mergedProps } = useStartAudio({ room, props });
 
     return (
       <button ref={ref} {...mergedProps}>

packages/react/src/hooks/useSpeakingParticipants.ts

@@ -1,6 +1,6 @@
 import { activeSpeakerObserver } from '@livekit/components-core';
 import * as React from 'react';
-import { useMaybeRoomContext } from '../context';
+import { useEnsureRoom } from '../context';
 import { useObservableState } from './internal';
 import { Room } from 'livekit-client';
 
@@ -14,10 +14,9 @@ import { Room } from 'livekit-client';
  * @public
  */
 export function useSpeakingParticipants(room?: Room) {
-  const roomContext = useMaybeRoomContext();
-  const roomFallback = React.useMemo(() => room ?? roomContext ?? new Room(), [room, roomContext]);
+  const ensuredRoom = useEnsureRoom(room);
 
-  const speakerObserver = React.useMemo(() => activeSpeakerObserver(roomFallback), [roomFallback]);
-  const activeSpeakers = useObservableState(speakerObserver, roomFallback.activeSpeakers);
+  const speakerObserver = React.useMemo(() => activeSpeakerObserver(ensuredRoom), [ensuredRoom]);
+  const activeSpeakers = useObservableState(speakerObserver, ensuredRoom.activeSpeakers);
   return activeSpeakers;
 }