Skip to content

Commit 7ee536a

Browse files
su-exsu-ex
committed
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.
2 parents bfb8023 + f7e6250 commit 7ee536a

File tree

168 files changed

+8161
-5284
lines changed

Some content is hidden

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

168 files changed

+8161
-5284
lines changed

‎CHANGELOG.md

Lines changed: 134 additions & 0 deletions
Large diffs are not rendered by default.

‎__test-utils__/environment.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "matrix-react-sdk",
3-
"version": "3.39.1",
3+
"version": "3.40.0",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {
@@ -58,9 +58,6 @@
5858
},
5959
"dependencies": {
6060
"@babel/runtime": "^7.12.5",
61-
"@matrix-org/linkify-element": "^4.0.0-rc.5",
62-
"@matrix-org/linkify-string": "^4.0.0-rc.5",
63-
"@matrix-org/linkifyjs": "^4.0.0-rc.6",
6461
"@sentry/browser": "^6.11.0",
6562
"@sentry/tracing": "^6.11.0",
6663
"@types/geojson": "^7946.0.8",
@@ -88,11 +85,14 @@
8885
"is-ip": "^3.1.0",
8986
"jszip": "^3.7.0",
9087
"katex": "^0.12.0",
88+
"linkify-element": "^4.0.0-beta.4",
89+
"linkify-string": "^4.0.0-beta.4",
90+
"linkifyjs": "^4.0.0-beta.4",
9191
"lodash": "^4.17.20",
9292
"maplibre-gl": "^1.15.2",
93-
"matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1",
93+
"matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#dfa6feaa12bcfc8e99b05a148e12fff7f9d62f08",
9494
"matrix-events-sdk": "^0.0.1-beta.6",
95-
"matrix-js-sdk": "15.5.0",
95+
"matrix-js-sdk": "15.5.1",
9696
"matrix-widget-api": "^0.1.0-beta.18",
9797
"minimist": "^1.2.5",
9898
"opus-recorder": "^8.0.3",
@@ -176,9 +176,9 @@
176176
"eslint-plugin-react": "^7.22.0",
177177
"eslint-plugin-react-hooks": "^4.2.0",
178178
"glob": "^7.1.6",
179-
"jest": "^26.6.3",
179+
"jest": "^27.4.0",
180180
"jest-canvas-mock": "^2.3.0",
181-
"jest-environment-jsdom-sixteen": "^1.0.3",
181+
"jest-environment-jsdom": "^27.0.6",
182182
"jest-fetch-mock": "^3.0.3",
183183
"jest-raw-loader": "^1.0.1",
184184
"matrix-mock-request": "^1.2.3",
@@ -201,7 +201,7 @@
201201
"snapshotSerializers": [
202202
"enzyme-to-json/serializer"
203203
],
204-
"testEnvironment": "./__test-utils__/environment.js",
204+
"testEnvironment": "jsdom",
205205
"testMatch": [
206206
"<rootDir>/test/**/*-test.[jt]s?(x)"
207207
],

‎res/css/_components.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@
183183
@import "./views/messages/_CallEvent.scss";
184184
@import "./views/messages/_CreateEvent.scss";
185185
@import "./views/messages/_DateSeparator.scss";
186+
@import "./views/messages/_JumpToDatePicker.scss";
186187
@import "./views/messages/_EventTileBubble.scss";
187188
@import "./views/messages/_HiddenBody.scss";
188189
@import "./views/messages/_MEmoteBody.scss";

‎res/css/structures/_ContextualMenu.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ limitations under the License.
4141
}
4242

4343
.mx_ContextualMenu_right {
44-
right: 0;
44+
right: 16px;
4545
}
4646

4747
.mx_ContextualMenu.mx_ContextualMenu_withChevron_right {

‎res/css/structures/_RoomSearch.scss

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ limitations under the License.
3535
mask-repeat: no-repeat;
3636
background-color: $secondary-content;
3737
margin-left: 7px;
38+
margin-bottom: 2px;
3839
}
3940

4041
.mx_RoomSearch_input {
@@ -44,14 +45,18 @@ limitations under the License.
4445
padding: 0;
4546
height: 100%;
4647
width: 100%;
47-
font-size: $font-12px;
48-
line-height: $font-16px;
4948

5049
&:not(.mx_RoomSearch_inputExpanded)::placeholder {
5150
color: $tertiary-content !important; // !important to override default app-wide styles
5251
}
5352
}
5453

