rzerres/element-call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use more consistent names for layout types

Browse Source
This commit is contained in:
Robin
2024-07-18 11:24:18 -04:00
parent 0664f978e3
commit 4955535374
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/room/InCallView.tsx
View File

@@ -344,9 +344,9 @@ export const InCallView: FC<InCallViewProps> = ({
};
return {
grid: makeGridLayout(inputs),
"spotlight landscape": makeSpotlightLandscapeLayout(inputs),
"spotlight portrait": makeSpotlightPortraitLayout(inputs),
"spotlight expanded": makeSpotlightExpandedLayout(inputs),
"spotlight-landscape": makeSpotlightLandscapeLayout(inputs),
"spotlight-portrait": makeSpotlightPortraitLayout(inputs),
"spotlight-expanded": makeSpotlightExpandedLayout(inputs),
"one-on-one": makeOneOnOneLayout(inputs),
};
}, [gridBoundsObservable, spotlightAlignment, pipAlignment]);
@@ -392,7 +392,7 @@ export const InCallView: FC<InCallViewProps> = ({
);
// The grid tiles go *under* the spotlight in the portrait layout, but
// *over* the spotlight in the expanded layout
return layout.type === "spotlight expanded" ? (
return layout.type === "spotlight-expanded" ? (
<>
{fixedGrid}
{scrollingGrid}

14
src/state/CallViewModel.ts
View File

@@ -89,19 +89,19 @@ export interface GridLayout {
}
export interface SpotlightLandscapeLayout {
type: "spotlight landscape";
type: "spotlight-landscape";
spotlight: MediaViewModel[];
grid: UserMediaViewModel[];
}
export interface SpotlightPortraitLayout {
type: "spotlight portrait";
type: "spotlight-portrait";
spotlight: MediaViewModel[];
grid: UserMediaViewModel[];
}
export interface SpotlightExpandedLayout {
type: "spotlight expanded";
type: "spotlight-expanded";
spotlight: MediaViewModel[];
pip?: UserMediaViewModel;
}
@@ -583,7 +583,7 @@ export class CallViewModel extends ViewModel {
const spotlightLandscapeLayout = combineLatest(
[this.grid, this.spotlight],
(grid, spotlight): Layout => ({
type: "spotlight landscape",
type: "spotlight-landscape",
spotlight,
grid,
}),
@@ -591,7 +591,7 @@ export class CallViewModel extends ViewModel {
const spotlightExpandedLayout = combineLatest(
[this.spotlight, this.pip],
(spotlight, pip): Layout => ({
type: "spotlight expanded",
type: "spotlight-expanded",
spotlight,
pip: pip ?? undefined,
}),
@@ -641,7 +641,7 @@ export class CallViewModel extends ViewModel {
return combineLatest(
[this.grid, this.spotlight],
(grid, spotlight): Layout => ({
type: "spotlight portrait",
type: "spotlight-portrait",
spotlight,
grid,
}),
@@ -675,7 +675,7 @@ export class CallViewModel extends ViewModel {
);
public showSpeakingIndicators: Observable<boolean> = this.layout.pipe(
map((l) => l.type !== "one-on-one" && l.type !== "spotlight expanded"),
map((l) => l.type !== "one-on-one" && l.type !== "spotlight-expanded"),
distinctUntilChanged(),
shareReplay(1),
);