Apply prettier formatting
This commit is contained in:
@@ -41,7 +41,7 @@ export enum Container {
|
||||
// changes needed", though this may change in the future.
|
||||
Right = "right",
|
||||
|
||||
Center = "center"
|
||||
Center = "center",
|
||||
}
|
||||
|
||||
export interface IStoredLayout {
|
||||
@@ -210,7 +210,7 @@ export class WidgetLayoutStore extends ReadyWatchingStore {
|
||||
const manualContainer = userLayout?.widgets?.[widget.id]?.container;
|
||||
const isLegacyPinned = !!legacyPinned?.[widget.id];
|
||||
const defaultContainer = WidgetType.JITSI.matches(widget.type) ? Container.Top : Container.Right;
|
||||
if ((manualContainer) ? manualContainer === Container.Center : stateContainer === Container.Center) {
|
||||
if (manualContainer ? manualContainer === Container.Center : stateContainer === Container.Center) {
|
||||
if (centerWidgets.length) {
|
||||
console.error("Tried to push a second widget into the center container");
|
||||
} else {
|
||||
@@ -221,7 +221,7 @@ export class WidgetLayoutStore extends ReadyWatchingStore {
|
||||
}
|
||||
let targetContainer = defaultContainer;
|
||||
if (!!manualContainer || !!stateContainer) {
|
||||
targetContainer = (manualContainer) ? manualContainer : stateContainer;
|
||||
targetContainer = manualContainer ? manualContainer : stateContainer;
|
||||
} else if (isLegacyPinned && !stateContainer) {
|
||||
// Special legacy case
|
||||
targetContainer = Container.Top;
|
||||
@@ -299,7 +299,7 @@ export class WidgetLayoutStore extends ReadyWatchingStore {
|
||||
// When we're over, we try to scale all the widgets within range first.
|
||||
// We clamp values to try and keep ourselves sane and within range.
|
||||
for (let i = 0; i < widths.length; i++) {
|
||||
widths[i] = clamp(widths[i] - (difference / widths.length), MIN_WIDGET_WIDTH_PCT, 100);
|
||||
widths[i] = clamp(widths[i] - difference / widths.length, MIN_WIDGET_WIDTH_PCT, 100);
|
||||
}
|
||||
|
||||
// If we're still over, find the widgets which have more width than the minimum
|
||||
@@ -311,9 +311,9 @@ export class WidgetLayoutStore extends ReadyWatchingStore {
|
||||
const toReclaim = sum(...widths) - 100;
|
||||
if (toReclaim > 0) {
|
||||
const largeIndices = widths
|
||||
.map((v, i) => ([i, v]))
|
||||
.filter(p => p[1] > MIN_WIDGET_WIDTH_PCT)
|
||||
.map(p => p[0]);
|
||||
.map((v, i) => [i, v])
|
||||
.filter((p) => p[1] > MIN_WIDGET_WIDTH_PCT)
|
||||
.map((p) => p[0]);
|
||||
for (const idx of largeIndices) {
|
||||
widths[idx] -= toReclaim / largeIndices.length;
|
||||
}
|
||||
@@ -352,18 +352,22 @@ export class WidgetLayoutStore extends ReadyWatchingStore {
|
||||
}
|
||||
|
||||
public isInContainer(room: Optional<Room>, widget: IApp, container: Container): boolean {
|
||||
return this.getContainerWidgets(room, container).some(w => w.id === widget.id);
|
||||
return this.getContainerWidgets(room, container).some((w) => w.id === widget.id);
|
||||
}
|
||||
|
||||
public canAddToContainer(room: Room, container: Container): boolean {
|
||||
switch (container) {
|
||||
case Container.Top: return this.getContainerWidgets(room, container).length < MAX_PINNED;
|
||||
case Container.Right: return this.getContainerWidgets(room, container).length < MAX_PINNED;
|
||||
case Container.Center: return this.getContainerWidgets(room, container).length < 1;
|
||||
case Container.Top:
|
||||
return this.getContainerWidgets(room, container).length < MAX_PINNED;
|
||||
case Container.Right:
|
||||
return this.getContainerWidgets(room, container).length < MAX_PINNED;
|
||||
case Container.Center:
|
||||
return this.getContainerWidgets(room, container).length < 1;
|
||||
}
|
||||
}
|
||||
|
||||
public getResizerDistributions(room: Room, container: Container): string[] { // yes, string.
|
||||
public getResizerDistributions(room: Room, container: Container): string[] {
|
||||
// yes, string.
|
||||
let distributions = this.byRoom[room.roomId]?.[container]?.distributions;
|
||||
if (!distributions || distributions.length < 2) return [];
|
||||
|
||||
@@ -373,13 +377,13 @@ export class WidgetLayoutStore extends ReadyWatchingStore {
|
||||
|
||||
if (distributions.length === 2) distributions = [distributions[0]];
|
||||
if (distributions.length === 3) distributions = [distributions[0], distributions[2]];
|
||||
return distributions.map(d => `${d.toFixed(1)}%`); // actual percents - these are decoded later
|
||||
return distributions.map((d) => `${d.toFixed(1)}%`); // actual percents - these are decoded later
|
||||
}
|
||||
|
||||
public setResizerDistributions(room: Room, container: Container, distributions: string[]) {
|
||||
if (container !== Container.Top) return; // ignore - not relevant
|
||||
|
||||
const numbers = distributions.map(d => Number(Number(d.substring(0, d.length - 1)).toFixed(1)));
|
||||
const numbers = distributions.map((d) => Number(Number(d.substring(0, d.length - 1)).toFixed(1)));
|
||||
const widgets = this.getContainerWidgets(room, container);
|
||||
|
||||
// From getResizerDistributions, we need to fill in the middle size if applicable.
|
||||
@@ -420,7 +424,7 @@ export class WidgetLayoutStore extends ReadyWatchingStore {
|
||||
|
||||
public moveWithinContainer(room: Room, container: Container, widget: IApp, delta: number) {
|
||||
const widgets = arrayFastClone(this.getContainerWidgets(room, container));
|
||||
const currentIdx = widgets.findIndex(w => w.id === widget.id);
|
||||
const currentIdx = widgets.findIndex((w) => w.id === widget.id);
|
||||
if (currentIdx < 0) return; // no change needed
|
||||
|
||||
widgets.splice(currentIdx, 1); // remove existing widget
|
||||
@@ -494,7 +498,7 @@ export class WidgetLayoutStore extends ReadyWatchingStore {
|
||||
evContent.widgets[widget.id] = { container };
|
||||
if (container === Container.Top) {
|
||||
const containerWidgets = this.getContainerWidgets(room, container);
|
||||
const idx = containerWidgets.findIndex(w => w.id === widget.id);
|
||||
const idx = containerWidgets.findIndex((w) => w.id === widget.id);
|
||||
const widths = this.byRoom[room.roomId]?.[container]?.distributions;
|
||||
const height = this.byRoom[room.roomId]?.[container]?.height;
|
||||
evContent.widgets[widget.id] = {
|
||||
@@ -527,7 +531,7 @@ export class WidgetLayoutStore extends ReadyWatchingStore {
|
||||
const allWidgets = this.getAllWidgets(room);
|
||||
for (const [widget, container] of allWidgets) {
|
||||
const containerWidgets = this.getContainerWidgets(room, container);
|
||||
const idx = containerWidgets.findIndex(w => w.id === widget.id);
|
||||
const idx = containerWidgets.findIndex((w) => w.id === widget.id);
|
||||
const widths = this.byRoom[room.roomId]?.[container]?.distributions;
|
||||
if (!newLayout[widget.id]) {
|
||||
newLayout[widget.id] = {
|
||||
|
||||
Reference in New Issue
Block a user