Merge tag 'v3.40.0' into sc

* Capitalize "Privacy" in UserMenu ([\matrix-org#7738](matrix-org#7738)). Contributed by @aaronraimist. * Move new search experience to a Beta ([\matrix-org#7718](matrix-org#7718)). Fixes element-hq/element-meta#139 element-hq/element-web#20618 and element-hq/element-web#20339. * Auto select "Other homeserver" when user press "Edit" in homeserver field ([\matrix-org#7337](matrix-org#7337)). Fixes element-hq/element-web#20125. Contributed by @SimonBrandner. * Add unread badges and avatar decorations to spotlight search ([\matrix-org#7696](matrix-org#7696)). Fixes element-hq/element-web#20821. * Enable location sharing ([\matrix-org#7703](matrix-org#7703)). * Simplify Composer buttons ([\matrix-org#7678](matrix-org#7678)). * Add a warning to the console to discourage attacks and encourage contributing ([\matrix-org#7673](matrix-org#7673)). Fixes element-hq/element-web#2803. Contributed by @SimonBrandner. * Don't show replaced calls in the timeline ([\matrix-org#7452](matrix-org#7452)). Contributed by @SimonBrandner. * Tweak `/addwidget` widget names ([\matrix-org#7681](matrix-org#7681)). * Chat export parameter customisation ([\matrix-org#7647](matrix-org#7647)). * Put call on hold when transfer dialog is opened ([\matrix-org#7669](matrix-org#7669)). * Share e2ee keys when using /invite SlashCommand ([\matrix-org#7655](matrix-org#7655)). Fixes element-hq/element-web#20778 and element-hq/element-web#16982. * Tweak spotlight roving behaviour to reset when changing query ([\matrix-org#7656](matrix-org#7656)). Fixes element-hq/element-web#20537 element-hq/element-web#20612 and element-hq/element-web#20184. * Look up tile server info in homeserver's .well-known area ([\matrix-org#7623](matrix-org#7623)). * Add grouper for hidden events ([\matrix-org#7649](matrix-org#7649)). * The keyboard shortcut is control (or cmd) shift h. ([\matrix-org#7584](matrix-org#7584)). Contributed by @UwUnyaa. * [Release] Fix cutout misalignment on some decorated room avatars ([\matrix-org#7785](matrix-org#7785)). * [Release] Fix add existing space not showing any spaces ([\matrix-org#7756](matrix-org#7756)). * [Release] Inhibit Room List keyboard pass-thru when the search beta is enabled ([\matrix-org#7754](matrix-org#7754)). * [Release] Fix space member list not opening ([\matrix-org#7755](matrix-org#7755)). * Null-guard ELS from null summaryMembers ([\matrix-org#7744](matrix-org#7744)). Fixes element-hq/element-web#20807. * Improve responsiveness of the layout switcher ([\matrix-org#7736](matrix-org#7736)). * Tweak timeline card layout ([\matrix-org#7743](matrix-org#7743)). Fixes element-hq/element-web#20846. * Ensure location bodies have a width in bubbles ([\matrix-org#7742](matrix-org#7742)). Fixes element-hq/element-web#20916. * Tune aria-live regions around clocks/timers ([\matrix-org#7735](matrix-org#7735)). Fixes element-hq/element-web#20967. * Fix instances of decorated room avatar wrongly having their own tabIndex ([\matrix-org#7730](matrix-org#7730)). * Remove weird padding on stickers ([\matrix-org#6271](matrix-org#6271)). Fixes element-hq/element-web#17787. Contributed by @SimonBrandner. * Fix width issue of the composer overflow menu items ([\matrix-org#7731](matrix-org#7731)). Fixes element-hq/element-web#20898. * Properly handle persistent widgets when room is left ([\matrix-org#7724](matrix-org#7724)). Fixes element-hq/element-web#20901. * Null guard space hierarchy ([\matrix-org#7729](matrix-org#7729)). Fixes matrix-org/element-web-rageshakes#10433. * Fix add existing rooms button ([\matrix-org#7728](matrix-org#7728)). Fixes element-hq/element-web#20924. Contributed by @SimonBrandner. * Truncate long server names on login/register screen ([\matrix-org#7702](matrix-org#7702)). Fixes element-hq/element-web#18452. * Update PollCreateDialog-test to snapshot the html and not react tree ([\matrix-org#7712](matrix-org#7712)). * Fix creating polls outside of threads ([\matrix-org#7711](matrix-org#7711)). Fixes element-hq/element-web#20882. * Open native room when clicking notification from a virtual room ([\matrix-org#7709](matrix-org#7709)). * Fix relative link handling in Element Desktop ([\matrix-org#7708](matrix-org#7708)). Fixes element-hq/element-web#20783. * Reuse CopyableText component in all places it can be ([\matrix-org#7701](matrix-org#7701)). Fixes element-hq/element-web#20855. * Fit location into the width of the container ([\matrix-org#7705](matrix-org#7705)). Fixes element-hq/element-web#20861. * Make Spotlight Dialog roving reset more stable ([\matrix-org#7698](matrix-org#7698)). Fixes element-hq/element-web#20826. * Fix incorrect sizing of DecoratedRoomAvatar in RoomHeader ([\matrix-org#7697](matrix-org#7697)). Fixes element-hq/element-web#20090. * Use a more correct test for emoji ([\matrix-org#7685](matrix-org#7685)). Fixes element-hq/element-web#20824. Contributed by @robintown. * Fix vertical spacing in `compact` `<ContextMenu>` ([\matrix-org#7684](matrix-org#7684)). Fixes element-hq/element-web#20801. * Fix the sticker picker ([\matrix-org#7692](matrix-org#7692)). Fixes element-hq/element-web#20797. * Fix publishing address wrongly demanding the alias be available ([\matrix-org#7690](matrix-org#7690)). Fixes element-hq/element-web#12013 and element-hq/element-web#20833. * Prevent MemberAvatar soft-crashing when rendered with null member prop ([\matrix-org#7691](matrix-org#7691)). Fixes element-hq/element-web#20714. * Ensure UserInfo can be rendered without a room ([\matrix-org#7687](matrix-org#7687)). Fixes element-hq/element-web#20830. * Make polls fill column width in bubbles layout ([\matrix-org#7661](matrix-org#7661)). Fixes element-hq/element-web#20712. * Add a background to expanded nick name in IRC layout to make it readable. ([\matrix-org#7652](matrix-org#7652)). Fixes element-hq/element-web#20757. Contributed by @UwUnyaa. * Fix accessibility and consistency of MessageComposerButtons ([\matrix-org#7679](matrix-org#7679)). Fixes element-hq/element-web#20814. * Don't show shield next to deleted messages ([\matrix-org#7671](matrix-org#7671)). Fixes element-hq/element-web#20475. Contributed by @SimonBrandner. * Fix font size of spaces between big emoji ([\matrix-org#7675](matrix-org#7675)). Contributed by @robintown. * Fix shift-enter repeating last character ([\matrix-org#7665](matrix-org#7665)). Fixes element-hq/element-web#17215. Contributed by @SimonBrandner. * Remove Unpin option from maximised widget context menu ([\matrix-org#7657](matrix-org#7657)). * Fix new call event grouper implementation for encrypted rooms ([\matrix-org#7654](matrix-org#7654)). * Fix issue with tile error boundaries collapsing in bubbles layout ([\matrix-org#7653](matrix-org#7653)). * Fix emojis getting cropped in irc & bubble layouts by anti-zalgo ([\matrix-org#7637](matrix-org#7637)). Fixes element-hq/element-web#20744. * Fix space panel edge gradient not applying on load ([\matrix-org#7644](matrix-org#7644)). Fixes element-hq/element-web#20756. * Fix search results view for layouts other than Group/Modern ([\matrix-org#7648](matrix-org#7648)). Fixes element-hq/element-web#20745.
SchildiChat · Feb 14, 2022 · 7ee536a · 7ee536a
2 parents bfb8023 + f7e6250
commit 7ee536a
Show file tree

Hide file tree

Showing 168 changed files with 8,161 additions and 5,284 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/__test-utils__/environment.js b/__test-utils__/environment.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "3.39.1",
+  "version": "3.40.0",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {
@@ -58,9 +58,6 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@matrix-org/linkify-element": "^4.0.0-rc.5",
-    "@matrix-org/linkify-string": "^4.0.0-rc.5",
-    "@matrix-org/linkifyjs": "^4.0.0-rc.6",
     "@sentry/browser": "^6.11.0",
     "@sentry/tracing": "^6.11.0",
     "@types/geojson": "^7946.0.8",
@@ -88,11 +85,14 @@
     "is-ip": "^3.1.0",
     "jszip": "^3.7.0",
     "katex": "^0.12.0",
+    "linkify-element": "^4.0.0-beta.4",
+    "linkify-string": "^4.0.0-beta.4",
+    "linkifyjs": "^4.0.0-beta.4",
     "lodash": "^4.17.20",
     "maplibre-gl": "^1.15.2",
-    "matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1",
+    "matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#dfa6feaa12bcfc8e99b05a148e12fff7f9d62f08",
     "matrix-events-sdk": "^0.0.1-beta.6",
-    "matrix-js-sdk": "15.5.0",
+    "matrix-js-sdk": "15.5.1",
     "matrix-widget-api": "^0.1.0-beta.18",
     "minimist": "^1.2.5",
     "opus-recorder": "^8.0.3",
@@ -176,9 +176,9 @@
     "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-react-hooks": "^4.2.0",
     "glob": "^7.1.6",
-    "jest": "^26.6.3",
+    "jest": "^27.4.0",
     "jest-canvas-mock": "^2.3.0",
-    "jest-environment-jsdom-sixteen": "^1.0.3",
+    "jest-environment-jsdom": "^27.0.6",
     "jest-fetch-mock": "^3.0.3",
     "jest-raw-loader": "^1.0.1",
     "matrix-mock-request": "^1.2.3",
@@ -201,7 +201,7 @@
     "snapshotSerializers": [
       "enzyme-to-json/serializer"
     ],
-    "testEnvironment": "./__test-utils__/environment.js",
+    "testEnvironment": "jsdom",
     "testMatch": [
       "<rootDir>/test/**/*-test.[jt]s?(x)"
     ],

diff --git a/res/css/_components.scss b/res/css/_components.scss
@@ -183,6 +183,7 @@
 @import "./views/messages/_CallEvent.scss";
 @import "./views/messages/_CreateEvent.scss";
 @import "./views/messages/_DateSeparator.scss";
+@import "./views/messages/_JumpToDatePicker.scss";
 @import "./views/messages/_EventTileBubble.scss";
 @import "./views/messages/_HiddenBody.scss";
 @import "./views/messages/_MEmoteBody.scss";

diff --git a/res/css/structures/_ContextualMenu.scss b/res/css/structures/_ContextualMenu.scss
@@ -41,7 +41,7 @@ limitations under the License.
 }
 
 .mx_ContextualMenu_right {
-    right: 0;
+    right: 16px;
 }
 
 .mx_ContextualMenu.mx_ContextualMenu_withChevron_right {

diff --git a/res/css/structures/_RoomSearch.scss b/res/css/structures/_RoomSearch.scss
@@ -35,6 +35,7 @@ limitations under the License.
         mask-repeat: no-repeat;
         background-color: $secondary-content;
         margin-left: 7px;
+        margin-bottom: 2px;
     }
 
     .mx_RoomSearch_input {
@@ -44,14 +45,18 @@ limitations under the License.
         padding: 0;
         height: 100%;
         width: 100%;
-        font-size: $font-12px;
-        line-height: $font-16px;
 
         &:not(.mx_RoomSearch_inputExpanded)::placeholder {
             color: $tertiary-content !important; // !important to override default app-wide styles
         }
     }
 
+    .mx_RoomSearch_input,
+    .mx_RoomSearch_spotlightTriggerText {
+        font-size: $font-12px;
+        line-height: $font-16px;
+    }
+
     &.mx_RoomSearch_hasQuery {
         border-color: $secondary-content;
     }
@@ -107,4 +112,36 @@ limitations under the License.
             }
         }
     }
