Merge branch 'livekit' into use-modals

src/Modal.tsx

@@ -31,7 +31,7 @@ import { ReactComponent as CloseIcon } from "@vector-im/compound-design-tokens/i
 import classNames from "classnames";
 import { Heading } from "@vector-im/compound-web";
 
-import styles from "./Modal.module.css";
+import styles from "./NewModal.module.css";
 import { useMediaQuery } from "./useMediaQuery";
 import { Glass } from "./Glass";
 
@@ -45,7 +45,7 @@ export interface ModalProps extends AriaDialogProps {
    */
   // An option to leave the open state uncontrolled is intentionally not
   // provided, since modals are always opened due to external triggers, and it
-  // is the author's belief that controlled components lead to more obvious code
+  // is the author's belief that controlled components lead to more obvious code.
   open: boolean;
   /**
    * Callback for when the user dismisses the modal. If undefined, the modal

src/index.css

@@ -160,7 +160,9 @@ body,
   flex-direction: column;
 }
 
-/* On Android and iOS, prefer native system fonts */
+/* On Android and iOS, prefer native system fonts. The global.css file of
+Compound Web is where these variables ultimately get consumed to set the page's
+font-family. */
 body[data-platform="android"] {
   --cpd-font-family-sans: "Roboto", "Noto", "Inter", sans-serif;
 }

src/livekit/useECConnectionState.ts

@@ -17,8 +17,10 @@ limitations under the License.
 import {
   AudioCaptureOptions,
   ConnectionState,
+  LocalTrackPublication,
   Room,
   RoomEvent,
+  Track,
 } from "livekit-client";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { logger } from "matrix-js-sdk/src/logger";
@@ -54,16 +56,24 @@ async function doConnect(
   audioOptions: AudioCaptureOptions
 ): Promise<void> {
   await livekitRoom!.connect(sfuConfig!.url, sfuConfig!.jwt);
-  const audioTracks = await livekitRoom!.localParticipant.createTracks({
-    audio: audioOptions,
+  const hasMicrophoneTrack = Array.from(
+    livekitRoom?.localParticipant.audioTracks.values()
+  ).some((track: LocalTrackPublication) => {
+    return track.source == Track.Source.Microphone;
   });
-  if (audioTracks.length < 1) {
-    logger.info("Tried to pre-create local audio track but got no tracks");
-    return;
-  }
-  if (!audioEnabled) await audioTracks[0].mute();
+  // We create a track in case there isn't any.
+  if (!hasMicrophoneTrack) {
+    const audioTracks = await livekitRoom!.localParticipant.createTracks({
+      audio: audioOptions,
+    });
+    if (audioTracks.length < 1) {
+      logger.info("Tried to pre-create local audio track but got no tracks");
+      return;
+    }
+    if (!audioEnabled) await audioTracks[0].mute();
 
-  await livekitRoom?.localParticipant.publishTrack(audioTracks[0]);
+    await livekitRoom?.localParticipant.publishTrack(audioTracks[0]);
+  }
 }
 
 export function useECConnectionState(