From 620590bd905ef60ed4e80528ecb7f877d7de3370 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 18 Mar 2019 16:24:56 +0000
Subject: [PATCH 1/4] Update yarn.lock

Which wasn't updated at release time
---
 yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index d1da66b82b..bca7997c18 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4371,10 +4371,10 @@ math-random@^1.0.1:
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
   integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
 
-matrix-js-sdk@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.0.1.tgz#783efc501e2521997869cfe8e719134d9e10a45c"
-  integrity sha512-+ErnXHfkxOoRHUYbY/R+2ZHvPKdPCx/eoYjb2Oy7L9pBqCNllI0WRVsro6oqRJQs0krVP8blyIjWOJynWSw96g==
+matrix-js-sdk@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.0.2.tgz#482d8d2076c7565cf7354722e96c9971e372182a"
+  integrity sha512-4WCBJFSoOLelHi7IUAcVxPQF+gTc/i9NUKZ77qwUfcZVED8VKTIyWZnwpeLgocK5gAOJV9fkAyO5mny9SkZaGg==
   dependencies:
     another-json "^0.2.0"
     babel-runtime "^6.26.0"

From 817fe1a520d90a778d196c34257bcd3d38a24dc2 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 21 Mar 2019 11:01:47 +0100
Subject: [PATCH 2/4] disable typing notifs jumping prevention for now

---
 src/components/structures/ScrollPanel.js | 29 ++----------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index ee4045c91e..b88bd6d98e 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -216,8 +216,6 @@ module.exports = React.createClass({
             this._lastSetScroll = undefined;
         }
 
-        this._checkBlockShrinking();
-
         this.props.onScroll(ev);
 
         this.checkFillState();
@@ -234,7 +232,6 @@ module.exports = React.createClass({
     // where it ought to be, and set off pagination requests if necessary.
     checkScroll: function() {
         this._restoreSavedScrollState();
-        this._checkBlockShrinking();
         this.checkFillState();
     },
 
@@ -691,36 +688,14 @@ module.exports = React.createClass({
      * jumping when the typing indicator gets replaced by a smaller message.
      */
     blockShrinking: function() {
-        const messageList = this.refs.itemlist;
-        if (messageList) {
-            const currentHeight = messageList.clientHeight;
-            messageList.style.minHeight = `${currentHeight}px`;
-        }
+        // Disabled for now because of https://github.com/vector-im/riot-web/issues/9205
     },
 
     /**
      * Clear the previously set min height
      */
     clearBlockShrinking: function() {
-        const messageList = this.refs.itemlist;
-        if (messageList) {
-            messageList.style.minHeight = null;
-        }
-    },
-
-    _checkBlockShrinking: function() {
-        const sn = this._getScrollNode();
-        const scrollState = this.scrollState;
-        if (!scrollState.stuckAtBottom) {
-            const spaceBelowViewport = sn.scrollHeight - (sn.scrollTop + sn.clientHeight);
-            // only if we've scrolled up 200px from the bottom
-            // should we clear the min-height used by the typing notifications,
-            // otherwise we might still see it jump as the whitespace disappears
-            // when scrolling up from the bottom
-            if (spaceBelowViewport >= 200) {
-                this.clearBlockShrinking();
-            }
-        }
+        // Disabled for now because of https://github.com/vector-im/riot-web/issues/9205
     },
 
     render: function() {

From 3ab205b64d38be88d7e632acfac469c085a68e37 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 21 Mar 2019 11:24:01 +0100
Subject: [PATCH 3/4] Prepare changelog for v1.0.5

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76852d6575..b3313abacc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [1.0.5](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.0.5) (2019-03-21)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.0.4...v1.0.5)
+
+ * Hotfix: disable typing notifs jumping prevention for now
+   [\#2811](https://github.com/matrix-org/matrix-react-sdk/pull/2811)
+
 Changes in [1.0.4](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v1.0.4) (2019-03-18)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v1.0.4-rc.1...v1.0.4)

From a483352798c2d3b0b4a48ce548d593658b5aadf4 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 21 Mar 2019 11:27:29 +0100
Subject: [PATCH 4/4] v1.0.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ee423d80d3..506802e458 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {