From 31c66a1128d13e51db85e27e07e9f26be0602d06 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 31 Jul 2020 13:24:17 +0100 Subject: [PATCH 1/8] Upgrade matrix-js-sdk to 8.0.1-rc.1 --- package.json | 2 +- yarn.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 0808f5aecd..a5bb9d522e 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "is-ip": "^2.0.0", "linkifyjs": "^2.1.9", "lodash": "^4.17.19", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "8.0.1-rc.1", "minimist": "^1.2.5", "pako": "^1.0.11", "parse5": "^5.1.1", diff --git a/yarn.lock b/yarn.lock index 47248af9cd..21a3aa19f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6435,9 +6435,10 @@ mathml-tag-names@^2.0.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "8.0.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c669382e12c8cd1d7d538421dfad4f50812af44d" +matrix-js-sdk@8.0.1-rc.1: + version "8.0.1-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1-rc.1.tgz#dbc2544f0058e2530e84a5d3b3e1abe06e395597" + integrity sha512-K3wOAf8lVLBx3Xhgb57JoVtFRVf52PHDnsnj00ST4kCAbnlJ3iuJ8OuOX16Bbk0fvV7RLJi/At4bm1Ld6PsIkQ== dependencies: "@babel/runtime" "^7.8.3" another-json "^0.2.0" From bc66ec851ab4d65ffe3f0cdc436ac2d38ca1c62f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 31 Jul 2020 13:30:45 +0100 Subject: [PATCH 2/8] Prepare changelog for v3.1.0-rc.1 --- CHANGELOG.md | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d944d58f36..721f005dd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,43 @@ +Changes in [3.1.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.1.0-rc.1) (2020-07-31) +============================================================================================================= +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.0.0...v3.1.0-rc.1) + + * Upgrade JS SDK to 8.0.1-rc.1 + * Update from Weblate + [\#5071](https://github.com/matrix-org/matrix-react-sdk/pull/5071) + * Add local echo for notifications in the new room list + [\#5065](https://github.com/matrix-org/matrix-react-sdk/pull/5065) + * Fix various small regressions in the room list's behaviour + [\#5070](https://github.com/matrix-org/matrix-react-sdk/pull/5070) + * Remove redundant lint dependencies + [\#5059](https://github.com/matrix-org/matrix-react-sdk/pull/5059) + * Fix key backup warning on soft logout page + [\#5069](https://github.com/matrix-org/matrix-react-sdk/pull/5069) + * Bump elliptic from 6.5.2 to 6.5.3 + [\#5066](https://github.com/matrix-org/matrix-react-sdk/pull/5066) + * Fix crash on logging in again after soft logout + [\#5068](https://github.com/matrix-org/matrix-react-sdk/pull/5068) + * Convert right_panel to TS + [\#5036](https://github.com/matrix-org/matrix-react-sdk/pull/5036) + * Remove all unreferenced images + [\#5063](https://github.com/matrix-org/matrix-react-sdk/pull/5063) + * Provide nicer error for no known servers error when accepting an invite + [\#5061](https://github.com/matrix-org/matrix-react-sdk/pull/5061) + * add logging for keytar/pickle key + [\#5057](https://github.com/matrix-org/matrix-react-sdk/pull/5057) + * Don't speak the outgoing message if it is in the Sending state. + [\#4075](https://github.com/matrix-org/matrix-react-sdk/pull/4075) + * Remove poorly contrasted "dark style" heading in Room Preview Bar + [\#5052](https://github.com/matrix-org/matrix-react-sdk/pull/5052) + * Fix Query Matcher regression with certain unhomoglyph'd characters + [\#5050](https://github.com/matrix-org/matrix-react-sdk/pull/5050) + * Fix handlebar interaction + [\#4989](https://github.com/matrix-org/matrix-react-sdk/pull/4989) + * Minor improvements to filtering performance + [\#5054](https://github.com/matrix-org/matrix-react-sdk/pull/5054) + * Fix TextWithTooltip "leaking" tooltip wrappers + [\#5055](https://github.com/matrix-org/matrix-react-sdk/pull/5055) + Changes in [3.0.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.0.0) (2020-07-27) =================================================================================================== [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.10.1...v3.0.0) From d08a08daeb6cb50d3b0de7f7001a34f82ace6223 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 31 Jul 2020 13:30:45 +0100 Subject: [PATCH 3/8] v3.1.0-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a5bb9d522e..f23163248c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.0.0", + "version": "3.1.0-rc.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { From 7b7105f3f7b4c46dab5a148af7b170dc70347365 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 31 Jul 2020 16:26:03 -0600 Subject: [PATCH 4/8] Handle tag changes in sticky room updates Fixes https://github.com/vector-im/element-web/issues/14848 When we're filtering the sticky room will be excluded from the filtered set, and thus won't even appear in the `getOrderedRoomsWithoutSticky()` result. Further, we will likely have to update the position ourselves to ensure the sticky room can be placed appropriately in the list. --- src/stores/room-list/algorithms/Algorithm.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts index 2654a8b460..f1a7ab1613 100644 --- a/src/stores/room-list/algorithms/Algorithm.ts +++ b/src/stores/room-list/algorithms/Algorithm.ts @@ -212,7 +212,18 @@ export class Algorithm extends EventEmitter { // We specifically do NOT use the ordered rooms set as it contains the sticky room, which // means we'll be off by 1 when the user is switching rooms. This leads to visual jumping // when the user is moving south in the list (not north, because of math). - let position = this.getOrderedRoomsWithoutSticky()[tag].indexOf(val); + const tagList = this.getOrderedRoomsWithoutSticky()[tag] || []; // can be null if filtering + let position = tagList.indexOf(val); + + // We do want to see if a tag change happened though - if this did happen then we'll want + // to force the position to zero (top) to ensure we can properly handle it. + const wasSticky = this._lastStickyRoom.room ? this._lastStickyRoom.room.roomId === val.roomId : false; + if (this._lastStickyRoom.tag && tag !== this._lastStickyRoom.tag && wasSticky && position < 0) { + console.warn(`Sticky room ${val.roomId} changed tags during sticky room handling`); + position = 0; + } + + // Sanity check the position to make sure the room is qualified for being sticky if (position < 0) throw new Error(`${val.roomId} does not appear to be known and cannot be sticky`); // 🐉 Here be dragons. From 1e868a256dc8ea572e0a7a6cda588d214f214755 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 5 Aug 2020 14:32:02 +0100 Subject: [PATCH 5/8] Fix room list scrolling in Safari This sets `flex-basis` properly in Safari so the room list is scrollable. Fixes https://github.com/vector-im/element-web/issues/14877 --- res/css/structures/_LeftPanel.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss index db531cf088..354dc87b8f 100644 --- a/res/css/structures/_LeftPanel.scss +++ b/res/css/structures/_LeftPanel.scss @@ -137,6 +137,7 @@ $tagPanelWidth: 56px; // only applies in this file, used for calculations .mx_LeftPanel_roomListWrapper { overflow: hidden; margin-top: 10px; // so we're not up against the search/filter + flex: 1 0 0; // needed in Safari to properly set flex-basis &.mx_LeftPanel_roomListWrapper_stickyBottom { padding-bottom: 32px; From 57814a40c1ec99cba18f9cb29c0ab9f88b3abbc6 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 5 Aug 2020 15:50:03 +0100 Subject: [PATCH 6/8] Upgrade matrix-js-sdk to 8.0.1 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f23163248c..12039b986e 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "is-ip": "^2.0.0", "linkifyjs": "^2.1.9", "lodash": "^4.17.19", - "matrix-js-sdk": "8.0.1-rc.1", + "matrix-js-sdk": "8.0.1", "minimist": "^1.2.5", "pako": "^1.0.11", "parse5": "^5.1.1", diff --git a/yarn.lock b/yarn.lock index 21a3aa19f6..8d15ba01d0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6435,10 +6435,10 @@ mathml-tag-names@^2.0.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -matrix-js-sdk@8.0.1-rc.1: - version "8.0.1-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1-rc.1.tgz#dbc2544f0058e2530e84a5d3b3e1abe06e395597" - integrity sha512-K3wOAf8lVLBx3Xhgb57JoVtFRVf52PHDnsnj00ST4kCAbnlJ3iuJ8OuOX16Bbk0fvV7RLJi/At4bm1Ld6PsIkQ== +matrix-js-sdk@8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1.tgz#dafd41023671249c01e4278e7103c93200b34e5e" + integrity sha512-DT2YjWi8l2eHyNTKZOhBkN/EakIMDDEglSCg+RWY4QzFaXYlSwfwfzzCujjtq1hxVSKim8NC7KqxgNetOiBegA== dependencies: "@babel/runtime" "^7.8.3" another-json "^0.2.0" From 299aa3ed98add307a1526c8ab5c9dc289d94a6a9 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 5 Aug 2020 16:05:29 +0100 Subject: [PATCH 7/8] Prepare changelog for v3.1.0 --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 721f005dd9..468d7d211a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +Changes in [3.1.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.1.0) (2020-08-05) +=================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.1.0-rc.1...v3.1.0) + + * Upgrade JS SDK to 8.0.1 + * Fix room list scrolling in Safari + [\#5091](https://github.com/matrix-org/matrix-react-sdk/pull/5091) + * Add null guard in InviteDialog + [\#5084](https://github.com/matrix-org/matrix-react-sdk/pull/5084) + * Add null guard in InviteDialog + [\#5082](https://github.com/matrix-org/matrix-react-sdk/pull/5082) + * Handle tag changes in sticky room updates + [\#5080](https://github.com/matrix-org/matrix-react-sdk/pull/5080) + Changes in [3.1.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.1.0-rc.1) (2020-07-31) ============================================================================================================= [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.0.0...v3.1.0-rc.1) From f8ed635fbfaa79e91acb96dee1922714ba9ccfab Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 5 Aug 2020 16:05:30 +0100 Subject: [PATCH 8/8] v3.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 12039b986e..50ddf84948 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.1.0-rc.1", + "version": "3.1.0", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": {