From 7571552836c42fa2024ffb0b48af76b907a50d4d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 5 Apr 2022 18:12:37 +0100 Subject: [PATCH 1/8] Upgrade matrix-js-sdk to 16.0.2-rc.1 --- package.json | 2 +- yarn.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index abba2bb753..7f88cec033 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "maplibre-gl": "^1.15.2", "matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90", "matrix-events-sdk": "^0.0.1-beta.7", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "16.0.2-rc.1", "matrix-widget-api": "^0.1.0-beta.18", "minimist": "^1.2.5", "opus-recorder": "^8.0.3", diff --git a/yarn.lock b/yarn.lock index 00e139cea3..808ea04e44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6285,9 +6285,10 @@ matrix-events-sdk@^0.0.1-beta.7: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934" integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA== -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "16.0.1" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/bdc3da1fac3cb454b409325b6a50cd869b3d5d57" +matrix-js-sdk@16.0.2-rc.1: + version "16.0.2-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-16.0.2-rc.1.tgz#b5c748fc9bd95b97d3f13b1a63860c0033bee35d" + integrity sha512-dmrP+leQKLKGg0s/tOEHkWMVz9N3lrccgi3wI4XGiGi0hI8/xv/Y5est6hcpg5axOa1JyD1KqqV0o41whdb6PQ== dependencies: "@babel/runtime" "^7.12.5" another-json "^0.2.0" From f2368792393b7d3c6bb9b5e12e6f87c6dae0e430 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 5 Apr 2022 18:13:44 +0100 Subject: [PATCH 2/8] Prepare changelog for v3.42.2-rc.1 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba3cac6c70..1a32b21734 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +Changes in [3.42.2-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.42.2-rc.1) (2022-04-05) +=============================================================================================================== + Changes in [3.42.1-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.42.1-rc.1) (2022-03-22) =============================================================================================================== From e4df547c3127eb172556b9f0c59015e6e24da571 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 5 Apr 2022 18:13:45 +0100 Subject: [PATCH 3/8] v3.42.2-rc.1 --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 7f88cec033..6382d790fe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.42.1", + "version": "3.42.2-rc.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { @@ -25,7 +25,7 @@ "bin": { "reskindex": "scripts/reskindex.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", @@ -237,5 +237,6 @@ "text", "json" ] - } + }, + "typings": "./lib/index.d.ts" } From 70c10886c4ecb5cb0be94b67899ea421426cbe55 Mon Sep 17 00:00:00 2001 From: Germain Date: Wed, 6 Apr 2022 11:48:58 +0100 Subject: [PATCH 4/8] Port #8240 to release (#8241) * fix uneven gutter size in thread panel * Fix indicator positioning * fix gutter sizing * fix dropdown inner padding and spacing * lint fix --- res/css/structures/_RoomView.scss | 4 ++-- res/css/views/right_panel/_ThreadPanel.scss | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss index 7990db8cf1..84e6041ecd 100644 --- a/res/css/structures/_RoomView.scss +++ b/res/css/structures/_RoomView.scss @@ -326,8 +326,8 @@ hr.mx_RoomView_myReadMarker { .mx_Indicator { position: absolute; - right: 0; - top: 0; + right: -3px; + top: -3px; width: $dot-size; height: $dot-size; border-radius: 50%; diff --git a/res/css/views/right_panel/_ThreadPanel.scss b/res/css/views/right_panel/_ThreadPanel.scss index cb77f365b8..89b3f8aeb9 100644 --- a/res/css/views/right_panel/_ThreadPanel.scss +++ b/res/css/views/right_panel/_ThreadPanel.scss @@ -20,8 +20,8 @@ limitations under the License. height: 100px; overflow: visible; - &.mx_BaseCard { - padding-right: 0; + &:not(.mx_ThreadView).mx_BaseCard { + padding-right: 2px; } .mx_BaseCard_header { @@ -48,7 +48,7 @@ limitations under the License. } .mx_ThreadPanel__header { - width: calc(100% - 30px); + width: calc(100% - 38px); height: 24px; display: flex; flex: 1; @@ -118,7 +118,7 @@ limitations under the License. &.mx_ThreadView .mx_ThreadView_timelinePanelWrapper { /* the scrollbar is 8px wide, and we want a 12px gap with the side of the panel. Hence the magic number, 8+4=12 */ - width: calc(100% - 4px); + width: calc(100% + 6px); padding-right: 4px; position: relative; min-height: 0; // don't displace the composer @@ -184,7 +184,7 @@ limitations under the License. } .mx_ThreadPanel_dropdown { - padding: 3px 8px; + padding: 3px 4px 3px 8px; border-radius: 4px; line-height: 1.5; user-select: none; @@ -294,7 +294,7 @@ limitations under the License. top: 0; bottom: 0; left: 0; - right: 0; + right: 6px; padding: 20px; h2 { From 6bd090c090bff8298bb138bb52102969c9d29194 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 8 Apr 2022 08:11:39 +0000 Subject: [PATCH 5/8] Port #8249 to release (#8254) Signed-off-by: Suguru Hirahara --- res/css/views/rooms/_EventTile.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss index 4238dca938..29f6242c4b 100644 --- a/res/css/views/rooms/_EventTile.scss +++ b/res/css/views/rooms/_EventTile.scss @@ -954,7 +954,6 @@ $threadInfoLineHeight: calc(2 * $font-12px); .mx_EventTile { display: flex; flex-direction: column; - padding-top: 14px; // due to layout differences, this odd number matches the 18px padding-top of main tl events .mx_EventTile_line { padding-left: 0; @@ -972,6 +971,10 @@ $threadInfoLineHeight: calc(2 * $font-12px); } } + .mx_EventTile:not([data-layout=bubble]) { + padding-top: 14px; // due to layout differences, this odd number matches the 18px padding-top of main tl events + } + .mx_EventTile[data-layout=bubble] { margin-left: 36px; margin-right: 36px; From 7844c3ac8d4b7189d57e115bc3ba41be13ea294a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 12 Apr 2022 10:31:47 +0100 Subject: [PATCH 6/8] Upgrade matrix-js-sdk to 17.0.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 6382d790fe..ffc8dbd282 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "maplibre-gl": "^1.15.2", "matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90", "matrix-events-sdk": "^0.0.1-beta.7", - "matrix-js-sdk": "16.0.2-rc.1", + "matrix-js-sdk": "17.0.0", "matrix-widget-api": "^0.1.0-beta.18", "minimist": "^1.2.5", "opus-recorder": "^8.0.3", diff --git a/yarn.lock b/yarn.lock index 808ea04e44..07b02ce35d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6285,10 +6285,10 @@ matrix-events-sdk@^0.0.1-beta.7: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934" integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA== -matrix-js-sdk@16.0.2-rc.1: - version "16.0.2-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-16.0.2-rc.1.tgz#b5c748fc9bd95b97d3f13b1a63860c0033bee35d" - integrity sha512-dmrP+leQKLKGg0s/tOEHkWMVz9N3lrccgi3wI4XGiGi0hI8/xv/Y5est6hcpg5axOa1JyD1KqqV0o41whdb6PQ== +matrix-js-sdk@17.0.0: + version "17.0.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-17.0.0.tgz#6edf2f8d05da003e98a6cf5269a4717adfe4e406" + integrity sha512-8nv+a1e6n4x4DYKiBFRS6/CIpsE22+31K+9/4Y5MB8m3iraSVBtdZ5y/9ktQnjQuo9I85TvyqHL2obRWF7UD5Q== dependencies: "@babel/runtime" "^7.12.5" another-json "^0.2.0" From f7cb4af076fb4144cbd813c9d4e52ac52cd73329 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 12 Apr 2022 10:33:25 +0100 Subject: [PATCH 7/8] Prepare changelog for v3.42.3 --- CHANGELOG.md | 53 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a32b21734..0126f1f369 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,53 @@ -Changes in [3.42.2-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.42.2-rc.1) (2022-04-05) -=============================================================================================================== +Changes in [3.42.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.42.3) (2022-04-12) +===================================================================================================== -Changes in [3.42.1-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.42.1-rc.1) (2022-03-22) -=============================================================================================================== +## ✨ Features + * Release threads as a beta feature ([\#8081](https://github.com/matrix-org/matrix-react-sdk/pull/8081)). Fixes vector-im/element-web#21351. + * More video rooms design updates ([\#8222](https://github.com/matrix-org/matrix-react-sdk/pull/8222)). + * Update video rooms to new design specs ([\#8207](https://github.com/matrix-org/matrix-react-sdk/pull/8207)). Fixes vector-im/element-web#21515, vector-im/element-web#21516 vector-im/element-web#21519 and vector-im/element-web#21526. + * Live Location Sharing - left panel warning with error ([\#8201](https://github.com/matrix-org/matrix-react-sdk/pull/8201)). + * Live location sharing - Stop publishing location to beacons with consecutive errors ([\#8194](https://github.com/matrix-org/matrix-react-sdk/pull/8194)). + * Live location sharing: allow retry when stop sharing fails ([\#8193](https://github.com/matrix-org/matrix-react-sdk/pull/8193)). + * Allow voice messages to be scrubbed in the timeline ([\#8079](https://github.com/matrix-org/matrix-react-sdk/pull/8079)). Fixes vector-im/element-web#18713. + * Live location sharing - stop sharing to beacons in rooms you left ([\#8187](https://github.com/matrix-org/matrix-react-sdk/pull/8187)). + * Allow sending and thumbnailing AVIF images ([\#8172](https://github.com/matrix-org/matrix-react-sdk/pull/8172)). + * Live location sharing - handle geolocation errors ([\#8179](https://github.com/matrix-org/matrix-react-sdk/pull/8179)). + * Show voice room participants when not connected ([\#8136](https://github.com/matrix-org/matrix-react-sdk/pull/8136)). Fixes vector-im/element-web#21513. + * Add margins between labs sections ([\#8169](https://github.com/matrix-org/matrix-react-sdk/pull/8169)). + * Live location sharing - send geolocation beacon events - happy path ([\#8127](https://github.com/matrix-org/matrix-react-sdk/pull/8127)). + * Add support for Animated (A)PNG ([\#8158](https://github.com/matrix-org/matrix-react-sdk/pull/8158)). Fixes vector-im/element-web#12967. + * Don't form continuations from thread roots ([\#8166](https://github.com/matrix-org/matrix-react-sdk/pull/8166)). Fixes vector-im/element-web#20908. + * Improve handling of animated GIF and WEBP images ([\#8153](https://github.com/matrix-org/matrix-react-sdk/pull/8153)). Fixes vector-im/element-web#16193 and vector-im/element-web#6684. + * Wire up file preview for video files ([\#8140](https://github.com/matrix-org/matrix-react-sdk/pull/8140)). Fixes vector-im/element-web#21539. + * When showing thread, always auto-focus its composer ([\#8115](https://github.com/matrix-org/matrix-react-sdk/pull/8115)). Fixes vector-im/element-web#21438. + * Live location sharing - refresh beacon expiry in room ([\#8116](https://github.com/matrix-org/matrix-react-sdk/pull/8116)). + * Use styled mxids in member list v2 ([\#8110](https://github.com/matrix-org/matrix-react-sdk/pull/8110)). Fixes vector-im/element-web#14825. Contributed by @SimonBrandner. + * Delete groups (legacy communities system) ([\#8027](https://github.com/matrix-org/matrix-react-sdk/pull/8027)). Fixes vector-im/element-web#17532. + * Add a prototype of voice rooms in labs ([\#8084](https://github.com/matrix-org/matrix-react-sdk/pull/8084)). Fixes vector-im/element-web#3546. + +## 🐛 Bug Fixes + * Fix editing `
    ` tags with a non-1 start attribute ([\#8211](https://github.com/matrix-org/matrix-react-sdk/pull/8211)). Fixes vector-im/element-web#21625. + * Fix URL previews being enabled when room first created ([\#8227](https://github.com/matrix-org/matrix-react-sdk/pull/8227)). Fixes vector-im/element-web#21659. + * Don't use m.call for Jitsi video rooms ([\#8223](https://github.com/matrix-org/matrix-react-sdk/pull/8223)). + * Scale emoji with size of surrounding text ([\#8224](https://github.com/matrix-org/matrix-react-sdk/pull/8224)). + * Make "Jump to date" translatable ([\#8218](https://github.com/matrix-org/matrix-react-sdk/pull/8218)). + * Normalize call buttons ([\#8129](https://github.com/matrix-org/matrix-react-sdk/pull/8129)). Fixes vector-im/element-web#21493. Contributed by @luixxiul. + * Show room preview bar with maximised widgets ([\#8180](https://github.com/matrix-org/matrix-react-sdk/pull/8180)). Fixes vector-im/element-web#21542. + * Update more strings to not wrongly mention room when it is/could be a space ([\#7722](https://github.com/matrix-org/matrix-react-sdk/pull/7722)). Fixes vector-im/element-web#20243 and vector-im/element-web#20910. + * Fix issue with redacting via edit composer flow causing stuck editStates ([\#8184](https://github.com/matrix-org/matrix-react-sdk/pull/8184)). + * Fix some image/video scroll jumps ([\#8182](https://github.com/matrix-org/matrix-react-sdk/pull/8182)). + * Fix "react error on share dialog" ([\#8170](https://github.com/matrix-org/matrix-react-sdk/pull/8170)). Contributed by @yaya-usman. + * Fix disambiguated profile in threads in bubble layout ([\#8168](https://github.com/matrix-org/matrix-react-sdk/pull/8168)). Fixes vector-im/element-web#21570. Contributed by @SimonBrandner. + * Responsive BetaCard on Labs ([\#8154](https://github.com/matrix-org/matrix-react-sdk/pull/8154)). Fixes vector-im/element-web#21554. Contributed by @luixxiul. + * Display button as inline in room directory dialog ([\#8164](https://github.com/matrix-org/matrix-react-sdk/pull/8164)). Fixes vector-im/element-web#21567. Contributed by @luixxiul. + * Null guard TimelinePanel unmount edge ([\#8171](https://github.com/matrix-org/matrix-react-sdk/pull/8171)). + * Fix beta pill label breaking ([\#8162](https://github.com/matrix-org/matrix-react-sdk/pull/8162)). Fixes vector-im/element-web#21566. Contributed by @luixxiul. + * Strip relations when forwarding ([\#7929](https://github.com/matrix-org/matrix-react-sdk/pull/7929)). Fixes vector-im/element-web#19769, vector-im/element-web#18067 vector-im/element-web#21015 and vector-im/element-web#10924. + * Don't try (and fail) to show replies for redacted events ([\#8141](https://github.com/matrix-org/matrix-react-sdk/pull/8141)). Fixes vector-im/element-web#21435. + * Fix 3pid member info for space member list ([\#8128](https://github.com/matrix-org/matrix-react-sdk/pull/8128)). Fixes vector-im/element-web#21534. + * Set max-width to user context menu ([\#8089](https://github.com/matrix-org/matrix-react-sdk/pull/8089)). Fixes vector-im/element-web#21486. Contributed by @luixxiul. + * Fix issue with falsey hrefs being sent in events ([\#8113](https://github.com/matrix-org/matrix-react-sdk/pull/8113)). Fixes vector-im/element-web#21417. + * Make video sizing consistent with images ([\#8102](https://github.com/matrix-org/matrix-react-sdk/pull/8102)). Fixes vector-im/element-web#20072. Changes in [3.42.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.42.0) (2022-03-15) ===================================================================================================== From 5f356093fdce2822256b9936b67962f66133f54c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 12 Apr 2022 10:33:26 +0100 Subject: [PATCH 8/8] v3.42.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ffc8dbd282..8293d4198d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.42.2-rc.1", + "version": "3.42.3", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": {