Merge branch 'develop' into travis/room-list/hover-state

src/stores/room-list/ListLayout.ts

@@ -64,7 +64,24 @@ export class ListLayout {
     }
 
     public get minVisibleTiles(): number {
-        return 3;
+        // the .65 comes from the CSS where the show more button is
+        // mathematically 65% of a tile when floating.
+        return 4.65;
+    }
+
+    public calculateTilesToPixelsMin(maxTiles: number, n: number, possiblePadding: number): number {
+        // Only apply the padding if we're about to use maxTiles as we need to
+        // plan for the padding. If we're using n, the padding is already accounted
+        // for by the resizing stuff.
+        let padding = 0;
+        if (maxTiles < n) {
+            padding = possiblePadding;
+        }
+        return this.tilesToPixels(Math.min(maxTiles, n)) + padding;
+    }
+
+    public tilesToPixelsWithPadding(n: number, padding: number): number {
+        return this.tilesToPixels(n) + padding;
     }
 
     public tilesToPixels(n: number): number {

src/stores/room-list/RoomListStoreTempProxy.ts

@@ -31,11 +31,14 @@ export class RoomListStoreTempProxy {
         return SettingsStore.isFeatureEnabled("feature_new_room_list");
     }
 
-    public static addListener(handler: () => void) {
+    public static addListener(handler: () => void): RoomListStoreTempToken {
         if (RoomListStoreTempProxy.isUsingNewStore()) {
-            return RoomListStore.instance.on(UPDATE_EVENT, handler);
+            const offFn = () => RoomListStore.instance.off(UPDATE_EVENT, handler);
+            RoomListStore.instance.on(UPDATE_EVENT, handler);
+            return new RoomListStoreTempToken(offFn);
         } else {
-            return OldRoomListStore.addListener(handler);
+            const token = OldRoomListStore.addListener(handler);
+            return new RoomListStoreTempToken(() => token.remove());
         }
     }
 
@@ -47,3 +50,12 @@ export class RoomListStoreTempProxy {
         }
     }
 }
+
+export class RoomListStoreTempToken {
+    constructor(private offFn: () => void) {
+    }
+
+    public remove(): void {
+        this.offFn();
+    }
+}

src/stores/room-list/TagWatcher.ts

@@ -74,6 +74,11 @@ export class TagWatcher {
                 this.store.removeFilter(filter);
             }
 
+            // Destroy any and all old filter conditions to prevent resource leaks
+            for (const filter of this.filters.values()) {
+                filter.destroy();
+            }
+
             this.filters = newFilters;
         }
     };