Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering

2021-05-07 00:07:51 +03:00
parent 330f222dd1 d531e3d59f
commit cc919452b5
76 changed files with 2187 additions and 581 deletions
--- a/src/components/views/elements/ImageView.tsx
+++ b/src/components/views/elements/ImageView.tsx
@@ -114,6 +114,8 @@ export default class ImageView extends React.Component<IProps, IState> {

    componentWillUnmount() {
        this.focusLock.current.removeEventListener('wheel', this.onWheel);
+        window.removeEventListener("resize", this.calculateZoom);
+        this.image.current.removeEventListener("load", this.calculateZoom);
    }

    private calculateZoom = () => {