Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations

src/utils/MultiLock.ts

@@ -1,30 +0,0 @@
-/*
-Copyright 2021 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.
-*/
-
-import { EnhancedMap } from "./maps";
-import AwaitLock from "await-lock";
-
-export type DoneFn = () => void;
-
-export class MultiLock {
-    private locks = new EnhancedMap<string, AwaitLock>();
-
-    public async acquire(key: string): Promise<DoneFn> {
-        const lock = this.locks.getOrCreate(key, new AwaitLock());
-        await lock.acquireAsync();
-        return () => lock.release();
-    }
-}

src/utils/ResizeNotifier.js

@@ -74,12 +74,6 @@ export default class ResizeNotifier extends EventEmitter {
 
     // can be called in quick succession
     notifyWindowResized() {
-        // no need to throttle this one,
-        // also it could make scrollbars appear for
-        // a split second when the room list manual layout is now
-        // taller than the available space
-        this.emit("leftPanelResized");
-
         this._updateMiddlePanel();
     }
 }

src/utils/promise.ts

@@ -51,24 +51,6 @@ export function defer<T>(): IDeferred<T> {
     return {resolve, reject, promise};
 }
 
-// Promise.allSettled polyfill until browser support is stable in Firefox
-export function allSettled<T>(promises: Promise<T>[]): Promise<Array<ISettledFulfilled<T> | ISettledRejected>> {
-    if (Promise.allSettled) {
-        return Promise.allSettled<T>(promises);
-    }
-
-    // @ts-ignore - typescript isn't smart enough to see the disjoint here
-    return Promise.all(promises.map((promise) => {
-        return promise.then(value => ({
-            status: "fulfilled",
-            value,
-        })).catch(reason => ({
-            status: "rejected",
-            reason,
-        }));
-    }));
-}
-
 // Helper method to retry a Promise a given number of times or until a predicate fails
 export async function retry<T, E extends Error>(fn: () => Promise<T>, num: number, predicate?: (e: E) => boolean) {
     let lastErr: E;