Merge branch 'develop' into travis/room-list/css-layout

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

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-data": "^4.0.2",
-    "emojibase-regex": "^4.0.1",
+    "emojibase-regex": "^3.0.0",
     "escape-html": "^1.0.3",
     "file-saver": "^1.3.3",
     "filesize": "3.5.6",

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;

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();

src/components/views/rooms/RoomSublist2.tsx

@@ -217,11 +217,8 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                 handles = []; // no handles, we're at a minimum
             }
 
-            // TODO: Remove Math hacks
+            // TODO: This might need adjustment, however for now it is fine as a round.
-            let nVisible = Math.floor(layout.visibleTiles);
+            const nVisible = Math.round(layout.visibleTiles);
-            if (localStorage.getItem("mx_rl_mathfn")) {
-                nVisible = Math[localStorage.getItem("mx_rl_mathfn")](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<IProps, IState> {
                 // 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, (
                     <div
                         onClick={this.onShowAllClick}

src/stores/room-list/ListLayout.ts

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { TagID } from "./models";
+
 const TILE_HEIGHT_PX = 44;
 
 interface ISerializedListLayout {
@@ -23,7 +25,7 @@ interface ISerializedListLayout {
 export class ListLayout {
     private _n = 0;
 
-    constructor(public readonly tagId) {
+    constructor(public readonly tagId: TagID) {
         const serialized = localStorage.getItem(this.key);
         if (serialized) {
             // We don't use the setters as they cause writes.

yarn.lock

@@ -3155,15 +3155,15 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emojibase-data@^5.0.1:
+emojibase-data@^4.0.2:
-  version "5.0.1"
+  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-5.0.1.tgz#ce6fe36b4affd3578e0be8779211018a2fdae960"
+  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-4.2.1.tgz#3d1f0c69ddbb2ca7b7014f5e34654190802a40df"
-  integrity sha512-rYWlogJ2q5P78U8Xx1vhsXHcYKu1wFnr7+o6z9QHssZ1SsJLTCkJINZIPHRFWuDreAUK457TkqHpdOXElu0fzA==
+  integrity sha512-O0vxoPMgVkRq/uII/gdAjz9RwNv6ClJrd3J9QCCRC4btZRmeut/qohC/Fi+NNXUcjY08RWNTvxSnq/vij8hvrw==
 
-emojibase-regex@^4.0.1:
+emojibase-regex@^3.0.0:
-  version "4.0.1"
+  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-4.0.1.tgz#a2cd4bbb42825422da9ec72f15e970bc2c90b46a"
+  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-3.2.1.tgz#122935958c9a49c96bb29ac69ccbbac0b2e7022d"
-  integrity sha512-S42UHkFfz15i4NNz+wi9iMKFo+B6Kalc6PJLpYX0BUANViXw4vSyYZMFdBGRLduSabWHuEcTLZl9xOa2YP3eJw==
+  integrity sha512-VAX2Rc2U/alu5q6P2cET2alzC63o1Uarm6Ea/b3ab+KOzxZT4JKmB0tCU1sTZvfNKa16KMLCK2k7hJBHJq4vWQ==
 
 emojis-list@^2.0.0:
   version "2.1.0"
@@ -5802,8 +5802,8 @@ mathml-tag-names@^2.0.1:
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "6.2.0"
+  version "6.2.1"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/ef1d5e3d765bc4dc133c0637434c2ca9941ff97b"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/ebe66bdd6e0f6edbc60be1612c5a1fc0c9ea092c"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"