From 3c3438f000fd8769765f5c7021b3929c4aced84a Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 5 Sep 2023 16:56:48 +0100 Subject: [PATCH 01/11] Upgrade matrix-js-sdk to 28.1.0-rc.1 --- package.json | 2 +- yarn.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 99bc0c0db9..adeffa3dd0 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "maplibre-gl": "^2.0.0", "matrix-encrypt-attachment": "^1.0.3", "matrix-events-sdk": "0.0.1", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "28.1.0-rc.1", "matrix-widget-api": "^1.5.0", "memoize-one": "^6.0.0", "minimist": "^1.2.5", diff --git a/yarn.lock b/yarn.lock index 8b39fb9820..c99a2ba1e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7473,9 +7473,10 @@ matrix-events-sdk@0.0.1: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd" integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "28.0.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/4c00b410466b855e178ed47217dac6b31536a7bf" +matrix-js-sdk@28.1.0-rc.1: + version "28.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-28.1.0-rc.1.tgz#b4aabc01087b7301f23ba3f80fcefcd8434d3591" + integrity sha512-lNzZ10sQW6SxZdLUFQMKYk9/vY1DbbSaOLG68NCOxRgund9Ef+KQWmp3AYyiDvKr5PTQWSIaJRgwZW3+AsV3Rg== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/matrix-sdk-crypto-wasm" "^1.2.1" From de8ef980cb00486d70ab9bde25674c2e0663d4ac Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 5 Sep 2023 16:58:58 +0100 Subject: [PATCH 02/11] Prepare changelog for v3.80.0-rc.1 --- CHANGELOG.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b588020eb7..241ee65d62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,30 @@ +Changes in [3.80.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.80.0-rc.1) (2023-09-05) +=============================================================================================================== + +## ✨ Features + * Allow creating public knock rooms ([\#11481](https://github.com/matrix-org/matrix-react-sdk/pull/11481)). Contributed by @charlynguyen. + * Render custom images in reactions according to MSC4027 ([\#11087](https://github.com/matrix-org/matrix-react-sdk/pull/11087)). Contributed by @sumnerevans. + * Introduce room knocks bar ([\#11475](https://github.com/matrix-org/matrix-react-sdk/pull/11475)). Contributed by @charlynguyen. + * Room header UI updates ([\#11507](https://github.com/matrix-org/matrix-react-sdk/pull/11507)). Fixes vector-im/element-web#25892. + * Remove green "verified" bar for encrypted events ([\#11496](https://github.com/matrix-org/matrix-react-sdk/pull/11496)). + * Update member count on room summary update ([\#11488](https://github.com/matrix-org/matrix-react-sdk/pull/11488)). + * Support for E2EE in Element Call ([\#11492](https://github.com/matrix-org/matrix-react-sdk/pull/11492)). + * Allow requesting to join knock rooms via spotlight ([\#11482](https://github.com/matrix-org/matrix-react-sdk/pull/11482)). Contributed by @charlynguyen. + * Lock out the first tab if Element is opened in a second tab. ([\#11425](https://github.com/matrix-org/matrix-react-sdk/pull/11425)). Fixes vector-im/element-web#25157. + * Change avatar to use Compound implementation ([\#11448](https://github.com/matrix-org/matrix-react-sdk/pull/11448)). + +## 🐛 Bug Fixes + * Use RoomStateEvent.Update for knocks ([\#11516](https://github.com/matrix-org/matrix-react-sdk/pull/11516)). Contributed by @charlynguyen. + * Prevent event propagation when clicking icon buttons ([\#11515](https://github.com/matrix-org/matrix-react-sdk/pull/11515)). + * Only display RoomKnocksBar when feature flag is enabled ([\#11513](https://github.com/matrix-org/matrix-react-sdk/pull/11513)). Contributed by @andybalaam. + * Fix avatars of knock members for people tab of room settings ([\#11506](https://github.com/matrix-org/matrix-react-sdk/pull/11506)). Fixes vector-im/element-web#26083. Contributed by @charlynguyen. + * Fixes read receipt avatar offset ([\#11483](https://github.com/matrix-org/matrix-react-sdk/pull/11483)). Fixes vector-im/element-web#26067, vector-im/element-web#26064 vector-im/element-web#26059 and vector-im/element-web#26061. + * Fix avatar defects ([\#11473](https://github.com/matrix-org/matrix-react-sdk/pull/11473)). Fixes vector-im/element-web#26051 and vector-im/element-web#26046. + * Fix consistent avatar output for Percy ([\#11472](https://github.com/matrix-org/matrix-react-sdk/pull/11472)). Fixes vector-im/element-web#26049 and vector-im/element-web#26052. + * Fix colour of avatar and colour matching with username ([\#11470](https://github.com/matrix-org/matrix-react-sdk/pull/11470)). Fixes vector-im/element-web#26042. + * Fix incompatibility of Soft Logout with Element-R ([\#11468](https://github.com/matrix-org/matrix-react-sdk/pull/11468)). + * Fix instances of double translation and guard translation calls using typescript ([\#11443](https://github.com/matrix-org/matrix-react-sdk/pull/11443)). + Changes in [3.79.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.79.0) (2023-08-29) ===================================================================================================== From 87272fc3c6a5c7a69cea0bb8f05ed28d025a037a Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 5 Sep 2023 16:59:00 +0100 Subject: [PATCH 03/11] v3.80.0-rc.1 --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index adeffa3dd0..924867e8d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.79.0", + "version": "3.80.0-rc.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { @@ -23,7 +23,7 @@ "package.json", ".stylelintrc.js" ], - "main": "./src/index.ts", + "main": "./lib/index.ts", "matrix_src_main": "./src/index.ts", "matrix_lib_main": "./lib/index.ts", "matrix_lib_typings": "./lib/index.d.ts", @@ -230,5 +230,6 @@ "outputDirectory": "coverage", "outputName": "jest-sonar-report.xml", "relativePaths": true - } + }, + "typings": "./lib/index.d.ts" } From 708537d615a599016fabb09a38731715993b352e Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Thu, 7 Sep 2023 09:36:42 +0200 Subject: [PATCH 04/11] [Backport staging] Fix EventTile avatars being rendered with a size of 0 instead of hidden (#11577) Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/rooms/EventTile.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx index 986eafcca9..77fb270768 100644 --- a/src/components/views/rooms/EventTile.tsx +++ b/src/components/views/rooms/EventTile.tsx @@ -1003,7 +1003,7 @@ export class UnwrappedEventTile extends React.Component let avatar: JSX.Element | null = null; let sender: JSX.Element | null = null; - let avatarSize: string; + let avatarSize: string | null; let needsSenderProfile: boolean; if (isRenderingNotification) { @@ -1021,7 +1021,7 @@ export class UnwrappedEventTile extends React.Component avatarSize = "32px"; needsSenderProfile = true; } else if (eventType === EventType.RoomCreate || isBubbleMessage) { - avatarSize = "0"; + avatarSize = null; needsSenderProfile = false; } else if (this.props.layout == Layout.IRC) { avatarSize = "14px"; @@ -1032,14 +1032,14 @@ export class UnwrappedEventTile extends React.Component ElementCall.CALL_EVENT_TYPE.matches(eventType) ) { // no avatar or sender profile for continuation messages and call tiles - avatarSize = "0"; + avatarSize = null; needsSenderProfile = false; } else { avatarSize = "30px"; needsSenderProfile = true; } - if (this.props.mxEvent.sender && avatarSize) { + if (this.props.mxEvent.sender && avatarSize !== null) { let member: RoomMember | null = null; // set member to receiver (target) if it is a 3PID invite // so that the correct avatar is shown as the text is From 9834686e90e645cabbe157d2a884ce14c3261fd1 Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Fri, 8 Sep 2023 12:47:50 +0200 Subject: [PATCH 05/11] [Backport staging] Fix avatars in public room & space search being flex shrunk (#11591) Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> --- res/css/views/dialogs/_SpotlightDialog.pcss | 1 + src/components/views/dialogs/spotlight/SpotlightDialog.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/res/css/views/dialogs/_SpotlightDialog.pcss b/res/css/views/dialogs/_SpotlightDialog.pcss index 5c2f5b6717..b7198012ab 100644 --- a/res/css/views/dialogs/_SpotlightDialog.pcss +++ b/res/css/views/dialogs/_SpotlightDialog.pcss @@ -277,6 +277,7 @@ limitations under the License. margin-right: $spacing-8; width: 24px; height: 24px; + flex-shrink: 0; .mx_BaseAvatar { width: inherit; diff --git a/src/components/views/dialogs/spotlight/SpotlightDialog.tsx b/src/components/views/dialogs/spotlight/SpotlightDialog.tsx index bcb89c63ef..d0b69cfaf5 100644 --- a/src/components/views/dialogs/spotlight/SpotlightDialog.tsx +++ b/src/components/views/dialogs/spotlight/SpotlightDialog.tsx @@ -563,7 +563,7 @@ const SpotlightDialog: React.FC = ({ initialText = "", initialFilter = n }; let otherSearchesSection: JSX.Element | undefined; - if (trimmedQuery || filter !== Filter.PublicRooms) { + if (trimmedQuery || (filter !== Filter.PublicRooms && filter !== Filter.PublicSpaces)) { otherSearchesSection = (
Date: Fri, 8 Sep 2023 12:56:59 +0200 Subject: [PATCH 06/11] [Backport staging] Fix vertical alignment of default avatar font (#11592) Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> --- res/css/views/avatars/_BaseAvatar.pcss | 3 ++- res/css/views/right_panel/_UserInfo.pcss | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/res/css/views/avatars/_BaseAvatar.pcss b/res/css/views/avatars/_BaseAvatar.pcss index dd643ebfb5..8545fa128a 100644 --- a/res/css/views/avatars/_BaseAvatar.pcss +++ b/res/css/views/avatars/_BaseAvatar.pcss @@ -24,8 +24,9 @@ limitations under the License. } button.mx_BaseAvatar { - /* The user agent stylesheet overrides the font-size in this scenario + /* The user agent stylesheet overrides the font-size & line-height in this scenario And that breaks the alignment, emojis, and all sorts of things */ font-size: inherit; + line-height: inherit; } diff --git a/res/css/views/right_panel/_UserInfo.pcss b/res/css/views/right_panel/_UserInfo.pcss index c0b8f16c6b..13e64cb903 100644 --- a/res/css/views/right_panel/_UserInfo.pcss +++ b/res/css/views/right_panel/_UserInfo.pcss @@ -99,6 +99,11 @@ limitations under the License. margin: 0 auto; transition: 0.5s; + .mx_BaseAvatar { + /* Override the calculated font-size so that the letter isn't tiny */ + font-size: 4rem; + } + .mx_BaseAvatar, .mx_BaseAvatar img { width: 100%; @@ -250,6 +255,11 @@ limitations under the License. max-width: 72px; margin: 0 auto; } + + .mx_BaseAvatar { + /* Override the calculated font-size so that the letter isn't tiny */ + font-size: 2rem; + } } } } From 1df268e017c84207502f488d03e3d6d8c438413c Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Fri, 8 Sep 2023 11:58:23 +0100 Subject: [PATCH 07/11] Prepare changelog for v3.80.0-rc.2 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 241ee65d62..492f4f3699 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +Changes in [3.80.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.80.0-rc.2) (2023-09-08) +=============================================================================================================== + +## 🐛 Bug Fixes + * Fix vertical alignment of default avatar font ([\#11582](https://github.com/matrix-org/matrix-react-sdk/pull/11582)). Fixes vector-im/element-web#26081. + * Fix avatars in public room & space search being flex shrunk ([\#11580](https://github.com/matrix-org/matrix-react-sdk/pull/11580)). Fixes vector-im/element-web#26133. + * Fix EventTile avatars being rendered with a size of 0 instead of hidden ([\#11558](https://github.com/matrix-org/matrix-react-sdk/pull/11558)). Fixes vector-im/element-web#26075. + Changes in [3.80.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.80.0-rc.1) (2023-09-05) =============================================================================================================== From ffbc52aa61d29a85ee50eb03c885e6abebb261de Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Fri, 8 Sep 2023 11:58:24 +0100 Subject: [PATCH 08/11] v3.80.0-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 924867e8d5..b98408cb38 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.80.0-rc.1", + "version": "3.80.0-rc.2", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { From 5cd6570a5d80114e9514cc553ecf8d3e8448abb3 Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 12 Sep 2023 16:56:34 +0100 Subject: [PATCH 09/11] Upgrade matrix-js-sdk to 28.1.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b98408cb38..509c0a6d67 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "maplibre-gl": "^2.0.0", "matrix-encrypt-attachment": "^1.0.3", "matrix-events-sdk": "0.0.1", - "matrix-js-sdk": "28.1.0-rc.1", + "matrix-js-sdk": "28.1.0", "matrix-widget-api": "^1.5.0", "memoize-one": "^6.0.0", "minimist": "^1.2.5", diff --git a/yarn.lock b/yarn.lock index c99a2ba1e5..6f393f3955 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7473,10 +7473,10 @@ matrix-events-sdk@0.0.1: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd" integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== -matrix-js-sdk@28.1.0-rc.1: - version "28.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-28.1.0-rc.1.tgz#b4aabc01087b7301f23ba3f80fcefcd8434d3591" - integrity sha512-lNzZ10sQW6SxZdLUFQMKYk9/vY1DbbSaOLG68NCOxRgund9Ef+KQWmp3AYyiDvKr5PTQWSIaJRgwZW3+AsV3Rg== +matrix-js-sdk@28.1.0: + version "28.1.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-28.1.0.tgz#0e4640a93f19f5768e6bddf870a95e5be02257db" + integrity sha512-GwhsOAka40i7hc+Hm/tiJdDgMgx/BWLGQmKQAcqFk4E2uxlB0k01D+cyLhRvmfiwlRbdABohGgqSiQRL7LD98w== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/matrix-sdk-crypto-wasm" "^1.2.1" From 62a32ed5b4f3ff897db62a81e5ea14986596f34f Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 12 Sep 2023 16:58:34 +0100 Subject: [PATCH 10/11] Prepare changelog for v3.80.0 --- CHANGELOG.md | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 492f4f3699..dc5485b840 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,5 @@ -Changes in [3.80.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.80.0-rc.2) (2023-09-08) -=============================================================================================================== - -## 🐛 Bug Fixes - * Fix vertical alignment of default avatar font ([\#11582](https://github.com/matrix-org/matrix-react-sdk/pull/11582)). Fixes vector-im/element-web#26081. - * Fix avatars in public room & space search being flex shrunk ([\#11580](https://github.com/matrix-org/matrix-react-sdk/pull/11580)). Fixes vector-im/element-web#26133. - * Fix EventTile avatars being rendered with a size of 0 instead of hidden ([\#11558](https://github.com/matrix-org/matrix-react-sdk/pull/11558)). Fixes vector-im/element-web#26075. - -Changes in [3.80.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.80.0-rc.1) (2023-09-05) -=============================================================================================================== +Changes in [3.80.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.80.0) (2023-09-12) +===================================================================================================== ## ✨ Features * Allow creating public knock rooms ([\#11481](https://github.com/matrix-org/matrix-react-sdk/pull/11481)). Contributed by @charlynguyen. @@ -22,6 +14,9 @@ Changes in [3.80.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases * Change avatar to use Compound implementation ([\#11448](https://github.com/matrix-org/matrix-react-sdk/pull/11448)). ## 🐛 Bug Fixes + * Fix vertical alignment of default avatar font ([\#11582](https://github.com/matrix-org/matrix-react-sdk/pull/11582)). Fixes vector-im/element-web#26081. + * Fix avatars in public room & space search being flex shrunk ([\#11580](https://github.com/matrix-org/matrix-react-sdk/pull/11580)). Fixes vector-im/element-web#26133. + * Fix EventTile avatars being rendered with a size of 0 instead of hidden ([\#11558](https://github.com/matrix-org/matrix-react-sdk/pull/11558)). Fixes vector-im/element-web#26075. * Use RoomStateEvent.Update for knocks ([\#11516](https://github.com/matrix-org/matrix-react-sdk/pull/11516)). Contributed by @charlynguyen. * Prevent event propagation when clicking icon buttons ([\#11515](https://github.com/matrix-org/matrix-react-sdk/pull/11515)). * Only display RoomKnocksBar when feature flag is enabled ([\#11513](https://github.com/matrix-org/matrix-react-sdk/pull/11513)). Contributed by @andybalaam. From fc017165881364ddc57c257604a2c4e6f8639fd2 Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 12 Sep 2023 16:58:37 +0100 Subject: [PATCH 11/11] v3.80.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 509c0a6d67..f990a48548 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.80.0-rc.2", + "version": "3.80.0", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": {