Skip to content

Commit

Permalink
Merge tag 'v3.62.0' into sc
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
su-ex committed Dec 6, 2022
2 parents 85a4d8d + df0eba7 commit f78012d
Show file tree
Hide file tree
Showing 265 changed files with 7,580 additions and 4,807 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/static_analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ jobs:
checks: write
steps:
- uses: actions/checkout@v3

- name: Install Deps
run: "scripts/ci/layered.sh"

- name: Get diff lines
id: diff
Expand All @@ -66,7 +69,7 @@ jobs:
use-check: false
check-fail-mode: added
output-behaviour: annotate
ts-extra-args: '--strict'
ts-extra-args: '--strict --noImplicitAny'
files-changed: ${{ steps.files.outputs.files_updated }}
files-added: ${{ steps.files.outputs.files_created }}
files-deleted: ${{ steps.files.outputs.files_deleted }}
Expand Down
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
Changes in [3.62.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.62.0) (2022-12-06)
=====================================================================================================

## ✨ Features
* 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.
* Enable users to join group calls from multiple devices ([\#9625](https://github.com/matrix-org/matrix-react-sdk/pull/9625)).
* fix(visual): make cursor a pointer for summaries ([\#9419](https://github.com/matrix-org/matrix-react-sdk/pull/9419)). Contributed by @r00ster91.
* Add placeholder for rich text editor ([\#9613](https://github.com/matrix-org/matrix-react-sdk/pull/9613)).
* Consolidate public room search experience ([\#9605](https://github.com/matrix-org/matrix-react-sdk/pull/9605)). Fixes vector-im/element-web#22846.
* New password reset flow ([\#9581](https://github.com/matrix-org/matrix-react-sdk/pull/9581)). Fixes vector-im/element-web#23131.
* Device manager - add tooltip to device details toggle ([\#9594](https://github.com/matrix-org/matrix-react-sdk/pull/9594)).
* sliding sync: add lazy-loading member support ([\#9530](https://github.com/matrix-org/matrix-react-sdk/pull/9530)).
* 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.

## 🐛 Bug Fixes
* 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.
* 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.
* Fix screensharing in 1:1 calls ([\#9612](https://github.com/matrix-org/matrix-react-sdk/pull/9612)). Fixes vector-im/element-web#23808.
* Fix the background color flashing when joining a call ([\#9640](https://github.com/matrix-org/matrix-react-sdk/pull/9640)).
* Fix the size of the 'Private space' icon ([\#9638](https://github.com/matrix-org/matrix-react-sdk/pull/9638)).
* Fix reply editing in rich text editor (https ([\#9615](https://github.com/matrix-org/matrix-react-sdk/pull/9615)).
* 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.
* 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.
* Fix form tooltip positioning ([\#9598](https://github.com/matrix-org/matrix-react-sdk/pull/9598)). Fixes vector-im/element-web#22861.
* 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.
* Fix call splitbrains when switching between rooms ([\#9692](https://github.com/matrix-org/matrix-react-sdk/pull/9692)).
* 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.

Changes in [3.61.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.61.0) (2022-11-22)
=====================================================================================================

Expand Down
19 changes: 10 additions & 9 deletions cypress/e2e/room-directory/room-directory.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,16 @@ describe("Room Directory", () => {

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

cy.get('.mx_RoomDirectory_dialogWrapper [name="dirsearch"]').type("Unknown Room");
cy.get(".mx_RoomDirectory_dialogWrapper h5").should("contain", 'No results for "Unknown Room"');
cy.get(".mx_RoomDirectory_dialogWrapper").percySnapshotElement("Room Directory - filtered no results");

cy.get('.mx_RoomDirectory_dialogWrapper [name="dirsearch"]').type("{selectAll}{backspace}test1234");
cy.contains(".mx_RoomDirectory_dialogWrapper .mx_RoomDirectory_listItem", name)
.should("exist").as("resultRow");
cy.get(".mx_RoomDirectory_dialogWrapper").percySnapshotElement("Room Directory - filtered one result");
cy.get("@resultRow").find(".mx_AccessibleButton").contains("Join").click();
cy.get('.mx_SpotlightDialog [aria-label="Search"]').type("Unknown Room");
cy.get(".mx_SpotlightDialog .mx_SpotlightDialog_otherSearches_messageSearchText")
.should("contain", "can't find the room you're looking for");
cy.get(".mx_SpotlightDialog_wrapper").percySnapshotElement("Room Directory - filtered no results");

cy.get('.mx_SpotlightDialog [aria-label="Search"]').type("{selectAll}{backspace}test1234");
cy.contains(".mx_SpotlightDialog .mx_SpotlightDialog_result_publicRoomName", name)
.should("exist");
cy.get(".mx_SpotlightDialog_wrapper").percySnapshotElement("Room Directory - filtered one result");
cy.get(".mx_SpotlightDialog .mx_SpotlightDialog_option").find(".mx_AccessibleButton").contains("Join").click();

cy.url().should('contain', `/#/room/#test1234:localhost`);
});
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/settings/device-management.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ describe("Device manager", () => {
const sessionName = `Alice's device`;
// open the first session
cy.get('.mx_FilteredDeviceList_list .mx_FilteredDeviceList_listItem').first().within(() => {
cy.get('[aria-label="Toggle device details"]').click();
cy.get('[aria-label="Show details"]').click();

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

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

### Getting a Synapse
The key difference is in starting Synapse instances. Tests use this plugin via
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "matrix-react-sdk",
"version": "3.61.0",
"version": "3.62.0",
"description": "SDK for matrix.org using React",
"author": "matrix.org",
"repository": {
Expand Down Expand Up @@ -61,6 +61,7 @@
"@matrix-org/react-sdk-module-api": "^0.0.3",
"@sentry/browser": "^6.11.0",
"@sentry/tracing": "^6.11.0",
"@testing-library/react-hooks": "^8.0.1",
"@types/geojson": "^7946.0.8",
"@types/ua-parser-js": "^0.7.36",
"await-lock": "^2.1.0",
Expand Down Expand Up @@ -93,7 +94,7 @@
"maplibre-gl": "^1.15.2",
"matrix-encrypt-attachment": "^1.0.3",
"matrix-events-sdk": "0.0.1",
"matrix-js-sdk": "21.2.0",
"matrix-js-sdk": "22.0.0",
"matrix-widget-api": "^1.1.1",
"minimist": "^1.2.5",
"opus-recorder": "^8.0.3",
Expand Down Expand Up @@ -212,7 +213,7 @@
"stylelint": "^14.9.1",
"stylelint-config-standard": "^26.0.0",
"stylelint-scss": "^4.2.0",
"typescript": "4.7.4",
"typescript": "4.8.4",
"walk": "^2.3.14"
},
"jest": {
Expand Down
4 changes: 4 additions & 0 deletions res/css/_common.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,10 @@ fieldset {
border: none;
}

summary {
cursor: pointer;
}

legend {
padding-inline: unset;
border: none;
Expand Down
4 changes: 2 additions & 2 deletions res/css/_components.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
@import "./structures/_BackdropPanel.pcss";
@import "./structures/_CompatibilityPage.pcss";
@import "./structures/_ContextualMenu.pcss";
@import "./structures/_ErrorMessage.pcss";
@import "./structures/_FileDropTarget.pcss";
@import "./structures/_FilePanel.pcss";
@import "./structures/_GenericDropdownMenu.pcss";
Expand All @@ -63,7 +64,6 @@
@import "./structures/_NotificationPanel.pcss";
@import "./structures/_QuickSettingsButton.pcss";
@import "./structures/_RightPanel.pcss";
@import "./structures/_RoomDirectory.pcss";
@import "./structures/_RoomSearch.pcss";
@import "./structures/_RoomStatusBar.pcss";
@import "./structures/_RoomView.pcss";
Expand Down Expand Up @@ -157,6 +157,7 @@
@import "./views/dialogs/_UntrustedDeviceDialog.pcss";
@import "./views/dialogs/_UploadConfirmDialog.pcss";
@import "./views/dialogs/_UserSettingsDialog.pcss";
@import "./views/dialogs/_VerifyEMailDialog.pcss";
@import "./views/dialogs/_WidgetCapabilitiesPromptDialog.pcss";
@import "./views/dialogs/security/_AccessSecretStorageDialog.pcss";
@import "./views/dialogs/security/_CreateCrossSigningDialog.pcss";
Expand All @@ -169,7 +170,6 @@
@import "./views/elements/_CopyableText.pcss";
@import "./views/elements/_DesktopCapturerSourcePicker.pcss";
@import "./views/elements/_DialPadBackspaceButton.pcss";
@import "./views/elements/_DirectorySearchBox.pcss";
@import "./views/elements/_Dropdown.pcss";
@import "./views/elements/_EditableItemList.pcss";
@import "./views/elements/_ErrorBoundary.pcss";
Expand Down
28 changes: 27 additions & 1 deletion res/css/compound/_Icon.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,34 @@ limitations under the License.
padding: 1px;
}

.mx_Icon_accent {
color: $accent;
}

.mx_Icon_alert {
color: $alert;
}

.mx_Icon_8 {
flex: 0 0 8px;
height: 8px;
width: 8px;
}

.mx_Icon_16 {
height: 16px;
flex: 0 0 16px;
height: 16px;
width: 16px;
}

.mx_Icon_24 {
flex: 0 0 24px;
height: 24px;
width: 24px;
}

.mx_Icon_32 {
flex: 0 0 32px;
height: 32px;
width: 32px;
}
25 changes: 25 additions & 0 deletions res/css/structures/_ErrorMessage.pcss
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
Copyright 2022 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

.mx_ErrorMessage {
align-items: center;
color: $alert;
display: flex;
font-size: $font-12px;
gap: $spacing-8;
line-height: 1.2em;
min-height: 2.4em;
}
Loading

0 comments on commit f78012d

Please sign in to comment.