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

Commit 8d18e0b

Browse files
nmscodenmscode
authored
Merge branch 'matrix-org:develop' into develop
2 parents a6a0cfa + 219f4fa commit 8d18e0b

File tree

5 files changed

+62
-31
lines changed

5 files changed

+62
-31
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
"@types/react-transition-group": "^4.4.0",
165165
"@types/sanitize-html": "^2.3.1",
166166
"@types/zxcvbn": "^4.4.0",
167-
"@typescript-eslint/eslint-plugin": "^5.6.0",
167+
"@typescript-eslint/eslint-plugin": "^5.35.1",
168168
"@typescript-eslint/parser": "^5.6.0",
169169
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
170170
"allchange": "^1.0.6",

‎src/components/views/elements/Tooltip.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import ReactDOM from 'react-dom';
2222
import classNames from 'classnames';
2323

2424
import UIStore from "../../../stores/UIStore";
25+
import { objectHasDiff } from "../../../utils/objects";
2526

2627
export enum Alignment {
2728
Natural, // Pick left or right
@@ -91,8 +92,10 @@ export default class Tooltip extends React.PureComponent<ITooltipProps, State> {
9192
this.updatePosition();
9293
}
9394

94-
public componentDidUpdate() {
95-
this.updatePosition();
95+
public componentDidUpdate(prevProps) {
96+
if (objectHasDiff(prevProps, this.props)) {
97+
this.updatePosition();
98+
}
9699
}
97100

98101
// Remove the wrapper element, as the tooltip has finished using it

‎src/components/views/rooms/RoomList.tsx‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -592,12 +592,8 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
592592
let extraTiles = null;
593593
if (orderedTagId === DefaultTagID.Suggested) {
594594
extraTiles = this.renderSuggestedRooms();
595-
}
596-
597-
if (this.state.feature_favourite_messages && orderedTagId === DefaultTagID.SavedItems) {
595+
} else if (this.state.feature_favourite_messages && orderedTagId === DefaultTagID.SavedItems) {
598596
extraTiles = this.renderFavoriteMessagesList();
599-
} else {
600-
extraTiles = null;
601597
}
602598

603599
const aesthetics = TAG_AESTHETICS[orderedTagId];

‎tsconfig.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,5 @@
2424
"./src/**/*.tsx",
2525
"./test/**/*.ts",
2626
"./test/**/*.tsx"
27-
],
28-
"exclude": [
29-
"./test/end-to-end-tests/"
3027
]
3128
}

‎yarn.lock‎

Lines changed: 55 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2299,14 +2299,14 @@
22992299
resolved "https://registry.yarnpkg.com/@types/zxcvbn/-/zxcvbn-4.4.1.tgz#46e42cbdcee681b22181478feaf4af2bc4c1abd2"
23002300
integrity sha512-3NoqvZC2W5gAC5DZbTpCeJ251vGQmgcWIHQJGq2J240HY6ErQ9aWKkwfoKJlHLx+A83WPNTZ9+3cd2ILxbvr1w==
23012301

2302-
"@typescript-eslint/eslint-plugin@^5.6.0":
2303-
version "5.34.0"
2304-
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.34.0.tgz#d690f60e335596f38b01792e8f4b361d9bd0cb35"
2305-
integrity sha512-eRfPPcasO39iwjlUAMtjeueRGuIrW3TQ9WseIDl7i5UWuFbf83yYaU7YPs4j8+4CxUMIsj1k+4kV+E+G+6ypDQ==
2306-
dependencies:
2307-
"@typescript-eslint/scope-manager" "5.34.0"
2308-
"@typescript-eslint/type-utils" "5.34.0"
2309-
"@typescript-eslint/utils" "5.34.0"
2302+
"@typescript-eslint/eslint-plugin@^5.35.1":
2303+
version "5.36.1"
2304+
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.36.1.tgz#471f64dc53600025e470dad2ca4a9f2864139019"
2305+
integrity sha512-iC40UK8q1tMepSDwiLbTbMXKDxzNy+4TfPWgIL661Ym0sD42vRcQU93IsZIrmi+x292DBr60UI/gSwfdVYexCA==
2306+
dependencies:
2307+
"@typescript-eslint/scope-manager" "5.36.1"
2308+
"@typescript-eslint/type-utils" "5.36.1"
2309+
"@typescript-eslint/utils" "5.36.1"
23102310
debug "^4.3.4"
23112311
functional-red-black-tree "^1.0.1"
23122312
ignore "^5.2.0"
@@ -2332,12 +2332,21 @@
23322332
"@typescript-eslint/types" "5.34.0"
23332333
"@typescript-eslint/visitor-keys" "5.34.0"
23342334

