From 3fd52c9e074c2f834ac8115a2d413597f833c13a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 28 May 2025 13:03:53 +0000 Subject: [PATCH 1/5] Upgrade dependency to matrix-js-sdk@37.7.0-rc.0 --- package.json | 2 +- yarn.lock | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index f8b98a0fef..3d12fa2dbf 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "maplibre-gl": "^5.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": "37.7.0-rc.0", "matrix-widget-api": "^1.10.0", "memoize-one": "^6.0.0", "mime": "^4.0.4", diff --git a/yarn.lock b/yarn.lock index 27a3ae410b..ef25a56366 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2218,10 +2218,10 @@ emojibase "^15.3.1" emojibase-data "^15.3.1" -"@matrix-org/matrix-sdk-crypto-wasm@^14.0.1": - version "14.0.1" - resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-14.0.1.tgz#e258ef84bcc7889f0e7eb3a7dbecf0830a6dd606" - integrity sha512-CgLpHs6nTw5pjSsMBi9xbQnBXf2l8YhImQP9cv8nbGSCYdYjFI0FilMXffzjWV5HThpNHri/3pF20ahZtuS3VA== +"@matrix-org/matrix-sdk-crypto-wasm@^14.2.0": + version "14.2.0" + resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-14.2.0.tgz#1d6bddb2f777ac1674546467aab6f8584a7f2e71" + integrity sha512-xYbH1Yg8YwfXxGsCVDypiRvSVYPnCybsoRqlBDuAvIOs9tOfmdeeJqN+3VxvLWH28g3CtJs+9Afw8dYSHViTFg== "@matrix-org/olm@3.2.15": version "3.2.15" @@ -3765,7 +3765,7 @@ classnames "^2.5.1" vaul "^1.0.0" -"@vector-im/matrix-wysiwyg-wasm@link:../../Library/Caches/Yarn/v6/npm-@vector-im-matrix-wysiwyg-2.38.3-cc54d8b3e9472bcd8e622126ba364ee31952cd8a-integrity/node_modules/bindings/wysiwyg-wasm": +"@vector-im/matrix-wysiwyg-wasm@link:../../../.cache/yarn/v6/npm-@vector-im-matrix-wysiwyg-2.38.3-cc54d8b3e9472bcd8e622126ba364ee31952cd8a-integrity/node_modules/bindings/wysiwyg-wasm": version "0.0.0" uid "" @@ -9126,12 +9126,13 @@ 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 "37.6.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c35c7d1a3be073e0922cf28f13225805fc2a78f8" +matrix-js-sdk@37.7.0-rc.0: + version "37.7.0-rc.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-37.7.0-rc.0.tgz#52b3fd7ddd32204844f2c2b20be78359fba8c83f" + integrity sha512-9CIJYfuF+bbWxAmkDXjyPwh6lVbBXvRP2YYALu1jmYIfOQkmowTX4LZqvS/vUiVPMOLnu/DPJL71toDxm9sT0A== dependencies: "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^14.0.1" + "@matrix-org/matrix-sdk-crypto-wasm" "^14.2.0" "@matrix-org/olm" "3.2.15" another-json "^0.2.0" bs58 "^6.0.0" From ee87b0e2d25ed090876ee324e43e7c307704cecd Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 28 May 2025 13:10:03 +0000 Subject: [PATCH 2/5] v1.11.102-rc.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3d12fa2dbf..1a9ff0ef34 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.101", + "version": "1.11.102-rc.0", "description": "Element: the future of secure communication", "author": "New Vector Ltd.", "repository": { From 713cd472c6f8ad974f733c512f4142c6400a9d37 Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Thu, 29 May 2025 09:29:48 -0500 Subject: [PATCH 3/5] Close call options popup menu when option has been selected (#30052) (#30054) To avoid locking the user into the popup due to focus lock clash Fixes #29985 (cherry picked from commit 7eb133286b1a0d783c589fd852ddf61642e1d805) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/rooms/RoomHeader/RoomHeader.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/views/rooms/RoomHeader/RoomHeader.tsx b/src/components/views/rooms/RoomHeader/RoomHeader.tsx index 4462e4468a..663c8e9ff0 100644 --- a/src/components/views/rooms/RoomHeader/RoomHeader.tsx +++ b/src/components/views/rooms/RoomHeader/RoomHeader.tsx @@ -178,7 +178,10 @@ export default function RoomHeader({ aria-label={label} children={children} className="mx_RoomHeader_videoCallOption" - onClick={(ev) => videoCallClick(ev, option)} + onClick={(ev) => { + setMenuOpen(false); + videoCallClick(ev, option); + }} Icon={VideoCallIcon} onSelect={() => {} /* Dummy handler since we want the click event.*/} /> From 5cf543a9a7c80f375c88f24f1b93b2cb42025e4c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 3 Jun 2025 14:52:36 +0000 Subject: [PATCH 4/5] Upgrade dependency to matrix-js-sdk@37.7.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 1a9ff0ef34..6504066724 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "maplibre-gl": "^5.0.0", "matrix-encrypt-attachment": "^1.0.3", "matrix-events-sdk": "0.0.1", - "matrix-js-sdk": "37.7.0-rc.0", + "matrix-js-sdk": "37.7.0", "matrix-widget-api": "^1.10.0", "memoize-one": "^6.0.0", "mime": "^4.0.4", diff --git a/yarn.lock b/yarn.lock index ef25a56366..1dc9e36eea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9126,10 +9126,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@37.7.0-rc.0: - version "37.7.0-rc.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-37.7.0-rc.0.tgz#52b3fd7ddd32204844f2c2b20be78359fba8c83f" - integrity sha512-9CIJYfuF+bbWxAmkDXjyPwh6lVbBXvRP2YYALu1jmYIfOQkmowTX4LZqvS/vUiVPMOLnu/DPJL71toDxm9sT0A== +matrix-js-sdk@37.7.0: + version "37.7.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-37.7.0.tgz#8106de841188c0b293f05978eab7043ddfd1b5ef" + integrity sha512-Lq4k/pbMwHsjsPHavVkiwyX0eId/XdNzYZlSvynwCTOU8VfN+i7/9fQFK0MqYD/95CgeWSI2o7h1bq1vDAzbYw== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/matrix-sdk-crypto-wasm" "^14.2.0" From dba49527218cd6f0017aa47f0a137f830e8f0b22 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 3 Jun 2025 14:56:05 +0000 Subject: [PATCH 5/5] v1.11.102 --- CHANGELOG.md | 24 ++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48a721c013..ace25bc10f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,27 @@ +Changes in [1.11.102](https://github.com/element-hq/element-web/releases/tag/v1.11.102) (2025-06-03) +==================================================================================================== +## ✨ Features + +* EW: Modernize the recovery key input modal ([#29819](https://github.com/element-hq/element-web/pull/29819)). Contributed by @uhoreg. +* New room list: move secondary filters into primary filters ([#29972](https://github.com/element-hq/element-web/pull/29972)). Contributed by @florianduros. +* Prompt the user when key storage is unexpectedly off ([#29912](https://github.com/element-hq/element-web/pull/29912)). Contributed by @andybalaam. +* New room list: move sort menu in room list header ([#29983](https://github.com/element-hq/element-web/pull/29983)). Contributed by @florianduros. +* New room list: rework spacing of room list item ([#29965](https://github.com/element-hq/element-web/pull/29965)). Contributed by @florianduros. +* RLS: Remove forgotten room from skiplist ([#29933](https://github.com/element-hq/element-web/pull/29933)). Contributed by @MidhunSureshR. +* Add room list sorting ([#29951](https://github.com/element-hq/element-web/pull/29951)). Contributed by @dbkr. +* Don't use the minimised width(68px) on the new room list ([#29778](https://github.com/element-hq/element-web/pull/29778)). Contributed by @langleyd. + +## 🐛 Bug Fixes + +* [Backport staging] Close call options popup menu when option has been selected ([#30054](https://github.com/element-hq/element-web/pull/30054)). Contributed by @RiotRobot. +* RoomListStoreV3: Only add new rooms that pass `VisibilityProvider` check ([#29974](https://github.com/element-hq/element-web/pull/29974)). Contributed by @MidhunSureshR. +* Re-order primary filters ([#29957](https://github.com/element-hq/element-web/pull/29957)). Contributed by @dbkr. +* Fix leaky CSS adding `!` to all H1 elements ([#29964](https://github.com/element-hq/element-web/pull/29964)). Contributed by @t3chguy. +* Fix extensions panel style ([#29273](https://github.com/element-hq/element-web/pull/29273)). Contributed by @langleyd. +* Fix state events being hidden from widgets in read\_events actions ([#29954](https://github.com/element-hq/element-web/pull/29954)). Contributed by @robintown. +* Remove old filter test ([#29963](https://github.com/element-hq/element-web/pull/29963)). Contributed by @dbkr. + + Changes in [1.11.101](https://github.com/element-hq/element-web/releases/tag/v1.11.101) (2025-05-20) ==================================================================================================== ## ✨ Features diff --git a/package.json b/package.json index 6504066724..eb67519293 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.102-rc.0", + "version": "1.11.102", "description": "Element: the future of secure communication", "author": "New Vector Ltd.", "repository": {