diff --git a/CHANGELOG.md b/CHANGELOG.md index 89b20de919..63702de38b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,20 @@ +Changes in [2.7.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.7.1) (2020-06-05) +=================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.7.0...v2.7.1) + + * Upgrade to JS SDK 6.2.1 + * Fix exceptions from Tooltip + [\#4716](https://github.com/matrix-org/matrix-react-sdk/pull/4716) + * Fix not being able to dismiss new login toasts + [\#4715](https://github.com/matrix-org/matrix-react-sdk/pull/4715) + * Fix compact layout regression + [\#4714](https://github.com/matrix-org/matrix-react-sdk/pull/4714) + Changes in [2.7.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.7.0) (2020-06-04) =================================================================================================== [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.7.0-rc.2...v2.7.0) + * Upgrade to JS SDK 6.2.0 * Prevent (double) 4S bootstrap from RestoreKeyBackupDialog [\#4703](https://github.com/matrix-org/matrix-react-sdk/pull/4703) * Fix checkbox bleed diff --git a/package.json b/package.json index 630297718a..eae83d3878 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "2.7.0", + "version": "2.7.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { @@ -65,8 +65,8 @@ "create-react-class": "^15.6.0", "diff-dom": "^4.1.3", "diff-match-patch": "^1.0.4", - "emojibase-data": "^5.0.1", - "emojibase-regex": "^4.0.1", + "emojibase-data": "^4.0.2", + "emojibase-regex": "^3.0.0", "escape-html": "^1.0.3", "file-saver": "^1.3.3", "filesize": "3.5.6", diff --git a/res/css/views/rooms/_GroupLayout.scss b/res/css/views/rooms/_GroupLayout.scss index af12cce5d6..de4a5538cd 100644 --- a/res/css/views/rooms/_GroupLayout.scss +++ b/res/css/views/rooms/_GroupLayout.scss @@ -18,7 +18,6 @@ limitations under the License. $left-gutter: 65px; .mx_GroupLayout { - .mx_EventTile { > .mx_SenderProfile { line-height: $font-17px; @@ -53,14 +52,14 @@ $left-gutter: 65px; /* Compact layout overrides */ .mx_MatrixChat_useCompactLayout { - .mx_EventTile_line, .mx_EventTile_reply { - padding-top: 0px; - padding-bottom: 0px; - } - .mx_EventTile { padding-top: 4px; + .mx_EventTile_line, .mx_EventTile_reply { + padding-top: 0; + padding-bottom: 0; + } + &.mx_EventTile_info { // same as the padding for non-compact .mx_EventTile.mx_EventTile_info padding-top: 0px; diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js index ba1be6a125..82f61e0e1f 100644 --- a/src/components/views/rooms/BasicMessageComposer.js +++ b/src/components/views/rooms/BasicMessageComposer.js @@ -359,6 +359,8 @@ export default class BasicMessageEditor extends React.Component { } _onSelectionChange = () => { + const {isEmpty} = this.props.model; + this._refreshLastCaretIfNeeded(); const selection = document.getSelection(); if (this._hasTextSelected && selection.isCollapsed) { @@ -366,7 +368,7 @@ export default class BasicMessageEditor extends React.Component { if (this._formatBarRef) { this._formatBarRef.hide(); } - } else if (!selection.isCollapsed) { + } else if (!selection.isCollapsed && !isEmpty) { this._hasTextSelected = true; if (this._formatBarRef) { const selectionRect = selection.getRangeAt(0).getBoundingClientRect(); diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx index 90231596fe..650a3ae645 100644 --- a/src/components/views/rooms/RoomSublist2.tsx +++ b/src/components/views/rooms/RoomSublist2.tsx @@ -217,11 +217,8 @@ export default class RoomSublist2 extends React.Component { handles = []; // no handles, we're at a minimum } - // TODO: Remove Math hacks - let nVisible = Math.floor(layout.visibleTiles); - if (localStorage.getItem("mx_rl_mathfn")) { - nVisible = Math[localStorage.getItem("mx_rl_mathfn")](layout.visibleTiles); - } + // TODO: This might need adjustment, however for now it is fine as a round. + const nVisible = Math.round(layout.visibleTiles); const visibleTiles = tiles.slice(0, nVisible); // If we're hiding rooms, show a 'show more' button to the user. This button @@ -233,10 +230,12 @@ export default class RoomSublist2 extends React.Component { // we have a cutoff condition - add the button to show all // we +1 to account for the room we're about to hide with our 'show more' button + // this results in the button always being 1+, and not needing an i18n `count`. const numMissing = (tiles.length - visibleTiles.length) + 1; // TODO: CSS TBD // TODO: Make this an actual tile + // TODO: This is likely to pop out of the list, consider that. visibleTiles.splice(visibleTiles.length - 1, 1, (