2335-
"@typescript-eslint/[email protected]":
2336-
version "5.34.0"
2337-
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.34.0.tgz#7a324ab9ddd102cd5e1beefc94eea6f3eb32d32d"
2338-
integrity sha512-Pxlno9bjsQ7hs1pdWRUv9aJijGYPYsHpwMeCQ/Inavhym3/XaKt1ZKAA8FIw4odTBfowBdZJDMxf2aavyMDkLg==
2335+
"@typescript-eslint/[email protected]":
2336+
version "5.36.1"
2337+
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.36.1.tgz#23c49b7ddbcffbe09082e6694c2524950766513f"
2338+
integrity sha512-pGC2SH3/tXdu9IH3ItoqciD3f3RRGCh7hb9zPdN2Drsr341zgd6VbhP5OHQO/reUqihNltfPpMpTNihFMarP2w==
2339+
dependencies:
2340+
"@typescript-eslint/types" "5.36.1"
2341+
"@typescript-eslint/visitor-keys" "5.36.1"
2342+
2343+
"@typescript-eslint/[email protected]":
2344+
version "5.36.1"
2345+
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.36.1.tgz#016fc2bff6679f54c0b2df848a493f0ca3d4f625"
2346+
integrity sha512-xfZhfmoQT6m3lmlqDvDzv9TiCYdw22cdj06xY0obSznBsT///GK5IEZQdGliXpAOaRL34o8phEvXzEo/VJx13Q==
23392347
dependencies:
2340-
"@typescript-eslint/utils" "5.34.0"
2348+
"@typescript-eslint/typescript-estree" "5.36.1"
2349+
"@typescript-eslint/utils" "5.36.1"
23412350
debug "^4.3.4"
23422351
tsutils "^3.21.0"
23432352

@@ -2346,6 +2355,11 @@
23462355
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.34.0.tgz#217bf08049e9e7b86694d982e88a2c1566330c78"
23472356
integrity sha512-49fm3xbbUPuzBIOcy2CDpYWqy/X7VBkxVN+DC21e0zIm3+61Z0NZi6J9mqPmSW1BDVk9FIOvuCFyUPjXz93sjA==
23482357

2358+
"@typescript-eslint/[email protected]":
2359+
version "5.36.1"
2360+
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.36.1.tgz#1cf0e28aed1cb3ee676917966eb23c2f8334ce2c"
2361+
integrity sha512-jd93ShpsIk1KgBTx9E+hCSEuLCUFwi9V/urhjOWnOaksGZFbTOxAT47OH2d4NLJnLhkVD+wDbB48BuaycZPLBg==
2362+
23492363
"@typescript-eslint/[email protected]":
23502364
version "5.34.0"
23512365
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.34.0.tgz#ba7b83f4bf8ccbabf074bbf1baca7a58de3ccb9a"
@@ -2359,15 +2373,28 @@
23592373
semver "^7.3.7"
23602374
tsutils "^3.21.0"
23612375

2362-
"@typescript-eslint/[email protected]":
2363-
version "5.34.0"
2364-
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.34.0.tgz#0cae98f48d8f9e292e5caa9343611b6faf49e743"
2365-
integrity sha512-kWRYybU4Rn++7lm9yu8pbuydRyQsHRoBDIo11k7eqBWTldN4xUdVUMCsHBiE7aoEkFzrUEaZy3iH477vr4xHAQ==
2376+
"@typescript-eslint/[email protected]":
2377+
version "5.36.1"
2378+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.1.tgz#b857f38d6200f7f3f4c65cd0a5afd5ae723f2adb"
2379+
integrity sha512-ih7V52zvHdiX6WcPjsOdmADhYMDN15SylWRZrT2OMy80wzKbc79n8wFW0xpWpU0x3VpBz/oDgTm2xwDAnFTl+g==
2380+
dependencies:
2381+
"@typescript-eslint/types" "5.36.1"
2382+
"@typescript-eslint/visitor-keys" "5.36.1"
2383+
debug "^4.3.4"
2384+
globby "^11.1.0"
2385+
is-glob "^4.0.3"
2386+
semver "^7.3.7"
2387+
tsutils "^3.21.0"
2388+
2389+
"@typescript-eslint/[email protected]":
2390+
version "5.36.1"
2391+
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.36.1.tgz#136d5208cc7a3314b11c646957f8f0b5c01e07ad"
2392+
integrity sha512-lNj4FtTiXm5c+u0pUehozaUWhh7UYKnwryku0nxJlYUEWetyG92uw2pr+2Iy4M/u0ONMKzfrx7AsGBTCzORmIg==
23662393
dependencies:
23672394
"@types/json-schema" "^7.0.9"
2368-
"@typescript-eslint/scope-manager" "5.34.0"
2369-
"@typescript-eslint/types" "5.34.0"
2370-
"@typescript-eslint/typescript-estree" "5.34.0"
2395+
"@typescript-eslint/scope-manager" "5.36.1"
2396+
"@typescript-eslint/types" "5.36.1"
2397+
"@typescript-eslint/typescript-estree" "5.36.1"
23712398
eslint-scope "^5.1.1"
23722399
eslint-utils "^3.0.0"
23732400

@@ -2379,6 +2406,14 @@
23792406
"@typescript-eslint/types" "5.34.0"
23802407
eslint-visitor-keys "^3.3.0"
23812408

2409+
"@typescript-eslint/[email protected]":
2410+
version "5.36.1"
2411+
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.1.tgz#7731175312d65738e501780f923896d200ad1615"
2412+
integrity sha512-ojB9aRyRFzVMN3b5joSYni6FAS10BBSCAfKJhjJAV08t/a95aM6tAhz+O1jF+EtgxktuSO3wJysp2R+Def/IWQ==
2413+
dependencies:
2414+
"@typescript-eslint/types" "5.36.1"
2415+
eslint-visitor-keys "^3.3.0"
2416+
23822417
"@wojtekmaj/enzyme-adapter-react-17@^0.6.1":
23832418
version "0.6.7"
23842419
resolved "https://registry.yarnpkg.com/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.6.7.tgz#7784bd32f518b186218cebb26c98c852676f30b0"

0 commit comments

Comments
 (0)