+
+    &.mx_RoomSearch_spotlightTrigger {
+        cursor: pointer;
+        min-width: 0;
+
+        .mx_RoomSearch_spotlightTriggerText {
+            color: $tertiary-content;
+            flex: 1;
+            min-width: 0;
+            // the following rules are to match that of a real input field
+            overflow: hidden;
+            margin: 9px;
+            font-weight: $font-semi-bold;
+        }
+
+        &:hover {
+            background-color: $tertiary-content;
+
+            .mx_RoomSearch_spotlightTriggerText {
+                color: $background;
+            }
+
+            .mx_RoomSearch_shortcutPrompt {
+                background-color: $background;
+                color: $secondary-content;
+            }
+
+            .mx_RoomSearch_icon {
+                background-color: $background;
+            }
+        }
+    }
 }
diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
@@ -209,6 +209,10 @@ limitations under the License.
 .mx_RoomView_searchResultsPanel {
     .mx_RoomView_messageListWrapper {
         justify-content: flex-start;
+
+        > .mx_RoomView_MessageList > li > ol {
+            list-style-type: none;
+        }
     }
 
     a {

diff --git a/res/css/structures/_SpaceHierarchy.scss b/res/css/structures/_SpaceHierarchy.scss
@@ -84,6 +84,8 @@ limitations under the License.
             width: 16px;
             left: 0;
             background-image: url("$(res)/img/element-icons/warning-badge.svg");
+            background-size: cover;
+            background-repeat: no-repeat;
         }
     }
 

