Implement most of the remaining layout changes

Includes the mobile UX optimizations and the tweaks we've made to cut down on wasted space, but does not yet include the change to embed the spotlight tile within the grid.

src/grid/CallLayout.ts

@@ -65,6 +65,10 @@ export interface SpotlightTileModel {
 export type TileModel = GridTileModel | SpotlightTileModel;
 
 export interface CallLayoutOutputs<Model> {
+  /**
+   * Whether the scrolling layer of the layout should appear on top.
+   */
+  scrollingOnTop: boolean;
   /**
    * The visually fixed (non-scrolling) layer of the layout.
    */
@@ -121,7 +125,7 @@ export function arrangeTiles(
   );
   let rows = Math.ceil(tileCount / columns);
 
-  let tileWidth = (width - (columns - 1) * gap) / columns;
+  let tileWidth = (width - (columns + 1) * gap) / columns;
   let tileHeight = (minHeight - (rows - 1) * gap) / rows;
 
   // Impose a minimum width and height on the tiles
@@ -132,7 +136,7 @@ export function arrangeTiles(
     // c = (W + g) / (w + g).
     columns = Math.floor((width + gap) / (tileMinWidth + gap));
     rows = Math.ceil(tileCount / columns);
-    tileWidth = (width - (columns - 1) * gap) / columns;
+    tileWidth = (width - (columns + 1) * gap) / columns;
     tileHeight = (minHeight - (rows - 1) * gap) / rows;
   }
   if (tileHeight < tileMinHeight) tileHeight = tileMinHeight;

src/grid/GridLayout.module.css

@@ -16,7 +16,6 @@ limitations under the License.
 
 .fixed,
 .scrolling {
-  margin-inline: var(--inline-content-inset);
   block-size: 100%;
 }
 
@@ -41,7 +40,7 @@ limitations under the License.
   position: absolute;
   inline-size: 404px;
   block-size: 233px;
-  inset: -12px;
+  inset: 0;
 }
 
 .fixed > .slot[data-block-alignment="start"] {

src/grid/GridLayout.tsx

@@ -40,6 +40,8 @@ export const makeGridLayout: CallLayout<GridLayoutModel> = ({
   minBounds,
   spotlightAlignment,
 }) => ({
+  scrollingOnTop: false,
+
   // The "fixed" (non-scrolling) part of the layout is where the spotlight tile
   // lives
   fixed: forwardRef(function GridLayoutFixed({ model, Slot }, ref) {

src/grid/OneOnOneLayout.module.css

@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 .layer {
-  margin-inline: var(--inline-content-inset);
   block-size: 100%;
   display: grid;
   place-items: center;
@@ -36,7 +35,6 @@ limitations under the License.
   position: absolute;
   inline-size: 404px;
   block-size: 233px;
-  inset: -12px;
 }
 
 .slot[data-block-alignment="start"] {

src/grid/OneOnOneLayout.tsx

@@ -19,63 +19,19 @@ import { useObservableEagerState } from "observable-hooks";
 import classNames from "classnames";
 
 import { OneOnOneLayout as OneOnOneLayoutModel } from "../state/CallViewModel";
-import {
-  CallLayout,
-  GridTileModel,
-  SpotlightTileModel,
-  arrangeTiles,
-} from "./CallLayout";
+import { CallLayout, GridTileModel, arrangeTiles } from "./CallLayout";
 import { useReactiveState } from "../useReactiveState";
 import styles from "./OneOnOneLayout.module.css";
 import { DragCallback } from "./Grid";
 
 export const makeOneOnOneLayout: CallLayout<OneOnOneLayoutModel> = ({
   minBounds,
-  spotlightAlignment,
   pipAlignment,
 }) => ({
-  fixed: forwardRef(function OneOnOneLayoutFixed({ model, Slot }, ref) {
-    const { width, height } = useObservableEagerState(minBounds);
-    const spotlightAlignmentValue = useObservableEagerState(spotlightAlignment);
+  scrollingOnTop: false,
 
-    const [generation] = useReactiveState<number>(
-      (prev) => (prev === undefined ? 0 : prev + 1),
-      [width, height, model.spotlight === undefined, spotlightAlignmentValue],
-    );
-
-    const spotlightTileModel: SpotlightTileModel | undefined = useMemo(
-      () =>
-        model.spotlight && {
-          type: "spotlight",
-          vms: model.spotlight,
-          maximised: false,
-        },
-      [model.spotlight],
-    );
-
-    const onDragSpotlight: DragCallback = useCallback(
-      ({ xRatio, yRatio }) =>
-        spotlightAlignment.next({
-          block: yRatio < 0.5 ? "start" : "end",
-          inline: xRatio < 0.5 ? "start" : "end",
-        }),
-      [],
-    );
-
-    return (
-      <div ref={ref} data-generation={generation} className={styles.layer}>
-        {spotlightTileModel && (
-          <Slot
-            className={classNames(styles.slot, styles.spotlight)}
-            id="spotlight"
-            model={spotlightTileModel}
-            onDrag={onDragSpotlight}
-            data-block-alignment={spotlightAlignmentValue.block}
-            data-inline-alignment={spotlightAlignmentValue.inline}
-          />
-        )}
-      </div>
-    );
+  fixed: forwardRef(function OneOnOneLayoutFixed(_props, ref) {
+    return <div ref={ref} data-generation={0} />;
   }),
 
   scrolling: forwardRef(function OneOnOneLayoutScrolling({ model, Slot }, ref) {

src/grid/SpotlightExpandedLayout.module.css

@@ -0,0 +1,47 @@
+/*
+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.
+*/
+
+.layer {
+  block-size: 100%;
+}
+
+.spotlight {
+  block-size: 100%;
+  inline-size: 100%;
+}
+
+.pip {
+  position: absolute;
+  inline-size: 180px;
+  block-size: 135px;
+  inset: var(--cpd-space-4x);
+}
+
+.pip[data-block-alignment="start"] {
+  inset-block-end: unset;
+}
+
+.pip[data-block-alignment="end"] {
+  inset-block-start: unset;
+}
+
+.pip[data-inline-alignment="start"] {
+  inset-inline-end: unset;
+}
+
+.pip[data-inline-alignment="end"] {
+  inset-inline-start: unset;
+}

src/grid/SpotlightExpandedLayout.tsx

@@ -0,0 +1,99 @@
+/*
+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 { forwardRef, useCallback, useMemo } from "react";
+import { useObservableEagerState } from "observable-hooks";
+
+import { SpotlightExpandedLayout as SpotlightExpandedLayoutModel } from "../state/CallViewModel";
+import { CallLayout, GridTileModel, SpotlightTileModel } from "./CallLayout";
+import { DragCallback } from "./Grid";
+import styles from "./SpotlightExpandedLayout.module.css";
+import { useReactiveState } from "../useReactiveState";
+
+export const makeSpotlightExpandedLayout: CallLayout<
+  SpotlightExpandedLayoutModel
+> = ({ minBounds, pipAlignment }) => ({
+  scrollingOnTop: true,
+
+  fixed: forwardRef(function SpotlightExpandedLayoutFixed(
+    { model, Slot },
+    ref,
+  ) {
+    const { width, height } = useObservableEagerState(minBounds);
+
+    const [generation] = useReactiveState<number>(
+      (prev) => (prev === undefined ? 0 : prev + 1),
+      [width, height],
+    );
+
+    const spotlightTileModel: SpotlightTileModel = useMemo(
+      () => ({ type: "spotlight", vms: model.spotlight, maximised: true }),
+      [model.spotlight],
+    );
+
+    return (
+      <div ref={ref} data-generation={generation} className={styles.layer}>
+        <Slot
+          className={styles.spotlight}
+          id="spotlight"
+          model={spotlightTileModel}
+        />
+      </div>
+    );
+  }),
+
+  scrolling: forwardRef(function SpotlightExpandedLayoutScrolling(
+    { model, Slot },
+    ref,
+  ) {
+    const { width, height } = useObservableEagerState(minBounds);
+    const pipAlignmentValue = useObservableEagerState(pipAlignment);
+
+    const [generation] = useReactiveState<number>(
+      (prev) => (prev === undefined ? 0 : prev + 1),
+      [width, height, model.pip === undefined, pipAlignmentValue],
+    );
+
+    const pipTileModel: GridTileModel | undefined = useMemo(
+      () => model.pip && { type: "grid", vm: model.pip },
+      [model.pip],
+    );
+
+    const onDragPip: DragCallback = useCallback(
+      ({ xRatio, yRatio }) =>
+        pipAlignment.next({
+          block: yRatio < 0.5 ? "start" : "end",
+          inline: xRatio < 0.5 ? "start" : "end",
+        }),
+      [],
+    );
+
+    return (
+      <div ref={ref} data-generation={generation} className={styles.layer}>
+        {pipTileModel && (
+          <Slot
+            className={styles.pip}
+            id="pip"
+            model={pipTileModel}
+            onDrag={onDragPip}
+            data-block-alignment={pipAlignmentValue.block}
+            data-inline-alignment={pipAlignmentValue.inline}
+          />
+        )}
+      </div>
+    );
+  }),
+});

src/grid/SpotlightLandscapeLayout.module.css

@@ -0,0 +1,54 @@
+/*
+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.
+*/
+
+.layer {
+  block-size: 100%;
+  display: grid;
+  --gap: 20px;
+  gap: var(--gap);
+  --grid-slot-width: 180px;
+  grid-template-columns: 1fr var(--grid-slot-width);
+  grid-template-rows: minmax(1fr, auto);
+  padding-inline: var(--gap);
+}
+
+.spotlight {
+  container: spotlight / size;
+  display: grid;
+  place-items: center;
+}
+
+/* CSS makes us put a condition here, even though all we want to do is
+unconditionally select the container so we can use cq units */
+@container spotlight (width > 0) {
+  .spotlight > .slot {
+    inline-size: min(100cqi, 100cqb * (17 / 9));
+    block-size: min(100cqb, 100cqi / (4 / 3));
+  }
+}
+
+.grid {
+  display: flex;
+  flex-wrap: wrap;
+  gap: var(--gap);
+  justify-content: center;
+  align-content: center;
+}
+
+.grid > .slot {
+  inline-size: 180px;
+  block-size: 135px;
+}

src/grid/SpotlightLandscapeLayout.tsx

@@ -0,0 +1,93 @@
+/*
+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 { forwardRef, useMemo } from "react";
+import { useObservableEagerState } from "observable-hooks";
+import classNames from "classnames";
+
+import { CallLayout, GridTileModel, TileModel } from "./CallLayout";
+import { SpotlightLandscapeLayout as SpotlightLandscapeLayoutModel } from "../state/CallViewModel";
+import styles from "./SpotlightLandscapeLayout.module.css";
+import { useReactiveState } from "../useReactiveState";
+
+export const makeSpotlightLandscapeLayout: CallLayout<
+  SpotlightLandscapeLayoutModel
+> = ({ minBounds }) => ({
+  scrollingOnTop: false,
+
+  fixed: forwardRef(function SpotlightLandscapeLayoutFixed(
+    { model, Slot },
+    ref,
+  ) {
+    const { width, height } = useObservableEagerState(minBounds);
+    const tileModel: TileModel = useMemo(
+      () => ({
+        type: "spotlight",
+        vms: model.spotlight,
+        maximised: false,
+      }),
+      [model.spotlight],
+    );
+    const [generation] = useReactiveState<number>(
+      (prev) => (prev === undefined ? 0 : prev + 1),
+      [model.grid.length, width, height],
+    );
+
+    return (
+      <div ref={ref} data-generation={generation} className={styles.layer}>
+        <div className={styles.spotlight}>
+          <Slot className={styles.slot} id="spotlight" model={tileModel} />
+        </div>
+        <div className={styles.grid} />
+      </div>
+    );
+  }),
+
+  scrolling: forwardRef(function SpotlightLandscapeLayoutScrolling(
+    { model, Slot },
+    ref,
+  ) {
+    const { width, height } = useObservableEagerState(minBounds);
+    const tileModels: GridTileModel[] = useMemo(
+      () => model.grid.map((vm) => ({ type: "grid", vm })),
+      [model.grid],
+    );
+    const [generation] = useReactiveState<number>(
+      (prev) => (prev === undefined ? 0 : prev + 1),
+      [model.spotlight.length, model.grid, width, height],
+    );
+
+    return (
+      <div ref={ref} data-generation={generation} className={styles.layer}>
+        <div
+          className={classNames(styles.spotlight, {
+            [styles.withIndicators]: model.spotlight.length > 1,
+          })}
+        />
+        <div className={styles.grid}>
+          {tileModels.map((m) => (
+            <Slot
+              key={m.vm.id}
+              className={styles.slot}
+              id={m.vm.id}
+              model={m}
+            />
+          ))}
+        </div>
+      </div>
+    );
+  }),
+});

src/grid/SpotlightLayout.module.css

@@ -1,98 +0,0 @@
-/*
-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.
-*/
-
-.layer {
-  margin-inline: var(--inline-content-inset);
-  block-size: 100%;
-  display: grid;
-  --grid-gap: 20px;
-  gap: 30px;
-}
-
-.layer[data-orientation="landscape"] {
-  --grid-slot-width: 180px;
-  grid-template-columns: 1fr calc(
-      var(--grid-columns) * var(--grid-slot-width) + (var(--grid-columns) - 1) *
-        var(--grid-gap)
-    );
-  grid-template-rows: minmax(1fr, auto);
-}
-
-.spotlight {
-  container: spotlight / size;
-  display: grid;
-  place-items: center;
-}
-
-/* CSS makes us put a condition here, even though all we want to do is
-unconditionally select the container so we can use cq units */
-@container spotlight (width > 0) {
-  .layer[data-orientation="landscape"] > .spotlight > .slot {
-    inline-size: min(100cqi, 100cqb * (17 / 9));
-    block-size: min(100cqb, 100cqi / (4 / 3));
-  }
-}
-
-.grid {
-  display: flex;
-  flex-wrap: wrap;
-  gap: var(--grid-gap);
-  justify-content: center;
-}
-
-.layer[data-orientation="landscape"] > .grid {
-  align-content: center;
-}
-
-.layer > .grid > .slot {
-  inline-size: var(--grid-slot-width);
-}
-
-.layer[data-orientation="landscape"] > .grid > .slot {
-  block-size: 135px;
-}
-
-.layer[data-orientation="portrait"] {
-  margin-inline: 0;
-  display: block;
-}
-
-.layer[data-orientation="portrait"] > .spotlight {
-  inline-size: 100%;
-  aspect-ratio: 16 / 9;
-  margin-block-end: var(--cpd-space-4x);
-}
-
-.layer[data-orientation="portrait"] > .spotlight.withIndicators {
-  margin-block-end: calc(2 * var(--cpd-space-4x) + 2px);
-}
-
-.layer[data-orientation="portrait"] > .spotlight > .slot {
-  inline-size: 100%;
-  block-size: 100%;
-}
-
-.layer[data-orientation="portrait"] > .grid {
-  margin-inline: var(--inline-content-inset);
-  align-content: start;
-}
-
-.layer[data-orientation="portrait"] > .grid > .slot {
-  --grid-slot-width: calc(
-    (100% - (var(--grid-columns) - 1) * var(--grid-gap)) / var(--grid-columns)
-  );
-  aspect-ratio: 4 / 3;
-}

src/grid/SpotlightPortraitLayout.module.css

@@ -0,0 +1,56 @@
+/*
+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.
+*/
+
+.layer {
+  block-size: 100%;
+  display: grid;
+  --gap: 20px;
+  gap: var(--gap);
+  margin-inline: 0;
+  display: block;
+}
+
+.spotlight {
+  container: spotlight / size;
+  display: grid;
+  place-items: center;
+  inline-size: 100%;
+  aspect-ratio: 16 / 9;
+  margin-block-end: var(--cpd-space-4x);
+}
+
+.spotlight.withIndicators {
+  margin-block-end: calc(2 * var(--cpd-space-4x) + 2px);
+}
+
+.spotlight > .slot {
+  inline-size: 100%;
+  block-size: 100%;
+}
+
+.grid {
+  display: flex;
+  flex-wrap: wrap;
+  gap: var(--grid-gap);
+  justify-content: center;
+  align-content: start;
+  padding-inline: var(--grid-gap);
+}
+
+.grid > .slot {
+  inline-size: var(--grid-tile-width);
+  block-size: var(--grid-tile-height);
+}

src/grid/SpotlightPortraitLayout.tsx

@@ -18,46 +18,39 @@ import { CSSProperties, forwardRef, useMemo } from "react";
 import { useObservableEagerState } from "observable-hooks";
 import classNames from "classnames";
 
-import { CallLayout, GridTileModel, TileModel } from "./CallLayout";
-import { SpotlightLayout as SpotlightLayoutModel } from "../state/CallViewModel";
-import styles from "./SpotlightLayout.module.css";
+import {
+  CallLayout,
+  GridTileModel,
+  TileModel,
+  arrangeTiles,
+} from "./CallLayout";
+import { SpotlightPortraitLayout as SpotlightPortraitLayoutModel } from "../state/CallViewModel";
+import styles from "./SpotlightPortraitLayout.module.css";
 import { useReactiveState } from "../useReactiveState";
 
 interface GridCSSProperties extends CSSProperties {
-  "--grid-columns": number;
+  "--grid-gap": string;
+  "--grid-tile-width": string;
+  "--grid-tile-height": string;
 }
 
-interface Layout {
-  orientation: "portrait" | "landscape";
-  gridColumns: number;
-}
+export const makeSpotlightPortraitLayout: CallLayout<
+  SpotlightPortraitLayoutModel
+> = ({ minBounds }) => ({
+  scrollingOnTop: false,
 
-function getLayout(gridLength: number, width: number): Layout {
-  const orientation = width < 800 ? "portrait" : "landscape";
-  return {
-    orientation,
-    gridColumns:
-      orientation === "portrait"
-        ? Math.floor(width / 190)
-        : gridLength > 20
-          ? 2
-          : 1,
-  };
-}
-
-export const makeSpotlightLayout: CallLayout<SpotlightLayoutModel> = ({
-  minBounds,
-}) => ({
-  fixed: forwardRef(function SpotlightLayoutFixed({ model, Slot }, ref) {
+  fixed: forwardRef(function SpotlightPortraitLayoutFixed(
+    { model, Slot },
+    ref,
+  ) {
     const { width, height } = useObservableEagerState(minBounds);
-    const layout = getLayout(model.grid.length, width);
     const tileModel: TileModel = useMemo(
       () => ({
         type: "spotlight",
         vms: model.spotlight,
-        maximised: layout.orientation === "portrait",
+        maximised: true,
       }),
-      [model.spotlight, layout.orientation],
+      [model.spotlight],
     );
     const [generation] = useReactiveState<number>(
       (prev) => (prev === undefined ? 0 : prev + 1),
@@ -65,27 +58,24 @@ export const makeSpotlightLayout: CallLayout<SpotlightLayoutModel> = ({
     );
 
     return (
-      <div
-        ref={ref}
-        data-generation={generation}
-        data-orientation={layout.orientation}
-        className={styles.layer}
-        style={{ "--grid-columns": layout.gridColumns } as GridCSSProperties}
-      >
+      <div ref={ref} data-generation={generation} className={styles.layer}>
         <div className={styles.spotlight}>
           <Slot className={styles.slot} id="spotlight" model={tileModel} />
         </div>
-        <div className={styles.grid} />
       </div>
     );
   }),
 
-  scrolling: forwardRef(function SpotlightLayoutScrolling(
+  scrolling: forwardRef(function SpotlightPortraitLayoutScrolling(
     { model, Slot },
     ref,
   ) {
     const { width, height } = useObservableEagerState(minBounds);
-    const layout = getLayout(model.grid.length, width);
+    const { gap, tileWidth, tileHeight } = arrangeTiles(
+      width,
+      0,
+      model.grid.length,
+    );
     const tileModels: GridTileModel[] = useMemo(
       () => model.grid.map((vm) => ({ type: "grid", vm })),
       [model.grid],
@@ -99,9 +89,14 @@ export const makeSpotlightLayout: CallLayout<SpotlightLayoutModel> = ({
       <div
         ref={ref}
         data-generation={generation}
-        data-orientation={layout.orientation}
         className={styles.layer}
-        style={{ "--grid-columns": layout.gridColumns } as GridCSSProperties}
+        style={
+          {
+            "--grid-gap": `${gap}px`,
+            "--grid-tile-width": `${Math.floor(tileWidth)}px`,
+            "--grid-tile-height": `${Math.floor(tileHeight)}px`,
+          } as GridCSSProperties
+        }
       >
         <div
           className={classNames(styles.spotlight, {