Merge pull request #2218 from element-hq/renovate/docker-setup-buildx-action-digest

Update docker/setup-buildx-action digest to 0d103c3

.eslintrc.cjs

@@ -38,6 +38,16 @@ module.exports = {
     "jsx-a11y/media-has-caption": "off",
     // We should use the js-sdk logger, never console directly.
     "no-console": ["error"],
+    "no-restricted-imports": [
+      "error",
+      {
+        name: "@react-rxjs/core",
+        importNames: ["Subscribe", "RemoveSubscribe"],
+        message:
+          "These components are easy to misuse, please use the 'subscribe' component wrapper instead",
+      },
+    ],
+    "react/display-name": "error",
   },
   settings: {
     react: {

.github/CODEOWNERS

@@ -1 +1 @@
-* @vector-im/element-call-reviewers
+* @element-hq/element-call-reviewers

.github/workflows/build.yaml

@@ -26,7 +26,7 @@ jobs:
           VITE_APP_VERSION: ${{ github.sha }}
           NODE_OPTIONS: "--max-old-space-size=4096"
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build
           path: dist

.github/workflows/e2e.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Check out test private repo
         uses: actions/checkout@v4
         with:
-          repository: vector-im/static-call-participant
+          repository: element-hq/static-call-participant
           ref: refs/heads/main
           path: static-call-participant
           token: ${{ secrets.GH_E2E_TEST_TOKEN }}

.github/workflows/netlify-pr.yaml

@@ -36,7 +36,7 @@ jobs:
       # There's a 'download artifact' action, but it hasn't been updated for the workflow_run action
       # (https://github.com/actions/download-artifact/issues/60) so instead we get this mess:
       - name: 📥 Download artifact
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v3
         with:
           run_id: ${{ github.event.workflow_run.id }}
           name: build
@@ -44,12 +44,10 @@ jobs:
 
       - name: Add redirects file
         # We fetch from github directly as we don't bother checking out the repo
-        run: curl -s https://raw.githubusercontent.com/vector-im/element-call/main/config/netlify_redirects > webapp/_redirects
+        run: curl -s https://raw.githubusercontent.com/element-hq/element-call/main/config/netlify_redirects > webapp/_redirects
 
       - name: Add config file
-        env:
-          HEADBRACH: ${{ github.event.workflow_run.head_branch }}
-        run: curl -s "https://raw.githubusercontent.com/vector-im/element-call/${HEADBRACH}/config/element_io_preview.json" > webapp/config.json
+        run: curl -s "https://raw.githubusercontent.com/${{ github.event.workflow_run.head_repository.full_name }}/${{ github.event.workflow_run.head_branch }}/config/element_io_preview.json" > webapp/config.json
 
       - name: ☁️ Deploy to Netlify
         id: netlify

.github/workflows/publish.yaml

@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Log in to container registry
-        uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
+        uses: docker/login-action@5139682d94efc37792e6b54386b5b470a68a4737
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -54,7 +54,7 @@ jobs:
           tar --numeric-owner --transform "s/dist/element-call-${TARBALL_VERSION}/" -cvzf element-call-${TARBALL_VERSION}.tar.gz dist
 
       - name: Upload
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
+        uses: actions/upload-artifact@ef09cdac3e2d3e60d8ccadda691f4f1cec5035cb
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
@@ -62,7 +62,7 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@2a4836ac76fe8f5d0ee3a0d89aa12a80cc552ad3
+        uses: docker/metadata-action@232fc64e3a4e54539e087c5976439ea54be0959d
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
@@ -72,10 +72,10 @@ jobs:
             type=raw,value=latest-ci_${{steps.current-time.outputs.unix_time}},enable={{is_default_branch}}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@6d5347c4025fdf2bb05167a2519cac535a14a408
+        uses: docker/setup-buildx-action@0d103c3126aa41d772a8362f6aa67afac040f80c
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56
+        uses: docker/build-push-action@b3eddbb94c4146a0988a620b01720afe50639271
         with:
           context: .
           platforms: linux/amd64,linux/arm64

.github/workflows/test.yaml

@@ -1,11 +1,11 @@
-name: Run jest tests
+name: Run unit tests
 on:
   pull_request: {}
   push:
     branches: [livekit, full-mesh]
 jobs:
-  jest:
-    name: Run jest tests
+  vitest:
+    name: Run vitest tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -16,9 +16,9 @@ jobs:
           cache: "yarn"
       - name: Install dependencies
         run: "yarn install"
-      - name: Jest
+      - name: Vitest
         run: "yarn run test"
       - name: Upload to codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           flags: unittests

.github/workflows/translations-download.yaml

@@ -15,7 +15,7 @@ jobs:
       - name: Checkout the code
         uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           cache: "yarn"
 
@@ -38,7 +38,7 @@ jobs:
 
       - name: Create Pull Request
         id: cpr
-        uses: peter-evans/create-pull-request@v5.0.2
+        uses: peter-evans/create-pull-request@v6.0.0
         with:
           token: ${{ secrets.ELEMENT_BOT_TOKEN }}
           branch: actions/localazy-download

README.md

@@ -5,7 +5,7 @@
 
 Group calls with WebRTC that leverage [Matrix](https://matrix.org) and an open-source WebRTC toolkit from [LiveKit](https://livekit.io/).
 
-For prior version of the Element Call that relied solely on full-mesh logic, check [`full-mesh`](https://github.com/vector-im/element-call/tree/full-mesh) branch.
+For prior version of the Element Call that relied solely on full-mesh logic, check [`full-mesh`](https://github.com/element-hq/element-call/tree/full-mesh) branch.
 
 ![A demo of Element Call with six people](demo.jpg)
 
@@ -16,7 +16,7 @@ To try it out, visit our hosted version at [call.element.io](https://call.elemen
 Until prebuilt tarballs are available, you'll need to build Element Call from source. First, clone and install the package:
 
 ```
-git clone https://github.com/vector-im/element-call.git
+git clone https://github.com/element-hq/element-call.git
 cd element-call
 yarn
 yarn build
@@ -74,7 +74,7 @@ yarn link
 Next, we can set up this project:
 
 ```
-git clone https://github.com/vector-im/element-call.git
+git clone https://github.com/element-hq/element-call.git
 cd element-call
 yarn
 yarn link matrix-js-sdk
@@ -93,12 +93,12 @@ service for development. These use a test 'secret' published in this
 repository, so this must be used only for local development and
 **_never be exposed to the public Internet._**
 
-To use it, add SFU parameter in your local config `./public/config.yml`:
+To use it, add SFU parameter in your local config `./public/config.json`:
 
-```yaml
+```json
 "livekit": {
-    "jwt_service_url": "http://localhost:8881"
-  },
+  "livekit_service_url": "http://localhost:8881"
+},
 ```
 
 Run backend components:

backend-docker-compose.yml

@@ -5,7 +5,7 @@ networks:
 
 services:
   auth-service:
-    image: ghcr.io/vector-im/lk-jwt-service:latest-ci
+    image: ghcr.io/element-hq/lk-jwt-service:latest-ci
     hostname: auth-server
     ports:
       - 8881:8080

docs/url-params.md

@@ -1,57 +1,76 @@
-## Url Format and parameters
+# Url Format and parameters
 
 There are two formats for Element Call urls.
 
 - **Current Format**
-  ```
+
+  ```text
   https://element_call.domain/room/#
   /<room_name_alias>?roomId=!id:domain&password=1234&<other params see below>
   ```
-  The url is split into two sections. The `https://element_call.domain/room/#` contains the app and the intend that the link brings you into a specific room (`https://call.element.io/#` would be the homepage). The fragment is used for query parameters to make sure they never get sent to the element_call.domain server. Here we have the actual matrix roomId and the password which are used to connect all participants with e2ee. This allows that `<room_name_alias>` does not need to be unique. Multiple meetings with the label weekly-sync can be created without collisions.
+
+  The url is split into two sections. The `https://element_call.domain/room/#`
+  contains the app and the intend that the link brings you into a specific room
+  (`https://call.element.io/#` would be the homepage). The fragment is used for
+  query parameters to make sure they never get sent to the element_call.domain
+  server. Here we have the actual matrix roomId and the password which are used
+  to connect all participants with e2ee. This allows that `<room_name_alias>` does
+  not need to be unique. Multiple meetings with the label weekly-sync can be created
+  without collisions.
+
 - **deprecated**
-  ```
+
+  ```text
   https://element_call.domain/<room_name>
   ```
-  With this format the livekit alias that will be used is the `<room_name>`. All ppl connecting to this url will end up in the same unencrypted room. This does not scale, is super unsecure (ppl could end up in the same room by accident) and it also is not really possible to support encryption.
+
+  With this format the livekit alias that will be used is the `<room_name>`.
+  All ppl connecting to this url will end up in the same unencrypted room.
+  This does not scale, is super unsecure
+  (ppl could end up in the same room by accident) and it also is not really
+  possible to support encryption.
   The url parameters are spit into two categories: **general** and **widget related**.
 
-### Widget related params
+## Widget related params
 
 **widgetId**
-The id used by the widget. The presence of this parameter inplis that elemetn call will not connect to a homeserver directly and instead tries to establish postMessage communication via the `parentUrl`
+The id used by the widget. The presence of this parameter implies that element
+call will not connect to a homeserver directly and instead tries to establish
+postMessage communication via the `parentUrl`.
 
-```
+```ts
 widgetId: string | null;
 ```
 
 **parentUrl**
-The url used to send widget action postMessages. This should be the domain of the client
-or the webview the widget is hosted in. (in case the widget is not in an Iframe but in a
-dedicated webview we send the postMessages same webview the widget lives in. Filtering is
-done in the widget so it ignores the messages it receives from itself)
+The url used to send widget action postMessages. This should be the domain of
+the client or the webview the widget is hosted in. (in case the widget is not
+in an Iframe but in a dedicated webview we send the postMessages same webview
+the widget lives in. Filtering is done in the widget so it ignores the messages
+it receives from itself)
 
-```
+```ts
 parentUrl: string | null;
 ```
 
 **userId**
 The user's ID (only used in matryoshka mode).
 
-```
+```ts
 userId: string | null;
 ```
 
 **deviceId**
 The device's ID (only used in matryoshka mode).
 
-```
+```ts
 deviceId: string | null;
 ```
 
 **baseUrl**
 The base URL of the homeserver to use for media lookups in matryoshka mode.
 
-```
+```ts
 baseUrl: string | null;
 ```
 
@@ -64,14 +83,14 @@ roomId is an exception as we need the room ID in embedded (matroyska) mode, and
 the room alias (or even the via params because we are not trying to join it). This
 is also not validated, where it is in useRoomIdentifier().
 
-```
+```ts
 roomId: string | null;
 ```
 
 **confineToRoom**
 Whether the app should keep the user confined to the current call/room.
 
-```
+```ts
 confineToRoom: boolean; (default: false)
 ```
 
@@ -79,7 +98,7 @@ confineToRoom: boolean; (default: false)
 Whether upon entering a room, the user should be prompted to launch the
 native mobile app. (Affects only Android and iOS.)
 
-```
+```ts
 appPrompt: boolean; (default: true)
 ```
 
@@ -87,28 +106,29 @@ appPrompt: boolean; (default: true)
 Whether the app should pause before joining the call until it sees an
 io.element.join widget action, allowing it to be preloaded.
 
-```
+```ts
 preload: boolean; (default: false)
 ```
 
 **hideHeader**
 Whether to hide the room header when in a call.
 
-```
+```ts
 hideHeader: boolean; (default: false)
 ```
 
 **showControls**
-Whether to show the buttons to mute, screen-share, invite, hangup are shown when in a call.
+Whether to show the buttons to mute, screen-share, invite, hangup are shown
+when in a call.
 
-```
+```ts
 showControls: boolean; (default: true)
 ```
 
 **hideScreensharing**
 Whether to hide the screen-sharing button.
 
-```
+```ts
 hideScreensharing: boolean; (default: false)
 ```
 
@@ -116,7 +136,7 @@ hideScreensharing: boolean; (default: false)
 Whether to use end-to-end encryption. This is a legacy flag for the full mesh branch.
 It is not used on the livekit branch and has no impact there!
 
-```
+```ts
 enableE2EE: boolean; (default: true)
 ```
 
@@ -124,28 +144,29 @@ enableE2EE: boolean; (default: true)
 Whether to use per participant encryption.
 Keys will be exchanged over encrypted matrix room messages.
 
-```
+```ts
 perParticipantE2EE: boolean; (default: false)
 ```
 
 **password**
-E2EE password when using a shared secret. (For individual sender keys in embedded mode this is not required.)
+E2EE password when using a shared secret.
+(For individual sender keys in embedded mode this is not required.)
 
-```
+```ts
 password: string | null;
 ```
 
 **displayName**
 The display name to use for auto-registration.
 
-```
+```ts
 displayName: string | null;
 ```
 
 **lang**
 The BCP 47 code of the language the app should use.
 
-```
+```ts
 lang: string | null;
 ```
 
@@ -153,7 +174,7 @@ lang: string | null;
 The font/fonts which the interface should use.
 There can be multiple font url parameters: `?font=font-one&font=font-two...`
 
-```
+```ts
 font: string;
 font: string;
 ...
@@ -162,14 +183,15 @@ font: string;
 **fontScale**
 The factor by which to scale the interface's font size.
 
-```
+```ts
 fontScale: number | null;
 ```
 
 **analyticsID**
-The Posthog analytics ID. It is only available if the user has given consent for sharing telemetry in element web.
+The Posthog analytics ID. It is only available if the user has given consent for
+sharing telemetry in element web.
 
-```
+```ts
 analyticsID: string | null;
 ```
 
@@ -177,7 +199,7 @@ analyticsID: string | null;
 Whether the app is allowed to use fallback STUN servers for ICE in case the
 user's homeserver doesn't provide any.
 
-```
+```ts
 allowIceFallback: boolean; (default: false)
 ```
 
@@ -186,6 +208,45 @@ Setting this flag skips the lobby and brings you in the call directly.
 In the widget this can be combined with preload to pass the device settings
 with the join widget action.
 
-```
+```ts
 skipLobby: boolean; (default: false)
 ```
+
+**returnToLobby**
+Setting this flag makes element call show the lobby in widget mode after leaving
+a call.
+This is useful for video rooms.
+If set to false, the widget will show a blank page after leaving the call.
+
+```ts
+returnToLobby: boolean; (default: false)
+```
+
+**theme**
+The theme to use for element call.
+can be "light", "dark", "light-high-contrast" or "dark-high-contrast".
+If not set element call will use the dark theme.
+
+```ts
+theme: string | null;
+```
+
+**viaServers**
+This defines the homeserver that is going to be used when joining a room.
+It has to be set to a non default value for links to rooms
+that are not on the default homeserver,
+that is in use for the current user.
+
+```ts
+viaServers: string; (default: undefined)
+```
+
+**homeserver**
+This defines the homeserver that is going to be used when registering
+a new (guest) user.
+This can be user to configure a non default guest user server when
+creating a spa link.
+
+```ts
+homeserver: string; (default: undefined)
+```

package.json

@@ -13,21 +13,24 @@
     "lint:types": "tsc",
     "i18n": "node_modules/i18next-parser/bin/cli.js",
     "i18n:check": "node_modules/i18next-parser/bin/cli.js --fail-on-warnings --fail-on-update",
-    "test": "jest",
+    "test": "vitest",
+    "test:coverage": "vitest run --coverage",
     "backend": "docker-compose -f backend-docker-compose.yml up"
   },
   "dependencies": {
     "@juggle/resize-observer": "^3.3.1",
-    "@livekit/components-react": "^1.1.0",
+    "@livekit/components-core": "^0.9.0",
+    "@livekit/components-react": "^2.0.0",
     "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz",
     "@opentelemetry/api": "^1.4.0",
     "@opentelemetry/context-zone": "^1.9.1",
     "@opentelemetry/exporter-jaeger": "^1.9.1",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.45.0",
-    "@opentelemetry/instrumentation-document-load": "^0.33.0",
-    "@opentelemetry/instrumentation-user-interaction": "^0.33.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.48.0",
+    "@opentelemetry/instrumentation-document-load": "^0.35.0",
+    "@opentelemetry/instrumentation-user-interaction": "^0.35.0",
     "@opentelemetry/sdk-trace-web": "^1.9.1",
     "@radix-ui/react-dialog": "^1.0.4",
+    "@radix-ui/react-slider": "^1.1.2",
     "@radix-ui/react-visually-hidden": "^1.0.3",
     "@react-aria/button": "^3.3.4",
     "@react-aria/focus": "^3.5.0",
@@ -37,6 +40,7 @@
     "@react-aria/tabs": "^3.1.0",
     "@react-aria/tooltip": "^3.1.3",
     "@react-aria/utils": "^3.10.0",
+    "@react-rxjs/core": "^0.10.7",
     "@react-spring/web": "^9.4.4",
     "@react-stately/collections": "^3.3.4",
     "@react-stately/select": "^3.1.3",
@@ -46,8 +50,8 @@
     "@sentry/tracing": "^7.0.0",
     "@types/lodash": "^4.14.199",
     "@use-gesture/react": "^10.2.11",
-    "@vector-im/compound-design-tokens": "^0.1.0",
-    "@vector-im/compound-web": "^0.6.0",
+    "@vector-im/compound-design-tokens": "^1.0.0",
+    "@vector-im/compound-web": "^3.0.0",
     "@vitejs/plugin-basic-ssl": "^1.0.1",
     "@vitejs/plugin-react": "^4.0.1",
     "buffer": "^6.0.3",
@@ -56,9 +60,9 @@
     "i18next": "^23.0.0",
     "i18next-browser-languagedetector": "^7.0.0",
     "i18next-http-backend": "^2.0.0",
-    "livekit-client": "^1.12.3",
+    "livekit-client": "^2.0.2",
     "lodash": "^4.17.21",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#eca651c0c2ff0600bdae0bb6aba43485e48b69d5",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#8123e9a3f1142a7619758c0a238172b007e3a06a",
     "matrix-widget-api": "^1.3.1",
     "normalize.css": "^8.0.1",
     "pako": "^2.0.4",
@@ -66,15 +70,16 @@
     "posthog-js": "^1.29.0",
     "react": "18",
     "react-dom": "18",
-    "react-i18next": "^13.0.0",
+    "react-i18next": "^14.0.0",
     "react-router-dom": "^5.2.0",
     "react-use-clipboard": "^1.0.7",
     "react-use-measure": "^2.1.1",
+    "rxjs": "^7.8.1",
     "sdp-transform": "^2.14.1",
     "tinyqueue": "^2.0.3",
     "unique-names-generator": "^4.6.0",
     "uuid": "9",
-    "vaul": "^0.7.0"
+    "vaul": "^0.9.0"
   },
   "devDependencies": {
     "@babel/core": "^7.16.5",
@@ -84,21 +89,19 @@
     "@react-spring/rafz": "^9.7.3",
     "@react-types/dialog": "^3.5.5",
     "@sentry/vite-plugin": "^2.0.0",
-    "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.5.1",
     "@types/content-type": "^1.1.5",
     "@types/dom-screen-wake-lock": "^1.0.1",
     "@types/dompurify": "^3.0.2",
     "@types/grecaptcha": "^3.0.4",
-    "@types/jest": "^29.5.5",
     "@types/node": "^20.0.0",
     "@types/react-router-dom": "^5.3.3",
     "@types/request": "^2.48.8",
     "@types/sdp-transform": "^2.4.5",
     "@types/uuid": "9",
-    "@typescript-eslint/eslint-plugin": "^6.1.0",
-    "@typescript-eslint/parser": "^6.1.0",
+    "@typescript-eslint/eslint-plugin": "^7.0.0",
+    "@typescript-eslint/parser": "^7.0.0",
     "babel-loader": "^9.0.0",
     "babel-plugin-transform-vite-meta-env": "^1.0.3",
     "eslint": "^8.14.0",
@@ -110,39 +113,16 @@
     "eslint-plugin-matrix-org": "^1.2.1",
     "eslint-plugin-react": "^7.29.4",
     "eslint-plugin-react-hooks": "^4.5.0",
-    "eslint-plugin-unicorn": "^49.0.0",
+    "eslint-plugin-unicorn": "^51.0.0",
     "i18next-parser": "^8.0.0",
-    "identity-obj-proxy": "^3.0.0",
-    "jest": "^29.2.2",
-    "jest-environment-jsdom": "^29.3.1",
-    "jest-mock": "^29.5.0",
+    "jsdom": "^24.0.0",
     "prettier": "^3.0.0",
     "sass": "^1.42.1",
     "typescript": "^5.1.6",
     "typescript-eslint-language-service": "^5.0.5",
-    "vite": "^4.2.0",
+    "vite": "^5.0.0",
     "vite-plugin-html-template": "^1.1.0",
-    "vite-plugin-svgr": "^4.0.0"
-  },
-  "jest": {
-    "testEnvironment": "./test/environment.ts",
-    "testMatch": [
-      "<rootDir>/test/**/*-test.[jt]s?(x)"
-    ],
-    "transformIgnorePatterns": [
-      "/node_modules/(?!d3)+$",
-      "/node_modules/(?!internmap)+$"
-    ],
-    "moduleNameMapper": {
-      "\\.css$": "identity-obj-proxy",
-      "\\.svg\\?react$": "<rootDir>/test/mocks/svgr.ts",
-      "^\\./IndexedDBWorker\\?worker$": "<rootDir>/test/mocks/workerMock.ts",
-      "^\\./olm$": "<rootDir>/test/mocks/olmMock.ts"
-    },
-    "collectCoverage": true,
-    "coverageReporters": [
-      "text",
-      "cobertura"
-    ]
+    "vite-plugin-svgr": "^4.0.0",
+    "vitest": "^1.2.2"
   }
 }

public/locales/en-GB/app.json

@@ -49,6 +49,7 @@
     "home": "Home",
     "loading": "Loading…",
     "microphone": "Microphone",
+    "options": "Options",
     "password": "Password",
     "profile": "Profile",
     "settings": "Settings",
@@ -57,10 +58,8 @@
     "video": "Video"
   },
   "disconnected_banner": "Connectivity to the server has been lost.",
-  "exit_fullscreen_button_label": "Exit full screen",
   "full_screen_view_description": "<0>Submitting debug logs will help us track down the problem.</0>",
   "full_screen_view_h1": "<0>Oops, something's gone wrong.</0>",
-  "fullscreen_button_label": "Full screen",
   "group_call_loader_failed_heading": "Call not found",
   "group_call_loader_failed_text": "Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.",
   "hangup_button_label": "End call",
@@ -81,7 +80,6 @@
     "join_button": "Join call",
     "leave_button": "Back to recents"
   },
-  "local_volume_label": "Local volume",
   "log_in": "Log In",
   "logging_in": "Logging in…",
   "login_auth_links": "<0>Create an account</0> Or <2>Access as a guest</2>",
@@ -145,8 +143,12 @@
   "unmute_microphone_button_label": "Unmute microphone",
   "version": "Version: {{version}}",
   "video_tile": {
-    "presenter_label": "{{displayName}} is presenting",
-    "sfu_participant_local": "You"
+    "change_fit_contain": "Fit to frame",
+    "exit_full_screen": "Exit full screen",
+    "full_screen": "Full screen",
+    "mute_for_me": "Mute for me",
+    "sfu_participant_local": "You",
+    "volume": "Volume"
   },
   "waiting_for_participants": "Waiting for other participants…"
 }

renovate.json

@@ -7,5 +7,21 @@
       "matchPackagePatterns": ["matrix-js-sdk"],
       "enabled": false
     }
+  ],
+  "semanticCommits": "disabled",
+  "ignoreDeps": [
+    "@react-aria/button",
+    "@react-aria/focus",
+    "@react-aria/menu",
+    "@react-aria/overlays",
+    "@react-aria/select",
+    "@react-aria/tabs",
+    "@react-aria/tooltip",
+    "@react-aria/utils",
+    "@react-stately/collections",
+    "@react-stately/select",
+    "@react-stately/tooltip",
+    "@react-stately/tree",
+    "@react-types/dialog"
   ]
 }

src/App.tsx

