Wedge t3chguy's resizer prototype into the sublist

src/stores/room-list/ListLayout.ts

@@ -0,0 +1,65 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+const TILE_HEIGHT_PX = 34;
+
+interface ISerializedListLayout {
+    numTiles: number;
+}
+
+export class ListLayout {
+    private _n = 0;
+
+    constructor(public readonly tagId) {
+        const serialized = localStorage.getItem(this.key);
+        if (serialized) {
+            // We don't use the setters as they cause writes.
+            const parsed = <ISerializedListLayout>JSON.parse(serialized);
+            this._n = parsed.numTiles;
+        }
+    }
+
+    public get tileHeight(): number {
+        return TILE_HEIGHT_PX;
+    }
+
+    private get key(): string {
+        return `mx_sublist_layout_${this.tagId}_boxed`;
+    }
+
+    public get visibleTiles(): number {
+        return Math.max(this._n, this.minVisibleTiles);
+    }
+
+    public set visibleTiles(v: number) {
+        this._n = v;
+        localStorage.setItem(this.key, JSON.stringify(this.serialize()));
+    }
+
+    public get minVisibleTiles(): number {
+        return 3;
+    }
+
+    public tilesToPixels(n: number): number {
+        return n * this.tileHeight;
+    }
+
+    private serialize(): ISerializedListLayout {
+        return {
+            numTiles: this.visibleTiles,
+        };
+    }
+}

src/stores/room-list/RoomListLayoutStore.ts

@@ -1,85 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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.
-*/
-
-// TODO: Simplify the class load when we pick an approach for the list layout
-
-import { TagID } from "./models";
-
-const TILE_HEIGHT_PX = 34;
-
-export class LayoutUnit {
-    constructor(public readonly multiplier: number) {
-    }
-
-    public convert(val: number): number {
-        return Math.ceil(val * this.multiplier);
-    }
-
-    public normalizePixels(pixels: number): number {
-        return this.convert(Math.ceil(pixels / this.multiplier));
-    }
-
-    public forNumTiles(n: number): number {
-        const unitsPerTile = TILE_HEIGHT_PX / this.multiplier;
-        return unitsPerTile * n;
-    }
-}
-
-export const SMOOTH_RESIZE = new LayoutUnit(1);
-export const CHUNKED_RESIZE = new LayoutUnit(TILE_HEIGHT_PX);
-
-export class RoomListLayoutStore {
-    public unit: LayoutUnit = SMOOTH_RESIZE;
-    public minTilesShown = 1;
-
-    /**
-     * Minimum list height in pixels.
-     */
-    public get minListHeight(): number {
-        return this.unit.forNumTiles(this.minTilesShown);
-    }
-
-    private getStorageKey(tagId: TagID) {
-        return `mx_rlls_${tagId}_m_${this.unit.multiplier}`;
-    }
-
-    public setPixelHeight(tagId: TagID, pixels: number): void {
-        localStorage.setItem(this.getStorageKey(tagId), JSON.stringify({pixels}));
-    }
-
-    public getPixelHeight(tagId: TagID): number {
-        const stored = JSON.parse(localStorage.getItem(this.getStorageKey(tagId)));
-        let storedHeight = 0;
-        if (stored && stored.pixels) {
-            storedHeight = stored.pixels;
-        }
-        return this.unit.normalizePixels(Math.max(this.minListHeight, storedHeight));
-    }
-
-    // TODO: Remove helper functions for design iteration
-
-    public beSmooth() {
-        this.unit = SMOOTH_RESIZE;
-    }
-
-    public beChunked() {
-        this.unit = CHUNKED_RESIZE;
-    }
-
-    public beDifferent(multiplier: number) {
-        this.unit = new LayoutUnit(multiplier);
-    }
-}

src/stores/room-list/RoomListStore2.ts

@@ -29,7 +29,6 @@ import defaultDispatcher from "../../dispatcher/dispatcher";
 import { readReceiptChangeIsFor } from "../../utils/read-receipts";
 import { IFilterCondition } from "./filters/IFilterCondition";
 import { TagWatcher } from "./TagWatcher";
-import { RoomListLayoutStore } from "./RoomListLayoutStore";
 
 interface IState {
     tagsEnabled?: boolean;
@@ -45,8 +44,6 @@ interface IState {
 export const LISTS_UPDATE_EVENT = "lists_update";
 
 export class RoomListStore2 extends AsyncStore<ActionPayload> {
-    public readonly layout = new RoomListLayoutStore();
-
     private _matrixClient: MatrixClient;
     private initialListsGenerated = false;
     private enabled = false;