Merge tag 'v3.51.0' into sc

* Live location share - focus on user location on list item click ([\matrix-org#9051](matrix-org#9051)). Contributed by @kerryarchibald. * Live location sharing - don't trigger unread counts for beacon location events ([\matrix-org#9071](matrix-org#9071)). Contributed by @kerryarchibald. * Support for sending voice messages as replies and in threads ([\matrix-org#9097](matrix-org#9097)). Fixes element-hq/element-web#22031. * Add `Reply in thread` button to the right-click message context-menu ([\matrix-org#9004](matrix-org#9004)). Fixes element-hq/element-web#22745. * Starred_Messages_Feature_Contd_II/Outreachy ([\matrix-org#9086](matrix-org#9086)). * Use "frequently used emojis" for autocompletion in composer ([\matrix-org#8998](matrix-org#8998)). Fixes element-hq/element-web#18978. Contributed by @grimhilt. * Improve clickability of view source event toggle button ([\matrix-org#9068](matrix-org#9068)). Fixes element-hq/element-web#21856. Contributed by @luixxiul. * Improve clickability of "collapse" link button on bubble layout ([\matrix-org#9037](matrix-org#9037)). Fixes element-hq/element-web#22864. Contributed by @luixxiul. * Starred_Messages_Feature/Outreachy ([\matrix-org#8842](matrix-org#8842)). * Implement Use Case Selection screen ([\matrix-org#8984](matrix-org#8984)). Contributed by @justjanne. * Live location share - handle insufficient permissions in location sharing ([\matrix-org#9047](matrix-org#9047)). Contributed by @kerryarchibald. * Improve _FilePanel.scss ([\matrix-org#9031](matrix-org#9031)). Contributed by @luixxiul. * Improve spotlight accessibility by adding context menus ([\matrix-org#8907](matrix-org#8907)). Fixes element-hq/element-web#20875 and element-hq/element-web#22675. Contributed by @justjanne. * Replace mask-images with svg components in MessageActionBar ([\matrix-org#9088](matrix-org#9088)). Fixes element-hq/element-web#22912. Contributed by @kerryarchibald. * Unbreak in-app permalink tooltips ([\matrix-org#9087](matrix-org#9087)). Fixes element-hq/element-web#22874. * Show a back button when viewing a space member ([\matrix-org#9095](matrix-org#9095)). Fixes element-hq/element-web#22898. * Align the right edge of info tile lines with normal ones on IRC layout ([\matrix-org#9058](matrix-org#9058)). Fixes element-hq/element-web#22871. Contributed by @luixxiul. * Prevent email verification from overriding existing sessions ([\matrix-org#9075](matrix-org#9075)). Fixes element-hq/element-web#22881. Contributed by @justjanne. * Fix wrong buttons being used when exploring public rooms ([\matrix-org#9062](matrix-org#9062)). Fixes element-hq/element-web#22862. * Re-add padding to generic event list summary on IRC layout ([\matrix-org#9063](matrix-org#9063)). Fixes element-hq/element-web#22869. Contributed by @luixxiul. * Joining federated rooms via the spotlight search should no longer cause a "No known servers" error. ([\matrix-org#9055](matrix-org#9055)). Fixes element-hq/element-web#22845. Contributed by @Half-Shot.
SchildiChat · Aug 18, 2022 · 8cb2754 · 8cb2754
2 parents 3608ff2 + a97ac30
commit 8cb2754
Show file tree

Hide file tree

Showing 543 changed files with 8,465 additions and 4,676 deletions.
diff --git a/.stylelintrc.js b/.stylelintrc.js
@@ -1,5 +1,6 @@
 module.exports = {
     "extends": "stylelint-config-standard",
+    customSyntax: require('postcss-scss'),
     "plugins": [
         "stylelint-scss",
     ],
@@ -27,6 +28,25 @@ module.exports = {
         // rather than a CI thing. Shorthand selectors are harder to detect when searching for a
         // class name. This regex is trying to *allow* anything except `&words`, such as `&::before`,
         // `&.mx_Class`, etc.
-        "selector-nested-pattern": "^((&[ :.\\\[,])|([^&]))"
-    }
+        "selector-nested-pattern": "^((&[ :.\\\[,])|([^&]))",
+        "declaration-colon-space-after": "always-single-line",
+        // Disable some defaults
+        "selector-class-pattern": null,
+        "custom-property-pattern": null,
+        "selector-id-pattern": null,
+        "keyframes-name-pattern": null,
+        "string-quotes": null,
+        "alpha-value-notation": null,
+        "color-function-notation": null,
+        "selector-not-notation": null,
+        "import-notation": null,
+        "value-keyword-case": null,
+        "declaration-block-no-redundant-longhand-properties": null,
+        "shorthand-property-no-redundant-values": null,
+        "property-no-vendor-prefix": null,
+        "value-no-vendor-prefix": null,
+        "selector-no-vendor-prefix": null,
+        "media-feature-name-no-vendor-prefix": null,
+        "number-max-precision": null,
+    },
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,31 @@
+Changes in [3.51.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.51.0) (2022-08-02)
+=====================================================================================================
+
+## ✨ Features
+ * Live location share -  focus on user location on list item click ([\#9051](https://github.com/matrix-org/matrix-react-sdk/pull/9051)). Contributed by @kerryarchibald.
+ * Live location sharing - don't trigger unread counts for beacon location events ([\#9071](https://github.com/matrix-org/matrix-react-sdk/pull/9071)). Contributed by @kerryarchibald.
+ * Support for sending voice messages as replies and in threads ([\#9097](https://github.com/matrix-org/matrix-react-sdk/pull/9097)). Fixes vector-im/element-web#22031.
+ * Add `Reply in thread` button to the right-click message context-menu ([\#9004](https://github.com/matrix-org/matrix-react-sdk/pull/9004)). Fixes vector-im/element-web#22745.
+ * Starred_Messages_Feature_Contd_II/Outreachy ([\#9086](https://github.com/matrix-org/matrix-react-sdk/pull/9086)).
+ *  Use "frequently used emojis" for autocompletion in composer ([\#8998](https://github.com/matrix-org/matrix-react-sdk/pull/8998)). Fixes vector-im/element-web#18978. Contributed by @grimhilt.
+ * Improve clickability of view source event toggle button  ([\#9068](https://github.com/matrix-org/matrix-react-sdk/pull/9068)). Fixes vector-im/element-web#21856. Contributed by @luixxiul.
+ * Improve clickability of "collapse" link button on bubble layout ([\#9037](https://github.com/matrix-org/matrix-react-sdk/pull/9037)). Fixes vector-im/element-web#22864. Contributed by @luixxiul.
+ * Starred_Messages_Feature/Outreachy ([\#8842](https://github.com/matrix-org/matrix-react-sdk/pull/8842)).
+ * Implement Use Case Selection screen ([\#8984](https://github.com/matrix-org/matrix-react-sdk/pull/8984)). Contributed by @justjanne.
+ * Live location share - handle insufficient permissions in location sharing ([\#9047](https://github.com/matrix-org/matrix-react-sdk/pull/9047)). Contributed by @kerryarchibald.
+ * Improve _FilePanel.scss ([\#9031](https://github.com/matrix-org/matrix-react-sdk/pull/9031)). Contributed by @luixxiul.
+ * Improve spotlight accessibility by adding context menus ([\#8907](https://github.com/matrix-org/matrix-react-sdk/pull/8907)). Fixes vector-im/element-web#20875 and vector-im/element-web#22675. Contributed by @justjanne.
+
+## 🐛 Bug Fixes
+ * Replace mask-images with svg components in MessageActionBar ([\#9088](https://github.com/matrix-org/matrix-react-sdk/pull/9088)). Fixes vector-im/element-web#22912. Contributed by @kerryarchibald.
+ * Unbreak in-app permalink tooltips ([\#9087](https://github.com/matrix-org/matrix-react-sdk/pull/9087)). Fixes vector-im/element-web#22874.
+ * Show a back button when viewing a space member ([\#9095](https://github.com/matrix-org/matrix-react-sdk/pull/9095)). Fixes vector-im/element-web#22898.
+ * Align the right edge of info tile lines with normal ones on IRC layout ([\#9058](https://github.com/matrix-org/matrix-react-sdk/pull/9058)). Fixes vector-im/element-web#22871. Contributed by @luixxiul.
+ * Prevent email verification from overriding existing sessions ([\#9075](https://github.com/matrix-org/matrix-react-sdk/pull/9075)). Fixes vector-im/element-web#22881. Contributed by @justjanne.
+ * Fix wrong buttons being used when exploring public rooms ([\#9062](https://github.com/matrix-org/matrix-react-sdk/pull/9062)). Fixes vector-im/element-web#22862.
+ * Re-add padding to generic event list summary on IRC layout ([\#9063](https://github.com/matrix-org/matrix-react-sdk/pull/9063)). Fixes vector-im/element-web#22869. Contributed by @luixxiul.
+ * Joining federated rooms via the spotlight search should no longer cause a "No known servers" error. ([\#9055](https://github.com/matrix-org/matrix-react-sdk/pull/9055)). Fixes vector-im/element-web#22845. Contributed by @Half-Shot.
+
 Changes in [3.49.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.49.0) (2022-07-26)
 =====================================================================================================
 

diff --git a/cypress/e2e/1-register/register.spec.ts b/cypress/e2e/1-register/register.spec.ts
@@ -65,6 +65,8 @@ describe("Registration", () => {
         cy.startMeasuring("from-submit-to-home");
         cy.get(".mx_InteractiveAuthEntryComponents_termsSubmit").click();
 
+        cy.get(".mx_UseCaseSelection_skip .mx_AccessibleButton").click();
+
         cy.url().should('contain', '/#/home');
         cy.stopMeasuring("from-submit-to-home");
 

diff --git a/cypress/e2e/12-spotlight/spotlight.spec.ts b/cypress/e2e/12-spotlight/spotlight.spec.ts
@@ -139,6 +139,9 @@ describe("Spotlight", () => {
     const room2Name = "Lounge";
     let room2Id: string;
 
+    const room3Name = "Public";
+    let room3Id: string;
+
     beforeEach(() => {
         cy.startSynapse("default").then(data => {
             synapse = data;
@@ -163,6 +166,19 @@ describe("Spotlight", () => {
                             room2Id = _room2Id;
                             bot2.invite(room2Id, bot1.getUserId());
                         });
+                    bot2.createRoom({
+                        name: room3Name,
+                        visibility: Visibility.Public, initial_state: [{
+                            type: "m.room.history_visibility",
+                            state_key: "",
+                            content: {
+                                history_visibility: "world_readable",
+                            },
+                        }],
+                    }).then(({ room_id: _room3Id }) => {
+                        room3Id = _room3Id;
+                        bot2.invite(room3Id, bot1.getUserId());
+                    });
                 }),
             ).then(() =>
                 cy.get('.mx_RoomSublist_skeletonUI').should('not.exist'),
@@ -212,6 +228,7 @@ describe("Spotlight", () => {
             cy.spotlightSearch().clear().type(room1Name);
             cy.spotlightResults().should("have.length", 1);
             cy.spotlightResults().eq(0).should("contain", room1Name);
+            cy.spotlightResults().eq(0).should("contain", "View");
             cy.spotlightResults().eq(0).click();
             cy.url().should("contain", room1Id);
         }).then(() => {
@@ -225,6 +242,7 @@ describe("Spotlight", () => {
             cy.spotlightSearch().clear().type(room2Name);
             cy.spotlightResults().should("have.length", 1);
             cy.spotlightResults().eq(0).should("contain", room2Name);
+            cy.spotlightResults().eq(0).should("contain", "Join");
             cy.spotlightResults().eq(0).click();
             cy.url().should("contain", room2Id);
         }).then(() => {
@@ -233,6 +251,21 @@ describe("Spotlight", () => {
         });
     });
 
+    it("should find unknown public world readable rooms", () => {
+        cy.openSpotlightDialog().within(() => {
+            cy.spotlightFilter(Filter.PublicRooms);
+            cy.spotlightSearch().clear().type(room3Name);
+            cy.spotlightResults().should("have.length", 1);
+            cy.spotlightResults().eq(0).should("contain", room3Name);
+            cy.spotlightResults().eq(0).should("contain", "View");
+            cy.spotlightResults().eq(0).click();
+            cy.url().should("contain", room3Id);
+        }).then(() => {
+            cy.get(".mx_RoomPreviewBar_actions .mx_AccessibleButton").click();
+            cy.roomHeaderName().should("contain", room3Name);
+        });
+    });
+
     // TODO: We currently can’t test finding rooms on other homeservers/other protocols
     // We obviously don’t have federation or bridges in cypress tests
     /*
@@ -357,7 +390,7 @@ describe("Spotlight", () => {
             cy.spotlightSearch().clear().type("b");
             // our debouncing logic only starts the search after a short timeout,
             // so we wait a few milliseconds.
-            cy.wait(300);
+            cy.wait(1000);
             cy.get(".mx_Spinner").should("not.exist").then(() => {
                 cy.spotlightResults().should("have.length", 2).then(() => {
                     cy.spotlightResults().eq(0)

diff --git a/cypress/e2e/14-timeline/timeline.spec.ts b/cypress/e2e/14-timeline/timeline.spec.ts
@@ -23,6 +23,7 @@ import type { EventType } from "matrix-js-sdk/src/@types/event";
 import type { MatrixClient } from "matrix-js-sdk/src/client";
 import { SynapseInstance } from "../../plugins/synapsedocker";
 import { SettingLevel } from "../../../src/settings/SettingLevel";
+import { Layout } from "../../../src/settings/enums/Layout";
 import Chainable = Cypress.Chainable;
 
 // The avatar size used in the timeline
@@ -70,26 +71,27 @@ describe("Timeline", () => {
     let oldAvatarUrl: string;
     let newAvatarUrl: string;
 
+    beforeEach(() => {
+        cy.startSynapse("default").then(data => {
+            synapse = data;
+            cy.initTestUser(synapse, OLD_NAME).then(() =>
+                cy.window({ log: false }).then(() => {
+                    cy.createRoom({ name: ROOM_NAME }).then(_room1Id => {
+                        roomId = _room1Id;
+                    });
+                }),
+            );
+        });
+    });
+
     describe("useOnlyCurrentProfiles", () => {
         beforeEach(() => {
-            cy.startSynapse("default").then(data => {
-                synapse = data;
-                cy.initTestUser(synapse, OLD_NAME).then(() =>
-                    cy.window({ log: false }).then(() => {
-                        cy.createRoom({ name: ROOM_NAME }).then(_room1Id => {
-                            roomId = _room1Id;
-                        });
-                    }),
-                ).then(() => {
-                    cy.uploadContent(OLD_AVATAR).then((url) => {
-                        oldAvatarUrl = url;
-                        cy.setAvatarUrl(url);
-                    });
-                }).then(() => {
-                    cy.uploadContent(NEW_AVATAR).then((url) => {
-                        newAvatarUrl = url;
-                    });
-                });
+            cy.uploadContent(OLD_AVATAR).then((url) => {
+                oldAvatarUrl = url;
+                cy.setAvatarUrl(url);
+            });
+            cy.uploadContent(NEW_AVATAR).then((url) => {
+                newAvatarUrl = url;
             });
         });
 
@@ -142,4 +144,120 @@ describe("Timeline", () => {
             });
         });
     });
+
+    describe("message displaying", () => {
+        it("should create and configure a room on IRC layout", () => {
+            cy.visit("/#/room/" + roomId);
+            cy.setSettingValue("layout", null, SettingLevel.DEVICE, Layout.IRC);
+            cy.contains(".mx_RoomView_body .mx_GenericEventListSummary[data-layout=irc] " +
+                ".mx_GenericEventListSummary_summary", "created and configured the room.");
+            cy.percySnapshot("Configured room on IRC layout");
+        });
+
+        it("should add inline start margin to an event line on IRC layout", () => {
+            cy.visit("/#/room/" + roomId);
+            cy.setSettingValue("layout", null, SettingLevel.DEVICE, Layout.IRC);
+
+            // Wait until configuration is finished
+            cy.contains(".mx_RoomView_body .mx_GenericEventListSummary " +
+                ".mx_GenericEventListSummary_summary", "created and configured the room.");
+
+            // Click "expand" link button
+            cy.get(".mx_GenericEventListSummary_toggle[aria-expanded=false]").click();
+
+            // Check the event line has margin instead of inset property
+            // cf. _EventTile.pcss
+            //  --EventTile_irc_line_info-margin-inline-start
+            //  = calc(var(--name-width) + 10px + var(--icon-width))
+            //  = 80 + 10 + 14 = 104px
+            cy.get(".mx_EventTile[data-layout=irc].mx_EventTile_info:first-of-type .mx_EventTile_line")
+                .should('have.css', "margin-inline-start", "104px")
+                .should('have.css', "inset-inline-start", "0px");
+
+            // Exclude timestamp from snapshot
+            const percyCSS = ".mx_RoomView_body .mx_EventTile_info .mx_MessageTimestamp "
+                + "{ visibility: hidden !important; }";
+            cy.percySnapshot("Event line with inline start margin on IRC layout", { percyCSS });
+        });
+
+        it("should click top left of view source event toggle", () => {
+            sendEvent(roomId);
+            cy.visit("/#/room/" + roomId);
+            cy.setSettingValue("showHiddenEventsInTimeline", null, SettingLevel.DEVICE, true);
+            cy.contains(".mx_RoomView_body .mx_GenericEventListSummary " +
+                ".mx_GenericEventListSummary_summary", "created and configured the room.");
+
+            // Edit message
+            cy.contains(".mx_RoomView_body .mx_EventTile .mx_EventTile_line", "Message").within(() => {
+                cy.get('[aria-label="Edit"]').click({ force: true }); // Cypress has no ability to hover
+                cy.get(".mx_BasicMessageComposer_input").type("Edit{enter}");
+            });
+            cy.contains(".mx_RoomView_body .mx_EventTile[data-scroll-tokens]", "MessageEdit");
+
+            // Click top left of the event toggle, which should not be covered by MessageActionBar's safe area
+            cy.get(".mx_EventTile .mx_ViewSourceEvent").realHover()
+                .get(".mx_EventTile .mx_ViewSourceEvent .mx_ViewSourceEvent_toggle").click('topLeft', { force: false });
+
+            // Make sure the expand toggle worked
+            cy.get(".mx_EventTile .mx_ViewSourceEvent_expanded .mx_ViewSourceEvent_toggle").should("be.visible");
+        });
+
+        it("should click 'collapse' link button on the first hovered info event line on bubble layout", () => {
+            cy.visit("/#/room/" + roomId);
+            cy.setSettingValue("layout", null, SettingLevel.DEVICE, Layout.Bubble);
+            cy.contains(".mx_RoomView_body .mx_GenericEventListSummary[data-layout=bubble] " +
+                ".mx_GenericEventListSummary_summary", "created and configured the room.");
+
+            // Click "expand" link button
+            cy.get(".mx_GenericEventListSummary_toggle[aria-expanded=false]").click();
+
+            // Click "collapse" link button on the first hovered info event line
+            cy.get(".mx_GenericEventListSummary_unstyledList .mx_EventTile_info:first-of-type").realHover()
+                .get(".mx_GenericEventListSummary_toggle[aria-expanded=true]").click({ force: false });
+
+            // Make sure "collapse" link button worked
+            cy.get(".mx_GenericEventListSummary_toggle[aria-expanded=false]");
+        });
+    });
+
+    describe("message sending", () => {
+        const MESSAGE = "Hello world";
+        const viewRoomSendMessageAndSetupReply = () => {
+            // View room
+            cy.visit("/#/room/" + roomId);
+
+            // Send a message
+            cy.getComposer().type(`${MESSAGE}{enter}`);
+
+            // Reply to the message
+            cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile_line", "Hello world").within(() => {
+                cy.get('[aria-label="Reply"]').click({ force: true }); // Cypress has no ability to hover
+            });
+        };
+
+        it("can reply with a text message", () => {
+            const reply = "Reply";
+            viewRoomSendMessageAndSetupReply();
+
+            cy.getComposer().type(`${reply}{enter}`);
+
+            cy.get(".mx_RoomView_body .mx_EventTile .mx_EventTile_line").find(".mx_ReplyTile .mx_MTextBody")
+                .should("contain", MESSAGE);
+            cy.get(".mx_RoomView_body .mx_EventTile > .mx_EventTile_line > .mx_MTextBody").contains(reply)
+                .should("have.length", 1);
+        });
+
+        it("can reply with a voice message", () => {
+            viewRoomSendMessageAndSetupReply();
+
+            cy.openMessageComposerOptions().find(`[aria-label="Voice Message"]`).click();
+            cy.wait(3000);
+            cy.getComposer().find(".mx_MessageComposer_sendMessage").click();
+
+            cy.get(".mx_RoomView_body .mx_EventTile .mx_EventTile_line").find(".mx_ReplyTile .mx_MTextBody")
+                .should("contain", MESSAGE);
+            cy.get(".mx_RoomView_body .mx_EventTile > .mx_EventTile_line > .mx_MVoiceMessageBody")
+                .should("have.length", 1);
+        });
+    });
 });