54+
.mx_RoomSearch_input,
55+
.mx_RoomSearch_spotlightTriggerText {
56+
font-size: $font-12px;
57+
line-height: $font-16px;
58+
}
59+
5560
&.mx_RoomSearch_hasQuery {
5661
border-color: $secondary-content;
5762
}
@@ -107,4 +112,36 @@ limitations under the License.
107112
}
108113
}
109114
}
115+
116+
&.mx_RoomSearch_spotlightTrigger {
117+
cursor: pointer;
118+
min-width: 0;
119+
120+
.mx_RoomSearch_spotlightTriggerText {
121+
color: $tertiary-content;
122+
flex: 1;
123+
min-width: 0;
124+
// the following rules are to match that of a real input field
125+
overflow: hidden;
126+
margin: 9px;
127+
font-weight: $font-semi-bold;
128+
}
129+
130+
&:hover {
131+
background-color: $tertiary-content;
132+
133+
.mx_RoomSearch_spotlightTriggerText {
134+
color: $background;
135+
}
136+
137+
.mx_RoomSearch_shortcutPrompt {
138+
background-color: $background;
139+
color: $secondary-content;
140+
}
141+
142+
.mx_RoomSearch_icon {
143+
background-color: $background;
144+
}
145+
}
146+
}
110147
}

‎res/css/structures/_RoomView.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,10 @@ limitations under the License.
209209
.mx_RoomView_searchResultsPanel {
210210
.mx_RoomView_messageListWrapper {
211211
justify-content: flex-start;
212+
213+
> .mx_RoomView_MessageList > li > ol {
214+
list-style-type: none;
215+
}
212216
}
213217

214218
a {

‎res/css/structures/_SpaceHierarchy.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ limitations under the License.
8484
width: 16px;
8585
left: 0;
8686
background-image: url("$(res)/img/element-icons/warning-badge.svg");
87+
background-size: cover;
88+
background-repeat: no-repeat;
8789
}
8890
}
8991

‎res/css/views/avatars/_DecoratedRoomAvatar.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ limitations under the License.
2727

2828
.mx_DecoratedRoomAvatar_icon {
2929
position: absolute;
30+
// the following percentage based sizings are to match the scalable svg mask for the cutout
3031
bottom: -6.25%;
3132
right: -6.25%;
3233
margin: 12.5%;
@@ -37,8 +38,8 @@ limitations under the License.
3738

3839
.mx_DecoratedRoomAvatar_icon::before {
3940
content: '';
40-
width: 8px;
41-
height: 8px;
41+
width: 100%;
42+
height: 100%;
4243
right: 0;
4344
position: absolute;
4445
border-radius: 50%;

‎res/css/views/beta/_BetaCard.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ limitations under the License.
5656
line-height: $font-15px;
5757
color: $secondary-content;
5858
margin-top: 20px;
59+
60+
> h4 {
61+
margin: 0;
62+
}
63+
64+
> p {
65+
margin-top: 0;
66+
}
5967
}
6068
}
6169

@@ -64,6 +72,7 @@ limitations under the License.
6472
width: 300px;
6573
object-fit: contain;
6674
height: 100%;
75+
border-radius: 4px;
6776
}
6877
}
6978

@@ -90,6 +99,7 @@ limitations under the License.
9099
border-radius: 8px;
91100
text-transform: uppercase;
92101
font-size: 12px;
102+
font-weight: $font-semi-bold;
93103
line-height: 15px;
94104
color: #FFFFFF;
95105
display: inline-block;

‎res/css/views/context_menus/_IconizedContextMenu.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,21 @@ limitations under the License.
5050
}
5151

