Skip to content

Commit f78012d

Browse files
committed
Merge tag 'v3.62.0' into sc
* Further improve replies ([\matrix-org#6396](matrix-org#6396)). Fixes element-hq/element-web#19074, element-hq/element-web#18194 element-hq/element-web#18027 and element-hq/element-web#19179. * Enable users to join group calls from multiple devices ([\matrix-org#9625](matrix-org#9625)). * fix(visual): make cursor a pointer for summaries ([\matrix-org#9419](matrix-org#9419)). Contributed by @r00ster91. * Add placeholder for rich text editor ([\matrix-org#9613](matrix-org#9613)). * Consolidate public room search experience ([\matrix-org#9605](matrix-org#9605)). Fixes element-hq/element-web#22846. * New password reset flow ([\matrix-org#9581](matrix-org#9581)). Fixes element-hq/element-web#23131. * Device manager - add tooltip to device details toggle ([\matrix-org#9594](matrix-org#9594)). * sliding sync: add lazy-loading member support ([\matrix-org#9530](matrix-org#9530)). * Limit formatting bar offset to top of composer ([\matrix-org#9365](matrix-org#9365)). Fixes element-hq/element-web#12359. Contributed by @owi92. * Fix issues around up arrow event edit shortcut ([\matrix-org#9645](matrix-org#9645)). Fixes element-hq/element-web#18497 and element-hq/element-web#18964. * Fix search not being cleared when clicking on a result ([\matrix-org#9635](matrix-org#9635)). Fixes element-hq/element-web#23845. * Fix screensharing in 1:1 calls ([\matrix-org#9612](matrix-org#9612)). Fixes element-hq/element-web#23808. * Fix the background color flashing when joining a call ([\matrix-org#9640](matrix-org#9640)). * Fix the size of the 'Private space' icon ([\matrix-org#9638](matrix-org#9638)). * Fix reply editing in rich text editor (https ([\matrix-org#9615](matrix-org#9615)). * Fix thread list jumping back down while scrolling ([\matrix-org#9606](matrix-org#9606)). Fixes element-hq/element-web#23727. * Fix regression with TimelinePanel props updates not taking effect ([\matrix-org#9608](matrix-org#9608)). Fixes element-hq/element-web#23794. * Fix form tooltip positioning ([\matrix-org#9598](matrix-org#9598)). Fixes element-hq/element-web#22861. * Extract Search handling from RoomView into its own Component ([\matrix-org#9574](matrix-org#9574)). Fixes element-hq/element-web#498. * Fix call splitbrains when switching between rooms ([\matrix-org#9692](matrix-org#9692)). * Fix replies to emotes not showing as inline ([\matrix-org#9707](matrix-org#9707)). Fixes element-hq/element-web#23903.
2 parents 85a4d8d + df0eba7 commit f78012d

File tree

265 files changed

+7580
-4807
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

265 files changed

+7580
-4807
lines changed

.github/workflows/static_analysis.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ jobs:
4646
checks: write
4747
steps:
4848
- uses: actions/checkout@v3
49+
50+
- name: Install Deps
51+
run: "scripts/ci/layered.sh"
4952

5053
- name: Get diff lines
5154
id: diff
@@ -66,7 +69,7 @@ jobs:
6669
use-check: false
6770
check-fail-mode: added
6871
output-behaviour: annotate
69-
ts-extra-args: '--strict'
72+
ts-extra-args: '--strict --noImplicitAny'
7073
files-changed: ${{ steps.files.outputs.files_updated }}
7174
files-added: ${{ steps.files.outputs.files_created }}
7275
files-deleted: ${{ steps.files.outputs.files_deleted }}

CHANGELOG.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
Changes in [3.62.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.62.0) (2022-12-06)
2+
=====================================================================================================
3+
4+
## ✨ Features
5+
* Further improve replies ([\#6396](https://github.com/matrix-org/matrix-react-sdk/pull/6396)). Fixes vector-im/element-web#19074, vector-im/element-web#18194 vector-im/element-web#18027 and vector-im/element-web#19179.
6+
* Enable users to join group calls from multiple devices ([\#9625](https://github.com/matrix-org/matrix-react-sdk/pull/9625)).
7+
* fix(visual): make cursor a pointer for summaries ([\#9419](https://github.com/matrix-org/matrix-react-sdk/pull/9419)). Contributed by @r00ster91.
8+
* Add placeholder for rich text editor ([\#9613](https://github.com/matrix-org/matrix-react-sdk/pull/9613)).
9+
* Consolidate public room search experience ([\#9605](https://github.com/matrix-org/matrix-react-sdk/pull/9605)). Fixes vector-im/element-web#22846.
10+
* New password reset flow ([\#9581](https://github.com/matrix-org/matrix-react-sdk/pull/9581)). Fixes vector-im/element-web#23131.
11+
* Device manager - add tooltip to device details toggle ([\#9594](https://github.com/matrix-org/matrix-react-sdk/pull/9594)).
12+
* sliding sync: add lazy-loading member support ([\#9530](https://github.com/matrix-org/matrix-react-sdk/pull/9530)).
13+
* Limit formatting bar offset to top of composer ([\#9365](https://github.com/matrix-org/matrix-react-sdk/pull/9365)). Fixes vector-im/element-web#12359. Contributed by @owi92.
14+
15+
## 🐛 Bug Fixes
16+
* Fix issues around up arrow event edit shortcut ([\#9645](https://github.com/matrix-org/matrix-react-sdk/pull/9645)). Fixes vector-im/element-web#18497 and vector-im/element-web#18964.
17+
* Fix search not being cleared when clicking on a result ([\#9635](https://github.com/matrix-org/matrix-react-sdk/pull/9635)). Fixes vector-im/element-web#23845.
18+
* Fix screensharing in 1:1 calls ([\#9612](https://github.com/matrix-org/matrix-react-sdk/pull/9612)). Fixes vector-im/element-web#23808.
19+
* Fix the background color flashing when joining a call ([\#9640](https://github.com/matrix-org/matrix-react-sdk/pull/9640)).
20+
* Fix the size of the 'Private space' icon ([\#9638](https://github.com/matrix-org/matrix-react-sdk/pull/9638)).
21+
* Fix reply editing in rich text editor (https ([\#9615](https://github.com/matrix-org/matrix-react-sdk/pull/9615)).
22+
* Fix thread list jumping back down while scrolling ([\#9606](https://github.com/matrix-org/matrix-react-sdk/pull/9606)). Fixes vector-im/element-web#23727.
23+
* Fix regression with TimelinePanel props updates not taking effect ([\#9608](https://github.com/matrix-org/matrix-react-sdk/pull/9608)). Fixes vector-im/element-web#23794.
24+
* Fix form tooltip positioning ([\#9598](https://github.com/matrix-org/matrix-react-sdk/pull/9598)). Fixes vector-im/element-web#22861.
25+
* Extract Search handling from RoomView into its own Component ([\#9574](https://github.com/matrix-org/matrix-react-sdk/pull/9574)). Fixes vector-im/element-web#498.
26+
* Fix call splitbrains when switching between rooms ([\#9692](https://github.com/matrix-org/matrix-react-sdk/pull/9692)).
27+
* Fix replies to emotes not showing as inline ([\#9707](https://github.com/matrix-org/matrix-react-sdk/pull/9707)). Fixes vector-im/element-web#23903.
28+
129
Changes in [3.61.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.61.0) (2022-11-22)
230
=====================================================================================================
331

cypress/e2e/room-directory/room-directory.spec.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,16 @@ describe("Room Directory", () => {
8888

8989
cy.get('[role="button"][aria-label="Explore rooms"]').click();
9090

91-
cy.get('.mx_RoomDirectory_dialogWrapper [name="dirsearch"]').type("Unknown Room");
92-
cy.get(".mx_RoomDirectory_dialogWrapper h5").should("contain", 'No results for "Unknown Room"');
93-
cy.get(".mx_RoomDirectory_dialogWrapper").percySnapshotElement("Room Directory - filtered no results");
94-
95-
cy.get('.mx_RoomDirectory_dialogWrapper [name="dirsearch"]').type("{selectAll}{backspace}test1234");
96-
cy.contains(".mx_RoomDirectory_dialogWrapper .mx_RoomDirectory_listItem", name)
97-
.should("exist").as("resultRow");
98-
cy.get(".mx_RoomDirectory_dialogWrapper").percySnapshotElement("Room Directory - filtered one result");
99-
cy.get("@resultRow").find(".mx_AccessibleButton").contains("Join").click();
91+
cy.get('.mx_SpotlightDialog [aria-label="Search"]').type("Unknown Room");
92+
cy.get(".mx_SpotlightDialog .mx_SpotlightDialog_otherSearches_messageSearchText")
93+
.should("contain", "can't find the room you're looking for");
94+
cy.get(".mx_SpotlightDialog_wrapper").percySnapshotElement("Room Directory - filtered no results");
95+
96+
cy.get('.mx_SpotlightDialog [aria-label="Search"]').type("{selectAll}{backspace}test1234");
97+
cy.contains(".mx_SpotlightDialog .mx_SpotlightDialog_result_publicRoomName", name)
98+
.should("exist");
99+
cy.get(".mx_SpotlightDialog_wrapper").percySnapshotElement("Room Directory - filtered one result");
100+
cy.get(".mx_SpotlightDialog .mx_SpotlightDialog_option").find(".mx_AccessibleButton").contains("Join").click();
100101

101102
cy.url().should('contain', `/#/room/#test1234:localhost`);
102103
});

cypress/e2e/settings/device-management.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ describe("Device manager", () => {
8787
const sessionName = `Alice's device`;
8888
// open the first session
8989
cy.get('.mx_FilteredDeviceList_list .mx_FilteredDeviceList_listItem').first().within(() => {
90-
cy.get('[aria-label="Toggle device details"]').click();
90+
cy.get('[aria-label="Show details"]').click();
9191

9292
cy.contains('Session details').should('exist');
9393

docs/cypress.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ at the start of each test run.
7070
## Writing Tests
7171
Mostly this is the same advice as for writing any other Cypress test: the Cypress
7272
docs are well worth a read if you're not already familiar with Cypress testing, eg.
73-
https://docs.cypress.io/guides/references/best-practices .
73+
https://docs.cypress.io/guides/references/best-practices. To avoid your tests being
74+
flaky it is also recommended to give https://docs.cypress.io/guides/core-concepts/retry-ability
75+
a read.
7476

7577
### Getting a Synapse
7678
The key difference is in starting Synapse instances. Tests use this plugin via

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "matrix-react-sdk",
3-
"version": "3.61.0",
3+
"version": "3.62.0",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {
@@ -61,6 +61,7 @@
6161
"@matrix-org/react-sdk-module-api": "^0.0.3",
6262
"@sentry/browser": "^6.11.0",
6363
"@sentry/tracing": "^6.11.0",
64+
"@testing-library/react-hooks": "^8.0.1",
6465
"@types/geojson": "^7946.0.8",
6566
"@types/ua-parser-js": "^0.7.36",
6667
"await-lock": "^2.1.0",
@@ -93,7 +94,7 @@
9394
"maplibre-gl": "^1.15.2",
9495
"matrix-encrypt-attachment": "^1.0.3",
9596
"matrix-events-sdk": "0.0.1",
96-
"matrix-js-sdk": "21.2.0",
97+
"matrix-js-sdk": "22.0.0",
9798
"matrix-widget-api": "^1.1.1",
9899
"minimist": "^1.2.5",
99100
"opus-recorder": "^8.0.3",
@@ -212,7 +213,7 @@
212213
"stylelint": "^14.9.1",
213214
"stylelint-config-standard": "^26.0.0",
214215
"stylelint-scss": "^4.2.0",
215-
"typescript": "4.7.4",
216+
"typescript": "4.8.4",
216217
"walk": "^2.3.14"
217218
},
218219
"jest": {

res/css/_common.pcss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,10 @@ fieldset {
184184
border: none;
185185
}
186186

187+
summary {
188+
cursor: pointer;
189+
}
190+
187191
legend {
188192
padding-inline: unset;
189193
border: none;

res/css/_components.pcss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
@import "./structures/_BackdropPanel.pcss";
5050
@import "./structures/_CompatibilityPage.pcss";
5151
@import "./structures/_ContextualMenu.pcss";
52+
@import "./structures/_ErrorMessage.pcss";
5253
@import "./structures/_FileDropTarget.pcss";
5354
@import "./structures/_FilePanel.pcss";
5455
@import "./structures/_GenericDropdownMenu.pcss";
@@ -63,7 +64,6 @@
6364
@import "./structures/_NotificationPanel.pcss";
6465
@import "./structures/_QuickSettingsButton.pcss";
6566
@import "./structures/_RightPanel.pcss";
66-
@import "./structures/_RoomDirectory.pcss";
6767
@import "./structures/_RoomSearch.pcss";
6868
@import "./structures/_RoomStatusBar.pcss";
6969
@import "./structures/_RoomView.pcss";
@@ -157,6 +157,7 @@
157157
@import "./views/dialogs/_UntrustedDeviceDialog.pcss";
158158
@import "./views/dialogs/_UploadConfirmDialog.pcss";
159159
@import "./views/dialogs/_UserSettingsDialog.pcss";
160+
@import "./views/dialogs/_VerifyEMailDialog.pcss";
160161
@import "./views/dialogs/_WidgetCapabilitiesPromptDialog.pcss";
161162
@import "./views/dialogs/security/_AccessSecretStorageDialog.pcss";
162163
@import "./views/dialogs/security/_CreateCrossSigningDialog.pcss";
@@ -169,7 +170,6 @@
169170
@import "./views/elements/_CopyableText.pcss";
170171
@import "./views/elements/_DesktopCapturerSourcePicker.pcss";
171172
@import "./views/elements/_DialPadBackspaceButton.pcss";
172-
@import "./views/elements/_DirectorySearchBox.pcss";
173173
@import "./views/elements/_Dropdown.pcss";
174174
@import "./views/elements/_EditableItemList.pcss";
175175
@import "./views/elements/_ErrorBoundary.pcss";

res/css/compound/_Icon.pcss

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,34 @@ limitations under the License.
2525
padding: 1px;
2626
}
2727

28+
.mx_Icon_accent {
29+
color: $accent;
30+
}
31+
32+
.mx_Icon_alert {
33+
color: $alert;
34+
}
35+
36+
.mx_Icon_8 {
37+
flex: 0 0 8px;
38+
height: 8px;
39+
width: 8px;
40+
}
41+
2842
.mx_Icon_16 {
29-
height: 16px;
3043
flex: 0 0 16px;
44+
height: 16px;
3145
width: 16px;
3246
}
47+
48+
.mx_Icon_24 {
49+
flex: 0 0 24px;
50+
height: 24px;
51+
width: 24px;
52+
}
53+
54+
.mx_Icon_32 {
55+
flex: 0 0 32px;
56+
height: 32px;
57+
width: 32px;
58+
}

res/css/structures/_ErrorMessage.pcss

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/*
2+
Copyright 2022 The Matrix.org Foundation C.I.C.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
.mx_ErrorMessage {
18+
align-items: center;
19+
color: $alert;
20+
display: flex;
21+
font-size: $font-12px;
22+
gap: $spacing-8;
23+
line-height: 1.2em;
24+
min-height: 2.4em;
25+
}

0 commit comments

Comments
 (0)