Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 17f4945

Browse files
germain-gggermain-gg
committed
Merge branch 'develop' into gsouquet/cache-decrypt
2 parents c96f11d + 70d7a59 commit 17f4945

Some content is hidden

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

56 files changed

+1138
-647
lines changed

‎CHANGELOG.md‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,115 @@
1+
Changes in [3.20.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.20.0) (2021-05-10)
2+
=====================================================================================================
3+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.20.0-rc.1...v3.20.0)
4+
5+
* Upgrade to JS SDK 10.1.0
6+
* [Release] Don't use the event's metadata to calc the scale of an image
7+
[\#6004](https://github.com/matrix-org/matrix-react-sdk/pull/6004)
8+
9+
Changes in [3.20.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.20.0-rc.1) (2021-05-04)
10+
===============================================================================================================
11+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.19.0...v3.20.0-rc.1)
12+
13+
* Upgrade to JS SDK 10.1.0-rc.1
14+
* Translations update from Weblate
15+
[\#5966](https://github.com/matrix-org/matrix-react-sdk/pull/5966)
16+
* Fix more space panel layout and hover behaviour issues
17+
[\#5965](https://github.com/matrix-org/matrix-react-sdk/pull/5965)
18+
* Fix edge case with space panel alignment with subspaces on ff
19+
[\#5964](https://github.com/matrix-org/matrix-react-sdk/pull/5964)
20+
* Fix saving room pill part to history
21+
[\#5951](https://github.com/matrix-org/matrix-react-sdk/pull/5951)
22+
* Generate room preview even when minimized
23+
[\#5948](https://github.com/matrix-org/matrix-react-sdk/pull/5948)
24+
* Another change from recovery passphrase to Security Phrase
25+
[\#5934](https://github.com/matrix-org/matrix-react-sdk/pull/5934)
26+
* Sort rooms in the add existing to space dialog based on recency
27+
[\#5943](https://github.com/matrix-org/matrix-react-sdk/pull/5943)
28+
* Inhibit sending RR when context switching to a room
29+
[\#5944](https://github.com/matrix-org/matrix-react-sdk/pull/5944)
30+
* Prevent room list keyboard handling from landing focus on hidden nodes
31+
[\#5950](https://github.com/matrix-org/matrix-react-sdk/pull/5950)
32+
* Make the text filter search all spaces instead of just the selected one
33+
[\#5942](https://github.com/matrix-org/matrix-react-sdk/pull/5942)
34+
* Enable indent rule and fix indent
35+
[\#5931](https://github.com/matrix-org/matrix-react-sdk/pull/5931)
36+
* Prevent peeking members from reacting
37+
[\#5946](https://github.com/matrix-org/matrix-react-sdk/pull/5946)
38+
* Disallow inline display maths
39+
[\#5939](https://github.com/matrix-org/matrix-react-sdk/pull/5939)
40+
* Space creation prompt user to add existing rooms for "Just Me" spaces
41+
[\#5923](https://github.com/matrix-org/matrix-react-sdk/pull/5923)
42+
* Add test coverage collection script
43+
[\#5937](https://github.com/matrix-org/matrix-react-sdk/pull/5937)
44+
* Fix joining room using via servers regression
45+
[\#5936](https://github.com/matrix-org/matrix-react-sdk/pull/5936)
46+
* Revert "Fixes the two Todays problem in Redaction"
47+
[\#5938](https://github.com/matrix-org/matrix-react-sdk/pull/5938)
48+
* Handle encoded matrix URLs
49+
[\#5903](https://github.com/matrix-org/matrix-react-sdk/pull/5903)
50+
* Render ignored users setting regardless of if there are any
51+
[\#5860](https://github.com/matrix-org/matrix-react-sdk/pull/5860)
52+
* Fix inserting trailing colon after mention/pill
53+
[\#5830](https://github.com/matrix-org/matrix-react-sdk/pull/5830)
54+
* Fixes the two Todays problem in Redaction
55+
[\#5917](https://github.com/matrix-org/matrix-react-sdk/pull/5917)
56+
* Fix page up/down scrolling only half a page
57+
[\#5920](https://github.com/matrix-org/matrix-react-sdk/pull/5920)
58+
* Voice messages: Composer controls
59+
[\#5935](https://github.com/matrix-org/matrix-react-sdk/pull/5935)
60+
* Support MSC3086 asserted identity
61+
[\#5886](https://github.com/matrix-org/matrix-react-sdk/pull/5886)
62+
* Handle possible edge case with getting stuck in "unsent messages" bar
63+
[\#5930](https://github.com/matrix-org/matrix-react-sdk/pull/5930)
64+
* Fix suggested rooms not showing up regression from room list optimisation
65+
[\#5932](https://github.com/matrix-org/matrix-react-sdk/pull/5932)
66+
* Broadcast language change to ElectronPlatform
67+
[\#5913](https://github.com/matrix-org/matrix-react-sdk/pull/5913)
68+
* Fix VoIP PIP frame color
69+
[\#5701](https://github.com/matrix-org/matrix-react-sdk/pull/5701)
70+
* Convert some Flow-typed files to TypeScript
71+
[\#5912](https://github.com/matrix-org/matrix-react-sdk/pull/5912)
72+
* Initial SpaceStore tests work
73+
[\#5906](https://github.com/matrix-org/matrix-react-sdk/pull/5906)
74+
* Fix issues with space hierarchy in layout and with incompatible servers
75+
[\#5926](https://github.com/matrix-org/matrix-react-sdk/pull/5926)
76+
* Scale all mxc thumbs using device pixel ratio for hidpi
77+
[\#5928](https://github.com/matrix-org/matrix-react-sdk/pull/5928)
78+
* Fix add existing to space dialog no longer showing rooms for public spaces
79+
[\#5918](https://github.com/matrix-org/matrix-react-sdk/pull/5918)
80+
* Disable spaces context switching for when exploring a space
81+
[\#5924](https://github.com/matrix-org/matrix-react-sdk/pull/5924)
82+
* Autofocus search box in the add existing to space dialog
83+
[\#5921](https://github.com/matrix-org/matrix-react-sdk/pull/5921)
84+
* Use label element in add existing to space dialog for easier hit target
85+
[\#5922](https://github.com/matrix-org/matrix-react-sdk/pull/5922)
86+
* Dynamic max and min zoom in the new ImageView
87+
[\#5916](https://github.com/matrix-org/matrix-react-sdk/pull/5916)
88+
* Improve message error states
89+
[\#5897](https://github.com/matrix-org/matrix-react-sdk/pull/5897)
90+
* Check for null room in `VisibilityProvider`
91+
[\#5914](https://github.com/matrix-org/matrix-react-sdk/pull/5914)
92+
* Add unit tests for various collection-based utility functions
93+
[\#5910](https://github.com/matrix-org/matrix-react-sdk/pull/5910)
94+
* Spaces visual fixes
95+
[\#5909](https://github.com/matrix-org/matrix-react-sdk/pull/5909)
96+
* Remove reliance on DOM API to generated message preview
97+
[\#5908](https://github.com/matrix-org/matrix-react-sdk/pull/5908)
98+
* Expand upon voice message event & include overall waveform
99+
[\#5888](https://github.com/matrix-org/matrix-react-sdk/pull/5888)
100+
* Use floats for image background opacity
101+
[\#5905](https://github.com/matrix-org/matrix-react-sdk/pull/5905)
102+
* Show invites to spaces at the top of the space panel
103+
[\#5902](https://github.com/matrix-org/matrix-react-sdk/pull/5902)
104+
* Improve edge cases with spaces context switching
105+
[\#5899](https://github.com/matrix-org/matrix-react-sdk/pull/5899)
106+
* Fix spaces notification dots wrongly including upgraded (hidden) rooms
107+
[\#5900](https://github.com/matrix-org/matrix-react-sdk/pull/5900)
108+
* Iterate the spaces face pile design
109+
[\#5898](https://github.com/matrix-org/matrix-react-sdk/pull/5898)
110+
* Fix alignment issue with nested spaces being cut off wrong
111+
[\#5890](https://github.com/matrix-org/matrix-react-sdk/pull/5890)
112+
1113
Changes in [3.19.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.19.0) (2021-04-26)
2114
=====================================================================================================
3115
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.19.0-rc.1...v3.19.0)

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "matrix-react-sdk",
3-
"version": "3.19.0",
3+
"version": "3.20.0",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {
@@ -97,7 +97,7 @@
9797
"react-transition-group": "^4.4.1",
9898
"resize-observer-polyfill": "^1.5.1",
9999
"rfc4648": "^1.4.0",
100-
"sanitize-html": "github:apostrophecms/sanitize-html#3c7f93f2058f696f5359e3e58d464161647226db",
100+
"sanitize-html": "^2.3.2",
101101
"tar-js": "^0.3.0",
102102
"text-encoding-utf-8": "^1.0.2",
103103
"url": "^0.11.0",
@@ -132,6 +132,7 @@
132132
"@types/modernizr": "^3.5.3",
133133
"@types/node": "^14.14.22",
134134
"@types/pako": "^1.0.1",
135+
"@types/parse5": "^6.0.0",
135136
"@types/qrcode": "^1.3.5",
136137
"@types/react": "^16.9",
137138
"@types/react-dom": "^16.9.10",

‎res/css/structures/_SpacePanel.scss‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@ $activeBorderColor: $secondary-fg-color;
237237

238238
.mx_SpacePanel_badgeContainer {
239239
position: absolute;
240-
height: 16px;
241240

242241
// Create a flexbox to make aligning dot badges easier
243242
display: flex;
@@ -249,23 +248,37 @@ $activeBorderColor: $secondary-fg-color;
249248

250249
.mx_NotificationBadge_dot {
251250
// make the smaller dot occupy the same width for centering
252-
margin-left: 7px;
253-
margin-right: 7px;
251+
margin: 0 7px;
254252
}
255253
}
256254

257255
&.collapsed {
258256
.mx_SpaceButton {
259257
.mx_SpacePanel_badgeContainer {
260-
right: -3px;
261-
top: -3px;
258+
right: 0;
259+
top: 0;
260+
261+
.mx_NotificationBadge {
262+
background-clip: padding-box;
263+
}
264+
265+
.mx_NotificationBadge_dot {
266+
margin: 0 -1px 0 0;
267+
border: 3px solid $groupFilterPanel-bg-color;
268+
}
269+
270+
.mx_NotificationBadge_2char,
271+
.mx_NotificationBadge_3char {
272+
margin: -5px -5px 0 0;
273+
border: 2px solid $groupFilterPanel-bg-color;
274+
}
262275
}
263276

264277
&.mx_SpaceButton_active .mx_SpacePanel_badgeContainer {
265278
// when we draw the selection border we move the relative bounds of our parent
266279
// so update our position within the bounds of the parent to maintain position overall
267-
right: -6px;
268-
top: -6px;
280+
right: -3px;
281+
top: -3px;
269282
}
270283
}
271284
}

‎res/css/structures/_SpaceRoomDirectory.scss‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,19 @@ limitations under the License.
8686
color: $primary-fg-color;
8787

8888
.mx_AccessibleButton {
89-
padding: 2px 8px;
89+
padding: 4px 12px;
9090
font-weight: normal;
9191

9292
& + .mx_AccessibleButton {
9393
margin-left: 16px;
9494
}
9595
}
9696

97+
.mx_AccessibleButton_kind_danger_outline,
98+
.mx_AccessibleButton_kind_primary_outline {
99+
padding: 3px 12px; // to account for the 1px border
100+
}
101+
97102
> span {
98103
margin-left: auto;
99104
}
@@ -246,11 +251,17 @@ limitations under the License.
246251
grid-row: 1/3;
247252

248253
.mx_AccessibleButton {
249-
padding: 8px 18px;
254+
line-height: $font-24px;
255+
padding: 4px 16px;
250256
display: inline-block;
251257
visibility: hidden;
252258
}
253259

260+
.mx_AccessibleButton_kind_danger_outline,
261+
.mx_AccessibleButton_kind_primary_outline {
262+
padding: 3px 16px; // to account for the 1px border
263+
}
264+
254265
.mx_Checkbox {
255266
display: inline-flex;
256267
vertical-align: middle;

‎res/css/structures/_SpaceRoomView.scss‎

Lines changed: 23 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,8 @@ $SpaceRoomViewInnerWidth: 428px;
238238

239239
.mx_SpaceRoomView_landing_inviteButton {
240240
position: relative;
241-
padding-left: 40px;
241+
padding: 4px 18px 4px 40px;
242+
line-height: $font-24px;
242243
height: min-content;
243244

244245
&::before {
@@ -254,6 +255,27 @@ $SpaceRoomViewInnerWidth: 428px;
254255
mask-image: url('$(res)/img/element-icons/room/invite.svg');
255256
}
256257
}
258+
259+
.mx_SpaceRoomView_landing_settingsButton {
260+
position: relative;
261+
margin-left: 16px;
262+
width: 24px;
263+
height: 24px;
264+
265+
&::before {
266+
position: absolute;
267+
content: "";
268+
left: 0;
269+
top: 0;
270+
height: 24px;
271+
width: 24px;
272+
background: $tertiary-fg-color;
273+
mask-position: center;
274+
mask-size: contain;
275+
mask-repeat: no-repeat;
276+
mask-image: url('$(res)/img/element-icons/settings.svg');
277+
}
278+
}
257279
}
258280

259281
.mx_SpaceRoomView_landing_topic {
@@ -268,80 +290,6 @@ $SpaceRoomViewInnerWidth: 428px;
268290
background-color: $groupFilterPanel-bg-color;
269291
}
270292

271-
.mx_SpaceRoomView_landing_adminButtons {
272-
margin-top: 24px;
273-
274-
.mx_AccessibleButton {
275-
position: relative;
276-
width: 160px;
277-
height: 124px;
278-
box-sizing: border-box;
279-
padding: 72px 16px 0;
280-
border-radius: 12px;
281-
border: 1px solid $input-border-color;
282-
margin-right: 28px;
283-
margin-bottom: 20px;
284-
font-size: $font-14px;
285-
display: inline-block;
286-
vertical-align: bottom;
287-
288-
&:last-child {
289-
margin-right: 0;
290-
}
291-
292-
&:hover {
293-
background-color: rgba(141, 151, 165, 0.1);
294-
}
295-
296-
&::before, &::after {
297-
position: absolute;
298-
content: "";
299-
left: 16px;
300-
top: 16px;
301-
height: 40px;
302-
width: 40px;
303-
border-radius: 20px;
304-
}
305-
306-
&::after {
307-
mask-position: center;
308-
mask-size: 30px;
309-
mask-repeat: no-repeat;
310-
background: #ffffff; // white icon fill
311-
}
312-
313-
&.mx_SpaceRoomView_landing_addButton {
314-
&::before {
315-
background-color: #ac3ba8;
316-
}
317-
318-
&::after {
319-
mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
320-
}
321-
}
322-
323-
&.mx_SpaceRoomView_landing_createButton {
324-
&::before {
325-
background-color: #368bd6;
326-
}
327-
328-
&::after {
329-
mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
330-
}
331-
}
332-
333-
&.mx_SpaceRoomView_landing_settingsButton {
334-
&::before {
335-
background-color: #5c56f5;
336-
}
337-
338-
&::after {
339-
mask-image: url('$(res)/img/element-icons/settings.svg');
340-
}
341-
}
342-
}
343-
}
344-
345293
.mx_SearchBox {
346294
margin: 0 0 20px;
347295
}

‎res/css/views/elements/_AccessibleButton.scss‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,16 @@ limitations under the License.
7676
border: 1px solid $button-danger-bg-color;
7777
}
7878

79-
.mx_AccessibleButton_kind_danger.mx_AccessibleButton_disabled,
80-
.mx_AccessibleButton_kind_danger_outline.mx_AccessibleButton_disabled {
79+
.mx_AccessibleButton_kind_danger.mx_AccessibleButton_disabled {
8180
color: $button-danger-disabled-fg-color;
8281
background-color: $button-danger-disabled-bg-color;
8382
}
8483

84+
.mx_AccessibleButton_kind_danger_outline.mx_AccessibleButton_disabled {
85+
color: $button-danger-disabled-bg-color;
86+
border-color: $button-danger-disabled-bg-color;
87+
}
88+
8589
.mx_AccessibleButton_hasKind.mx_AccessibleButton_kind_danger_sm {
8690
padding: 5px 12px;
8791
color: $button-danger-fg-color;

‎res/css/views/messages/_MFileBody.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ limitations under the License.
6161

6262
.mx_MFileBody_info {
6363
background-color: $message-body-panel-bg-color;
64-
border-radius: 4px;
65-
width: 270px;
66-
padding: 8px;
64+
border-radius: 12px;
65+
width: 243px; // same width as a playable voice message, accounting for padding
66+
padding: 6px 12px;
6767
color: $message-body-panel-fg-color;
6868

6969
.mx_MFileBody_info_icon {
@@ -82,7 +82,7 @@ limitations under the License.
8282
mask-position: center;
8383
mask-size: cover;
8484
mask-image: url('$(res)/img/element-icons/room/composer/attach.svg');
85-
background-color: $message-body-panel-fg-color;
85+
background-color: $message-body-panel-icon-fg-color;
8686
width: 13px;
8787
height: 15px;
8888

0 commit comments

Comments
 (0)