From cd9c08098352d7747a97fc5dddda14e557aae972 Mon Sep 17 00:00:00 2001
From: Chris <chris.m.clarke@live.co.uk>
Date: Mon, 3 May 2021 13:42:41 +0100
Subject: [PATCH] minor code fixes

---
 .eslintrc.json                     |  2 ++
 src/common/ErrorBoundary.tsx       |  4 ++--
 src/components/Tags/TagsSelect.tsx | 16 ++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index e9a9aa101d..633422ae0e 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -37,6 +37,8 @@
     "react/no-unescaped-entities": "off",
     "react/jsx-no-target-blank": "warn",
     "react/display-name": "warn",
+    // as of v17 no longer required
+    "react/react-in-jsx-scope": "off",
     "@typescript-eslint/no-non-null-assertion": "off",
     "@typescript-eslint/no-empty-interface": "off",
     "react/prop-types": "off",
diff --git a/src/common/ErrorBoundary.tsx b/src/common/ErrorBoundary.tsx
index bdbc5093f0..9dea1bd299 100644
--- a/src/common/ErrorBoundary.tsx
+++ b/src/common/ErrorBoundary.tsx
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser'
-import * as React from 'react'
+import { Component } from 'react'
 
-export default class extends React.Component<any, any> {
+export default class ErrorBoundary extends Component<any, any> {
   constructor(props) {
     super(props)
     this.state = { error: null }
diff --git a/src/components/Tags/TagsSelect.tsx b/src/components/Tags/TagsSelect.tsx
index 4a196622cb..ea461a1037 100644
--- a/src/components/Tags/TagsSelect.tsx
+++ b/src/components/Tags/TagsSelect.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react'
+import { Component } from 'react'
 import { inject, observer } from 'mobx-react'
 import { TagsStore } from 'src/stores/Tags/tags.store'
 import { ISelectedTags, ITag, TagCategory } from 'src/models/tags.model'
@@ -9,12 +9,12 @@ import { FieldContainer } from '../Form/elements'
 import { DropdownIndicator } from '../DropdownIndicator'
 
 // we include props from react-final-form fields so it can be used as a custom field component
-export interface IProps extends FieldRenderProps<any, any> {
+export interface IProps extends Partial<FieldRenderProps<any, any>> {
   value?: ISelectedTags
   onChange: (val: ISelectedTags) => void
-  category: TagCategory | undefined
-  styleVariant: 'selector' | 'filter'
-  placeholder: string
+  category?: TagCategory | undefined
+  styleVariant?: 'selector' | 'filter'
+  placeholder?: string
   relevantTagsItems?: ICollectionWithTags[]
 }
 interface IState {
@@ -30,7 +30,7 @@ interface ICollectionWithTags {
 
 @inject('tagsStore')
 @observer
-class TagsSelect extends React.Component<IProps, IState> {
+class TagsSelect extends Component<IProps, IState> {
   public static defaultProps: IProps
   constructor(props: any) {
     super(props)
@@ -43,7 +43,7 @@ class TagsSelect extends React.Component<IProps, IState> {
   // if we initialise with a value we want to update the state to reflect the selected tags
   // we repeat this additionally for input in case it is being used as input component for react-final-form field
   public componentDidMount() {
-    const propsVal = { ...this.props.value, ...this.props.input.value }
+    const propsVal = { ...this.props.value, ...this.props.input!.value }
     const selectedTags = Object.keys(propsVal)
     this.setState({ selectedTags })
     this.props.onChange(propsVal)
@@ -129,7 +129,7 @@ export default TagsSelect
 // default onChange calls the input onChange function (linked to react-final-form)
 TagsSelect.defaultProps = {
   onChange: val => {
-    TagsSelect.defaultProps.input.onChange(val)
+    TagsSelect.defaultProps.input!.onChange(val)
   },
   input: {
     name: 'tagsSelect',