eslint to 8.9.0 (#7889)

Signed-off-by: Kerry Archibald <kerrya@element.io>
matrix-org · Feb 24, 2022 · 6e143c3 · 6e143c3
1 parent c257bc3
commit 6e143c3
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 89 deletions.
diff --git a/package.json b/package.json
@@ -168,13 +168,13 @@
     "concurrently": "^5.3.0",
     "enzyme": "^3.11.0",
     "enzyme-to-json": "^3.6.2",
-    "eslint": "7.18.0",
+    "eslint": "8.9.0",
     "eslint-config-google": "^0.14.0",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-matrix-org": "^0.4.0",
-    "eslint-plugin-react": "^7.22.0",
-    "eslint-plugin-react-hooks": "^4.2.0",
+    "eslint-plugin-react": "^7.28.0",
+    "eslint-plugin-react-hooks": "^4.3.0",
     "glob": "^7.1.6",
     "jest": "^27.4.0",
     "jest-canvas-mock": "^2.3.0",

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
@@ -815,7 +815,7 @@ export default class GroupView extends React.Component {
     _dismissUpgradeNotice = () => {
         localStorage.setItem(UPGRADE_NOTICE_LS_KEY, "true");
         this.setState({ showUpgradeNotice: false });
-    }
+    };
 
     _onCreateSpaceClick = () => {
         createSpaceFromCommunity(this._matrixClient, this.props.groupId);

diff --git a/src/components/views/groups/GroupRoomTile.js b/src/components/views/groups/GroupRoomTile.js
@@ -31,7 +31,7 @@ class GroupRoomTile extends React.Component {
         groupRoom: GroupRoomType.isRequired,
     };
 
-    static contextType = MatrixClientContext
+    static contextType = MatrixClientContext;
 
     onClick = e => {
         dis.dispatch({

diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
@@ -667,7 +667,11 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
 
     public focus(): void {
         // focus the first focusable element in this aria treeview widget
-        [...this.treeRef.current?.querySelectorAll<HTMLElement>('[role="treeitem"]')]
+        const treeItems = this.treeRef.current?.querySelectorAll<HTMLElement>('[role="treeitem"]');
+        if (treeItems) {
+            return;
+        }
+        [...treeItems]
             .find(e => e.offsetParent !== null)?.focus();
     }