5252
// round the top corners of the top button for the hover effect to be bounded
53-
&:first-child .mx_AccessibleButton:first-child {
53+
&:first-child .mx_IconizedContextMenu_item:first-child {
5454
border-radius: $border-radius-8px $border-radius-8px 0 0; // radius matches .mx_ContextualMenu
5555
}
5656

5757
// round the bottom corners of the bottom button for the hover effect to be bounded
58-
&:last-child .mx_AccessibleButton:last-child {
58+
&:last-child .mx_IconizedContextMenu_item:last-child {
5959
border-radius: 0 0 $border-radius-8px $border-radius-8px; // radius matches .mx_ContextualMenu
6060
}
6161

6262
// round all corners of the only button for the hover effect to be bounded
63-
&:first-child:last-child .mx_AccessibleButton:first-child:last-child {
64-
border-radius: 8px; // radius matches .mx_ContextualMenu
63+
&:first-child:last-child .mx_IconizedContextMenu_item:first-child:last-child {
64+
border-radius: $border-radius-8px; // radius matches .mx_ContextualMenu
6565
}
6666

67-
.mx_AccessibleButton {
67+
.mx_IconizedContextMenu_item {
6868
// pad the inside of the button so that the hover background is padded too
6969
padding-top: 12px;
7070
padding-bottom: 12px;
@@ -130,7 +130,7 @@ limitations under the License.
130130
}
131131

132132
.mx_IconizedContextMenu_optionList_red {
133-
.mx_AccessibleButton {
133+
.mx_IconizedContextMenu_item {
134134
color: $alert !important;
135135
}
136136

@@ -148,7 +148,7 @@ limitations under the License.
148148
}
149149

150150
.mx_IconizedContextMenu_active {
151-
&.mx_AccessibleButton, .mx_AccessibleButton {
151+
&.mx_IconizedContextMenu_item, .mx_IconizedContextMenu_item {
152152
color: $accent !important;
153153
}
154154

‎res/css/views/dialogs/_ExportDialog.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,7 @@ limitations under the License.
8989
padding: 9px 10px;
9090
}
9191
}
92+
93+
.mx_ExportDialog_attachments-checkbox {
94+
margin-top: $spacing-16;
95+
}

‎res/css/views/dialogs/_InviteDialog.scss

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,8 @@ limitations under the License.
130130
text-transform: uppercase;
131131
}
132132

133-
.mx_InviteDialog_footer_link {
134-
display: flex;
135-
justify-content: space-between;
136-
border-radius: 4px;
137-
border: solid 1px $light-fg-color;
138-
padding: 8px;
133+
.mx_CopyableText {
134+
width: unset; // full width
139135

140136
> a {
141137
text-decoration: none;
@@ -144,22 +140,6 @@ limitations under the License.
144140
text-overflow: ellipsis;
145141
}
146142
}
147-
148-
.mx_InviteDialog_footer_link_copy {
149-
flex-shrink: 0;
150-
cursor: pointer;
151-
margin-left: 20px;
152-
display: inherit;
153-
154-
> div {
155-
mask-image: url($copy-button-url);
156-
background-color: $message-action-bar-fg-color;
157-
margin-left: 5px;
158-
width: 20px;
159-
height: 20px;
160-
background-repeat: no-repeat;
161-
}
162-
}
163143
}
164144

165145
.mx_InviteDialog_roomTile {

‎res/css/views/dialogs/_ShareDialog.scss

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -20,44 +20,20 @@ limitations under the License.
2020
border-color: $light-fg-color;
2121
}
2222

23-
.mx_ShareDialog_content {
23+
.mx_ShareDialog .mx_ShareDialog_content {
2424
margin: 10px 0;
25-
}
26-
27-
.mx_ShareDialog_matrixto {
28-
display: flex;
29-
justify-content: space-between;
30-
border-radius: $border-radius-5px;
31-
border: solid 1px $light-fg-color;
32-
margin-bottom: 10px;
33-
margin-top: 30px;
34-
padding: 10px;
35-
}
3625

37-
.mx_ShareDialog_matrixto a {
38-
text-decoration: none;
39-
}
40-
41-
.mx_ShareDialog_matrixto_link {
42-
flex-shrink: 1;
43-
overflow: hidden;
44-
text-overflow: ellipsis;
45-
}
46-
47-
.mx_ShareDialog_matrixto_copy {
48-
flex-shrink: 0;
49-
cursor: pointer;
50-
margin-left: 20px;
51-
display: inherit;
52-
}
53-
.mx_ShareDialog_matrixto_copy::after {
54-
content: "";
55-
mask-image: url($copy-button-url);
56-
background-color: $message-action-bar-fg-color;
57-
margin-left: 5px;
58-
width: 20px;
59-
height: 20px;
60-
background-repeat: no-repeat;
26+
.mx_CopyableText {
27+
width: unset; // full width
28+
29+
> a {
30+
text-decoration: none;
31+
flex-shrink: 1;
32+
overflow: hidden;
33+
text-overflow: ellipsis;
34+
white-space: nowrap;
35+
}
36+
}
6137
}
6238

6339
.mx_ShareDialog_split {

0 commit comments

Comments
 (0)