diff --git a/res/css/views/avatars/_DecoratedRoomAvatar.scss b/res/css/views/avatars/_DecoratedRoomAvatar.scss
@@ -27,6 +27,7 @@ limitations under the License.
 
     .mx_DecoratedRoomAvatar_icon {
         position: absolute;
+        // the following percentage based sizings are to match the scalable svg mask for the cutout
         bottom: -6.25%;
         right: -6.25%;
         margin: 12.5%;
@@ -37,8 +38,8 @@ limitations under the License.
 
     .mx_DecoratedRoomAvatar_icon::before {
         content: '';
-        width: 8px;
-        height: 8px;
+        width: 100%;
+        height: 100%;
         right: 0;
         position: absolute;
         border-radius: 50%;

diff --git a/res/css/views/beta/_BetaCard.scss b/res/css/views/beta/_BetaCard.scss
@@ -56,6 +56,14 @@ limitations under the License.
                 line-height: $font-15px;
                 color: $secondary-content;
                 margin-top: 20px;
+
+                > h4 {
+                    margin: 0;
+                }
+
+                > p {
+                    margin-top: 0;
+                }
             }
         }
 
@@ -64,6 +72,7 @@ limitations under the License.
             width: 300px;
             object-fit: contain;
             height: 100%;
+            border-radius: 4px;
         }
     }
 
