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

Commit f18a240

Browse files
authored
Merge branch 'develop' into t3chguy/fix/17022
2 parents 203425c + 31b9a4c commit f18a240

Some content is hidden

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

55 files changed

+1954
-373
lines changed

CHANGELOG.md

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,121 @@
1+
Changes in [3.19.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.19.0) (2021-04-26)
2+
=====================================================================================================
3+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.19.0-rc.1...v3.19.0)
4+
5+
* Upgrade to JS SDK 10.0.0
6+
* [Release] Dynamic max and min zoom in the new ImageView
7+
[\#5927](https://github.com/matrix-org/matrix-react-sdk/pull/5927)
8+
* [Release] Add a WheelEvent normalization function
9+
[\#5911](https://github.com/matrix-org/matrix-react-sdk/pull/5911)
10+
* Add a WheelEvent normalization function
11+
[\#5904](https://github.com/matrix-org/matrix-react-sdk/pull/5904)
12+
* [Release] Use floats for image background opacity
13+
[\#5907](https://github.com/matrix-org/matrix-react-sdk/pull/5907)
14+
15+
Changes in [3.19.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.19.0-rc.1) (2021-04-21)
16+
===============================================================================================================
17+
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.18.0...v3.19.0-rc.1)
18+
19+
* Upgrade to JS SDK 10.0.0-rc.1
20+
* Translations update from Weblate
21+
[\#5896](https://github.com/matrix-org/matrix-react-sdk/pull/5896)
22+
* Fix sticky tags header in room list
23+
[\#5895](https://github.com/matrix-org/matrix-react-sdk/pull/5895)
24+
* Fix spaces filtering sometimes lagging behind or behaving oddly
25+
[\#5893](https://github.com/matrix-org/matrix-react-sdk/pull/5893)
26+
* Fix issue with spaces context switching looping and breaking
27+
[\#5894](https://github.com/matrix-org/matrix-react-sdk/pull/5894)
28+
* Improve RoomList render time when filtering
29+
[\#5874](https://github.com/matrix-org/matrix-react-sdk/pull/5874)
30+
* Avoid being stuck in a space
31+
[\#5891](https://github.com/matrix-org/matrix-react-sdk/pull/5891)
32+
* [Spaces] Context switching
33+
[\#5795](https://github.com/matrix-org/matrix-react-sdk/pull/5795)
34+
* Warn when you attempt to leave room that you are the only member of
35+
[\#5415](https://github.com/matrix-org/matrix-react-sdk/pull/5415)
36+
* Ensure PersistedElement are unmounted on application logout
37+
[\#5884](https://github.com/matrix-org/matrix-react-sdk/pull/5884)
38+
* Add missing space in seshat dialog and the corresponding string
39+
[\#5866](https://github.com/matrix-org/matrix-react-sdk/pull/5866)
40+
* A tiny change to make the Add existing rooms dialog a little nicer
41+
[\#5885](https://github.com/matrix-org/matrix-react-sdk/pull/5885)
42+
* Remove weird margin from the file panel
43+
[\#5889](https://github.com/matrix-org/matrix-react-sdk/pull/5889)
44+
* Trigger lazy loading when filtering using spaces
45+
[\#5882](https://github.com/matrix-org/matrix-react-sdk/pull/5882)
46+
* Fix typo in method call in add existing to space dialog
47+
[\#5883](https://github.com/matrix-org/matrix-react-sdk/pull/5883)
48+
* New Image View fixes/improvements
49+
[\#5872](https://github.com/matrix-org/matrix-react-sdk/pull/5872)
50+
* Limit voice recording length
51+
[\#5871](https://github.com/matrix-org/matrix-react-sdk/pull/5871)
52+
* Clean up add existing to space dialog and include DMs in it too
53+
[\#5881](https://github.com/matrix-org/matrix-react-sdk/pull/5881)
54+
* Fix unknown slash command error exploding
55+
[\#5853](https://github.com/matrix-org/matrix-react-sdk/pull/5853)
56+
* Switch to a spec conforming email validation Regexp
57+
[\#5852](https://github.com/matrix-org/matrix-react-sdk/pull/5852)
58+
* Cleanup unused state in MessageComposer
59+
[\#5877](https://github.com/matrix-org/matrix-react-sdk/pull/5877)
60+
* Pulse animation for voice messages recording state
61+
[\#5869](https://github.com/matrix-org/matrix-react-sdk/pull/5869)
62+
* Don't include invisible rooms in notify summary
63+
[\#5875](https://github.com/matrix-org/matrix-react-sdk/pull/5875)
64+
* Properly disable composer access when recording a voice message
65+
[\#5870](https://github.com/matrix-org/matrix-react-sdk/pull/5870)
66+
* Stabilise starting a DM with multiple people flow
67+
[\#5862](https://github.com/matrix-org/matrix-react-sdk/pull/5862)
68+
* Render msgOption only if showReadReceipts is enabled
69+
[\#5864](https://github.com/matrix-org/matrix-react-sdk/pull/5864)
70+
* Labs: Add quick/cheap "do not disturb" flag
71+
[\#5873](https://github.com/matrix-org/matrix-react-sdk/pull/5873)
72+
* Fix ReadReceipts animations
73+
[\#5836](https://github.com/matrix-org/matrix-react-sdk/pull/5836)
74+
* Add tooltips to message previews
75+
[\#5859](https://github.com/matrix-org/matrix-react-sdk/pull/5859)
76+
* IRC Layout fix layout spacing in replies
77+
[\#5855](https://github.com/matrix-org/matrix-react-sdk/pull/5855)
78+
* Move user to welcome_page if continuing with previous session
79+
[\#5849](https://github.com/matrix-org/matrix-react-sdk/pull/5849)
80+
* Improve image view
81+
[\#5521](https://github.com/matrix-org/matrix-react-sdk/pull/5521)
82+
* Add a button to reset personal encryption state during login
83+
[\#5819](https://github.com/matrix-org/matrix-react-sdk/pull/5819)
84+
* Fix js-sdk import in SlashCommands
85+
[\#5850](https://github.com/matrix-org/matrix-react-sdk/pull/5850)
86+
* Fix useRoomPowerLevels hook
87+
[\#5854](https://github.com/matrix-org/matrix-react-sdk/pull/5854)
88+
* Prevent state events being rendered with invalid state keys
89+
[\#5851](https://github.com/matrix-org/matrix-react-sdk/pull/5851)
90+
* Give server ACLs a name in 'roles & permissions' tab
91+
[\#5838](https://github.com/matrix-org/matrix-react-sdk/pull/5838)
92+
* Don't hide notification badge on the home space button as it has no menu
93+
[\#5845](https://github.com/matrix-org/matrix-react-sdk/pull/5845)
94+
* User Info hide disambiguation as we always show MXID anyway
95+
[\#5843](https://github.com/matrix-org/matrix-react-sdk/pull/5843)
96+
* Improve kick state to not show if the target was not joined to begin with
97+
[\#5846](https://github.com/matrix-org/matrix-react-sdk/pull/5846)
98+
* Fix space store wrongly switching to a non-space filter
99+
[\#5844](https://github.com/matrix-org/matrix-react-sdk/pull/5844)
100+
* Tweak appearance of invite reason
101+
[\#5847](https://github.com/matrix-org/matrix-react-sdk/pull/5847)
102+
* Update Inter font to v3.18
103+
[\#5840](https://github.com/matrix-org/matrix-react-sdk/pull/5840)
104+
* Enable sharing historical keys on invite
105+
[\#5839](https://github.com/matrix-org/matrix-react-sdk/pull/5839)
106+
* Add ability to hide post-login encryption setup with customisation point
107+
[\#5834](https://github.com/matrix-org/matrix-react-sdk/pull/5834)
108+
* Use LaTeX and TeX delimiters by default
109+
[\#5515](https://github.com/matrix-org/matrix-react-sdk/pull/5515)
110+
* Clone author's deps fork for Netlify previews
111+
[\#5837](https://github.com/matrix-org/matrix-react-sdk/pull/5837)
112+
* Show drop file UI only if dragging a file
113+
[\#5827](https://github.com/matrix-org/matrix-react-sdk/pull/5827)
114+
* Ignore punctuation when filtering rooms
115+
[\#5824](https://github.com/matrix-org/matrix-react-sdk/pull/5824)
116+
* Resizable CallView
117+
[\#5710](https://github.com/matrix-org/matrix-react-sdk/pull/5710)
118+
1119
Changes in [3.18.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.18.0) (2021-04-12)
2120
=====================================================================================================
3121
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.18.0-rc.1...v3.18.0)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "matrix-react-sdk",
3-
"version": "3.18.0",
3+
"version": "3.19.0",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {

res/css/structures/_RoomStatusBar.scss

Lines changed: 95 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
.mx_RoomStatusBar {
17+
.mx_RoomStatusBar:not(.mx_RoomStatusBar_unsentMessages) {
1818
margin-left: 65px;
1919
min-height: 50px;
2020
}
@@ -68,6 +68,99 @@ limitations under the License.
6868
min-height: 58px;
6969
}
7070

71+
.mx_RoomStatusBar_unsentMessages {
72+
> div[role="alert"] {
73+
// cheat some basic alignment
74+
display: flex;
75+
align-items: center;
76+
min-height: 70px;
77+
margin: 12px;
78+
padding-left: 16px;
79+
background-color: $header-panel-bg-color;
80+
border-radius: 4px;
81+
}
82+
83+
.mx_RoomStatusBar_unsentBadge {
84+
margin-right: 12px;
85+
86+
.mx_NotificationBadge {
87+
// Override sizing from the default badge
88+
width: 24px !important;
89+
height: 24px !important;
90+
border-radius: 24px !important;
91+
92+
.mx_NotificationBadge_count {
93+
font-size: $font-16px !important; // override default
94+
}
95+
}
96+
}
97+
98+
.mx_RoomStatusBar_unsentTitle {
99+
color: $warning-color;
100+
font-size: $font-15px;
101+
}
102+
103+
.mx_RoomStatusBar_unsentDescription {
104+
font-size: $font-12px;
105+
}
106+
107+
.mx_RoomStatusBar_unsentButtonBar {
108+
flex-grow: 1;
109+
text-align: right;
110+
margin-right: 22px;
111+
color: $muted-fg-color;
112+
113+
.mx_AccessibleButton {
114+
padding: 5px 10px;
115+
padding-left: 28px; // 16px for the icon, 2px margin to text, 10px regular padding
116+
display: inline-block;
117+
position: relative;
118+
119+
&:nth-child(2) {
120+
border-left: 1px solid $resend-button-divider-color;
121+
}
122+
123+
&::before {
124+
content: '';
125+
position: absolute;
126+
left: 10px; // inset for regular button padding
127+
background-color: $muted-fg-color;
128+
mask-repeat: no-repeat;
129+
mask-position: center;
130+
mask-size: contain;
131+
}
132+
133+
&.mx_RoomStatusBar_unsentCancelAllBtn::before {
134+
mask-image: url('$(res)/img/element-icons/trashcan.svg');
135+
width: 12px;
136+
height: 16px;
137+
top: calc(50% - 8px); // text sizes are dynamic
138+
}
139+
140+
&.mx_RoomStatusBar_unsentResendAllBtn {
141+
padding-left: 34px; // 28px from above, but +6px to account for the wider icon
142+
143+
&::before {
144+
mask-image: url('$(res)/img/element-icons/retry.svg');
145+
width: 18px;
146+
height: 18px;
147+
top: calc(50% - 9px); // text sizes are dynamic
148+
}
149+
}
150+
}
151+
152+
.mx_InlineSpinner {
153+
vertical-align: middle;
154+
margin-right: 5px;
155+
top: 1px; // just to help the vertical alignment be slightly better
156+
157+
& + span {
158+
margin-right: 10px; // same margin/padding as the rightmost button
159+
}
160+
}
161+
}
162+
}
163+
71164
.mx_RoomStatusBar_connectionLostBar img {
72165
padding-left: 10px;
73166
padding-right: 10px;
@@ -103,7 +196,7 @@ limitations under the License.
103196
}
104197

105198
.mx_MatrixChat_useCompactLayout {
106-
.mx_RoomStatusBar {
199+
.mx_RoomStatusBar:not(.mx_RoomStatusBar_unsentMessages) {
107200
min-height: 40px;
108201
}
109202

res/css/structures/_SpaceRoomView.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,12 +214,11 @@ $SpaceRoomViewInnerWidth: 428px;
214214

215215
.mx_SpaceRoomView_info {
216216
display: inline-block;
217-
margin: 0;
217+
margin: 0 auto 0 0;
218218
}
219219

220220
.mx_FacePile {
221221
display: inline-block;
222-
margin-left: auto;
223222
margin-right: 12px;
224223

225224
.mx_FacePile_faces {

res/css/views/dialogs/_AddExistingToSpaceDialog.scss

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,14 @@ limitations under the License.
148148
font-size: $font-15px;
149149
line-height: 30px;
150150
flex-grow: 1;
151+
overflow: hidden;
152+
white-space: nowrap;
153+
text-overflow: ellipsis;
154+
margin-right: 12px;
151155
}
152156

153-
.mx_FormButton {
154-
min-width: 92px;
155-
font-weight: normal;
156-
box-sizing: border-box;
157+
.mx_Checkbox {
158+
align-items: center;
157159
}
158160
}
159161
}
@@ -192,8 +194,4 @@ limitations under the License.
192194
padding: 0;
193195
}
194196
}
195-
196-
.mx_FormButton {
197-
padding: 8px 22px;
198-
}
199197
}

res/css/views/elements/_ImageView.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ limitations under the License.
3131

3232
.mx_ImageView_image {
3333
pointer-events: all;
34-
max-width: 95%;
35-
max-height: 95%;
34+
flex-shrink: 0;
3635
}
3736

3837
.mx_ImageView_panel {

res/css/views/messages/_MessageActionBar.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,3 +105,11 @@ limitations under the License.
105105
.mx_MessageActionBar_optionsButton::after {
106106
mask-image: url('$(res)/img/element-icons/context-menu.svg');
107107
}
108+
109+
.mx_MessageActionBar_resendButton::after {
110+
mask-image: url('$(res)/img/element-icons/retry.svg');
111+
}
112+
113+
.mx_MessageActionBar_cancelButton::after {
114+
mask-image: url('$(res)/img/element-icons/trashcan.svg');
115+
}

res/css/views/rooms/_EventTile.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,6 @@ $left-gutter: 64px;
214214
color: $accent-fg-color;
215215
}
216216

217-
.mx_EventTile_notSent {
218-
color: $event-notsent-color;
219-
}
220-
221217
.mx_EventTile_receiptSent,
222218
.mx_EventTile_receiptSending {
223219
// We don't use `position: relative` on the element because then it won't line

res/img/element-icons/retry.svg

Lines changed: 3 additions & 0 deletions
Loading

res/img/element-icons/trashcan.svg

Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)