@@ -24,6 +24,7 @@ import {
 import * as Sentry from "@sentry/react";
 import { OverlayProvider } from "@react-aria/overlays";
 import { History } from "history";
+import { TooltipProvider } from "@vector-im/compound-web";
 
 import { HomePage } from "./home/HomePage";
 import { LoginPage } from "./auth/LoginPage";
@@ -34,19 +35,21 @@ import { CrashView, LoadingView } from "./FullScreenView";
 import { DisconnectedBanner } from "./DisconnectedBanner";
 import { Initializer } from "./initializer";
 import { MediaDevicesProvider } from "./livekit/MediaDevicesContext";
+import { widget } from "./widget";
+import { useTheme } from "./useTheme";
 
 const SentryRoute = Sentry.withSentryRouting(Route);
 
-interface BackgroundProviderProps {
+interface SimpleProviderProps {
   children: JSX.Element;
 }
 
-const BackgroundProvider: FC<BackgroundProviderProps> = ({ children }) => {
+const BackgroundProvider: FC<SimpleProviderProps> = ({ children }) => {
   const { pathname } = useLocation();
 
   useEffect(() => {
     let backgroundImage = "";
-    if (!["/login", "/register"].includes(pathname)) {
+    if (!["/login", "/register"].includes(pathname) && !widget) {
       backgroundImage = "var(--background-gradient)";
     }
 
@@ -56,6 +59,10 @@ const BackgroundProvider: FC<BackgroundProviderProps> = ({ children }) => {
 
   return <>{children}</>;
 };
+const ThemeProvider: FC<SimpleProviderProps> = ({ children }) => {
+  useTheme();
+  return children;
+};
 
 interface AppProps {
   history: History;
@@ -63,7 +70,6 @@ interface AppProps {
 
 export const App: FC<AppProps> = ({ history }) => {
   const [loaded, setLoaded] = useState(false);
-
   useEffect(() => {
     Initializer.init()?.then(() => {
       setLoaded(true);
@@ -77,35 +83,39 @@ export const App: FC<AppProps> = ({ history }) => {
     // @ts-ignore
     <Router history={history}>
       <BackgroundProvider>
-        {loaded ? (
-          <Suspense fallback={null}>
-            <ClientProvider>
-              <MediaDevicesProvider>
-                <Sentry.ErrorBoundary fallback={errorPage}>
-                  <OverlayProvider>
-                    <DisconnectedBanner />
-                    <Switch>
-                      <SentryRoute exact path="/">
-                        <HomePage />
-                      </SentryRoute>
-                      <SentryRoute exact path="/login">
-                        <LoginPage />
-                      </SentryRoute>
-                      <SentryRoute exact path="/register">
-                        <RegisterPage />
-                      </SentryRoute>
-                      <SentryRoute path="*">
-                        <RoomPage />
-                      </SentryRoute>
-                    </Switch>
-                  </OverlayProvider>
-                </Sentry.ErrorBoundary>
-              </MediaDevicesProvider>
-            </ClientProvider>
-          </Suspense>
-        ) : (
-          <LoadingView />
-        )}
+        <ThemeProvider>
+          <TooltipProvider>
+            {loaded ? (
+              <Suspense fallback={null}>
+                <ClientProvider>
+                  <MediaDevicesProvider>
+                    <Sentry.ErrorBoundary fallback={errorPage}>
+                      <OverlayProvider>
+                        <DisconnectedBanner />
+                        <Switch>
+                          <SentryRoute exact path="/">
+                            <HomePage />
+                          </SentryRoute>
+                          <SentryRoute exact path="/login">
+                            <LoginPage />
+                          </SentryRoute>
+                          <SentryRoute exact path="/register">
+                            <RegisterPage />
+                          </SentryRoute>
+                          <SentryRoute path="*">
+                            <RoomPage />
+                          </SentryRoute>
+                        </Switch>
+                      </OverlayProvider>
+                    </Sentry.ErrorBoundary>
+                  </MediaDevicesProvider>
+                </ClientProvider>
+              </Suspense>
+            ) : (
+              <LoadingView />
+            )}
+          </TooltipProvider>
+        </ThemeProvider>
       </BackgroundProvider>
     </Router>
   );

src/Header.module.css

@@ -33,6 +33,7 @@ limitations under the License.
 }
 
 .headerLogo {
+  color: var(--cpd-color-text-primary);
   display: none;
   align-items: center;
   text-decoration: none;

src/Overlay.module.css

@@ -16,7 +16,6 @@ limitations under the License.
 
 .bg {
   position: fixed;
-  z-index: 100;
   inset: 0;
   background: rgba(3, 12, 27, 0.528);
 }
@@ -49,7 +48,6 @@ limitations under the License.
 
 .overlay {
   position: fixed;
-  z-index: 101;
 }
 
 .overlay.animate {

src/Slider.module.css

@@ -0,0 +1,66 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.slider {
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+
+.track {
+  flex-grow: 1;
+  border-radius: var(--cpd-radius-pill-effect);
+  background: var(--cpd-color-bg-subtle-primary);
+  height: var(--cpd-space-2x);
+  outline: var(--cpd-border-width-1) solid
+    var(--cpd-color-border-interactive-primary);
+  outline-offset: calc(-1 * var(--cpd-border-width-1));
+  cursor: pointer;
+  transition: outline-color ease 0.15s;
+}
+
+.track[data-disabled] {
+  cursor: initial;
+  outline-color: var(--cpd-color-border-disabled);
+}
+
+.highlight {
+  background: var(--cpd-color-bg-action-primary-rest);
+  position: absolute;
+  block-size: 100%;
+  border-radius: var(--cpd-radius-pill-effect);
+  transition: background-color ease 0.15s;
+}
+
+.highlight[data-disabled] {
+  background: var(--cpd-color-bg-action-primary-disabled);
+}
+
+.handle {
+  display: block;
+  block-size: var(--cpd-space-4x);
+  inline-size: var(--cpd-space-4x);
+  border-radius: var(--cpd-radius-pill-effect);
+  background: var(--cpd-color-bg-action-primary-rest);
+  box-shadow: 0 0 0 2px var(--cpd-color-bg-canvas-default);
+  cursor: pointer;
+  transition: background-color ease 0.15s;
+}
+
+.handle[data-disabled] {
+  cursor: initial;
+  background: var(--cpd-color-bg-action-primary-disabled);
+}

src/Slider.tsx

@@ -0,0 +1,68 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { FC, useCallback } from "react";
+import { Root, Track, Range, Thumb } from "@radix-ui/react-slider";
+import classNames from "classnames";
+
+import styles from "./Slider.module.css";
+
+interface Props {
+  className?: string;
+  label: string;
+  value: number;
+  onValueChange: (value: number) => void;
+  min: number;
+  max: number;
+  step: number;
+  disabled?: boolean;
+}
+
+/**
+ * A slider control allowing a value to be selected from a range.
+ */
+export const Slider: FC<Props> = ({
+  className,
+  label,
+  value,
+  onValueChange: onValueChangeProp,
+  min,
+  max,
+  step,
+  disabled,
+}) => {
+  const onValueChange = useCallback(
+    ([v]: number[]) => onValueChangeProp(v),
+    [onValueChangeProp],
+  );
+
+  return (
+    <Root
+      className={classNames(className, styles.slider)}
+      value={[value]}
+      onValueChange={onValueChange}
+      min={min}
+      max={max}
+      step={step}
+      disabled={disabled}
+    >
+      <Track className={styles.track}>
+        <Range className={styles.highlight} />
+      </Track>
+      <Thumb className={styles.handle} aria-label={label} />
+    </Root>
+  );
+};

src/Tooltip.tsx

@@ -59,6 +59,8 @@ const Tooltip = forwardRef<HTMLDivElement, TooltipProps>(
   },
 );
 
+Tooltip.displayName = "Tooltip";
+
 interface TooltipTriggerProps {
   children: ReactElement;
   placement?: Placement;
@@ -112,3 +114,5 @@ export const TooltipTrigger = forwardRef<HTMLElement, TooltipTriggerProps>(
     );
   },
 );
+
+TooltipTrigger.displayName = "TooltipTrigger";

src/TranslatedError.ts

@@ -14,10 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import i18n from "i18next";
-
-import type { ParseKeys, TFunction } from "i18next/typescript/t";
-import type { DefaultNamespace, TOptions } from "i18next/typescript/options";
+import type { DefaultNamespace, ParseKeys, TFunction, TOptions } from "i18next";
 
 /**
  * An error with messages in both English and the user's preferred language.
@@ -45,5 +42,5 @@ class TranslatedErrorImpl extends TranslatedError {}
 // function instead
 export const translatedError = (
   messageKey: ParseKeys<DefaultNamespace, TOptions>,
-  t: typeof i18n.t,
+  t: TFunction<"app", undefined>,
 ): TranslatedError => new TranslatedErrorImpl(messageKey, t);

src/UrlParams.ts

@@ -125,6 +125,29 @@ export interface UrlParams {
    * with the join widget action.
    */
   skipLobby: boolean;
+  /**
+   * Setting this flag makes element call show the lobby after leaving a call.
+   * This is useful for video rooms.
+   */
+  returnToLobby: boolean;
+  /**
+   * The theme to use for element call.
+   * can be "light", "dark", "light-high-contrast" or "dark-high-contrast".
+   */
+  theme: string | null;
+  /** This defines the homeserver that is going to be used when joining a room.
+   * It has to be set to a non default value for links to rooms
+   * that are not on the default homeserver,
+   * that is in use for the current user.
+   */
+  viaServers: string | null;
+  /**
+   * This defines the homeserver that is going to be used when registering
+   * a new (guest) user.
+   * This can be user to configure a non default guest user server when
+   * creating a spa link.
+   */
+  homeserver: string | null;
 }
 
 // This is here as a stopgap, but what would be far nicer is a function that
@@ -223,6 +246,10 @@ export const getUrlParams = (
     allowIceFallback: parser.getFlagParam("allowIceFallback"),
     perParticipantE2EE: parser.getFlagParam("perParticipantE2EE"),
     skipLobby: parser.getFlagParam("skipLobby"),
+    returnToLobby: parser.getFlagParam("returnToLobby"),
+    theme: parser.getParam("theme"),
+    viaServers: parser.getParam("viaServers"),
+    homeserver: parser.getParam("homeserver"),
   };
 };
 

src/UserMenu.tsx

@@ -66,7 +66,7 @@ export const UserMenu: FC<Props> = ({
       arr.push({
         key: "settings",
         icon: SettingsIcon,
-        label: "common.settings",
+        label: t("common.settings"),
       });
 
       if (isPasswordlessUser && !preventNavigation) {

src/UserMenuContainer.tsx

@@ -19,7 +19,7 @@ import { useHistory, useLocation } from "react-router-dom";
 
 import { useClientLegacy } from "./ClientContext";
 import { useProfile } from "./profile/useProfile";
-import { SettingsModal } from "./settings/SettingsModal";
+import { defaultSettingsTab, SettingsModal } from "./settings/SettingsModal";
 import { UserMenu } from "./UserMenu";
 
 interface Props {
@@ -37,17 +37,17 @@ export const UserMenuContainer: FC<Props> = ({ preventNavigation = false }) => {
     [setSettingsModalOpen],
   );
 
-  const [defaultSettingsTab, setDefaultSettingsTab] = useState<string>();
+  const [settingsTab, setSettingsTab] = useState(defaultSettingsTab);
 
   const onAction = useCallback(
     async (value: string) => {
       switch (value) {
         case "user":
-          setDefaultSettingsTab("profile");
+          setSettingsTab("profile");
           setSettingsModalOpen(true);
           break;
         case "settings":
-          setDefaultSettingsTab("audio");
+          setSettingsTab("audio");
           setSettingsModalOpen(true);
           break;
         case "logout":
@@ -76,9 +76,10 @@ export const UserMenuContainer: FC<Props> = ({ preventNavigation = false }) => {
       {client && (
         <SettingsModal
           client={client}
-          defaultTab={defaultSettingsTab}
           open={settingsModalOpen}
           onDismiss={onDismissSettingsModal}
+          tab={settingsTab}
+          onTabChange={setSettingsTab}
         />
       )}
     </>

src/auth/useRegisterPasswordlessUser.ts

@@ -21,6 +21,7 @@ import { useClient } from "../ClientContext";
 import { useInteractiveRegistration } from "../auth/useInteractiveRegistration";
 import { generateRandomName } from "../auth/generateRandomName";
 import { useRecaptcha } from "../auth/useRecaptcha";
+import { widget } from "../widget";
 
 interface UseRegisterPasswordlessUserType {
   privacyPolicyUrl?: string;
@@ -39,6 +40,11 @@ export function useRegisterPasswordlessUser(): UseRegisterPasswordlessUserType {
       if (!setClient) {
         throw new Error("No client context");
       }
+      if (widget) {
+        throw new Error(
+          "Registration was skipped: We should never try to register password-less user in embedded mode.",
+        );
+      }
 
       try {
         const recaptchaResponse = await execute();

src/button/Button.tsx

@@ -30,9 +30,6 @@ import SettingsSolidIcon from "@vector-im/compound-design-tokens/icons/settings-
 import ChevronDownIcon from "@vector-im/compound-design-tokens/icons/chevron-down.svg?react";
 
 import styles from "./Button.module.css";
-import Fullscreen from "../icons/Fullscreen.svg?react";
-import FullscreenExit from "../icons/FullscreenExit.svg?react";
-import { VolumeIcon } from "./VolumeIcon";
 
 export type ButtonVariant =
   | "default"
@@ -80,6 +77,7 @@ interface Props {
   // TODO: add all props for <Button>
   [index: string]: unknown;
 }
+
 export const Button = forwardRef<HTMLButtonElement, Props>(
   (
     {
@@ -135,6 +133,8 @@ export const Button = forwardRef<HTMLButtonElement, Props>(
   },
 );
 
+Button.displayName = "Button";
+
 export const MicButton: FC<{
   muted: boolean;
   // TODO: add all props for <Button>
@@ -230,45 +230,3 @@ export const SettingsButton: FC<{
     </Tooltip>
   );
 };
-
-interface AudioButtonProps extends Omit<Props, "variant"> {
-  /**
-   * A number between 0 and 1
-   */
-  volume: number;
-}
-
-export const AudioButton: FC<AudioButtonProps> = ({ volume, ...rest }) => {
-  const { t } = useTranslation();
-
-  return (
-    <Tooltip label={t("local_volume_label")}>
-      <Button variant="icon" {...rest}>
-        <VolumeIcon volume={volume} aria-label={t("local_volume_label")} />
-      </Button>
-    </Tooltip>
-  );
-};
-
-interface FullscreenButtonProps extends Omit<Props, "variant"> {
-  fullscreen?: boolean;
-}
-
-export const FullscreenButton: FC<FullscreenButtonProps> = ({
-  fullscreen,
-  ...rest
-}) => {
-  const { t } = useTranslation();
-  const Icon = fullscreen ? FullscreenExit : Fullscreen;
-  const label = fullscreen
-    ? t("exit_fullscreen_button_label")
-    : t("fullscreen_button_label");
-
-  return (
-    <Tooltip label={label}>
-      <Button variant="icon" {...rest}>
-        <Icon aria-label={label} />
-      </Button>
-    </Tooltip>
-  );
-};

src/config/Config.ts

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { getUrlParams } from "../UrlParams";
 import {
   DEFAULT_CONFIG,
   ConfigOptions,
@@ -45,10 +46,18 @@ export class Config {
 
   // Convenience accessors
   public static defaultHomeserverUrl(): string | undefined {
-    return Config.get().default_server_config?.["m.homeserver"].base_url;
+    return (
+      getUrlParams().homeserver ??
+      Config.get().default_server_config?.["m.homeserver"].base_url
+    );
   }
 
   public static defaultServerName(): string | undefined {
+    const homeserver = getUrlParams().homeserver;
+    if (homeserver) {
+      const url = new URL(homeserver);
+      return url.hostname;
+    }
     return Config.get().default_server_config?.["m.homeserver"].server_name;
   }
 

src/form/Form.tsx

@@ -38,3 +38,5 @@ export const Form = forwardRef<HTMLFormElement, FormProps>(
     );
   },
 );
+
+Form.displayName = "Form";

src/icons/AudioLow.svg

@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.9699 2.22605L6 7.20093L1.5 7.20093C0.671573 7.20093 0 7.8725 0 8.70093V15.3009C0 16.1294 0.671571 16.8009 1.5 16.8009L6 16.8009L11.9699 21.7758C12.4584 22.1829 13.2 21.8355 13.2 21.1996V2.80221C13.2 2.16634 12.4584 1.81897 11.9699 2.22605Z" fill="white"/>
-<path d="M17.5896 7.78682C17.2506 7.35087 16.6223 7.27234 16.1864 7.61141C15.7515 7.94959 15.6723 8.57548 16.0083 9.01128L16.0117 9.01586C16.0162 9.02185 16.0246 9.03334 16.0365 9.05007C16.0603 9.08359 16.0977 9.13784 16.1441 9.21085C16.2374 9.3574 16.3654 9.57639 16.4941 9.85222C16.7544 10.4099 17.0003 11.1627 17.0003 12.0008C17.0003 12.8388 16.7544 13.5916 16.4941 14.1493C16.3654 14.4251 16.2374 14.6441 16.1441 14.7907C16.0977 14.8637 16.0603 14.9179 16.0365 14.9514C16.0246 14.9682 16.0162 14.9797 16.0117 14.9857L16.0083 14.9903C15.6723 15.4261 15.7515 16.0519 16.1864 16.3901C16.6223 16.7292 17.2506 16.6506 17.5896 16.2147L16.8003 15.6008C17.5896 16.2147 17.5896 16.2147 17.5896 16.2147L17.5914 16.2124L17.5936 16.2095L17.5994 16.2021L17.6158 16.1802C17.6289 16.1626 17.6463 16.1389 17.6672 16.1094C17.709 16.0505 17.7654 15.9682 17.8315 15.8644C17.9632 15.6574 18.1352 15.3621 18.3065 14.9951C18.6462 14.267 19.0003 13.2199 19.0003 12.0008C19.0003 10.7816 18.6462 9.73448 18.3065 9.00645C18.1352 8.63942 17.9632 8.34412 17.8315 8.1371C17.7654 8.03333 17.709 7.95097 17.6672 7.89207C17.6463 7.8626 17.6289 7.83893 17.6158 7.82132L17.5994 7.79946L17.5936 7.79198L17.5914 7.78911L17.5905 7.78789C17.5905 7.78789 17.5896 7.78682 16.8003 8.40076L17.5896 7.78682Z" fill="white"/>
-</svg>

src/icons/AudioMuted.svg

@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2.63174 0.583224C2.15798 0.109466 1.38987 0.109466 0.91611 0.583224C0.442351 1.05698 0.442351 1.8251 0.91611 2.29885L5.3958 6.77855H5.37083L15.3629 16.7706V16.7456L20.7144 22.0972C21.1882 22.5709 21.9563 22.5709 22.4301 22.0972C22.9038 21.6234 22.9038 20.8553 22.4301 20.3816L2.63174 0.583224ZM15.3629 3.23319V9.88521L10.2275 4.74987L13.2404 2.2391C14.0833 1.53675 15.3629 2.13608 15.3629 3.23319ZM4.07191 16.8718H7.7929V16.872L13.2404 21.4116C14.0833 22.114 15.3629 21.5146 15.3629 20.4175V20.2018L2.4839 7.32287C1.87536 7.79641 1.48389 8.53577 1.48389 9.36657V14.2838C1.48389 15.7131 2.64258 16.8718 4.07191 16.8718Z" fill="white"/>
-</svg>

src/icons/Fullscreen.svg

@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M21 8.59V4C21 3.45 20.55 3 20 3H15.41C14.52 3 14.07 4.08 14.7 4.71L16.29 6.3L6.29 16.3L4.7 14.71C4.08 14.08 3 14.52 3 15.41V20C3 20.55 3.45 21 4 21H8.59C9.48 21 9.93 19.92 9.3 19.29L7.71 17.7L17.71 7.7L19.3 9.29C19.92 9.92 21 9.48 21 8.59Z" fill="white"/>
-</svg>

src/icons/FullscreenExit.svg

@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M21.29 4.12L16.7 8.71L18.29 10.3C18.92 10.93 18.47 12.01 17.58 12.01H13C12.45 12.01 12 11.56 12 11.01V6.41C12 5.52 13.08 5.07 13.71 5.7L15.3 7.29L19.89 2.7C20.28 2.31 20.91 2.31 21.3 2.7C21.68 3.1 21.68 3.73 21.29 4.12ZM4.11997 21.29L8.70997 16.7L10.3 18.29C10.93 18.92 12.01 18.47 12.01 17.58V13C12.01 12.45 11.56 12 11.01 12H6.40997C5.51997 12 5.06997 13.08 5.69997 13.71L7.28997 15.3L2.69997 19.89C2.30997 20.28 2.30997 20.91 2.69997 21.3C3.09997 21.68 3.72997 21.68 4.11997 21.29Z" fill="white"/>
-</svg>

src/icons/Logo.svg

@@ -2,17 +2,17 @@
 <desc>Element Call (Beta)</desc>
 <circle cx="15" cy="15" r="13" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M15 30C23.2843 30 30 23.2843 30 15C30 6.71573 23.2843 0 15 0C6.71573 0 0 6.71573 0 15C0 23.2843 6.71573 30 15 30ZM12.2579 6.98923C12.2579 6.38376 12.7497 5.89292 13.3565 5.89292C17.4687 5.89292 20.8024 9.21967 20.8024 13.3234C20.8024 13.9289 20.3106 14.4197 19.7038 14.4197C19.0971 14.4197 18.6052 13.9289 18.6052 13.3234C18.6052 10.4306 16.2553 8.08554 13.3565 8.08554C12.7497 8.08554 12.2579 7.59471 12.2579 6.98923ZM24.1066 13.3235C24.1066 12.7181 23.6148 12.2272 23.008 12.2272C22.4013 12.2272 21.9094 12.7181 21.9094 13.3235C21.9094 16.2163 19.5595 18.5614 16.6607 18.5614C16.0539 18.5614 15.5621 19.0523 15.5621 19.6577C15.5621 20.2632 16.0539 20.754 16.6607 20.754C20.7729 20.754 24.1066 17.4273 24.1066 13.3235ZM17.7601 23.011C17.7601 23.6164 17.2682 24.1073 16.6615 24.1073C12.5492 24.1073 9.21553 20.7805 9.21553 16.6768C9.21553 16.0713 9.70739 15.5805 10.3141 15.5805C10.9209 15.5805 11.4127 16.0713 11.4127 16.6768C11.4127 19.5696 13.7627 21.9146 16.6615 21.9146C17.2682 21.9146 17.7601 22.4055 17.7601 23.011ZM5.89281 16.6769C5.89281 17.2824 6.38466 17.7732 6.9914 17.7732C7.59813 17.7732 8.08999 17.2824 8.08999 16.6769C8.08999 13.7841 10.4399 11.439 13.3388 11.439C13.9455 11.439 14.4373 10.9482 14.4373 10.3427C14.4373 9.73722 13.9455 9.24639 13.3388 9.24639C9.22647 9.24639 5.89281 12.5731 5.89281 16.6769Z" fill="#0DBD8B"/>
-<path d="M53.5406 17.258H42.8052C42.932 18.3814 43.3397 19.2782 44.0282 19.9486C44.7167 20.6009 45.6227 20.927 46.746 20.927C47.4889 20.927 48.1593 20.7459 48.7572 20.3835C49.3551 20.0211 49.7809 19.5319 50.0346 18.9159H53.296C52.8611 20.3472 52.0458 21.5068 50.8499 22.3947C49.6722 23.2644 48.2771 23.6992 46.6645 23.6992C44.5627 23.6992 42.8596 23.0016 41.555 21.6065C40.2686 20.2114 39.6254 18.4448 39.6254 16.3068C39.6254 14.2231 40.2776 12.4747 41.5822 11.0614C42.8867 9.64814 44.5718 8.94151 46.6373 8.94151C48.7029 8.94151 50.3698 9.63908 51.6381 11.0342C52.9245 12.4112 53.5677 14.1506 53.5677 16.2524L53.5406 17.258ZM46.6373 11.5778C45.6227 11.5778 44.7801 11.8767 44.1098 12.4747C43.4394 13.0726 43.0226 13.8698 42.8596 14.8663H50.3607C50.2158 13.8698 49.8172 13.0726 49.1649 12.4747C48.5126 11.8767 47.6701 11.5778 46.6373 11.5778Z" fill="white"/>
-<path d="M55.7934 19.1605V2.9895H59.0276V19.2148C59.0276 19.9396 59.4262 20.302 60.2234 20.302L60.7941 20.2748V23.3459C60.4861 23.4003 60.16 23.4274 59.8157 23.4274C58.4206 23.4274 57.3969 23.0741 56.7446 22.3675C56.1104 21.6609 55.7934 20.5919 55.7934 19.1605Z" fill="white"/>
-<path d="M75.8563 17.258H65.121C65.2478 18.3814 65.6555 19.2782 66.344 19.9486C67.0325 20.6009 67.9384 20.927 69.0618 20.927C69.8047 20.927 70.4751 20.7459 71.073 20.3835C71.6709 20.0211 72.0967 19.5319 72.3503 18.9159H75.6117C75.1769 20.3472 74.3615 21.5068 73.1657 22.3947C71.988 23.2644 70.5928 23.6992 68.9803 23.6992C66.8785 23.6992 65.1753 23.0016 63.8708 21.6065C62.5843 20.2114 61.9411 18.4448 61.9411 16.3068C61.9411 14.2231 62.5934 12.4747 63.898 11.0614C65.2025 9.64814 66.8875 8.94151 68.9531 8.94151C71.0186 8.94151 72.6855 9.63908 73.9539 11.0342C75.2403 12.4112 75.8835 14.1506 75.8835 16.2524L75.8563 17.258ZM68.9531 11.5778C67.9384 11.5778 67.0959 11.8767 66.4255 12.4747C65.7551 13.0726 65.3384 13.8698 65.1753 14.8663H72.6765C72.5315 13.8698 72.1329 13.0726 71.4806 12.4747C70.8284 11.8767 69.9859 11.5778 68.9531 11.5778Z" fill="white"/>
-<path d="M90.448 15.274V23.3731H87.2138V14.9207C87.2138 12.7827 86.326 11.7137 84.5503 11.7137C83.59 11.7137 82.82 12.0217 82.2402 12.6377C81.6785 13.2538 81.3977 14.0963 81.3977 15.1653V23.3731H78.1635V9.26764H81.1531V11.1429C81.4973 10.5088 82.0228 9.98333 82.7294 9.5666C83.436 9.14987 84.3148 8.94151 85.3657 8.94151C87.3225 8.94151 88.7358 9.68438 89.6055 11.1701C90.8013 9.68438 92.3958 8.94151 94.3888 8.94151C96.0376 8.94151 97.3059 9.45789 98.1937 10.4907C99.0816 11.5053 99.5255 12.8461 99.5255 14.513V23.3731H96.2913V14.9207C96.2913 12.7827 95.4035 11.7137 93.6278 11.7137C92.6494 11.7137 91.8703 12.0308 91.2905 12.6649C90.7288 13.2809 90.448 14.1506 90.448 15.274Z" fill="white"/>
-<path d="M115.61 17.258H104.874C105.001 18.3814 105.409 19.2782 106.097 19.9486C106.786 20.6009 107.692 20.927 108.815 20.927C109.558 20.927 110.228 20.7459 110.826 20.3835C111.424 20.0211 111.85 19.5319 112.104 18.9159H115.365C114.93 20.3472 114.115 21.5068 112.919 22.3947C111.741 23.2644 110.346 23.6992 108.734 23.6992C106.632 23.6992 104.929 23.0016 103.624 21.6065C102.338 20.2114 101.694 18.4448 101.694 16.3068C101.694 14.2231 102.347 12.4747 103.651 11.0614C104.956 9.64814 106.641 8.94151 108.706 8.94151C110.772 8.94151 112.439 9.63908 113.707 11.0342C114.994 12.4112 115.637 14.1506 115.637 16.2524L115.61 17.258ZM108.706 11.5778C107.692 11.5778 106.849 11.8767 106.179 12.4747C105.508 13.0726 105.092 13.8698 104.929 14.8663H112.43C112.285 13.8698 111.886 13.0726 111.234 12.4747C110.582 11.8767 109.739 11.5778 108.706 11.5778Z" fill="white"/>
-<path d="M120.906 9.26764V11.1429C121.232 10.5269 121.767 10.0105 122.51 9.59378C123.271 9.15893 124.186 8.94151 125.255 8.94151C126.922 8.94151 128.208 9.44883 129.114 10.4635C130.038 11.4781 130.5 12.828 130.5 14.513V23.3731H127.266V14.9207C127.266 13.9242 127.03 13.1451 126.559 12.5834C126.106 12.0036 125.409 11.7137 124.467 11.7137C123.434 11.7137 122.619 12.0217 122.021 12.6377C121.441 13.2538 121.151 14.1053 121.151 15.1925V23.3731H117.917V9.26764H120.906Z" fill="white"/>
-<path d="M139.946 20.4922V23.2915C139.547 23.4003 138.985 23.4546 138.261 23.4546C135.507 23.4546 134.13 22.0685 134.13 19.2964V11.8496H131.982V9.26764H134.13V5.5986H137.364V9.26764H140V11.8496H137.364V18.9702C137.364 20.0755 137.889 20.6281 138.94 20.6281L139.946 20.4922Z" fill="white"/>
-<path d="M148.304 20.864C146.768 19.184 146 17.056 146 14.48C146 11.904 146.768 9.784 148.304 8.12C149.856 6.44 151.896 5.6 154.424 5.6C156.504 5.6 158.264 6.176 159.704 7.328C161.144 8.48 162.064 10.024 162.464 11.96H160.616C160.28 10.52 159.552 9.376 158.432 8.528C157.312 7.68 155.976 7.256 154.424 7.256C152.44 7.256 150.84 7.92 149.624 9.248C148.424 10.576 147.824 12.32 147.824 14.48C147.824 16.64 148.424 18.384 149.624 19.712C150.84 21.04 152.44 21.704 154.424 21.704C155.976 21.704 157.312 21.28 158.432 20.432C159.552 19.584 160.28 18.44 160.616 17H162.464C162.064 18.936 161.144 20.48 159.704 21.632C158.264 22.784 156.504 23.36 154.424 23.36C151.896 23.36 149.856 22.528 148.304 20.864Z" fill="white"/>
-<path d="M173.63 17.192C171.438 17.192 169.942 17.24 169.142 17.336C168.358 17.416 167.782 17.552 167.414 17.744C166.758 18.112 166.43 18.704 166.43 19.52C166.43 21.088 167.358 21.872 169.214 21.872C170.638 21.872 171.726 21.552 172.478 20.912C173.246 20.272 173.63 19.416 173.63 18.344V17.192ZM169.022 23.288C167.63 23.288 166.566 22.952 165.83 22.28C165.11 21.592 164.75 20.688 164.75 19.568C164.75 18.832 164.942 18.176 165.326 17.6C165.726 17.024 166.27 16.6 166.958 16.328C167.534 16.104 168.278 15.96 169.19 15.896C170.102 15.816 171.582 15.776 173.63 15.776V14.984C173.63 12.968 172.478 11.96 170.174 11.96C168.19 11.96 167.038 12.768 166.718 14.384H165.062C165.238 13.2 165.742 12.256 166.574 11.552C167.422 10.848 168.646 10.496 170.246 10.496C171.958 10.496 173.23 10.896 174.062 11.696C174.91 12.496 175.334 13.6 175.334 15.008V23H173.702V21.224C172.854 22.6 171.294 23.288 169.022 23.288Z" fill="white"/>
-<path d="M179.418 20.312V5H181.122V20.12C181.122 20.616 181.202 20.96 181.362 21.152C181.538 21.344 181.85 21.44 182.298 21.44L182.778 21.392V22.952C182.506 23 182.21 23.024 181.89 23.024C180.242 23.024 179.418 22.12 179.418 20.312Z" fill="white"/>
-<path d="M185.582 20.312V5H187.286V20.12C187.286 20.616 187.366 20.96 187.526 21.152C187.702 21.344 188.014 21.44 188.462 21.44L188.942 21.392V22.952C188.67 23 188.374 23.024 188.054 23.024C186.406 23.024 185.582 22.12 185.582 20.312Z" fill="white"/>
+<path d="M53.5406 17.258H42.8052C42.932 18.3814 43.3397 19.2782 44.0282 19.9486C44.7167 20.6009 45.6227 20.927 46.746 20.927C47.4889 20.927 48.1593 20.7459 48.7572 20.3835C49.3551 20.0211 49.7809 19.5319 50.0346 18.9159H53.296C52.8611 20.3472 52.0458 21.5068 50.8499 22.3947C49.6722 23.2644 48.2771 23.6992 46.6645 23.6992C44.5627 23.6992 42.8596 23.0016 41.555 21.6065C40.2686 20.2114 39.6254 18.4448 39.6254 16.3068C39.6254 14.2231 40.2776 12.4747 41.5822 11.0614C42.8867 9.64814 44.5718 8.94151 46.6373 8.94151C48.7029 8.94151 50.3698 9.63908 51.6381 11.0342C52.9245 12.4112 53.5677 14.1506 53.5677 16.2524L53.5406 17.258ZM46.6373 11.5778C45.6227 11.5778 44.7801 11.8767 44.1098 12.4747C43.4394 13.0726 43.0226 13.8698 42.8596 14.8663H50.3607C50.2158 13.8698 49.8172 13.0726 49.1649 12.4747C48.5126 11.8767 47.6701 11.5778 46.6373 11.5778Z" fill="currentColor"/>
+<path d="M55.7934 19.1605V2.9895H59.0276V19.2148C59.0276 19.9396 59.4262 20.302 60.2234 20.302L60.7941 20.2748V23.3459C60.4861 23.4003 60.16 23.4274 59.8157 23.4274C58.4206 23.4274 57.3969 23.0741 56.7446 22.3675C56.1104 21.6609 55.7934 20.5919 55.7934 19.1605Z" fill="currentColor"/>
+<path d="M75.8563 17.258H65.121C65.2478 18.3814 65.6555 19.2782 66.344 19.9486C67.0325 20.6009 67.9384 20.927 69.0618 20.927C69.8047 20.927 70.4751 20.7459 71.073 20.3835C71.6709 20.0211 72.0967 19.5319 72.3503 18.9159H75.6117C75.1769 20.3472 74.3615 21.5068 73.1657 22.3947C71.988 23.2644 70.5928 23.6992 68.9803 23.6992C66.8785 23.6992 65.1753 23.0016 63.8708 21.6065C62.5843 20.2114 61.9411 18.4448 61.9411 16.3068C61.9411 14.2231 62.5934 12.4747 63.898 11.0614C65.2025 9.64814 66.8875 8.94151 68.9531 8.94151C71.0186 8.94151 72.6855 9.63908 73.9539 11.0342C75.2403 12.4112 75.8835 14.1506 75.8835 16.2524L75.8563 17.258ZM68.9531 11.5778C67.9384 11.5778 67.0959 11.8767 66.4255 12.4747C65.7551 13.0726 65.3384 13.8698 65.1753 14.8663H72.6765C72.5315 13.8698 72.1329 13.0726 71.4806 12.4747C70.8284 11.8767 69.9859 11.5778 68.9531 11.5778Z" fill="currentColor"/>
+<path d="M90.448 15.274V23.3731H87.2138V14.9207C87.2138 12.7827 86.326 11.7137 84.5503 11.7137C83.59 11.7137 82.82 12.0217 82.2402 12.6377C81.6785 13.2538 81.3977 14.0963 81.3977 15.1653V23.3731H78.1635V9.26764H81.1531V11.1429C81.4973 10.5088 82.0228 9.98333 82.7294 9.5666C83.436 9.14987 84.3148 8.94151 85.3657 8.94151C87.3225 8.94151 88.7358 9.68438 89.6055 11.1701C90.8013 9.68438 92.3958 8.94151 94.3888 8.94151C96.0376 8.94151 97.3059 9.45789 98.1937 10.4907C99.0816 11.5053 99.5255 12.8461 99.5255 14.513V23.3731H96.2913V14.9207C96.2913 12.7827 95.4035 11.7137 93.6278 11.7137C92.6494 11.7137 91.8703 12.0308 91.2905 12.6649C90.7288 13.2809 90.448 14.1506 90.448 15.274Z" fill="currentColor"/>
+<path d="M115.61 17.258H104.874C105.001 18.3814 105.409 19.2782 106.097 19.9486C106.786 20.6009 107.692 20.927 108.815 20.927C109.558 20.927 110.228 20.7459 110.826 20.3835C111.424 20.0211 111.85 19.5319 112.104 18.9159H115.365C114.93 20.3472 114.115 21.5068 112.919 22.3947C111.741 23.2644 110.346 23.6992 108.734 23.6992C106.632 23.6992 104.929 23.0016 103.624 21.6065C102.338 20.2114 101.694 18.4448 101.694 16.3068C101.694 14.2231 102.347 12.4747 103.651 11.0614C104.956 9.64814 106.641 8.94151 108.706 8.94151C110.772 8.94151 112.439 9.63908 113.707 11.0342C114.994 12.4112 115.637 14.1506 115.637 16.2524L115.61 17.258ZM108.706 11.5778C107.692 11.5778 106.849 11.8767 106.179 12.4747C105.508 13.0726 105.092 13.8698 104.929 14.8663H112.43C112.285 13.8698 111.886 13.0726 111.234 12.4747C110.582 11.8767 109.739 11.5778 108.706 11.5778Z" fill="currentColor"/>
+<path d="M120.906 9.26764V11.1429C121.232 10.5269 121.767 10.0105 122.51 9.59378C123.271 9.15893 124.186 8.94151 125.255 8.94151C126.922 8.94151 128.208 9.44883 129.114 10.4635C130.038 11.4781 130.5 12.828 130.5 14.513V23.3731H127.266V14.9207C127.266 13.9242 127.03 13.1451 126.559 12.5834C126.106 12.0036 125.409 11.7137 124.467 11.7137C123.434 11.7137 122.619 12.0217 122.021 12.6377C121.441 13.2538 121.151 14.1053 121.151 15.1925V23.3731H117.917V9.26764H120.906Z" fill="currentColor"/>
+<path d="M139.946 20.4922V23.2915C139.547 23.4003 138.985 23.4546 138.261 23.4546C135.507 23.4546 134.13 22.0685 134.13 19.2964V11.8496H131.982V9.26764H134.13V5.5986H137.364V9.26764H140V11.8496H137.364V18.9702C137.364 20.0755 137.889 20.6281 138.94 20.6281L139.946 20.4922Z" fill="currentColor"/>
+<path d="M148.304 20.864C146.768 19.184 146 17.056 146 14.48C146 11.904 146.768 9.784 148.304 8.12C149.856 6.44 151.896 5.6 154.424 5.6C156.504 5.6 158.264 6.176 159.704 7.328C161.144 8.48 162.064 10.024 162.464 11.96H160.616C160.28 10.52 159.552 9.376 158.432 8.528C157.312 7.68 155.976 7.256 154.424 7.256C152.44 7.256 150.84 7.92 149.624 9.248C148.424 10.576 147.824 12.32 147.824 14.48C147.824 16.64 148.424 18.384 149.624 19.712C150.84 21.04 152.44 21.704 154.424 21.704C155.976 21.704 157.312 21.28 158.432 20.432C159.552 19.584 160.28 18.44 160.616 17H162.464C162.064 18.936 161.144 20.48 159.704 21.632C158.264 22.784 156.504 23.36 154.424 23.36C151.896 23.36 149.856 22.528 148.304 20.864Z" fill="currentColor"/>
+<path d="M173.63 17.192C171.438 17.192 169.942 17.24 169.142 17.336C168.358 17.416 167.782 17.552 167.414 17.744C166.758 18.112 166.43 18.704 166.43 19.52C166.43 21.088 167.358 21.872 169.214 21.872C170.638 21.872 171.726 21.552 172.478 20.912C173.246 20.272 173.63 19.416 173.63 18.344V17.192ZM169.022 23.288C167.63 23.288 166.566 22.952 165.83 22.28C165.11 21.592 164.75 20.688 164.75 19.568C164.75 18.832 164.942 18.176 165.326 17.6C165.726 17.024 166.27 16.6 166.958 16.328C167.534 16.104 168.278 15.96 169.19 15.896C170.102 15.816 171.582 15.776 173.63 15.776V14.984C173.63 12.968 172.478 11.96 170.174 11.96C168.19 11.96 167.038 12.768 166.718 14.384H165.062C165.238 13.2 165.742 12.256 166.574 11.552C167.422 10.848 168.646 10.496 170.246 10.496C171.958 10.496 173.23 10.896 174.062 11.696C174.91 12.496 175.334 13.6 175.334 15.008V23H173.702V21.224C172.854 22.6 171.294 23.288 169.022 23.288Z" fill="currentColor"/>
+<path d="M179.418 20.312V5H181.122V20.12C181.122 20.616 181.202 20.96 181.362 21.152C181.538 21.344 181.85 21.44 182.298 21.44L182.778 21.392V22.952C182.506 23 182.21 23.024 181.89 23.024C180.242 23.024 179.418 22.12 179.418 20.312Z" fill="currentColor"/>
+<path d="M185.582 20.312V5H187.286V20.12C187.286 20.616 187.366 20.96 187.526 21.152C187.702 21.344 188.014 21.44 188.462 21.44L188.942 21.392V22.952C188.67 23 188.374 23.024 188.054 23.024C186.406 23.024 185.582 22.12 185.582 20.312Z" fill="currentColor"/>
 <path d="M201 10C201 5.58172 204.582 2 209 2H252C256.418 2 260 5.58172 260 10V20C260 24.4183 256.418 28 252 28H209C204.582 28 201 24.4183 201 20V10Z" fill="#368BD6"/>
 <path d="M212.076 20H216.492C218.99 20 220.215 18.7269 220.215 17.0277C220.215 15.3764 219.043 14.407 217.882 14.3484V14.2418C218.947 13.9915 219.789 13.2457 219.789 11.9194C219.789 10.2947 218.617 9.09091 216.252 9.09091H212.076V20ZM214.052 18.3487V15.1527H216.231C217.451 15.1527 218.207 15.8984 218.207 16.8732C218.207 17.7415 217.61 18.3487 216.178 18.3487H214.052ZM214.052 13.7305V10.7209H216.05C217.211 10.7209 217.813 11.3335 217.813 12.1751C217.813 13.1339 217.035 13.7305 216.007 13.7305H214.052ZM221.934 20H229.072V18.3434H223.911V15.3658H228.662V13.7092H223.911V10.7475H229.03V9.09091H221.934V20ZM230.566 10.7475H233.938V20H235.898V10.7475H239.27V9.09091H230.566V10.7475ZM241.031 20L241.931 17.31H246.032L246.938 20H249.047L245.201 9.09091H242.762L238.921 20H241.031ZM242.464 15.7227L243.939 11.3281H244.024L245.5 15.7227H242.464Z" fill="white"/>
 </svg>

src/icons/Mic.svg

@@ -1,4 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.37785 4.70549C6.37785 2.79707 7.99961 1.25 10.0001 1.25C12.0007 1.25 13.6224 2.79707 13.6224 4.70548V9.87324C13.6224 11.7817 12.0007 13.3287 10.0001 13.3287C7.99961 13.3287 6.37785 11.7817 6.37785 9.87324V4.70549Z" fill="white"/>
-<path d="M3.66099 8.77015C4.30219 8.77015 4.82198 9.266 4.82198 9.87768C4.82198 12.5957 7.1314 14.8024 9.98617 14.8095C9.99084 14.8094 9.99552 14.8094 10.0002 14.8094C10.0049 14.8094 10.0095 14.8094 10.0141 14.8095C12.8688 14.8022 15.178 12.5956 15.178 9.87768C15.178 9.266 15.6978 8.77015 16.339 8.77015C16.9802 8.77015 17.5 9.266 17.5 9.87768C17.5 13.4496 14.7509 16.4077 11.1612 16.9394V17.6425C11.1612 18.2541 10.6414 18.75 10.0002 18.75C9.359 18.75 8.83921 18.2541 8.83921 17.6425V16.9395C5.24925 16.4079 2.5 13.4497 2.5 9.87768C2.5 9.266 3.01979 8.77015 3.66099 8.77015Z" fill="white"/>
-</svg>

src/icons/MicMuted.svg

@@ -1,5 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.9206 1.0544C1.68141 0.815201 1.29359 0.815201 1.0544 1.0544C0.815201 1.29359 0.815201 1.68141 1.0544 1.9206L4.55 5.41621V7C4.55 8.3531 5.6469 9.45 7 9.45C7.45436 9.45 7.87983 9.32632 8.24458 9.11079L9.12938 9.99558C8.52863 10.4234 7.7937 10.675 7 10.675C4.97035 10.675 3.325 9.02965 3.325 7C3.325 6.66173 3.05077 6.3875 2.7125 6.3875C2.37423 6.3875 2.1 6.66173 2.1 7C2.1 9.49877 3.97038 11.5607 6.3875 11.8621V12.5125C6.3875 12.8508 6.66173 13.125 7 13.125C7.33827 13.125 7.6125 12.8508 7.6125 12.5125V11.8621C8.50718 11.7505 9.32696 11.3978 10.0047 10.8709L12.0794 12.9456C12.3186 13.1848 12.7064 13.1848 12.9456 12.9456C13.1848 12.7064 13.1848 12.3186 12.9456 12.0794L1.9206 1.0544Z" fill="white"/>
-<path d="M10.5474 7.96338L11.5073 8.92525C11.7601 8.33424 11.9 7.68346 11.9 7C11.9 6.66173 11.6258 6.3875 11.2875 6.3875C10.9492 6.3875 10.675 6.66173 10.675 7C10.675 7.33336 10.6306 7.65634 10.5474 7.96338Z" fill="white"/>
-<path d="M4.81385 2.21784L9.45 6.86366V3.325C9.45 1.9719 8.3531 0.875 7 0.875C6.04532 0.875 5.21818 1.42104 4.81385 2.21784Z" fill="white"/>
-</svg>

src/icons/MuteMic.svg

@@ -1,5 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.74372 1.50628C2.40201 1.16457 1.84799 1.16457 1.50628 1.50628C1.16457 1.84799 1.16457 2.40201 1.50628 2.74372L6.5 7.73744V10C6.5 11.933 8.067 13.5 10 13.5C10.6491 13.5 11.2569 13.3233 11.778 13.0154L13.042 14.2794C12.1838 14.8906 11.1339 15.25 10 15.25C7.10051 15.25 4.75 12.8995 4.75 10C4.75 9.51675 4.35825 9.125 3.875 9.125C3.39175 9.125 3 9.51675 3 10C3 13.5697 5.67198 16.5153 9.125 16.9458V17.875C9.125 18.3582 9.51675 18.75 10 18.75C10.4832 18.75 10.875 18.3582 10.875 17.875V16.9458C12.1531 16.7865 13.3242 16.2825 14.2924 15.5299L17.2563 18.4937C17.598 18.8354 18.152 18.8354 18.4937 18.4937C18.8354 18.152 18.8354 17.598 18.4937 17.2563L2.74372 1.50628Z" fill="#394049"/>
-<path d="M15.0678 11.3763L16.439 12.7504C16.8001 11.9061 17 10.9764 17 10C17 9.51675 16.6082 9.125 16.125 9.125C15.6418 9.125 15.25 9.51675 15.25 10C15.25 10.4762 15.1866 10.9376 15.0678 11.3763Z" fill="#394049"/>
-<path d="M6.87692 3.16834L13.5 9.80523V4.75C13.5 2.817 11.933 1.25 10 1.25C8.63618 1.25 7.45455 2.03005 6.87692 3.16834Z" fill="#394049"/>
-</svg>

src/index.css

@@ -56,10 +56,6 @@ limitations under the License.
   --cpd-color-border-accent: var(--cpd-color-green-1100);
   --stopgap-color-on-solid-accent: var(--cpd-color-text-primary);
   --stopgap-background-85: rgba(16, 19, 23, 0.85);
-
-  background-size: calc(max(1440px, 100vw)) calc(max(800px, 100vh));
-  background-repeat: no-repeat;
-  background-position: center;
 }
 
 @font-face {
@@ -152,6 +148,9 @@ limitations under the License.
 
 body {
   background-color: var(--cpd-color-bg-canvas-default);
+  background-size: calc(max(1440px, 100vw)) calc(max(800px, 100vh));
+  background-repeat: no-repeat;
+  background-position: center;
   color: var(--cpd-color-text-primary);
   color-scheme: dark;
   margin: 0;
@@ -170,6 +169,9 @@ body,
 #root {
   display: flex;
   flex-direction: column;
+  /* The root should be a separate stacking context so that portalled elements
+  like modals and menus always appear over top of it */
+  isolation: isolate;
 }
 
 /* On Android and iOS, prefer native system fonts. The global.css file of

src/input/AvatarInputField.tsx

@@ -105,6 +105,8 @@ export const AvatarInputField = forwardRef<HTMLInputElement, Props>(
             aria-label={label}
             {...rest}
           />
+          {/* https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/issues/966 */}
+          {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
           <label htmlFor={id} className={styles.fileInputButton}>
             <EditIcon />
           </label>
@@ -122,3 +124,5 @@ export const AvatarInputField = forwardRef<HTMLInputElement, Props>(
     );
   },
 );
+
+AvatarInputField.displayName = "AvatarInputField";

src/input/Input.tsx

@@ -166,6 +166,8 @@ export const InputField = forwardRef<
   },
 );
 
+InputField.displayName = "InputField";
+
 interface ErrorMessageProps {
   error: Error;
 }

src/livekit/MediaDevicesContext.tsx

@@ -86,9 +86,7 @@ function useMediaDevice(
     () =>
       createMediaDeviceObserver(
         kind,
-        () => {
-          logger.error("Error creating MediaDeviceObserver");
-        },
+        () => logger.error("Error creating MediaDeviceObserver"),
         requestPermissions,
       ),
     [kind, requestPermissions],
@@ -102,8 +100,8 @@ function useMediaDevice(
       devId = available.some((d) => d.deviceId === selectedId)
         ? selectedId
         : available.some((d) => d.deviceId === fallbackDevice)
-        ? fallbackDevice
-        : available.at(0)?.deviceId;
+          ? fallbackDevice
+          : available.at(0)?.deviceId;
     }
 
     return {

src/livekit/options.ts

@@ -59,5 +59,4 @@ export const defaultLiveKitOptions: RoomOptions = {
   stopLocalTrackOnUnpublish: true,
   reconnectPolicy: new DefaultReconnectPolicy(),
   disconnectOnPageLeave: true,
-  expWebAudioMix: false,
 };

src/livekit/useECConnectionState.ts

@@ -61,7 +61,9 @@ async function doConnect(
   // doesn't publish it until you unmute. We want to publish it from the start so we're
   // always capturing audio: it helps keep bluetooth headsets in the right mode and
   // mobile browsers to know we're doing a call.
-  if (livekitRoom!.localParticipant.getTrack(Track.Source.Microphone)) {
+  if (
+    livekitRoom!.localParticipant.getTrackPublication(Track.Source.Microphone)
+  ) {
     logger.warn(
       "Pre-creating audio track but participant already appears to have an microphone track: this shouldn't happen!",
     );
@@ -90,7 +92,9 @@ async function doConnect(
   if (!audioEnabled) await preCreatedAudioTrack?.mute();
 
   // check again having awaited for the track to create
-  if (livekitRoom!.localParticipant.getTrack(Track.Source.Microphone)) {
+  if (
+    livekitRoom!.localParticipant.getTrackPublication(Track.Source.Microphone)
+  ) {
     logger.warn(
       "Pre-created audio track but participant already appears to have an microphone track: this shouldn't happen!",
     );
@@ -174,7 +178,7 @@ export function useECConnectionState(
 
   const doFocusSwitch = useCallback(async (): Promise<void> => {
     const screenshareTracks: MediaStreamTrack[] = [];
-    for (const t of livekitRoom!.localParticipant.videoTracks.values()) {
+    for (const t of livekitRoom!.localParticipant.videoTrackPublications.values()) {
       if (t.track && t.source == Track.Source.ScreenShare) {
         const newTrack = t.track.mediaStreamTrack.clone();
         newTrack.enabled = true;
@@ -248,6 +252,6 @@ export function useECConnectionState(
   return isSwitchingFocus
     ? ECAddonConnectionState.ECSwitchingFocus
     : isInDoConnect
-    ? ConnectionState.Connecting
-    : connState;
+      ? ConnectionState.Connecting
+      : connState;
 }

src/livekit/useLiveKit.ts

@@ -107,8 +107,6 @@ export function useLiveKit(
         ...defaultLiveKitOptions.audioCaptureDefaults,
         deviceId: initialDevices.current.audioInput.selectedId,
       },
-      // XXX Setting the audio output here doesn't seem to do anything… a bug in
-      // LiveKit?
       audioOutput: {
         deviceId: initialDevices.current.audioOutput.selectedId,
       },
@@ -293,7 +291,7 @@ export function useLiveKit(
           room.options.audioCaptureDefaults?.deviceId === "default"
         ) {
           const activeMicTrack = Array.from(
-            room.localParticipant.audioTracks.values(),
+            room.localParticipant.audioTrackPublications.values(),
           ).find((d) => d.source === Track.Source.Microphone)?.track;
 
           const defaultDevice = device.available.find(
@@ -315,7 +313,7 @@ export function useLiveKit(
             // Note that room.switchActiveDevice() won't work: Livekit will ignore it because
             // the deviceId hasn't changed (was & still is default).
             room.localParticipant
-              .getTrack(Track.Source.Microphone)
+              .getTrackPublication(Track.Source.Microphone)
               ?.audioTrack?.restartTrack();
           }
         } else {

src/matrix-utils.ts

@@ -188,16 +188,9 @@ export async function initClient(
     await client.store.startup();
   }
 
-  if (client.initCrypto) {
-    await client.initCrypto();
-  }
-
-  await client.startClient({
-    // dirty hack to reduce chance of gappy syncs
-    // should be fixed by spotting gaps and backpaginating
-    initialSyncLimit: 50,
-  });
-
+  await client.initCrypto();
+  client.setGlobalErrorOnUnknownDevices(false);
+  await client.startClient();
   await waitForSync(client);
 
   return client;

src/observable-utils.ts

@@ -0,0 +1,37 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Observable, defer, finalize, tap } from "rxjs";
+
+const nothing = Symbol("nothing");
+
+/**
+ * RxJS operator that invokes a callback when the Observable is finalized,
+ * passing the most recently emitted value. If no value was emitted, the
+ * callback will not be invoked.
+ */
+export function finalizeValue<T>(callback: (finalValue: T) => void) {
+  return (source: Observable<T>): Observable<T> =>
+    defer(() => {
+      let finalValue: T | typeof nothing = nothing;
+      return source.pipe(
+        tap((value) => (finalValue = value)),
+        finalize(() => {
+          if (finalValue !== nothing) callback(finalValue);
+        }),
+      );
+    });
+}

src/popover/Popover.tsx

@@ -58,3 +58,5 @@ export const Popover = forwardRef<HTMLDivElement, Props>(
     );
   },
 );
+
+Popover.displayName = "Popover";

src/popover/PopoverMenu.tsx

@@ -94,3 +94,5 @@ export const PopoverMenuTrigger = forwardRef<
     </div>
   );
 });
+
+PopoverMenuTrigger.displayName = "PopoverMenuTrigger";

src/room/EncryptionLock.module.css

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 .lock {
+  display: block;
   padding: var(--cpd-space-1x);
   border-radius: var(--cpd-radius-pill-effect);
 }

src/room/EncryptionLock.tsx

@@ -17,7 +17,7 @@ limitations under the License.
 import { FC } from "react";
 import { Tooltip } from "@vector-im/compound-web";
 import { useTranslation } from "react-i18next";
-import LockIcon from "@vector-im/compound-design-tokens/icons/lock.svg?react";
+import LockSolidIcon from "@vector-im/compound-design-tokens/icons/lock-solid.svg?react";
 import LockOffIcon from "@vector-im/compound-design-tokens/icons/lock-off.svg?react";
 
 import styles from "./EncryptionLock.module.css";
@@ -28,23 +28,17 @@ interface Props {
 
 export const EncryptionLock: FC<Props> = ({ encrypted }) => {
   const { t } = useTranslation();
-  const Icon = encrypted ? LockIcon : LockOffIcon;
+  const Icon = encrypted ? LockSolidIcon : LockOffIcon;
   const label = encrypted ? t("common.encrypted") : t("common.unencrypted");
 
   return (
-    <Tooltip label={label} side="right">
+    <Tooltip label={label} side="right" isTriggerInteractive={false}>
       <Icon
         width={16}
         height={16}
         className={styles.lock}
         data-encrypted={encrypted}
         aria-label={label}
-        // Make the icon focusable so that the tooltip can be opened
-        // with keyboard navigation
-        // TODO: Replace this with the solution from
-        // https://github.com/vector-im/compound-web/pull/130 once it
-        // lands
-        tabIndex={0}
       />
     </Tooltip>
   );

src/room/GroupCallView.tsx

@@ -87,7 +87,7 @@ export const GroupCallView: FC<Props> = ({
   const roomName = useRoomName(rtcSession.room);
   const roomAvatar = useRoomAvatar(rtcSession.room);
   const e2eeSharedKey = useRoomSharedKey(rtcSession.room.roomId);
-  const { perParticipantE2EE } = useUrlParams();
+  const { perParticipantE2EE, returnToLobby } = useUrlParams();
   const roomEncrypted =
     useIsRoomE2EE(rtcSession.room.roomId) || perParticipantE2EE;
 
@@ -137,9 +137,6 @@ export const GroupCallView: FC<Props> = ({
   }, [perParticipantE2EE, e2eeSharedKey]);
 
   useEffect(() => {
-    // this effect is only if we don't want to show the lobby (skipLobby = true)
-    if (!skipLobby) return;
-
     const defaultDeviceSetup = async (
       requestedDeviceData: JoinCallData,
     ): Promise<void> => {
@@ -189,24 +186,22 @@ export const GroupCallView: FC<Props> = ({
         }
       }
     };
-    if (widget && preload) {
-      // In preload mode, wait for a join action before entering
+
+    if (widget && preload && skipLobby) {
+      // In preload mode without lobby we wait for a join action before entering
       const onJoin = async (
         ev: CustomEvent<IWidgetApiRequest>,
       ): Promise<void> => {
         defaultDeviceSetup(ev.detail.data as unknown as JoinCallData);
         enterRTCSession(rtcSession, perParticipantE2EE);
-        await Promise.all([
-          widget!.api.setAlwaysOnScreen(true),
-          widget!.api.transport.reply(ev.detail, {}),
-        ]);
+        await widget!.api.transport.reply(ev.detail, {});
       };
       widget.lazyActions.on(ElementWidgetActions.JoinCall, onJoin);
       return () => {
         widget!.lazyActions.off(ElementWidgetActions.JoinCall, onJoin);
       };
-    } else {
-      // if we don't use preload and only skipLobby we enter the rtc session right away
+    } else if (widget && !preload && skipLobby) {
+      // No lobby and no preload: we enter the rtc session right away
       defaultDeviceSetup({ audioInput: null, videoInput: null });
       enterRTCSession(rtcSession, perParticipantE2EE);
     }
@@ -246,6 +241,9 @@ export const GroupCallView: FC<Props> = ({
 
   useEffect(() => {
     if (widget && isJoined) {
+      // set widget to sticky once joined.
+      widget!.api.setAlwaysOnScreen(true);
+
       const onHangup = async (
         ev: CustomEvent<IWidgetApiRequest>,
       ): Promise<void> => {
@@ -319,6 +317,21 @@ export const GroupCallView: FC<Props> = ({
       onDismiss={onDismissInviteModal}
     />
   );
+  const lobbyView = (
+    <>
+      {shareModal}
+      <LobbyView
+        client={client}
+        matrixInfo={matrixInfo}
+        muteStates={muteStates}
+        onEnter={(): void => enterRTCSession(rtcSession, perParticipantE2EE)}
+        confineToRoom={confineToRoom}
+        hideHeader={hideHeader}
+        participantCount={participantCount}
+        onShareClick={onShareClick}
+      />
+    </>
+  );
 
   if (isJoined) {
     return (
@@ -338,7 +351,9 @@ export const GroupCallView: FC<Props> = ({
         />
       </>
     );
-  } else if (left) {
+  } else if (left && widget === null) {
+    // Left in SPA mode:
+
     // The call ended view is shown for two reasons: prompting guests to create
     // an account, and prompting users that have opted into analytics to provide
     // feedback. We don't show a feedback prompt to widget users however (at
@@ -366,23 +381,14 @@ export const GroupCallView: FC<Props> = ({
       // LobbyView again which would open capture devices again.
       return null;
     }
-  } else if (preload) {
+  } else if (left && widget !== null) {
+    // Left in widget mode:
+    if (!returnToLobby) {
+      return null;
+    }
+  } else if (preload || skipLobby) {
     return null;
-  } else {
-    return (
-      <>
-        {shareModal}
-        <LobbyView
-          client={client}
-          matrixInfo={matrixInfo}
-          muteStates={muteStates}
-          onEnter={(): void => enterRTCSession(rtcSession, perParticipantE2EE)}
-          confineToRoom={confineToRoom}
-          hideHeader={hideHeader}
-          participantCount={participantCount}
-          onShareClick={onShareClick}
-        />
-      </>
-    );
   }
+
+  return lobbyView;
 };

src/room/InCallView.module.css

@@ -28,7 +28,9 @@ limitations under the License.
   flex-direction: column;
   overflow: auto;
   overflow-inline: hidden;
-  contain: strict;
+  /* There used to be a contain: strict here, but due to some bugs in Firefox,
+  this was causing the Z-ordering of modals to glitch out. It can be added back
+  if those issues appear to be resolved. */
 }
 
 .centerMessage {

src/room/InCallView.tsx

@@ -19,14 +19,11 @@ import {
   RoomAudioRenderer,
   RoomContext,
   useLocalParticipant,
-  useParticipants,
   useTracks,
 } from "@livekit/components-react";
 import { usePreventScroll } from "@react-aria/overlays";
 import { ConnectionState, Room, Track } from "livekit-client";
 import { MatrixClient } from "matrix-js-sdk/src/client";
-import { RoomMember } from "matrix-js-sdk/src/models/room-member";
-import { Room as MatrixRoom } from "matrix-js-sdk/src/models/room";
 import {
   FC,
   ReactNode,
@@ -39,9 +36,9 @@ import {
 } from "react";
 import { useTranslation } from "react-i18next";
 import useMeasure from "react-use-measure";
-import { logger } from "matrix-js-sdk/src/logger";
 import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
 import classNames from "classnames";
+import { useStateObservable } from "@react-rxjs/core";
 
 import LogoMark from "../icons/LogoMark.svg?react";
 import LogoType from "../icons/LogoType.svg?react";
@@ -54,22 +51,16 @@ import {
   SettingsButton,
 } from "../button";
 import { Header, LeftNav, RightNav, RoomHeaderInfo } from "../Header";
-import {
-  useVideoGridLayout,
-  TileDescriptor,
-  VideoGrid,
-} from "../video-grid/VideoGrid";
-import { useShowConnectionStats } from "../settings/useSetting";
-import { PosthogAnalytics } from "../analytics/PosthogAnalytics";
+import { useVideoGridLayout, VideoGrid } from "../video-grid/VideoGrid";
 import { useUrlParams } from "../UrlParams";
 import { useCallViewKeyboardShortcuts } from "../useCallViewKeyboardShortcuts";
 import { usePrefersReducedMotion } from "../usePrefersReducedMotion";
 import { ElementWidgetActions, widget } from "../widget";
 import styles from "./InCallView.module.css";
-import { ItemData, TileContent, VideoTile } from "../video-grid/VideoTile";
+import { VideoTile } from "../video-grid/VideoTile";
 import { NewVideoGrid } from "../video-grid/NewVideoGrid";
 import { OTelGroupCallMembership } from "../otel/OTelGroupCallMembership";
-import { SettingsModal } from "../settings/SettingsModal";
+import { SettingsModal, defaultSettingsTab } from "../settings/SettingsModal";
 import { useRageshakeRequestModal } from "../settings/submit-rageshake";
 import { RageshakeRequestModal } from "./RageshakeRequestModal";
 import { E2EEConfig, useLiveKit } from "../livekit/useLiveKit";
@@ -81,18 +72,14 @@ import { MuteStates } from "./MuteStates";
 import { MatrixInfo } from "./VideoPreview";
 import { InviteButton } from "../button/InviteButton";
 import { LayoutToggle } from "./LayoutToggle";
-import {
-  ECAddonConnectionState,
-  ECConnectionState,
-} from "../livekit/useECConnectionState";
+import { ECConnectionState } from "../livekit/useECConnectionState";
 import { useOpenIDSFU } from "../livekit/openIDSFU";
+import { useCallViewModel } from "../state/CallViewModel";
+import { subscribe } from "../state/subscribe";
 
 const canScreenshare = "getDisplayMedia" in (navigator.mediaDevices ?? {});
 const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
 
-// How long we wait after a focus switch before showing the real participant list again
-const POST_FOCUS_PARTICIPANT_UPDATE_DELAY_MS = 3000;
-
 export interface ActiveCallProps
   extends Omit<InCallViewProps, "livekitRoom" | "connState"> {
   e2eeConfig: E2EEConfig;
@@ -137,470 +124,342 @@ export interface InCallViewProps {
   onShareClick: (() => void) | null;
 }
 
-export const InCallView: FC<InCallViewProps> = ({
-  client,
-  matrixInfo,
-  rtcSession,
-  livekitRoom,
-  muteStates,
-  participantCount,
-  onLeave,
-  hideHeader,
-  otelGroupCallMembership,
-  connState,
-  onShareClick,
-}) => {
-  const { t } = useTranslation();
-  usePreventScroll();
-  useWakeLock();
+export const InCallView: FC<InCallViewProps> = subscribe(
+  ({
+    client,
+    matrixInfo,
+    rtcSession,
+    livekitRoom,
+    muteStates,
+    participantCount,
+    onLeave,
+    hideHeader,
+    otelGroupCallMembership,
+    connState,
+    onShareClick,
+  }) => {
+    const { t } = useTranslation();
+    usePreventScroll();
+    useWakeLock();
 
-  useEffect(() => {
-    if (connState === ConnectionState.Disconnected) {
-      // annoyingly we don't get the disconnection reason this way,
-      // only by listening for the emitted event
-      onLeave(new Error("Disconnected from call server"));
-    }
-  }, [connState, onLeave]);
+    useEffect(() => {
+      if (connState === ConnectionState.Disconnected) {
+        // annoyingly we don't get the disconnection reason this way,
+        // only by listening for the emitted event
+        onLeave(new Error("Disconnected from call server"));
+      }
+    }, [connState, onLeave]);
 
-  const containerRef1 = useRef<HTMLDivElement | null>(null);
-  const [containerRef2, bounds] = useMeasure({ polyfill: ResizeObserver });
-  const boundsValid = bounds.height > 0;
-  // Merge the refs so they can attach to the same element
-  const containerRef = useMergedRefs(containerRef1, containerRef2);
+    const containerRef1 = useRef<HTMLDivElement | null>(null);
+    const [containerRef2, bounds] = useMeasure({ polyfill: ResizeObserver });
+    const boundsValid = bounds.height > 0;
+    // Merge the refs so they can attach to the same element
+    const containerRef = useMergedRefs(containerRef1, containerRef2);
 
-  const screenSharingTracks = useTracks(
-    [{ source: Track.Source.ScreenShare, withPlaceholder: false }],
-    {
-      room: livekitRoom,
-    },
-  );
-  const { layout, setLayout } = useVideoGridLayout(
-    screenSharingTracks.length > 0,
-  );
-
-  const [showConnectionStats] = useShowConnectionStats();
-
-  const { hideScreensharing, showControls } = useUrlParams();
-
-  const { isScreenShareEnabled, localParticipant } = useLocalParticipant({
-    room: livekitRoom,
-  });
-
-  const toggleMicrophone = useCallback(
-    () => muteStates.audio.setEnabled?.((e) => !e),
-    [muteStates],
-  );
-  const toggleCamera = useCallback(
-    () => muteStates.video.setEnabled?.((e) => !e),
-    [muteStates],
-  );
-
-  // This function incorrectly assumes that there is a camera and microphone, which is not always the case.
-  // TODO: Make sure that this module is resilient when it comes to camera/microphone availability!
-  useCallViewKeyboardShortcuts(
-    containerRef1,
-    toggleMicrophone,
-    toggleCamera,
-    (muted) => muteStates.audio.setEnabled?.(!muted),
-  );
-
-  useEffect(() => {
-    widget?.api.transport.send(
-      layout === "grid"
-        ? ElementWidgetActions.TileLayout
-        : ElementWidgetActions.SpotlightLayout,
-      {},
+    const screenSharingTracks = useTracks(
+      [{ source: Track.Source.ScreenShare, withPlaceholder: false }],
+      {
+        room: livekitRoom,
+      },
+    );
+    const { layout, setLayout } = useVideoGridLayout(
+      screenSharingTracks.length > 0,
     );
-  }, [layout]);
 
-  useEffect(() => {
-    if (widget) {
-      const onTileLayout = (ev: CustomEvent<IWidgetApiRequest>): void => {
-        setLayout("grid");
-        widget!.api.transport.reply(ev.detail, {});
-      };
-      const onSpotlightLayout = (ev: CustomEvent<IWidgetApiRequest>): void => {
-        setLayout("spotlight");
-        widget!.api.transport.reply(ev.detail, {});
-      };
+    const { hideScreensharing, showControls } = useUrlParams();
 
-      widget.lazyActions.on(ElementWidgetActions.TileLayout, onTileLayout);
-      widget.lazyActions.on(
-        ElementWidgetActions.SpotlightLayout,
-        onSpotlightLayout,
+    const { isScreenShareEnabled, localParticipant } = useLocalParticipant({
+      room: livekitRoom,
+    });
+
+    const toggleMicrophone = useCallback(
+      () => muteStates.audio.setEnabled?.((e) => !e),
+      [muteStates],
+    );
+    const toggleCamera = useCallback(
+      () => muteStates.video.setEnabled?.((e) => !e),
+      [muteStates],
+    );
+
+    // This function incorrectly assumes that there is a camera and microphone, which is not always the case.
+    // TODO: Make sure that this module is resilient when it comes to camera/microphone availability!
+    useCallViewKeyboardShortcuts(
+      containerRef1,
+      toggleMicrophone,
+      toggleCamera,
+      (muted) => muteStates.audio.setEnabled?.(!muted),
+    );
+
+    useEffect(() => {
+      widget?.api.transport.send(
+        layout === "grid"
+          ? ElementWidgetActions.TileLayout
+          : ElementWidgetActions.SpotlightLayout,
+        {},
       );
+    }, [layout]);
 
-      return () => {
-        widget!.lazyActions.off(ElementWidgetActions.TileLayout, onTileLayout);
-        widget!.lazyActions.off(
+    useEffect(() => {
+      if (widget) {
+        const onTileLayout = (ev: CustomEvent<IWidgetApiRequest>): void => {
+          setLayout("grid");
+          widget!.api.transport.reply(ev.detail, {});
+        };
+        const onSpotlightLayout = (
+          ev: CustomEvent<IWidgetApiRequest>,
+        ): void => {
+          setLayout("spotlight");
+          widget!.api.transport.reply(ev.detail, {});
+        };
+
+        widget.lazyActions.on(ElementWidgetActions.TileLayout, onTileLayout);
+        widget.lazyActions.on(
           ElementWidgetActions.SpotlightLayout,
           onSpotlightLayout,
         );
-      };
-    }
-  }, [setLayout]);
 
-  const mobile = boundsValid && bounds.width <= 660;
-  const reducedControls = boundsValid && bounds.width <= 340;
-  const noControls = reducedControls && bounds.height <= 400;
+        return () => {
+          widget!.lazyActions.off(
+            ElementWidgetActions.TileLayout,
+            onTileLayout,
+          );
+          widget!.lazyActions.off(
+            ElementWidgetActions.SpotlightLayout,
+            onSpotlightLayout,
+          );
+        };
+      }
+    }, [setLayout]);
 
-  const items = useParticipantTiles(livekitRoom, rtcSession.room, connState);
-  const { fullscreenItem, toggleFullscreen, exitFullscreen } =
-    useFullscreen(items);
+    const mobile = boundsValid && bounds.width <= 660;
+    const reducedControls = boundsValid && bounds.width <= 340;
+    const noControls = reducedControls && bounds.height <= 400;
 
-  // The maximised participant: either the participant that the user has
-  // manually put in fullscreen, or the focused (active) participant if the
-  // window is too small to show everyone
-  const maximisedParticipant = useMemo(
-    () =>
-      fullscreenItem ??
-      (noControls
-        ? items.find((item) => item.isSpeaker) ?? items.at(0) ?? null
-        : null),
-    [fullscreenItem, noControls, items],
-  );
+    const vm = useCallViewModel(
+      rtcSession.room,
+      livekitRoom,
+      matrixInfo.roomEncrypted,
+      connState,
+    );
+    const items = useStateObservable(vm.tiles);
+    const { fullscreenItem, toggleFullscreen, exitFullscreen } =
+      useFullscreen(items);
 
-  const Grid =
-    items.length > 12 && layout === "grid" ? NewVideoGrid : VideoGrid;
+    // The maximised participant: either the participant that the user has
+    // manually put in fullscreen, or the focused (active) participant if the
+    // window is too small to show everyone
+    const maximisedParticipant = useMemo(
+      () =>
+        fullscreenItem ??
+        (noControls
+          ? items.find((item) => item.isSpeaker) ?? items.at(0) ?? null
+          : null),
+      [fullscreenItem, noControls, items],
+    );
 
-  const prefersReducedMotion = usePrefersReducedMotion();
+    const Grid =
+      items.length > 12 && layout === "grid" ? NewVideoGrid : VideoGrid;
 
-  // This state is lifted out of NewVideoGrid so that layout states can be
-  // restored after a layout switch or upon exiting fullscreen
-  const layoutStates = useLayoutStates();
+    const prefersReducedMotion = usePrefersReducedMotion();
+
+    // This state is lifted out of NewVideoGrid so that layout states can be
+    // restored after a layout switch or upon exiting fullscreen
+    const layoutStates = useLayoutStates();
+
+    const renderContent = (): JSX.Element => {
+      if (items.length === 0) {
+        return (
+          <div className={styles.centerMessage}>
+            <p>{t("waiting_for_participants")}</p>
+          </div>
+        );
+      }
+      if (maximisedParticipant) {
+        return (
+          <VideoTile
+            vm={maximisedParticipant.data}
+            maximised={true}
+            fullscreen={maximisedParticipant === fullscreenItem}
+            onToggleFullscreen={toggleFullscreen}
+            targetHeight={bounds.height}
+            targetWidth={bounds.width}
+            key={maximisedParticipant.id}
+            showSpeakingIndicator={false}
+            onOpenProfile={openProfile}
+          />
+        );
+      }
 
-  const renderContent = (): JSX.Element => {
-    if (items.length === 0) {
       return (
-        <div className={styles.centerMessage}>
-          <p>{t("waiting_for_participants")}</p>
-        </div>
+        <Grid
+          items={items}
+          layout={layout}
+          disableAnimations={prefersReducedMotion || isSafari}
+          layoutStates={layoutStates}
+        >
+          {({ data: vm, ...props }): ReactNode => (
+            <VideoTile
+              vm={vm}
+              maximised={false}
+              fullscreen={false}
+              onToggleFullscreen={toggleFullscreen}
+              showSpeakingIndicator={items.length > 2}
+              onOpenProfile={openProfile}
+              {...props}
+              ref={props.ref as Ref<HTMLDivElement>}
+            />
+          )}
+        </Grid>
       );
-    }
-    if (maximisedParticipant) {
-      return (
-        <VideoTile
-          maximised={true}
-          fullscreen={maximisedParticipant === fullscreenItem}
-          onToggleFullscreen={toggleFullscreen}
-          targetHeight={bounds.height}
-          targetWidth={bounds.width}
-          key={maximisedParticipant.id}
-          data={maximisedParticipant.data}
-          showSpeakingIndicator={false}
-          showConnectionStats={showConnectionStats}
-          matrixInfo={matrixInfo}
-        />
+    };
+
+    const rageshakeRequestModalProps = useRageshakeRequestModal(
+      rtcSession.room.roomId,
+    );
+
+    const [settingsModalOpen, setSettingsModalOpen] = useState(false);
+    const [settingsTab, setSettingsTab] = useState(defaultSettingsTab);
+
+    const openSettings = useCallback(
+      () => setSettingsModalOpen(true),
+      [setSettingsModalOpen],
+    );
+    const closeSettings = useCallback(
+      () => setSettingsModalOpen(false),
+      [setSettingsModalOpen],
+    );
+
+    const openProfile = useCallback(() => {
+      setSettingsTab("profile");
+      setSettingsModalOpen(true);
+    }, [setSettingsTab, setSettingsModalOpen]);
+
+    const toggleScreensharing = useCallback(async () => {
+      exitFullscreen();
+      await localParticipant.setScreenShareEnabled(!isScreenShareEnabled, {
+        audio: true,
+        selfBrowserSurface: "include",
+        surfaceSwitching: "include",
+        systemAudio: "include",
+      });
+    }, [localParticipant, isScreenShareEnabled, exitFullscreen]);
+
+    let footer: JSX.Element | null;
+
+    if (noControls) {
+      footer = null;
+    } else {
+      const buttons: JSX.Element[] = [];
+
+      buttons.push(
+        <MicButton
+          key="1"
+          muted={!muteStates.audio.enabled}
+          onPress={toggleMicrophone}
+          disabled={muteStates.audio.setEnabled === null}
+          data-testid="incall_mute"
+        />,
+        <VideoButton
+          key="2"
+          muted={!muteStates.video.enabled}
+          onPress={toggleCamera}
+          disabled={muteStates.video.setEnabled === null}
+          data-testid="incall_videomute"
+        />,
+      );
+
+      if (!reducedControls) {
+        if (canScreenshare && !hideScreensharing) {
+          buttons.push(
+            <ScreenshareButton
+              key="3"
+              enabled={isScreenShareEnabled}
+              onPress={toggleScreensharing}
+              data-testid="incall_screenshare"
+            />,
+          );
+        }
+        buttons.push(<SettingsButton key="4" onPress={openSettings} />);
+      }
+
+      buttons.push(
+        <HangupButton
+          key="6"
+          onPress={function (): void {
+            onLeave();
+          }}
+          data-testid="incall_leave"
+        />,
+      );
+      footer = (
+        <div
+          className={classNames(
+            showControls
+              ? styles.footer
+              : hideHeader
+                ? [styles.footer, styles.footerHidden]
+                : [styles.footer, styles.footerThin],
+          )}
+        >
+          {!mobile && !hideHeader && (
+            <div className={styles.logo}>
+              <LogoMark width={24} height={24} aria-hidden />
+              <LogoType
+                width={80}
+                height={11}
+                aria-label={import.meta.env.VITE_PRODUCT_NAME || "Element Call"}
+              />
+            </div>
+          )}
+          {showControls && <div className={styles.buttons}>{buttons}</div>}
+          {!mobile && !hideHeader && showControls && (
+            <LayoutToggle
+              className={styles.layout}
+              layout={layout}
+              setLayout={setLayout}
+            />
+          )}
+        </div>
       );
     }
 
     return (
-      <Grid
-        items={items}
-        layout={layout}
-        disableAnimations={prefersReducedMotion || isSafari}
-        layoutStates={layoutStates}
-      >
-        {(props): ReactNode => (
-          <VideoTile
-            maximised={false}
-            fullscreen={false}
-            onToggleFullscreen={toggleFullscreen}
-            showSpeakingIndicator={items.length > 2}
-            showConnectionStats={showConnectionStats}
-            matrixInfo={matrixInfo}
-            {...props}
-            ref={props.ref as Ref<HTMLDivElement>}
-          />
+      <div className={styles.inRoom} ref={containerRef}>
+        {!hideHeader && maximisedParticipant === null && (
+          <Header>
+            <LeftNav>
+              <RoomHeaderInfo
+                id={matrixInfo.roomId}
+                name={matrixInfo.roomName}
+                avatarUrl={matrixInfo.roomAvatar}
+                encrypted={matrixInfo.roomEncrypted}
+                participantCount={participantCount}
+              />
+            </LeftNav>
+            <RightNav>
+              {!reducedControls && showControls && onShareClick !== null && (
+                <InviteButton onClick={onShareClick} />
+              )}
+            </RightNav>
+          </Header>
         )}
-      </Grid>
-    );
-  };
-
-  const rageshakeRequestModalProps = useRageshakeRequestModal(
-    rtcSession.room.roomId,
-  );
-
-  const [settingsModalOpen, setSettingsModalOpen] = useState(false);
-
-  const openSettings = useCallback(
-    () => setSettingsModalOpen(true),
-    [setSettingsModalOpen],
-  );
-  const closeSettings = useCallback(
-    () => setSettingsModalOpen(false),
-    [setSettingsModalOpen],
-  );
-
-  const toggleScreensharing = useCallback(async () => {
-    exitFullscreen();
-    await localParticipant.setScreenShareEnabled(!isScreenShareEnabled, {
-      audio: true,
-      selfBrowserSurface: "include",
-      surfaceSwitching: "include",
-      systemAudio: "include",
-    });
-  }, [localParticipant, isScreenShareEnabled, exitFullscreen]);
-
-  let footer: JSX.Element | null;
-
-  if (noControls) {
-    footer = null;
-  } else {
-    const buttons: JSX.Element[] = [];
-
-    buttons.push(
-      <MicButton
-        key="1"
-        muted={!muteStates.audio.enabled}
-        onPress={toggleMicrophone}
-        disabled={muteStates.audio.setEnabled === null}
-        data-testid="incall_mute"
-      />,
-      <VideoButton
-        key="2"
-        muted={!muteStates.video.enabled}
-        onPress={toggleCamera}
-        disabled={muteStates.video.setEnabled === null}
-        data-testid="incall_videomute"
-      />,
-    );
-
-    if (!reducedControls) {
-      if (canScreenshare && !hideScreensharing) {
-        buttons.push(
-          <ScreenshareButton
-            key="3"
-            enabled={isScreenShareEnabled}
-            onPress={toggleScreensharing}
-            data-testid="incall_screenshare"
-          />,
-        );
-      }
-      buttons.push(<SettingsButton key="4" onPress={openSettings} />);
-    }
-
-    buttons.push(
-      <HangupButton
-        key="6"
-        onPress={function (): void {
-          onLeave();
-        }}
-        data-testid="incall_leave"
-      />,
-    );
-    footer = (
-      <div
-        className={classNames(
-          showControls
-            ? styles.footer
-            : hideHeader
-            ? [styles.footer, styles.footerHidden]
-            : [styles.footer, styles.footerThin],
-        )}
-      >
-        {!mobile && !hideHeader && (
-          <div className={styles.logo}>
-            <LogoMark width={24} height={24} aria-hidden />
-            <LogoType
-              width={80}
-              height={11}
-              aria-label={import.meta.env.VITE_PRODUCT_NAME || "Element Call"}
-            />
-          </div>
-        )}
-        {showControls && <div className={styles.buttons}>{buttons}</div>}
-        {!mobile && !hideHeader && showControls && (
-          <LayoutToggle
-            className={styles.layout}
-            layout={layout}
-            setLayout={setLayout}
-          />
+        <div className={styles.controlsOverlay}>
+          <RoomAudioRenderer />
+          {renderContent()}
+          {footer}
+        </div>
+        {!noControls && (
+          <RageshakeRequestModal {...rageshakeRequestModalProps} />
         )}
+        <SettingsModal
+          client={client}
+          roomId={rtcSession.room.roomId}
+          open={settingsModalOpen}
+          onDismiss={closeSettings}
+          tab={settingsTab}
+          onTabChange={setSettingsTab}
+        />
       </div>
     );
-  }
-
-  return (
-    <div className={styles.inRoom} ref={containerRef}>
-      {!hideHeader && maximisedParticipant === null && (
-        <Header>
-          <LeftNav>
-            <RoomHeaderInfo
-              id={matrixInfo.roomId}
-              name={matrixInfo.roomName}
-              avatarUrl={matrixInfo.roomAvatar}
-              encrypted={matrixInfo.roomEncrypted}
-              participantCount={participantCount}
-            />
-          </LeftNav>
-          <RightNav>
-            {!reducedControls && showControls && onShareClick !== null && (
-              <InviteButton onClick={onShareClick} />
-            )}
-          </RightNav>
-        </Header>
-      )}
-      <div className={styles.controlsOverlay}>
-        <RoomAudioRenderer />
-        {renderContent()}
-        {footer}
-      </div>
-      {!noControls && <RageshakeRequestModal {...rageshakeRequestModalProps} />}
-      <SettingsModal
-        client={client}
-        roomId={rtcSession.room.roomId}
-        open={settingsModalOpen}
-        onDismiss={closeSettings}
-      />
-    </div>
-  );
-};
-
-function findMatrixMember(
-  room: MatrixRoom,
-  id: string,
-): RoomMember | undefined {
-  if (!id) return undefined;
-
-  const parts = id.split(":");
-  // must be at least 3 parts because we know the first part is a userId which must necessarily contain a colon
-  if (parts.length < 3) {
-    logger.warn(
-      "Livekit participants ID doesn't look like a userId:deviceId combination",
-    );
-    return undefined;
-  }
-
-  parts.pop();
-  const userId = parts.join(":");
-
-  return room.getMember(userId) ?? undefined;
-}
-
-function useParticipantTiles(
-  livekitRoom: Room,
-  matrixRoom: MatrixRoom,
-  connState: ECConnectionState,
-): TileDescriptor<ItemData>[] {
-  const previousTiles = useRef<TileDescriptor<ItemData>[]>([]);
-
-  const sfuParticipants = useParticipants({
-    room: livekitRoom,
-  });
-
-  const items = useMemo(() => {
-    let allGhosts = true;
-
-    const speakActiveTime = new Date();
-    speakActiveTime.setSeconds(speakActiveTime.getSeconds() - 10);
-    // Iterate over SFU participants (those who actually are present from the SFU perspective) and create tiles for them.
-    const tiles: TileDescriptor<ItemData>[] = sfuParticipants.flatMap(
-      (sfuParticipant) => {
-        const spokeRecently =
-          sfuParticipant.lastSpokeAt !== undefined &&
-          sfuParticipant.lastSpokeAt > speakActiveTime;
-
-        const id = sfuParticipant.identity;
-        const member = findMatrixMember(matrixRoom, id);
-        // We always start with a local participant wit the empty string as their ID before we're
-        // connected, this is fine and we'll be in "all ghosts" mode.
-        if (id !== "" && member === undefined) {
-          logger.warn(
-            `Ruh, roh! No matrix member found for SFU participant '${id}': creating g-g-g-ghost!`,
-          );
-        }
-        allGhosts &&= member === undefined;
-
-        const userMediaTile = {
-          id,
-          focused: false,
-          isPresenter: sfuParticipant.isScreenShareEnabled,
-          isSpeaker:
-            (sfuParticipant.isSpeaking || spokeRecently) &&
-            !sfuParticipant.isLocal,
-          hasVideo: sfuParticipant.isCameraEnabled,
-          local: sfuParticipant.isLocal,
-          largeBaseSize: false,
-          data: {
-            id,
-            member,
-            sfuParticipant,
-            content: TileContent.UserMedia,
-          },
-        };
-
-        // If there is a screen sharing enabled for this participant, create a tile for it as well.
-        let screenShareTile: TileDescriptor<ItemData> | undefined;
-        if (sfuParticipant.isScreenShareEnabled) {
-          const screenShareId = `${id}:screen-share`;
-          screenShareTile = {
-            ...userMediaTile,
-            id: screenShareId,
-            focused: true,
-            largeBaseSize: true,
-            placeNear: id,
-            data: {
-              ...userMediaTile.data,
-              id: screenShareId,
-              content: TileContent.ScreenShare,
-            },
-          };
-        }
-
-        return screenShareTile
-          ? [userMediaTile, screenShareTile]
-          : [userMediaTile];
-      },
-    );
-
-    PosthogAnalytics.instance.eventCallEnded.cacheParticipantCountChanged(
-      tiles.length,
-    );
-
-    // If every item is a ghost, that probably means we're still connecting and
-    // shouldn't bother showing anything yet
-    return allGhosts ? [] : tiles;
-  }, [matrixRoom, sfuParticipants]);
-
-  // We carry over old tiles from the previous focus for some time after a focus switch
-  // so that the video tiles don't all disappear and reappear.
-  // This is set to true when the state transitions to Switching Focus and remains
-  // true for a short time after it changes (ie. connState is only switching focus for
-  // the time it takes us to reconnect to the conference).
-  // If there are still members that haven't reconnected after that time, they'll just
-  // appear to disconnect and will reappear once they reconnect.
-  const [isSwitchingFocus, setIsSwitchingFocus] = useState(false);
-
-  useEffect(() => {
-    if (connState === ECAddonConnectionState.ECSwitchingFocus) {
-      setIsSwitchingFocus(true);
-    } else if (isSwitchingFocus) {
-      setTimeout(() => {
-        setIsSwitchingFocus(false);
-      }, POST_FOCUS_PARTICIPANT_UPDATE_DELAY_MS);
-    }
-  }, [connState, setIsSwitchingFocus, isSwitchingFocus]);
-
-  if (
-    connState === ECAddonConnectionState.ECSwitchingFocus ||
-    isSwitchingFocus
-  ) {
-    logger.debug("Switching focus: injecting previous tiles");
-
-    // inject the previous tile for members that haven't rejoined yet
-    const newItems = items.slice(0);
-    const rejoined = new Set(newItems.map((p) => p.id));
-
-    for (const prevTile of previousTiles.current) {
-      if (!rejoined.has(prevTile.id)) {
-        newItems.push(prevTile);
-      }
-    }
-
-    return newItems;
-  } else {
-    previousTiles.current = items;
-    return items;
-  }
-}
+  },
+);

src/room/LobbyView.tsx

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 New Vector Ltd
+Copyright 2022-2023 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ import {
   SettingsButton,
   VideoButton,
 } from "../button/Button";
-import { SettingsModal } from "../settings/SettingsModal";
+import { SettingsModal, defaultSettingsTab } from "../settings/SettingsModal";
 import { useMediaQuery } from "../useMediaQuery";
 
 interface Props {
@@ -71,6 +71,7 @@ export const LobbyView: FC<Props> = ({
   );
 
   const [settingsModalOpen, setSettingsModalOpen] = useState(false);
+  const [settingsTab, setSettingsTab] = useState(defaultSettingsTab);
 
   const openSettings = useCallback(
     () => setSettingsModalOpen(true),
@@ -148,6 +149,8 @@ export const LobbyView: FC<Props> = ({
           client={client}
           open={settingsModalOpen}
           onDismiss={closeSettings}
+          tab={settingsTab}
+          onTabChange={setSettingsTab}
         />
       )}
     </>

src/room/RoomAuthView.tsx

@@ -41,6 +41,8 @@ export const RoomAuthView: FC = () => {
     // @ts-ignore
     (e) => {
       e.preventDefault();
+      setLoading(true);
+
       const data = new FormData(e.target);
       const dataForDisplayName = data.get("displayName");
       const displayName =

src/room/RoomPage.tsx

@@ -29,6 +29,7 @@ import { useOptInAnalytics } from "../settings/useSetting";
 import { HomePage } from "../home/HomePage";
 import { platform } from "../Platform";
 import { AppSelectionModal } from "./AppSelectionModal";
+import { widget } from "../widget";
 
 export const RoomPage: FC = () => {
   const {
@@ -62,7 +63,7 @@ export const RoomPage: FC = () => {
   useEffect(() => {
     // If we've finished loading, are not already authed and we've been given a display name as
     // a URL param, automatically register a passwordless user
-    if (!loading && !authenticated && displayName) {
+    if (!loading && !authenticated && displayName && !widget) {
       setIsRegistering(true);
       registerPasswordlessUser(displayName).finally(() => {
         setIsRegistering(false);

src/room/VideoPreview.tsx

@@ -114,14 +114,7 @@ export const VideoPreview: FC<Props> = ({
         playsInline
         // There's no reason for this to be focusable
         tabIndex={-1}
-        // React supports the disablePictureInPicture attribute, but Firefox
-        // only recognizes a value of "true", whereas React sets it to the empty
-        // string. So we need to bypass React and set it specifically to "true".
-        // https://bugzilla.mozilla.org/show_bug.cgi?id=1865748
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        // eslint-disable-next-line react/no-unknown-property
-        disablepictureinpicture="true"
+        disablePictureInPicture
       />
       {!muteStates.video.enabled && (
         <div className={styles.avatarContainer}>

src/room/useActiveFocus.ts

@@ -30,13 +30,6 @@ function getActiveFocus(
   const oldestMembership = rtcSession.getOldestMembership();
   const focus = oldestMembership?.getActiveFoci()[0] as LivekitFocus;
 
-  if (focus) {
-    logger.info(
-      `Got active focus for call from ${oldestMembership?.sender}/${oldestMembership?.deviceId}`,
-      focus,
-    );
-  }
-
   return focus;
 }
 
@@ -56,6 +49,11 @@ export function useActiveFocus(
     const newActiveFocus = getActiveFocus(rtcSession);
 
     if (!deepCompare(activeFocus, newActiveFocus)) {
+      const oldestMembership = rtcSession.getOldestMembership();
+      logger.warn(
+        `Got new active focus from membership: ${oldestMembership?.sender}/${oldestMembership?.deviceId}.
+        Updating focus (focus switch) from ${activeFocus} to ${newActiveFocus}`,
+      );
       setActiveFocus(newActiveFocus);
     }
   }, [activeFocus, rtcSession]);

src/room/useFullscreen.ts

@@ -18,9 +18,9 @@ limitations under the License.
 import { logger } from "matrix-js-sdk/src/logger";
 import { useCallback, useLayoutEffect, useRef } from "react";
 
-import { TileDescriptor } from "../video-grid/VideoGrid";
 import { useReactiveState } from "../useReactiveState";
 import { useEventTarget } from "../useEvents";
+import { TileDescriptor } from "../state/CallViewModel";
 
 const isFullscreen = (): boolean =>
   Boolean(document.fullscreenElement) ||

src/room/useLoadGroupCall.ts

@@ -82,10 +82,7 @@ export const useLoadGroupCall = (
           );
         }
       } else {
-        // room IDs we just try to join by their ID, which will not work in the
-        // general case without providing some servers to join via. We could provide
-        // our own server, but in practice that is implicit.
-        room = await client.joinRoom(roomIdOrAlias);
+        room = await client.joinRoom(roomIdOrAlias, { viaServers });
       }
 
       logger.info(

src/settings/FeedbackSettingsTab.tsx

@@ -93,7 +93,7 @@ export const FeedbackSettingsTab: FC<Props> = ({ roomId }) => {
               </FieldRow>
             )}
             <Button type="submit" disabled={sending}>
-              {sending ? t("submitting") : "action.submit"}
+              {sending ? t("submitting") : t("action.submit")}
             </Button>
           </FieldRow>
         )}

src/settings/SettingsModal.tsx

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { ChangeEvent, FC, Key, ReactNode, useCallback, useState } from "react";
+import { ChangeEvent, FC, Key, ReactNode } from "react";
 import { Item } from "@react-stately/collections";
 import { Trans, useTranslation } from "react-i18next";
 import { MatrixClient } from "matrix-js-sdk";
@@ -47,15 +47,33 @@ import {
 } from "../livekit/MediaDevicesContext";
 import { widget } from "../widget";
 
+type SettingsTab =
+  | "audio"
+  | "video"
+  | "profile"
+  | "feedback"
+  | "more"
+  | "developer";
+
 interface Props {
   open: boolean;
   onDismiss: () => void;
+  tab: SettingsTab;
+  onTabChange: (tab: SettingsTab) => void;
   client: MatrixClient;
   roomId?: string;
-  defaultTab?: string;
 }
 
-export const SettingsModal: FC<Props> = (props) => {
+export const defaultSettingsTab: SettingsTab = "audio";
+
+export const SettingsModal: FC<Props> = ({
+  open,
+  onDismiss,
+  tab,
+  onTabChange,
+  client,
+  roomId,
+}) => {
   const { t } = useTranslation();
 
   const [optInAnalytics, setOptInAnalytics] = useOptInAnalytics();
@@ -92,15 +110,6 @@ export const SettingsModal: FC<Props> = (props) => {
     );
   };
 
-  const [selectedTab, setSelectedTab] = useState<string | undefined>();
-
-  const onSelectedTabChanged = useCallback(
-    (tab: Key) => {
-      setSelectedTab(tab.toString());
-    },
-    [setSelectedTab],
-  );
-
   const optInDescription = (
     <Caption>
       <Trans i18nKey="settings.opt_in_description">
@@ -113,7 +122,7 @@ export const SettingsModal: FC<Props> = (props) => {
   );
 
   const devices = useMediaDevices();
-  useMediaDeviceNames(devices, props.open);
+  useMediaDeviceNames(devices, open);
 
   const audioTab = (
     <TabItem
@@ -158,7 +167,7 @@ export const SettingsModal: FC<Props> = (props) => {
         </>
       }
     >
-      <ProfileSettingsTab client={props.client} />
+      <ProfileSettingsTab client={client} />
     </TabItem>
   );
 
@@ -172,7 +181,7 @@ export const SettingsModal: FC<Props> = (props) => {
         </>
       }
     >
-      <FeedbackSettingsTab roomId={props.roomId} />
+      <FeedbackSettingsTab roomId={roomId} />
     </TabItem>
   );
 
@@ -260,12 +269,12 @@ export const SettingsModal: FC<Props> = (props) => {
     <Modal
       title={t("common.settings")}
       className={styles.settingsModal}
-      open={props.open}
-      onDismiss={props.onDismiss}
+      open={open}
+      onDismiss={onDismiss}
     >
       <TabContainer
-        onSelectionChange={onSelectedTabChanged}
-        selectedKey={selectedTab ?? props.defaultTab ?? "audio"}
+        onSelectionChange={onTabChange as (tab: Key) => void}
+        selectedKey={tab}
         className={styles.tabContainer}
       >
         {tabs}

src/state/CallViewModel.ts

@@ -0,0 +1,296 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {
+  connectedParticipantsObserver,
+  observeParticipantMedia,
+} from "@livekit/components-core";
+import { Room as LivekitRoom, RemoteParticipant } from "livekit-client";
+import { Room as MatrixRoom, RoomMember } from "matrix-js-sdk/src/matrix";
+import { useEffect, useRef } from "react";
+import {
+  EMPTY,
+  Observable,
+  combineLatest,
+  concat,
+  mergeAll,
+  of,
+  sample,
+  scan,
+  startWith,
+  takeUntil,
+  zip,
+} from "rxjs";
+import { state } from "@react-rxjs/core";
+import { logger } from "matrix-js-sdk/src/logger";
+
+import { ViewModel } from "./ViewModel";
+import { useObservable } from "./useObservable";
+import {
+  ECAddonConnectionState,
+  ECConnectionState,
+} from "../livekit/useECConnectionState";
+import { usePrevious } from "../usePrevious";
+import {
+  TileViewModel,
+  UserMediaTileViewModel,
+  ScreenShareTileViewModel,
+} from "./TileViewModel";
+import { finalizeValue } from "../observable-utils";
+
+// Represents something that should get a tile on the layout,
+// ie. a user's video feed or a screen share feed.
+export interface TileDescriptor<T> {
+  id: string;
+  focused: boolean;
+  isPresenter: boolean;
+  isSpeaker: boolean;
+  hasVideo: boolean;
+  local: boolean;
+  largeBaseSize: boolean;
+  placeNear?: string;
+  data: T;
+}
+
+// How long we wait after a focus switch before showing the real participant
+// list again
+const POST_FOCUS_PARTICIPANT_UPDATE_DELAY_MS = 3000;
+
+function findMatrixMember(
+  room: MatrixRoom,
+  id: string,
+): RoomMember | undefined {
+  if (!id) return undefined;
+
+  const parts = id.split(":");
+  // must be at least 3 parts because we know the first part is a userId which must necessarily contain a colon
+  if (parts.length < 3) {
+    logger.warn(
+      "Livekit participants ID doesn't look like a userId:deviceId combination",
+    );
+    return undefined;
+  }
+
+  parts.pop();
+  const userId = parts.join(":");
+
+  return room.getMember(userId) ?? undefined;
+}
+
+// TODO: Move wayyyy more business logic from the call and lobby views into here
+export class CallViewModel extends ViewModel {
+  private readonly rawRemoteParticipants = state(
+    connectedParticipantsObserver(this.livekitRoom),
+  );
+
+  // Lists of participants to "hold" on display, even if LiveKit claims that
+  // they've left
+  private readonly remoteParticipantHolds = zip(
+    this.connectionState,
+    this.rawRemoteParticipants.pipe(sample(this.connectionState)),
+    (s, ps) => {
+      // Whenever we switch focuses, we should retain all the previous
+      // participants for at least POST_FOCUS_PARTICIPANT_UPDATE_DELAY_MS ms to
+      // give their clients time to switch over and avoid jarring layout shifts
+      if (s === ECAddonConnectionState.ECSwitchingFocus) {
+        return concat(
+          // Hold these participants
+          of({ hold: ps }),
+          // Wait for time to pass and the connection state to have changed
+          Promise.all([
+            new Promise<void>((resolve) =>
+              setTimeout(resolve, POST_FOCUS_PARTICIPANT_UPDATE_DELAY_MS),
+            ),
+            new Promise<void>((resolve) => {
+              const subscription = this.connectionState
+                .pipe(takeUntil(this.destroyed))
+                .subscribe((s) => {
+                  if (s !== ECAddonConnectionState.ECSwitchingFocus) {
+                    resolve();
+                    subscription.unsubscribe();
+                  }
+                });
+            }),
+            // Then unhold them
+          ]).then(() => Promise.resolve({ unhold: ps })),
+        );
+      } else {
+        return EMPTY;
+      }
+    },
+  ).pipe(
+    mergeAll(),
+    // Aggregate the hold instructions into a single list showing which
+    // participants are being held
+    scan(
+      (holds, instruction) =>
+        "hold" in instruction
+          ? [instruction.hold, ...holds]
+          : holds.filter((h) => h !== instruction.unhold),
+      [] as RemoteParticipant[][],
+    ),
+    startWith([]),
+  );
+
+  private readonly remoteParticipants = combineLatest(
+    [this.rawRemoteParticipants, this.remoteParticipantHolds],
+    (raw, holds) => {
+      const result = [...raw];
+      const resultIds = new Set(result.map((p) => p.identity));
+
+      // Incorporate the held participants into the list
+      for (const hold of holds) {
+        for (const p of hold) {
+          if (!resultIds.has(p.identity)) {
+            result.push(p);
+            resultIds.add(p.identity);
+          }
+        }
+      }
+
+      return result;
+    },
+  );
+
+  /**
+   * The media tiles to be displayed in the call view.
+   */
+  public readonly tiles = state(
+    combineLatest([
+      this.remoteParticipants,
+      observeParticipantMedia(this.livekitRoom.localParticipant),
+    ]).pipe(
+      scan((ts, [remoteParticipants, { participant: localParticipant }]) => {
+        const ps = [localParticipant, ...remoteParticipants];
+        const tilesById = new Map(ts.map((t) => [t.id, t]));
+        const now = Date.now();
+        let allGhosts = true;
+
+        const newTiles = ps.flatMap((p) => {
+          const userMediaId = p.identity;
+          const member = findMatrixMember(this.matrixRoom, userMediaId);
+          allGhosts &&= member === undefined;
+          const spokeRecently =
+            p.lastSpokeAt !== undefined && now - +p.lastSpokeAt <= 10000;
+
+          // We always start with a local participant with the empty string as
+          // their ID before we're connected, this is fine and we'll be in
+          // "all ghosts" mode.
+          if (userMediaId !== "" && member === undefined) {
+            logger.warn(
+              `Ruh, roh! No matrix member found for SFU participant '${userMediaId}': creating g-g-g-ghost!`,
+            );
+          }
+
+          const userMediaVm =
+            tilesById.get(userMediaId)?.data ??
+            new UserMediaTileViewModel(userMediaId, member, p, this.encrypted);
+          tilesById.delete(userMediaId);
+
+          const userMediaTile: TileDescriptor<TileViewModel> = {
+            id: userMediaId,
+            focused: false,
+            isPresenter: p.isScreenShareEnabled,
+            isSpeaker: (p.isSpeaking || spokeRecently) && !p.isLocal,
+            hasVideo: p.isCameraEnabled,
+            local: p.isLocal,
+            largeBaseSize: false,
+            data: userMediaVm,
+          };
+
+          if (p.isScreenShareEnabled) {
+            const screenShareId = `${userMediaId}:screen-share`;
+            const screenShareVm =
+              tilesById.get(screenShareId)?.data ??
+              new ScreenShareTileViewModel(
+                screenShareId,
+                member,
+                p,
+                this.encrypted,
+              );
+            tilesById.delete(screenShareId);
+
+            const screenShareTile: TileDescriptor<TileViewModel> = {
+              id: screenShareId,
+              focused: true,
+              isPresenter: false,
+              isSpeaker: false,
+              hasVideo: true,
+              local: p.isLocal,
+              largeBaseSize: true,
+              placeNear: userMediaId,
+              data: screenShareVm,
+            };
+            return [userMediaTile, screenShareTile];
+          } else {
+            return [userMediaTile];
+          }
+        });
+
+        // Any tiles left in the map are unused and should be destroyed
+        for (const t of tilesById.values()) t.data.destroy();
+
+        // If every item is a ghost, that probably means we're still connecting
+        // and shouldn't bother showing anything yet
+        return allGhosts ? [] : newTiles;
+      }, [] as TileDescriptor<TileViewModel>[]),
+      finalizeValue((ts) => {
+        for (const t of ts) t.data.destroy();
+      }),
+    ),
+  );
+
+  public constructor(
+    // A call is permanently tied to a single Matrix room and LiveKit room
+    private readonly matrixRoom: MatrixRoom,
+    private readonly livekitRoom: LivekitRoom,
+    private readonly encrypted: boolean,
+    private readonly connectionState: Observable<ECConnectionState>,
+  ) {
+    super();
+  }
+}
+
+export function useCallViewModel(
+  matrixRoom: MatrixRoom,
+  livekitRoom: LivekitRoom,
+  encrypted: boolean,
+  connectionState: ECConnectionState,
+): CallViewModel {
+  const prevMatrixRoom = usePrevious(matrixRoom);
+  const prevLivekitRoom = usePrevious(livekitRoom);
+  const prevEncrypted = usePrevious(encrypted);
+  const connectionStateObservable = useObservable(connectionState);
+
+  const vm = useRef<CallViewModel>();
+  if (
+    matrixRoom !== prevMatrixRoom ||
+    livekitRoom !== prevLivekitRoom ||
+    encrypted !== prevEncrypted
+  ) {
+    vm.current?.destroy();
+    vm.current = new CallViewModel(
+      matrixRoom,
+      livekitRoom,
+      encrypted,
+      connectionStateObservable,
+    );
+  }
+
+  useEffect(() => vm.current?.destroy(), []);
+
+  return vm.current!;
+}

src/state/TileViewModel.ts

@@ -0,0 +1,242 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {
+  AudioSource,
+  TrackReferenceOrPlaceholder,
+  VideoSource,
+  observeParticipantEvents,
+  observeParticipantMedia,
+} from "@livekit/components-core";
+import { StateObservable, state } from "@react-rxjs/core";
+import {
+  LocalParticipant,
+  LocalTrack,
+  Participant,
+  ParticipantEvent,
+  RemoteParticipant,
+  Track,
+  TrackEvent,
+  facingModeFromLocalTrack,
+} from "livekit-client";
+import { RoomMember } from "matrix-js-sdk/src/matrix";
+import {
+  BehaviorSubject,
+  combineLatest,
+  distinctUntilChanged,
+  distinctUntilKeyChanged,
+  fromEvent,
+  map,
+  of,
+  startWith,
+  switchMap,
+  takeUntil,
+} from "rxjs";
+
+import { ViewModel } from "./ViewModel";
+
+function observeTrackReference(
+  participant: Participant,
+  source: Track.Source,
+): StateObservable<TrackReferenceOrPlaceholder> {
+  return state(
+    observeParticipantMedia(participant).pipe(
+      map(() => ({
+        participant,
+        publication: participant.getTrackPublication(source),
+        source,
+      })),
+      distinctUntilKeyChanged("publication"),
+    ),
+  );
+}
+
+abstract class BaseTileViewModel extends ViewModel {
+  /**
+   * Whether the tile belongs to the local user.
+   */
+  public readonly local = this.participant.isLocal;
+  /**
+   * The LiveKit video track to be shown on this tile.
+   */
+  public readonly video: StateObservable<TrackReferenceOrPlaceholder>;
+  /**
+   * Whether there should be a warning that this media is unencrypted.
+   */
+  public readonly unencryptedWarning: StateObservable<boolean>;
+
+  public constructor(
+    // TODO: This is only needed for full screen toggling and can be removed as
+    // soon as that code is moved into the view models
+    public readonly id: string,
+    /**
+     * The Matrix room member to which this tile belongs.
+     */
+    // TODO: Fully separate the data layer from the UI layer by keeping the
+    // member object internal
+    public readonly member: RoomMember | undefined,
+    protected readonly participant: LocalParticipant | RemoteParticipant,
+    callEncrypted: boolean,
+    audioSource: AudioSource,
+    videoSource: VideoSource,
+  ) {
+    super();
+    const audio = observeTrackReference(participant, audioSource);
+    this.video = observeTrackReference(participant, videoSource);
+    this.unencryptedWarning = state(
+      combineLatest(
+        [audio, this.video],
+        (a, v) =>
+          callEncrypted &&
+          (a.publication?.isEncrypted === false ||
+            v.publication?.isEncrypted === false),
+      ).pipe(distinctUntilChanged()),
+    );
+  }
+}
+
+/**
+ * A tile displaying some media.
+ */
+export type TileViewModel = UserMediaTileViewModel | ScreenShareTileViewModel;
+
+/**
+ * A tile displaying some participant's user media.
+ */
+export class UserMediaTileViewModel extends BaseTileViewModel {
+  /**
+   * Whether the video should be mirrored.
+   */
+  public readonly mirror = state(
+    this.video.pipe(
+      switchMap((v) => {
+        const track = v.publication?.track;
+        if (!(track instanceof LocalTrack)) return of(false);
+        // Watch for track restarts, because they indicate a camera switch
+        return fromEvent(track, TrackEvent.Restarted).pipe(
+          startWith(null),
+          // Mirror only front-facing cameras (those that face the user)
+          map(() => facingModeFromLocalTrack(track).facingMode === "user"),
+        );
+      }),
+    ),
+  );
+
+  /**
+   * Whether the participant is speaking.
+   */
+  public readonly speaking = state(
+    observeParticipantEvents(
+      this.participant,
+      ParticipantEvent.IsSpeakingChanged,
+    ).pipe(map((p) => p.isSpeaking)),
+  );
+
+  private readonly _locallyMuted = new BehaviorSubject(false);
+  /**
+   * Whether we've disabled this participant's audio.
+   */
+  public readonly locallyMuted = state(this._locallyMuted);
+
+  private readonly _localVolume = new BehaviorSubject(1);
+  /**
+   * The volume to which we've set this participant's audio, as a scalar
+   * multiplier.
+   */
+  public readonly localVolume = state(this._localVolume);
+
+  /**
+   * Whether this participant is sending audio (i.e. is unmuted on their side).
+   */
+  public readonly audioEnabled: StateObservable<boolean>;
+  /**
+   * Whether this participant is sending video.
+   */
+  public readonly videoEnabled: StateObservable<boolean>;
+
+  private readonly _cropVideo = new BehaviorSubject(true);
+  /**
+   * Whether the tile video should be contained inside the tile or be cropped to fit.
+   */
+  public readonly cropVideo = state(this._cropVideo);
+
+  public constructor(
+    id: string,
+    member: RoomMember | undefined,
+    participant: LocalParticipant | RemoteParticipant,
+    callEncrypted: boolean,
+  ) {
+    super(
+      id,
+      member,
+      participant,
+      callEncrypted,
+      Track.Source.Microphone,
+      Track.Source.Camera,
+    );
+
+    const media = observeParticipantMedia(participant);
+    this.audioEnabled = state(
+      media.pipe(map((m) => m.microphoneTrack?.isMuted === false)),
+    );
+    this.videoEnabled = state(
+      media.pipe(map((m) => m.cameraTrack?.isMuted === false)),
+    );
+
+    // Sync the local mute state and volume with LiveKit
+    if (!this.local)
+      combineLatest([this._locallyMuted, this._localVolume], (muted, volume) =>
+        muted ? 0 : volume,
+      )
+        .pipe(takeUntil(this.destroyed))
+        .subscribe((volume) => {
+          (this.participant as RemoteParticipant).setVolume(volume);
+        });
+  }
+
+  public toggleLocallyMuted(): void {
+    this._locallyMuted.next(!this._locallyMuted.value);
+  }
+
+  public toggleFitContain(): void {
+    this._cropVideo.next(!this._cropVideo.value);
+  }
+
+  public setLocalVolume(value: number): void {
+    this._localVolume.next(value);
+  }
+}
+
+/**
+ * A tile displaying some participant's screen share.
+ */
+export class ScreenShareTileViewModel extends BaseTileViewModel {
+  public constructor(
+    id: string,
+    member: RoomMember | undefined,
+    participant: LocalParticipant | RemoteParticipant,
+    callEncrypted: boolean,
+  ) {
+    super(
+      id,
+      member,
+      participant,
+      callEncrypted,
+      Track.Source.ScreenShareAudio,
+      Track.Source.ScreenShare,
+    );
+  }
+}

src/state/ViewModel.ts

@@ -1,6 +1,5 @@
 /*
-Copyright 2022 New Vector Ltd
-
+Copyright 2023 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,21 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { ComponentPropsWithoutRef, FC } from "react";
+import { Subject } from "rxjs";
 
-import AudioMuted from "../icons/AudioMuted.svg?react";
-import AudioLow from "../icons/AudioLow.svg?react";
-import Audio from "../icons/Audio.svg?react";
+/**
+ * An MVVM view model.
+ */
+export abstract class ViewModel {
+  protected readonly destroyed = new Subject<void>();
 
-interface Props extends ComponentPropsWithoutRef<"svg"> {
   /**
-   * Number between 0 and 1
+   * Instructs the ViewModel to clean up its resources. If you forget to call
+   * this, there may be memory leaks!
    */
-  volume: number;
+  public destroy(): void {
+    this.destroyed.next();
+    this.destroyed.complete();
+  }
 }
-
-export const VolumeIcon: FC<Props> = ({ volume, ...rest }) => {
-  if (volume <= 0) return <AudioMuted {...rest} />;
-  if (volume <= 0.5) return <AudioLow {...rest} />;
-  return <Audio {...rest} />;
-};

src/state/subscribe.tsx

@@ -0,0 +1,49 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {
+  ForwardRefExoticComponent,
+  ForwardRefRenderFunction,
+  PropsWithoutRef,
+  RefAttributes,
+  forwardRef,
+} from "react";
+// eslint-disable-next-line no-restricted-imports
+import { Subscribe, RemoveSubscribe } from "@react-rxjs/core";
+
+/**
+ * Wraps a React component that consumes Observables, resulting in a component
+ * that safely subscribes to its Observables before rendering. The component
+ * will return null until the subscriptions are created.
+ */
+export function subscribe<P, R>(
+  render: ForwardRefRenderFunction<R, P>,
+): ForwardRefExoticComponent<PropsWithoutRef<P> & RefAttributes<R>> {
+  const Subscriber = forwardRef<R, { p: P }>(({ p }, ref) => (
+    <RemoveSubscribe>{render(p, ref)}</RemoveSubscribe>
+  ));
+  Subscriber.displayName = "Subscriber";
+
+  // eslint-disable-next-line react/display-name
+  const OuterComponent = forwardRef<R, P>((p, ref) => (
+    <Subscribe>
+      <Subscriber ref={ref} p={p} />
+    </Subscribe>
+  ));
+  // Copy over the component's display name, default props, etc.
+  Object.assign(OuterComponent, render);
+  return OuterComponent;
+}

src/state/useObservable.ts

@@ -0,0 +1,31 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { useEffect, useRef } from "react";
+import { BehaviorSubject, Observable } from "rxjs";
+
+/**
+ * React hook that creates an Observable from a changing value. The Observable
+ * replays its current value upon subscription, emits whenever the value
+ * changes, and completes when the component is unmounted.
+ */
+export function useObservable<T>(value: T): Observable<T> {
+  const subject = useRef<BehaviorSubject<T>>();
+  subject.current ??= new BehaviorSubject(value);
+  if (value !== subject.current.value) subject.current.next(value);
+  useEffect(() => subject.current!.complete(), []);
+  return subject.current;
+}

src/typography/Typography.tsx

@@ -57,6 +57,8 @@ export const Headline = forwardRef<HTMLHeadingElement, TypographyProps>(
   },
 );
 
+Headline.displayName = "Headline";
+
 export const Title = forwardRef<HTMLHeadingElement, TypographyProps>(
   (
     {
@@ -85,6 +87,8 @@ export const Title = forwardRef<HTMLHeadingElement, TypographyProps>(
   },
 );
 
+Title.displayName = "Title";
+
 export const Subtitle = forwardRef<HTMLParagraphElement, TypographyProps>(
   (
     {
@@ -113,6 +117,8 @@ export const Subtitle = forwardRef<HTMLParagraphElement, TypographyProps>(
   },
 );
 
+Subtitle.displayName = "Subtitle";
+
 export const Body = forwardRef<HTMLParagraphElement, TypographyProps>(
   (
     {
@@ -141,6 +147,8 @@ export const Body = forwardRef<HTMLParagraphElement, TypographyProps>(
   },
 );
 
+Body.displayName = "Body";
+
 export const Caption = forwardRef<HTMLParagraphElement, TypographyProps>(
   (
     {
@@ -170,6 +178,8 @@ export const Caption = forwardRef<HTMLParagraphElement, TypographyProps>(
   },
 );
 
+Caption.displayName = "Caption";
+
 export const Micro = forwardRef<HTMLParagraphElement, TypographyProps>(
   (
     {
@@ -199,11 +209,14 @@ export const Micro = forwardRef<HTMLParagraphElement, TypographyProps>(
   },
 );
 
+Micro.displayName = "Micro";
+
 interface LinkProps extends TypographyProps {
   to?: H.LocationDescriptor<unknown>;
   color?: string;
   href?: string;
 }
+
 export const Link = forwardRef<HTMLAnchorElement, LinkProps>(
   (
     {
@@ -254,3 +267,5 @@ export const Link = forwardRef<HTMLAnchorElement, LinkProps>(
     );
   },
 );
+
+Link.displayName = "Link";

src/usePrevious.ts

@@ -0,0 +1,27 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { useRef } from "react";
+
+/**
+ * React hook that returns the value given on the previous render.
+ */
+export function usePrevious<T>(value: T): T | undefined {
+  const ref = useRef<T>();
+  const previous = ref.current;
+  ref.current = value;
+  return previous;
+}

src/useTheme.ts

@@ -0,0 +1,41 @@
+/*
+Copyright 2024 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { useLayoutEffect, useRef } from "react";
+
+import { useUrlParams } from "./UrlParams";
+
+export const useTheme = (): void => {
+  const { theme: themeName } = useUrlParams();
+  const previousTheme = useRef<string | null>(document.body.classList.item(0));
+  useLayoutEffect(() => {
+    // Don't update the current theme if the url does not contain a theme prop.
+    if (!themeName) return;
+    const theme = themeName.includes("light") ? "light" : "dark";
+    const themeHighContrast = themeName.includes("high-contrast") ? "-hc" : "";
+    const themeString = "cpd-theme-" + theme + themeHighContrast;
+    if (themeString !== previousTheme.current) {
+      document.body.classList.remove(
+        "cpd-theme-light",
+        "cpd-theme-dark",
+        "cpd-theme-light-hc",
+        "cpd-theme-dark-hc",
+      );
+      document.body.classList.add(themeString);
+      previousTheme.current = themeString;
+    }
+  }, [previousTheme, themeName]);
+};

src/video-grid/BigGrid.tsx

@@ -19,11 +19,11 @@ import { RectReadOnly } from "react-use-measure";
 import { FC, memo, ReactNode } from "react";
 import { zip } from "lodash";
 
-import { TileDescriptor } from "./VideoGrid";
 import { Slot } from "./NewVideoGrid";
 import { Layout } from "./Layout";
 import { count, findLastIndex } from "../array-utils";
 import styles from "./BigGrid.module.css";
+import { TileDescriptor } from "../state/CallViewModel";
 
 /**
  * A 1×1 cell in a grid which belongs to a tile.
@@ -1010,6 +1010,8 @@ const Slots: FC<{ s: Grid }> = memo(({ s: g }) => {
   );
 });
 
+Slots.displayName = "Slots";
+
 /**
  * Given a tile and numbers in the range [0, 1) describing a position within the
  * tile, this returns the index of the specific cell in which that position

src/video-grid/Layout.tsx

@@ -18,7 +18,7 @@ import { ComponentType, ReactNode, useCallback, useMemo, useRef } from "react";
 
 import type { RectReadOnly } from "react-use-measure";
 import { useReactiveState } from "../useReactiveState";
-import type { TileDescriptor } from "./VideoGrid";
+import { TileDescriptor } from "../state/CallViewModel";
 
 /**
  * A video grid layout system with concrete states of type State.

src/video-grid/NewVideoGrid.tsx

@@ -32,7 +32,6 @@ import styles from "./NewVideoGrid.module.css";
 import {
   VideoGridProps as Props,
   TileSpring,
-  TileDescriptor,
   ChildrenProperties,
 } from "./VideoGrid";
 import { useReactiveState } from "../useReactiveState";
@@ -40,6 +39,7 @@ import { useMergedRefs } from "../useMergedRefs";
 import { TileWrapper } from "./TileWrapper";
 import { BigGrid } from "./BigGrid";
 import { useLayout } from "./Layout";
+import { TileDescriptor } from "../state/CallViewModel";
 
 interface Rect {
   x: number;

src/video-grid/TileWrapper.tsx

@@ -43,12 +43,8 @@ interface Props<T> {
   children: (props: ChildrenProperties<T>) => ReactNode;
 }
 
-/**
- * A wrapper around a tile in a video grid. This component exists to decouple
- * child components from the grid.
- */
-export const TileWrapper = memo(
-  ({
+const TileWrapper_ = memo(
+  <T,>({
     id,
     onDragRef,
     targetWidth,
@@ -64,7 +60,7 @@ export const TileWrapper = memo(
     width,
     height,
     children,
-  }) => {
+  }: Props<T>) => {
     const ref = useRef<HTMLElement | null>(null);
 
     useDrag((state) => onDragRef?.current!(id, state), {
@@ -97,7 +93,15 @@ export const TileWrapper = memo(
       </>
     );
   },
-  // We pretend this component is a simple function rather than a
-  // NamedExoticComponent, because that's the only way we can fit in a type
-  // parameter
-) as <T>(props: Props<T>) => JSX.Element;
+);
+
+TileWrapper_.displayName = "TileWrapper";
+
+/**
+ * A wrapper around a tile in a video grid. This component exists to decouple
+ * child components from the grid.
+ */
+// We pretend this component is a simple function rather than a
+// NamedExoticComponent, because that's the only way we can fit in a type
+// parameter
+export const TileWrapper = TileWrapper_ as <T>(props: Props<T>) => JSX.Element;

src/video-grid/VideoGrid.tsx

@@ -16,7 +16,6 @@ limitations under the License.
 
 import {
   ComponentProps,
-  Key,
   MutableRefObject,
   ReactNode,
   Ref,
@@ -45,6 +44,7 @@ import styles from "./VideoGrid.module.css";
 import { Layout } from "../room/LayoutToggle";
 import { TileWrapper } from "./TileWrapper";
 import { LayoutStatesMap } from "./Layout";
+import { TileDescriptor } from "../state/CallViewModel";
 
 interface TilePosition {
   x: number;
@@ -112,7 +112,7 @@ export function useVideoGridLayout(hasScreenshareFeeds: boolean): {
   return { layout: layoutRef.current, setLayout };
 }
 
-const GAP = 8;
+const GAP = 20;
 
 function useIsMounted(): MutableRefObject<boolean> {
   const isMountedRef = useRef<boolean>(false);
@@ -812,7 +812,7 @@ export function reorderTiles<T>(
 interface DragTileData {
   offsetX: number;
   offsetY: number;
-  key: Key;
+  key: string;
   x: number;
   y: number;
 }
@@ -839,20 +839,6 @@ export interface VideoGridProps<T> {
   children: (props: ChildrenProperties<T>) => ReactNode;
 }
 
-// Represents something that should get a tile on the layout,
-// ie. a user's video feed or a screen share feed.
-export interface TileDescriptor<T> {
-  id: string;
-  focused: boolean;
-  isPresenter: boolean;
-  isSpeaker: boolean;
-  hasVideo: boolean;
-  local: boolean;
-  largeBaseSize: boolean;
-  placeNear?: string;
-  data: T;
-}
-
 export function VideoGrid<T>({
   items,
   layout,
@@ -872,7 +858,7 @@ export function VideoGrid<T>({
   });
   const [scrollPosition, setScrollPosition] = useState<number>(0);
   const draggingTileRef = useRef<DragTileData | null>(null);
-  const lastTappedRef = useRef<{ [index: Key]: number }>({});
+  const lastTappedRef = useRef<{ [index: string]: number }>({});
   const lastLayoutRef = useRef<Layout>(layout);
   const isMounted = useIsMounted();
 
@@ -887,7 +873,7 @@ export function VideoGrid<T>({
   useEffect(() => {
     setTileState(({ tiles, ...rest }) => {
       const newTiles: Tile<T>[] = [];
-      const removedTileKeys: Set<Key> = new Set();
+      const removedTileKeys: Set<string> = new Set();
 
       for (const tile of tiles) {
         let item = items.find((item) => item.id === tile.key);
@@ -1149,7 +1135,7 @@ export function VideoGrid<T>({
   ]) as unknown as [SpringValues<TileSpring>[], SpringRef<TileSpring>];
 
   const onTap = useCallback(
-    (tileKey: Key) => {
+    (tileKey: string) => {
       const lastTapped = lastTappedRef.current[tileKey];
 
       if (!lastTapped || Date.now() - lastTapped > 500) {

src/video-grid/VideoTile.module.css

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 New Vector Ltd
+Copyright 2022-2023 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,60 +16,138 @@ limitations under the License.
 
 .videoTile {
   position: absolute;
-  contain: strict;
   top: 0;
   container-name: videoTile;
   container-type: size;
   border-radius: var(--cpd-space-4x);
-  overflow: hidden;
-  cursor: pointer;
-  outline: 2px solid rgba(0, 0, 0, 0);
-  transition:
-    outline-radius ease 0.15s,
-    outline-color ease 0.15s;
+  transition: outline-color ease 0.15s;
+  outline: var(--cpd-border-width-2) solid rgb(0 0 0 / 0);
 }
 
-.videoTile * {
-  user-select: none;
-}
-
-.videoTile video {
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
-  background-color: var(--cpd-color-bg-subtle-primary);
-}
-
-.videoTile.isLocal:not(.screenshare) video {
-  transform: scaleX(-1);
+/* Use a pseudo-element to create the expressive speaking border, since CSS
+borders don't support gradients */
+.videoTile::before {
+  content: "";
+  position: absolute;
+  z-index: -1; /* Put it below the outline */
+  opacity: 0; /* Hidden unless speaking */
+  transition: opacity ease 0.15s;
+  inset: calc(-1 * var(--cpd-border-width-4));
+  border-radius: var(--cpd-space-5x);
+  background: linear-gradient(
+      119deg,
+      rgba(13, 92, 189, 0.7) 0%,
+      rgba(13, 189, 168, 0.7) 100%
+    ),
+    linear-gradient(
+      180deg,
+      rgba(13, 92, 189, 0.9) 0%,
+      rgba(13, 189, 168, 0.9) 100%
+    );
+  background-blend-mode: overlay, normal;
 }
 
 .videoTile.speaking {
   /* !important because speaking border should take priority over hover */
-  outline: 4px solid var(--cpd-color-border-accent) !important;
+  outline: var(--cpd-border-width-1) solid var(--cpd-color-bg-canvas-default) !important;
+}
+
+.videoTile.speaking::before {
+  opacity: 1;
 }
 
 @media (hover: hover) {
   .videoTile:hover {
-    outline: 2px solid var(--cpd-color-gray-1400);
+    outline: var(--cpd-border-width-2) solid
+      var(--cpd-color-border-interactive-hovered);
   }
 }
 
 .videoTile.maximised {
   position: relative;
   border-radius: 0;
-  height: 100%;
-  width: 100%;
+  inline-size: 100%;
+  block-size: 100%;
 }
 
-.videoTile.screenshare > video {
+.videoTile video {
+  inline-size: 100%;
+  block-size: 100%;
+  object-fit: contain;
+  background-color: var(--cpd-color-bg-subtle-primary);
+  /* This transform is a no-op, but it forces Firefox to use a different
+  rendering path, one that actually clips the corners of <video> elements into
+  the intended rounded shape. We can remove this if Firefox stops being broken. */
+  transform: translate(0);
+}
+
+.videoTile.mirror video {
+  transform: scaleX(-1);
+}
+
+.videoTile.screenshare video {
   object-fit: contain;
 }
 
-.nameTag {
+.videoTile.cropVideo video {
+  object-fit: cover;
+}
+
+.videoTile.videoMuted video {
+  display: none;
+}
+
+.bg {
+  background-color: var(--cpd-color-bg-subtle-secondary);
+  inline-size: 100%;
+  block-size: 100%;
+  border-radius: inherit;
+  contain: strict;
+}
+
+.avatar {
+  display: none;
   position: absolute;
-  inset-inline-start: var(--cpd-space-1x);
-  inset-block-end: var(--cpd-space-1x);
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  pointer-events: none;
+}
+
+.videoTile.videoMuted .avatar {
+  display: initial;
+}
+
+/* CSS makes us put a condition here, even though all we want to do is
+unconditionally select the container so we can use cqmin units */
+@container videoTile (width > 0) {
+  .avatar {
+    /* Half of the smallest dimension of the tile */
+    inline-size: 50cqmin;
+    block-size: 50cqmin;
+  }
+}
+
+.avatar > img {
+  /* To make avatars scale smoothly with their tiles during animations, we
+  override the styles set on the element */
+  inline-size: 100% !important;
+  block-size: 100% !important;
+}
+
+.fg {
+  position: absolute;
+  inset: var(--cpd-space-1x);
+  display: grid;
+  grid-template-columns: 1fr auto;
+  grid-template-rows: 1fr auto;
+  grid-template-areas: ". button2" "nameTag button1";
+  gap: var(--cpd-space-1x);
+  place-items: start;
+}
+
+.nameTag {
+  grid-area: nameTag;
   padding: var(--cpd-space-1x);
   padding-block: var(--cpd-space-1x);
   color: var(--cpd-color-text-primary);
@@ -78,13 +156,14 @@ limitations under the License.
   align-items: center;
   border-radius: var(--cpd-radius-pill-effect);
   user-select: none;
-  max-width: calc(100% - 48px);
   overflow: hidden;
-  z-index: 1;
   box-shadow: var(--small-drop-shadow);
+  box-sizing: border-box;
+  max-inline-size: 100%;
 }
 
-.nameTag > svg {
+.nameTag > svg,
+.nameTag > span {
   flex-shrink: 0;
 }
 
@@ -96,105 +175,69 @@ limitations under the License.
   color: var(--cpd-color-icon-primary);
 }
 
-.nameTag span {
+.nameTag > .name {
   text-overflow: ellipsis;
   overflow: hidden;
   white-space: nowrap;
   padding-inline: var(--cpd-space-2x);
+  flex-shrink: 1;
 }
 
 .errorIcon {
+  display: block;
   color: var(--cpd-color-icon-critical-primary);
 }
 
-.toolbar {
-  position: absolute;
-  top: 0;
-  left: 0;
-
-  width: 100%;
-  height: 42px;
-
-  color: var(--cpd-color-text-primary);
-  background-color: var(--stopgap-background-85);
-
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-
-  overflow: hidden;
-  z-index: 1;
-
+.fg > button {
+  appearance: none;
+  border: none;
+  border-radius: var(--cpd-radius-pill-effect);
+  padding: var(--cpd-space-1x);
+  background: var(--cpd-color-bg-action-primary-rest);
+  box-shadow: var(--small-drop-shadow);
+  cursor: pointer;
+  opacity: 0;
   transition: opacity ease 0.15s;
 }
 
-.toolbar:not(:hover) {
-  opacity: 0;
+.fg > button:focus-visible,
+.fg > :focus-visible ~ button,
+.fg > button[data-enabled="true"],
+.fg > button[data-state="open"] {
+  opacity: 1;
 }
 
-.toolbar:hover + .presenterLabel {
-  top: calc(42px + 20px); /* toolbar + margin */
-}
+@media (hover) {
+  .fg:hover > button {
+    opacity: 1;
+  }
 
-.button {
-  margin-right: 16px;
-}
-
-.button svg {
-  width: 16px;
-  height: 16px;
-}
-
-.videoMutedOverlay {
-  width: 100%;
-  height: 100%;
-  background-color: var(--cpd-color-bg-subtle-secondary);
-}
-
-.presenterLabel {
-  position: absolute;
-  top: 20px;
-  left: 50%;
-  transform: translateX(-50%);
-  background-color: var(--stopgap-background-85);
-  border-radius: 4px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 4px 8px;
-  font-weight: normal;
-  font-size: var(--font-size-caption);
-  line-height: var(--font-size-body);
-}
-
-.screensharePIP {
-  bottom: 8px;
-  right: 8px;
-  width: 25%;
-  max-width: 360px;
-  border-radius: 20px;
-}
-
-.debugInfo {
-  position: absolute;
-  top: 16px;
-  left: 16px;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-/* CSS makes us put a condition here, even though all we want to do is
-unconditionally select the container so we can use cqmin units */
-@container videoTile (width > 0) {
-  .avatar {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    /* To make avatars scale smoothly with their tiles during animations, we
-    override the styles set on the element */
-    --avatarSize: 50cqmin; /* Half of the smallest dimension of the tile */
-    width: var(--avatarSize) !important;
-    height: var(--avatarSize) !important;
-    border-radius: 10000px !important;
+  .fg > button:hover {
+    background: var(--cpd-color-bg-action-primary-hovered);
   }
 }
+
+.fg > button:active {
+  background: var(--cpd-color-bg-action-primary-pressed) !important;
+}
+
+.fg > button[data-state="open"] {
+  background: var(--cpd-color-bg-action-primary-pressed);
+}
+
+.fg > button > svg {
+  display: block;
+  color: var(--cpd-color-icon-on-solid-primary);
+}
+
+.fg > button:first-of-type {
+  grid-area: button1;
+}
+
+.fg > button:nth-of-type(2) {
+  grid-area: button2;
+}
+
+.volumeSlider {
+  width: 100%;
+}

src/video-grid/VideoTile.tsx

@@ -16,6 +16,8 @@ limitations under the License.
 
 import {
   ComponentProps,
+  ForwardedRef,
+  ReactNode,
   forwardRef,
   useCallback,
   useEffect,
@@ -24,11 +26,9 @@ import {
 import { animated } from "@react-spring/web";
 import classNames from "classnames";
 import { useTranslation } from "react-i18next";
-import { LocalParticipant, RemoteParticipant, Track } from "livekit-client";
 import {
-  ConnectionQualityIndicator,
+  TrackReferenceOrPlaceholder,
   VideoTrack,
-  useMediaTrack,
 } from "@livekit/components-react";
 import {
   RoomMember,
@@ -37,237 +37,458 @@ import {
 import MicOnSolidIcon from "@vector-im/compound-design-tokens/icons/mic-on-solid.svg?react";
 import MicOffSolidIcon from "@vector-im/compound-design-tokens/icons/mic-off-solid.svg?react";
 import ErrorIcon from "@vector-im/compound-design-tokens/icons/error.svg?react";
-import { Text, Tooltip } from "@vector-im/compound-web";
+import MicOffIcon from "@vector-im/compound-design-tokens/icons/mic-off.svg?react";
+import OverflowHorizontalIcon from "@vector-im/compound-design-tokens/icons/overflow-horizontal.svg?react";
+import VolumeOnIcon from "@vector-im/compound-design-tokens/icons/volume-on.svg?react";
+import VolumeOffIcon from "@vector-im/compound-design-tokens/icons/volume-off.svg?react";
+import UserProfileIcon from "@vector-im/compound-design-tokens/icons/user-profile.svg?react";
+import ExpandIcon from "@vector-im/compound-design-tokens/icons/expand.svg?react";
+import CollapseIcon from "@vector-im/compound-design-tokens/icons/collapse.svg?react";
+import {
+  Text,
+  Tooltip,
+  ContextMenu,
+  MenuItem,
+  ToggleMenuItem,
+  Menu,
+} from "@vector-im/compound-web";
+import { useStateObservable } from "@react-rxjs/core";
 
 import { Avatar } from "../Avatar";
 import styles from "./VideoTile.module.css";
 import { useReactiveState } from "../useReactiveState";
-import { AudioButton, FullscreenButton } from "../button/Button";
-import { VideoTileSettingsModal } from "./VideoTileSettingsModal";
-import { MatrixInfo } from "../room/VideoPreview";
+import {
+  ScreenShareTileViewModel,
+  TileViewModel,
+  UserMediaTileViewModel,
+} from "../state/TileViewModel";
+import { subscribe } from "../state/subscribe";
+import { useMergedRefs } from "../useMergedRefs";
+import { Slider } from "../Slider";
 
-export interface ItemData {
-  id: string;
-  member?: RoomMember;
-  sfuParticipant: LocalParticipant | RemoteParticipant;
-  content: TileContent;
-}
-
-export enum TileContent {
-  UserMedia = "user-media",
-  ScreenShare = "screen-share",
-}
-
-interface Props {
-  data: ItemData;
-  maximised: boolean;
-  fullscreen: boolean;
-  onToggleFullscreen: (itemId: string) => void;
-  // TODO: Refactor these props.
-  targetWidth: number;
-  targetHeight: number;
+interface TileProps {
+  tileRef?: ForwardedRef<HTMLDivElement>;
   className?: string;
   style?: ComponentProps<typeof animated.div>["style"];
-  showSpeakingIndicator: boolean;
-  showConnectionStats: boolean;
-  // TODO: This dependency in particular should probably not be here. We can fix
-  // this with a view model.
-  matrixInfo: MatrixInfo;
+  targetWidth: number;
+  targetHeight: number;
+  video: TrackReferenceOrPlaceholder;
+  member: RoomMember | undefined;
+  videoEnabled: boolean;
+  maximised: boolean;
+  unencryptedWarning: boolean;
+  nameTagLeadingIcon?: ReactNode;
+  nameTag: string;
+  displayName: string;
+  primaryButton: ReactNode;
+  secondaryButton?: ReactNode;
+  [k: string]: unknown;
 }
 
-export const VideoTile = forwardRef<HTMLDivElement, Props>(
+const Tile = forwardRef<HTMLDivElement, TileProps>(
   (
     {
-      data,
-      maximised,
-      fullscreen,
-      onToggleFullscreen,
+      tileRef = null,
       className,
       style,
       targetWidth,
       targetHeight,
-      showSpeakingIndicator,
-      showConnectionStats,
-      matrixInfo,
+      video,
+      member,
+      videoEnabled,
+      maximised,
+      unencryptedWarning,
+      nameTagLeadingIcon,
+      nameTag,
+      displayName,
+      primaryButton,
+      secondaryButton,
+      ...props
     },
-    tileRef,
+    ref,
   ) => {
     const { t } = useTranslation();
-
-    const { content, sfuParticipant, member } = data;
-
-    // Handle display name changes.
-    const [displayName, setDisplayName] = useReactiveState(
-      () => member?.rawDisplayName ?? "[👻]",
-      [member],
-    );
-    useEffect(() => {
-      if (member) {
-        const updateName = (): void => {
-          setDisplayName(member.rawDisplayName);
-        };
-
-        member!.on(RoomMemberEvent.Name, updateName);
-        return (): void => {
-          member!.removeListener(RoomMemberEvent.Name, updateName);
-        };
-      }
-    }, [member, setDisplayName]);
-
-    const audioInfo = useMediaTrack(
-      content === TileContent.UserMedia
-        ? Track.Source.Microphone
-        : Track.Source.ScreenShareAudio,
-      sfuParticipant,
-    );
-    const videoInfo = useMediaTrack(
-      content === TileContent.UserMedia
-        ? Track.Source.Camera
-        : Track.Source.ScreenShare,
-      sfuParticipant,
-    );
-    const muted = audioInfo.isMuted !== false;
-    const encrypted =
-      audioInfo.publication?.isEncrypted !== false &&
-      videoInfo.publication?.isEncrypted !== false;
-
-    const MicIcon = muted ? MicOffSolidIcon : MicOnSolidIcon;
-
-    const onFullscreen = useCallback(() => {
-      onToggleFullscreen(data.id);
-    }, [data, onToggleFullscreen]);
-
-    const [videoTileSettingsModalOpen, setVideoTileSettingsModalOpen] =
-      useState(false);
-    const openVideoTileSettingsModal = useCallback(
-      () => setVideoTileSettingsModalOpen(true),
-      [setVideoTileSettingsModalOpen],
-    );
-    const closeVideoTileSettingsModal = useCallback(
-      () => setVideoTileSettingsModalOpen(false),
-      [setVideoTileSettingsModalOpen],
-    );
-
-    const toolbarButtons: JSX.Element[] = [];
-    if (!sfuParticipant.isLocal) {
-      toolbarButtons.push(
-        <AudioButton
-          key="localVolume"
-          className={styles.button}
-          volume={(sfuParticipant as RemoteParticipant).getVolume() ?? 0}
-          onPress={openVideoTileSettingsModal}
-        />,
-      );
-
-      if (content === TileContent.ScreenShare) {
-        toolbarButtons.push(
-          <FullscreenButton
-            key="fullscreen"
-            className={styles.button}
-            fullscreen={fullscreen}
-            onPress={onFullscreen}
-          />,
-        );
-      }
-    }
+    const mergedRef = useMergedRefs(tileRef, ref);
 
     return (
       <animated.div
         className={classNames(styles.videoTile, className, {
-          [styles.isLocal]: sfuParticipant.isLocal,
-          [styles.speaking]:
-            sfuParticipant.isSpeaking &&
-            content === TileContent.UserMedia &&
-            showSpeakingIndicator,
-          [styles.screenshare]: content === TileContent.ScreenShare,
           [styles.maximised]: maximised,
+          [styles.videoMuted]: !videoEnabled,
         })}
         style={style}
-        ref={tileRef}
+        ref={mergedRef}
         data-testid="videoTile"
+        {...props}
       >
-        {toolbarButtons.length > 0 && (!maximised || fullscreen) && (
-          <div className={classNames(styles.toolbar)}>{toolbarButtons}</div>
-        )}
-        {content === TileContent.UserMedia &&
-          !sfuParticipant.isCameraEnabled && (
-            <>
-              <div className={styles.videoMutedOverlay} />
-              <Avatar
-                key={member?.userId}
-                id={member?.userId ?? displayName}
-                name={displayName}
-                size={Math.round(Math.min(targetWidth, targetHeight) / 2)}
-                src={member?.getMxcAvatarUrl()}
-                className={styles.avatar}
-              />
-            </>
-          )}
-        {content === TileContent.ScreenShare ? (
-          <div className={styles.presenterLabel}>
-            <span>{t("video_tile.presenter_label", { displayName })}</span>
-          </div>
-        ) : (
-          <div className={styles.nameTag}>
-            <MicIcon
-              width={20}
-              height={20}
-              aria-label={muted ? t("microphone_off") : t("microphone_on")}
-              data-muted={muted}
-              className={styles.muteIcon}
+        <div className={styles.bg}>
+          <Avatar
+            id={member?.userId ?? displayName}
+            name={displayName}
+            size={Math.round(Math.min(targetWidth, targetHeight) / 2)}
+            src={member?.getMxcAvatarUrl()}
+            className={styles.avatar}
+          />
+          {video.publication !== undefined && (
+            <VideoTrack
+              trackRef={video}
+              // There's no reason for this to be focusable
+              tabIndex={-1}
+              disablePictureInPicture
             />
-            <Text as="span" size="sm" weight="medium">
-              {sfuParticipant.isLocal
-                ? t("video_tile.sfu_participant_local")
-                : displayName}
+          )}
+        </div>
+        <div className={styles.fg}>
+          <div className={styles.nameTag}>
+            {nameTagLeadingIcon}
+            <Text as="span" size="sm" weight="medium" className={styles.name}>
+              {nameTag}
             </Text>
-            {matrixInfo.roomEncrypted && !encrypted && (
-              <Tooltip label={t("common.unencrypted")} side="bottom">
+            {unencryptedWarning && (
+              <Tooltip
+                label={t("common.unencrypted")}
+                side="bottom"
+                isTriggerInteractive={false}
+              >
                 <ErrorIcon
                   width={20}
                   height={20}
                   aria-label={t("common.unencrypted")}
                   className={styles.errorIcon}
-                  // Make the icon focusable so that the tooltip can be opened
-                  // with keyboard navigation
-                  // TODO: Replace this with the solution from
-                  // https://github.com/vector-im/compound-web/pull/130 once it
-                  // lands
-                  tabIndex={0}
                 />
               </Tooltip>
             )}
-            {showConnectionStats && (
-              <ConnectionQualityIndicator participant={sfuParticipant} />
-            )}
           </div>
-        )}
-        <VideoTrack
-          participant={sfuParticipant}
-          source={
-            content === TileContent.UserMedia
-              ? Track.Source.Camera
-              : Track.Source.ScreenShare
-          }
-          // There's no reason for this to be focusable
-          tabIndex={-1}
-          // React supports the disablePictureInPicture attribute, but Firefox
-          // only recognizes a value of "true", whereas React sets it to the empty
-          // string. So we need to bypass React and set it specifically to "true".
-          // https://bugzilla.mozilla.org/show_bug.cgi?id=1865748
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-ignore
-          // eslint-disable-next-line react/no-unknown-property
-          disablepictureinpicture="true"
-        />
-        {!maximised && (
-          <VideoTileSettingsModal
-            data={data}
-            open={videoTileSettingsModalOpen}
-            onDismiss={closeVideoTileSettingsModal}
-          />
-        )}
+          {primaryButton}
+          {secondaryButton}
+        </div>
       </animated.div>
     );
   },
 );
+
+Tile.displayName = "Tile";
+
+interface UserMediaTileProps {
+  vm: UserMediaTileViewModel;
+  className?: string;
+  style?: ComponentProps<typeof animated.div>["style"];
+  targetWidth: number;
+  targetHeight: number;
+  nameTag: string;
+  displayName: string;
+  maximised: boolean;
+  onOpenProfile: () => void;
+  showSpeakingIndicator: boolean;
+}
+
+const UserMediaTile = subscribe<UserMediaTileProps, HTMLDivElement>(
+  (
+    {
+      vm,
+      className,
+      style,
+      targetWidth,
+      targetHeight,
+      nameTag,
+      displayName,
+      maximised,
+      onOpenProfile,
+      showSpeakingIndicator,
+    },
+    ref,
+  ) => {
+    const { t } = useTranslation();
+    const video = useStateObservable(vm.video);
+    const audioEnabled = useStateObservable(vm.audioEnabled);
+    const videoEnabled = useStateObservable(vm.videoEnabled);
+    const unencryptedWarning = useStateObservable(vm.unencryptedWarning);
+    const mirror = useStateObservable(vm.mirror);
+    const speaking = useStateObservable(vm.speaking);
+    const locallyMuted = useStateObservable(vm.locallyMuted);
+    const cropVideo = useStateObservable(vm.cropVideo);
+    const localVolume = useStateObservable(vm.localVolume);
+    const onChangeMute = useCallback(() => vm.toggleLocallyMuted(), [vm]);
+    const onChangeFitContain = useCallback(() => vm.toggleFitContain(), [vm]);
+    const onSelectMute = useCallback((e: Event) => e.preventDefault(), []);
+    const onSelectFitContain = useCallback(
+      (e: Event) => e.preventDefault(),
+      [],
+    );
+
+    const onChangeLocalVolume = useCallback(
+      (v: number) => vm.setLocalVolume(v),
+      [vm],
+    );
+
+    const MicIcon = audioEnabled ? MicOnSolidIcon : MicOffSolidIcon;
+    const VolumeIcon = locallyMuted ? VolumeOffIcon : VolumeOnIcon;
+
+    const [menuOpen, setMenuOpen] = useState(false);
+    const menu = vm.local ? (
+      <>
+        <MenuItem
+          Icon={UserProfileIcon}
+          label={t("common.profile")}
+          onSelect={onOpenProfile}
+        />
+        <ToggleMenuItem
+          Icon={ExpandIcon}
+          label={t("video_tile.change_fit_contain")}
+          checked={cropVideo}
+          onChange={onChangeFitContain}
+          onSelect={onSelectFitContain}
+        />
+      </>
+    ) : (
+      <>
+        <ToggleMenuItem
+          Icon={MicOffIcon}
+          label={t("video_tile.mute_for_me")}
+          checked={locallyMuted}
+          onChange={onChangeMute}
+          onSelect={onSelectMute}
+        />
+        <ToggleMenuItem
+          Icon={ExpandIcon}
+          label={t("video_tile.change_fit_contain")}
+          checked={cropVideo}
+          onChange={onChangeFitContain}
+          onSelect={onSelectFitContain}
+        />
+        {/* TODO: Figure out how to make this slider keyboard accessible */}
+        <MenuItem as="div" Icon={VolumeIcon} label={null} onSelect={null}>
+          <Slider
+            className={styles.volumeSlider}
+            label={t("video_tile.volume")}
+            value={localVolume}
+            onValueChange={onChangeLocalVolume}
+            min={0.1}
+            max={1}
+            step={0.01}
+            disabled={locallyMuted}
+          />
+        </MenuItem>
+      </>
+    );
+
+    const tile = (
+      <Tile
+        tileRef={ref}
+        className={classNames(className, {
+          [styles.mirror]: mirror,
+          [styles.speaking]: showSpeakingIndicator && speaking,
+          [styles.cropVideo]: cropVideo,
+        })}
+        style={style}
+        targetWidth={targetWidth}
+        targetHeight={targetHeight}
+        video={video}
+        member={vm.member}
+        videoEnabled={videoEnabled}
+        maximised={maximised}
+        unencryptedWarning={unencryptedWarning}
+        nameTagLeadingIcon={
+          <MicIcon
+            width={20}
+            height={20}
+            aria-label={audioEnabled ? t("microphone_on") : t("microphone_off")}
+            data-muted={!audioEnabled}
+            className={styles.muteIcon}
+          />
+        }
+        nameTag={nameTag}
+        displayName={displayName}
+        primaryButton={
+          <Menu
+            open={menuOpen}
+            onOpenChange={setMenuOpen}
+            title={nameTag}
+            trigger={
+              <button aria-label={t("common.options")}>
+                <OverflowHorizontalIcon aria-hidden width={20} height={20} />
+              </button>
+            }
+            side="left"
+            align="start"
+          >
+            {menu}
+          </Menu>
+        }
+      />
+    );
+
+    return (
+      <ContextMenu title={nameTag} trigger={tile} hasAccessibleAlternative>
+        {menu}
+      </ContextMenu>
+    );
+  },
+);
+
+UserMediaTile.displayName = "UserMediaTile";
+
+interface ScreenShareTileProps {
+  vm: ScreenShareTileViewModel;
+  className?: string;
+  style?: ComponentProps<typeof animated.div>["style"];
+  targetWidth: number;
+  targetHeight: number;
+  nameTag: string;
+  displayName: string;
+  maximised: boolean;
+  fullscreen: boolean;
+  onToggleFullscreen: (itemId: string) => void;
+}
+
+const ScreenShareTile = subscribe<ScreenShareTileProps, HTMLDivElement>(
+  (
+    {
+      vm,
+      className,
+      style,
+      targetWidth,
+      targetHeight,
+      nameTag,
+      displayName,
+      maximised,
+      fullscreen,
+      onToggleFullscreen,
+    },
+    ref,
+  ) => {
+    const { t } = useTranslation();
+    const video = useStateObservable(vm.video);
+    const unencryptedWarning = useStateObservable(vm.unencryptedWarning);
+    const onClickFullScreen = useCallback(
+      () => onToggleFullscreen(vm.id),
+      [onToggleFullscreen, vm],
+    );
+
+    const FullScreenIcon = fullscreen ? CollapseIcon : ExpandIcon;
+
+    return (
+      <Tile
+        ref={ref}
+        className={classNames(className, styles.screenshare)}
+        style={style}
+        targetWidth={targetWidth}
+        targetHeight={targetHeight}
+        video={video}
+        member={vm.member}
+        videoEnabled={true}
+        maximised={maximised}
+        unencryptedWarning={unencryptedWarning}
+        nameTag={nameTag}
+        displayName={displayName}
+        primaryButton={
+          !vm.local && (
+            <button
+              aria-label={
+                fullscreen
+                  ? t("video_tile.full_screen")
+                  : t("video_tile.exit_full_screen")
+              }
+              onClick={onClickFullScreen}
+            >
+              <FullScreenIcon aria-hidden width={20} height={20} />
+            </button>
+          )
+        }
+      />
+    );
+  },
+);
+
+ScreenShareTile.displayName = "ScreenShareTile";
+
+interface Props {
+  vm: TileViewModel;
+  maximised: boolean;
+  fullscreen: boolean;
+  onToggleFullscreen: (itemId: string) => void;
+  onOpenProfile: () => void;
+  targetWidth: number;
+  targetHeight: number;
+  className?: string;
+  style?: ComponentProps<typeof animated.div>["style"];
+  showSpeakingIndicator: boolean;
+}
+
+export const VideoTile = forwardRef<HTMLDivElement, Props>(
+  (
+    {
+      vm,
+      maximised,
+      fullscreen,
+      onToggleFullscreen,
+      onOpenProfile,
+      className,
+      style,
+      targetWidth,
+      targetHeight,
+      showSpeakingIndicator,
+    },
+    ref,
+  ) => {
+    const { t } = useTranslation();
+
+    // Handle display name changes.
+    // TODO: Move this into the view model
+    const [displayName, setDisplayName] = useReactiveState(
+      () => vm.member?.rawDisplayName ?? "[👻]",
+      [vm.member],
+    );
+    useEffect(() => {
+      if (vm.member) {
+        const updateName = (): void => {
+          setDisplayName(vm.member!.rawDisplayName);
+        };
+
+        vm.member!.on(RoomMemberEvent.Name, updateName);
+        return (): void => {
+          vm.member!.removeListener(RoomMemberEvent.Name, updateName);
+        };
+      }
+    }, [vm.member, setDisplayName]);
+    const nameTag = vm.local
+      ? t("video_tile.sfu_participant_local")
+      : displayName;
+
+    if (vm instanceof UserMediaTileViewModel) {
+      return (
+        <UserMediaTile
+          ref={ref}
+          className={className}
+          style={style}
+          vm={vm}
+          targetWidth={targetWidth}
+          targetHeight={targetHeight}
+          nameTag={nameTag}
+          displayName={displayName}
+          maximised={maximised}
+          onOpenProfile={onOpenProfile}
+          showSpeakingIndicator={showSpeakingIndicator}
+        />
+      );
+    } else {
+      return (
+        <ScreenShareTile
+          ref={ref}
+          className={className}
+          style={style}
+          vm={vm}
+          targetWidth={targetWidth}
+          targetHeight={targetHeight}
+          nameTag={nameTag}
+          displayName={displayName}
+          maximised={maximised}
+          fullscreen={fullscreen}
+          onToggleFullscreen={onToggleFullscreen}
+        />
+      );
+    }
+  },
+);
+
+VideoTile.displayName = "VideoTile";

src/video-grid/VideoTileSettingsModal.module.css

@@ -1,120 +0,0 @@
-/*
-Copyright 2022 - 2023 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.videoTileSettingsModal {
-  width: 700px;
-  height: 316px;
-  display: flex;
-}
-
-.content {
-  position: relative;
-  margin: 27px 34px;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-}
-
-.localVolumePercentage {
-  width: 3ch;
-}
-
-.localVolumeSlider[type="range"] {
-  -ms-appearance: none;
-  -moz-appearance: none;
-  -webkit-appearance: none;
-  appearance: none;
-
-  background-color: transparent;
-  --slider-color: var(--cpd-color-bg-subtle-primary);
-  --slider-height: 4px;
-  --thumb-color: var(--cpd-color-text-action-accent);
-  --thumb-radius: 100%;
-  --thumb-size: 16px;
-  --thumb-margin-top: -6px;
-
-  cursor: pointer;
-  width: 100%;
-}
-
-.localVolumeSlider[type="range"]::-moz-range-track {
-  -moz-appearance: none;
-  appearance: none;
-
-  background-color: var(--slider-color);
-  height: var(--slider-height);
-}
-.localVolumeSlider[type="range"]::-ms-track {
-  -ms-appearance: none;
-  appearance: none;
-
-  background-color: var(--slider-color);
-  height: var(--slider-height);
-}
-.localVolumeSlider[type="range"]::-webkit-slider-runnable-track {
-  -webkit-appearance: none;
-  appearance: none;
-
-  background-color: var(--slider-color);
-  height: var(--slider-height);
-}
-
-.localVolumeSlider[type="range"]::-moz-range-thumb {
-  -moz-appearance: none;
-  appearance: none;
-
-  height: var(--thumb-size);
-  width: var(--thumb-size);
-  margin-top: var(--thumb-margin-top);
-  border-radius: var(--thumb-radius);
-  background: var(--thumb-color);
-}
-.localVolumeSlider[type="range"]::-ms-thumb {
-  -ms-appearance: none;
-  appearance: none;
-
-  height: var(--thumb-size);
-  width: var(--thumb-size);
-  margin-top: var(--thumb-margin-top);
-  border-radius: var(--thumb-radius);
-  background: var(--thumb-color);
-}
-.localVolumeSlider[type="range"]::-webkit-slider-thumb {
-  -webkit-appearance: none;
-  appearance: none;
-
-  height: var(--thumb-size);
-  width: var(--thumb-size);
-  margin-top: var(--thumb-margin-top);
-  border-radius: var(--thumb-radius);
-  background: var(--thumb-color);
-}
-
-.localVolumeSlider[type="range"]::-moz-range-progress {
-  -moz-appearance: none;
-  appearance: none;
-
-  height: var(--slider-height);
-  background: var(--thumb-color);
-}
-.localVolumeSlider[type="range"]::-ms-fill-lower {
-  -moz-appearance: none;
-  appearance: none;
-
-  height: var(--slider-height);
-  background: var(--thumb-color);
-}

src/video-grid/VideoTileSettingsModal.tsx

@@ -1,97 +0,0 @@
-/*
-Copyright 2022 - 2023 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { ChangeEvent, FC, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { RemoteParticipant, Track } from "livekit-client";
-
-import { FieldRow } from "../input/Input";
-import { Modal } from "../Modal";
-import styles from "./VideoTileSettingsModal.module.css";
-import { VolumeIcon } from "../button/VolumeIcon";
-import { ItemData, TileContent } from "./VideoTile";
-
-interface LocalVolumeProps {
-  participant: RemoteParticipant;
-  content: TileContent;
-}
-
-const LocalVolume: FC<LocalVolumeProps> = ({
-  participant,
-  content,
-}: LocalVolumeProps) => {
-  const source =
-    content === TileContent.UserMedia
-      ? Track.Source.Microphone
-      : Track.Source.ScreenShareAudio;
-
-  const [localVolume, setLocalVolume] = useState<number>(
-    participant.getVolume(source) ?? 0,
-  );
-
-  const onLocalVolumeChanged = (event: ChangeEvent<HTMLInputElement>): void => {
-    const value: number = +event.target.value;
-    setLocalVolume(value);
-    participant.setVolume(value, source);
-  };
-
-  return (
-    <>
-      <FieldRow>
-        <VolumeIcon volume={localVolume} />
-        <input
-          className={styles.localVolumeSlider}
-          type="range"
-          min="0"
-          max="1"
-          step="0.01"
-          value={localVolume}
-          onChange={onLocalVolumeChanged}
-        />
-      </FieldRow>
-    </>
-  );
-};
-
-interface Props {
-  data: ItemData;
-  open: boolean;
-  onDismiss: () => void;
-}
-
-export const VideoTileSettingsModal: FC<Props> = ({
-  data,
-  open,
-  onDismiss,
-}) => {
-  const { t } = useTranslation();
-
-  return (
-    <Modal
-      className={styles.videoTileSettingsModal}
-      title={t("local_volume_label")}
-      open={open}
-      onDismiss={onDismiss}
-    >
-      <div className={styles.content}>
-        <LocalVolume
-          participant={data.sfuParticipant as RemoteParticipant}
-          content={data.content}
-        />
-      </div>
-    </Modal>
-  );
-};

test/Toast-test.tsx

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { vi } from "vitest";
 import { screen, render } from "@testing-library/react";
 import { Toast } from "../src/Toast";
 import userEvent from "@testing-library/user-event";
@@ -35,7 +36,7 @@ test("Toast renders", () => {
 });
 
 test("Toast dismisses when clicked", async () => {
-  const onDismiss = jest.fn();
+  const onDismiss = vi.fn();
   render(
     <Toast open={true} onDismiss={onDismiss}>
       Hello world!
@@ -47,13 +48,13 @@ test("Toast dismisses when clicked", async () => {
 
 test("Toast dismisses itself after the specified timeout", async () => {
   withFakeTimers(() => {
-    const onDismiss = jest.fn();
+    const onDismiss = vi.fn();
     render(
       <Toast open={true} onDismiss={onDismiss} autoDismiss={2000}>
         Hello world!
       </Toast>,
     );
-    jest.advanceTimersByTime(2000);
+    vi.advanceTimersByTime(2000);
     expect(onDismiss).toHaveBeenCalled();
   });
 });

test/UrlParams-test.ts

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { mocked } from "jest-mock";
+import { vi } from "vitest";
 
 import { getRoomIdentifierFromUrl } from "../src/UrlParams";
 import { Config } from "../src/config/Config";
@@ -24,11 +24,11 @@ const ROOM_ID = "!d45f138fsd";
 const ORIGIN = "https://call.element.io";
 const HOMESERVER = "call.ems.host";
 
-jest.mock("../src/config/Config");
+vi.mock("../src/config/Config");
 
 describe("UrlParams", () => {
   beforeAll(() => {
-    mocked(Config.defaultServerName).mockReturnValue("call.ems.host");
+    vi.mocked(Config.defaultServerName).mockReturnValue("call.ems.host");
   });
 
   describe("handles URL with /room/", () => {

test/__snapshots__/Toast-test.tsx.snap

@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`Toast renders 1`] = `
 <button
@@ -13,7 +13,7 @@ exports[`Toast renders 1`] = `
   type="button"
 >
   <h3
-    class="_font-body-sm-semibold_1jx6b_45"
+    class="_typography_yh5dq_162 _font-body-sm-semibold_yh5dq_45"
     id="radix-:r4:"
   >
     Hello world!

test/environment.ts

@@ -1,18 +0,0 @@
-import { TextEncoder } from "util";
-import JSDOMEnvironment_, {
-  TestEnvironment as TestEnvironment_,
-} from "jest-environment-jsdom";
-import { JestEnvironmentConfig, EnvironmentContext } from "@jest/environment";
-
-// This is a patched version of jsdom that adds TextEncoder, as a workaround for
-// https://github.com/jsdom/jsdom/issues/2524
-// Once that issue is resolved, this custom environment file can be deleted
-export default class JSDOMEnvironment extends JSDOMEnvironment_ {
-  constructor(config: JestEnvironmentConfig, context: EnvironmentContext) {
-    super(config, context);
-    this.global.TextEncoder ??= TextEncoder;
-  }
-}
-
-export const TestEnvironment =
-  TestEnvironment_ === JSDOMEnvironment_ ? JSDOMEnvironment : TestEnvironment_;

test/mocks/olmMock.ts

@@ -1 +0,0 @@
-module.exports = { loadOlm: jest.fn(async () => {}) };

test/mocks/svgr.ts

@@ -1,3 +0,0 @@
-// Mock file for SVG imports
-const ReactComponent = "svg";
-export default ReactComponent;

test/mocks/workerMock.ts

@@ -1 +0,0 @@
-module.exports = jest.fn();

test/room/checkForParallelCalls-test.ts

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { Mocked, mocked } from "jest-mock";
+import { vi, Mocked } from "vitest";
 import { RoomState } from "matrix-js-sdk/src/models/room-state";
 import { PosthogAnalytics } from "../../src/analytics/PosthogAnalytics";
 import { checkForParallelCalls } from "../../src/room/checkForParallelCalls";
@@ -23,10 +23,10 @@ import { withFakeTimers } from "../utils";
 const withMockedPosthog = (
   continuation: (posthog: Mocked<PosthogAnalytics>) => void,
 ) => {
-  const posthog = mocked({
-    trackEvent: jest.fn(),
+  const posthog = vi.mocked({
+    trackEvent: vi.fn(),
   } as unknown as PosthogAnalytics);
-  const instanceSpy = jest
+  const instanceSpy = vi
     .spyOn(PosthogAnalytics, "instance", "get")
     .mockReturnValue(posthog);
   try {

test/utils.ts

@@ -13,12 +13,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+import { vi } from "vitest";
 
 export function withFakeTimers(continuation: () => void): void {
-  jest.useFakeTimers();
+  vi.useFakeTimers();
   try {
     continuation();
   } finally {
-    jest.useRealTimers();
+    vi.useRealTimers();
   }
 }

test/video-grid/BigGrid-test.ts

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { TileDescriptor } from "../../src/state/CallViewModel";
 import {
   addItems,
   column,
@@ -26,7 +27,6 @@ import {
   row,
   moveTile,
 } from "../../src/video-grid/BigGrid";
-import { TileDescriptor } from "../../src/video-grid/VideoGrid";
 
 /**
  * Builds a grid from a string specifying the contents of each cell as a letter.
@@ -315,7 +315,7 @@ jk`;
   const grid = mkGrid(input);
   let gridAfter = grid;
 
-  const toggle = (tileId: string) => {
+  const toggle = (tileId: string): void => {
     const tile = grid.cells.find((c) => c?.item.id === tileId)!.item;
     gridAfter = cycleTileSize(gridAfter, tile);
   };

test/video-grid/VideoGrid-test.ts

@@ -14,11 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {
-  Tile,
-  TileDescriptor,
-  reorderTiles,
-} from "../../src/video-grid/VideoGrid";
+import { TileDescriptor } from "../../src/state/CallViewModel";
+import { Tile, reorderTiles } from "../../src/video-grid/VideoGrid";
 
 const alice: Tile<unknown> = {
   key: "alice",

tsconfig.json

@@ -12,9 +12,23 @@
     "experimentalDecorators": true,
     "esModuleInterop": true,
     "noUnusedLocals": true,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "declaration": true,
     "resolveJsonModule": true,
+    "paths": {
+      // These imports within @livekit/components-core and
+      // @livekit/components-react are broken under the "bundler" module
+      // resolution mode, so we need to resolve them manually
+      "livekit-client/dist/src/room/Room": [
+        "./node_modules/livekit-client/dist/src/room/Room.d.ts"
+      ],
+      "livekit-client/dist/src/room/participant/Participant": [
+        "./node_modules/livekit-client/dist/src/room/participant/Participant.d.ts"
+      ],
+      "livekit-client/dist/src/proto/livekit_models_pb": [
+        "./node_modules/livekit-client/dist/src/proto/livekit_models_pb.d.ts"
+      ]
+    },
 
     // TODO: Enable the following options later.
     // "forceConsistentCasingInFileNames": true,
@@ -29,6 +43,7 @@
   },
   "include": [
     "./node_modules/matrix-js-sdk/src/@types/*.d.ts",
+    "./node_modules/vitest/globals.d.ts",
     "./src/**/*.ts",
     "./src/**/*.tsx",
     "./test/**/*.ts",

vite.config.js

@@ -77,6 +77,11 @@ export default defineConfig(({ mode }) => {
         "matrix-js-sdk",
         "react-use-measure",
         "@juggle/resize-observer",
+        // These packages modify the document based on some module-level global
+        // state, and don't play nicely with duplicate copies of themselves
+        // https://github.com/radix-ui/primitives/issues/1241#issuecomment-1847837850
+        "@radix-ui/react-focus-guards",
+        "@radix-ui/react-dismissable-layer",
       ],
     },
   };

vitest.config.js

@@ -0,0 +1,24 @@
+import { defineConfig, mergeConfig } from "vitest/config";
+import viteConfig from "./vite.config";
+
+export default defineConfig((configEnv) =>
+  mergeConfig(
+    viteConfig(configEnv),
+    defineConfig({
+      test: {
+        globals: true,
+        environment: "jsdom",
+        css: {
+          modules: {
+            classNameStrategy: "non-scoped",
+          },
+        },
+        include: ["test/**/*-test.[jt]s?(x)"],
+        coverage: {
+          reporter: ["text", "html"],
+          exclude: ["node_modules/"],
+        },
+      },
+    }),
+  ),
+);