@@ -90,6 +99,7 @@ limitations under the License.
     border-radius: 8px;
     text-transform: uppercase;
     font-size: 12px;
+    font-weight: $font-semi-bold;
     line-height: 15px;
     color: #FFFFFF;
     display: inline-block;

diff --git a/res/css/views/context_menus/_IconizedContextMenu.scss b/res/css/views/context_menus/_IconizedContextMenu.scss
@@ -50,21 +50,21 @@ limitations under the License.
         }
 
         // round the top corners of the top button for the hover effect to be bounded
-        &:first-child .mx_AccessibleButton:first-child {
+        &:first-child .mx_IconizedContextMenu_item:first-child {
             border-radius: $border-radius-8px $border-radius-8px 0 0; // radius matches .mx_ContextualMenu
         }
 
         // round the bottom corners of the bottom button for the hover effect to be bounded
-        &:last-child .mx_AccessibleButton:last-child {
+        &:last-child .mx_IconizedContextMenu_item:last-child {
             border-radius: 0 0 $border-radius-8px $border-radius-8px; // radius matches .mx_ContextualMenu
         }
 
         // round all corners of the only button for the hover effect to be bounded
-        &:first-child:last-child .mx_AccessibleButton:first-child:last-child {
-            border-radius: 8px; // radius matches .mx_ContextualMenu
+        &:first-child:last-child .mx_IconizedContextMenu_item:first-child:last-child {
+            border-radius: $border-radius-8px; // radius matches .mx_ContextualMenu
         }
 
-        .mx_AccessibleButton {
+        .mx_IconizedContextMenu_item {
             // pad the inside of the button so that the hover background is padded too
             padding-top: 12px;
             padding-bottom: 12px;
@@ -130,7 +130,7 @@ limitations under the License.
     }
 
     .mx_IconizedContextMenu_optionList_red {
-        .mx_AccessibleButton {
+        .mx_IconizedContextMenu_item {
             color: $alert !important;
         }
 
@@ -148,7 +148,7 @@ limitations under the License.
     }
 
     .mx_IconizedContextMenu_active {
-        &.mx_AccessibleButton, .mx_AccessibleButton {
+        &.mx_IconizedContextMenu_item, .mx_IconizedContextMenu_item {
             color: $accent !important;
         }
 

diff --git a/res/css/views/dialogs/_ExportDialog.scss b/res/css/views/dialogs/_ExportDialog.scss
@@ -89,3 +89,7 @@ limitations under the License.
         padding: 9px 10px;
     }
 }
+
+.mx_ExportDialog_attachments-checkbox {
+    margin-top: $spacing-16;
+}
diff --git a/res/css/views/dialogs/_InviteDialog.scss b/res/css/views/dialogs/_InviteDialog.scss
@@ -130,12 +130,8 @@ limitations under the License.
         text-transform: uppercase;
     }
 
-    .mx_InviteDialog_footer_link {
-        display: flex;
-        justify-content: space-between;
-        border-radius: 4px;
-        border: solid 1px $light-fg-color;
-        padding: 8px;
+    .mx_CopyableText {
+        width: unset; // full width
 
         > a {
             text-decoration: none;
@@ -144,22 +140,6 @@ limitations under the License.
             text-overflow: ellipsis;
         }
     }
-
-    .mx_InviteDialog_footer_link_copy {
-        flex-shrink: 0;
-        cursor: pointer;
-        margin-left: 20px;
-        display: inherit;
-
-        > div {
-            mask-image: url($copy-button-url);
-            background-color: $message-action-bar-fg-color;
-            margin-left: 5px;
-            width: 20px;
-            height: 20px;
-            background-repeat: no-repeat;
-        }
-    }
 }
 
 .mx_InviteDialog_roomTile {

diff --git a/res/css/views/dialogs/_ShareDialog.scss b/res/css/views/dialogs/_ShareDialog.scss
@@ -20,44 +20,20 @@ limitations under the License.
     border-color: $light-fg-color;
 }
 
-.mx_ShareDialog_content {
+.mx_ShareDialog .mx_ShareDialog_content {
     margin: 10px 0;
-}
-
-.mx_ShareDialog_matrixto {
-    display: flex;
-    justify-content: space-between;
-    border-radius: $border-radius-5px;
-    border: solid 1px $light-fg-color;
-    margin-bottom: 10px;
-    margin-top: 30px;
-    padding: 10px;
-}
 
-.mx_ShareDialog_matrixto a {
-    text-decoration: none;
-}
-
-.mx_ShareDialog_matrixto_link {
-    flex-shrink: 1;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.mx_ShareDialog_matrixto_copy {
-    flex-shrink: 0;
-    cursor: pointer;
-    margin-left: 20px;
-    display: inherit;
-}
-.mx_ShareDialog_matrixto_copy::after {
-    content: "";
-    mask-image: url($copy-button-url);
-    background-color: $message-action-bar-fg-color;
-    margin-left: 5px;
-    width: 20px;
-    height: 20px;
-    background-repeat: no-repeat;
+    .mx_CopyableText {
+        width: unset; // full width
+
+        > a {
+            text-decoration: none;
+            flex-shrink: 1;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+    }
 }
 
 .mx_ShareDialog_split {