From 31f8ada876b3aec45ffffcf82079eaacb69349fc Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Thu, 7 Oct 2021 08:03:45 +0200 Subject: chore: upgrade react to latest (#2030) --- .eslintrc.js | 2 + babel.config.json | 2 +- package-lock.json | 62 +++++++--------------- package.json | 8 +-- packages/forms/package.json | 6 --- packages/forms/src/button/index.tsx | 6 +-- packages/forms/src/error/index.tsx | 2 +- packages/forms/src/input/index.tsx | 4 +- packages/forms/src/label/index.tsx | 6 +-- packages/forms/src/select/index.tsx | 4 +- packages/forms/src/textarea/index.tsx | 4 +- packages/forms/src/toggle/index.tsx | 4 +- packages/forms/src/wrapper/index.tsx | 4 +- packages/ui/package.json | 6 --- packages/ui/src/badge/ProBadge.tsx | 2 +- packages/ui/src/badge/index.tsx | 4 +- packages/ui/src/headline/index.tsx | 6 +-- packages/ui/src/icon/index.tsx | 2 +- packages/ui/src/infobox/index.tsx | 4 +- packages/ui/src/loader/index.tsx | 2 +- src/I18n.js | 2 +- src/app.js | 1 - src/components/AppUpdateInfoBar.js | 2 +- src/components/auth/AuthLayout.js | 4 +- src/components/auth/ChangeServer.js | 2 +- src/components/auth/Import.js | 2 +- src/components/auth/Invite.js | 2 +- src/components/auth/Locked.js | 2 +- src/components/auth/Login.js | 2 +- src/components/auth/Password.js | 2 +- src/components/auth/SetupAssistant.js | 2 +- src/components/auth/Signup.js | 2 +- src/components/auth/Welcome.js | 2 +- src/components/layout/AppLayout.js | 2 +- src/components/layout/Sidebar.js | 2 +- .../services/content/ConnectionLostBanner.js | 4 +- .../content/ErrorHandlers/WebviewErrorHandler.js | 2 +- src/components/services/content/ServiceDisabled.js | 2 +- src/components/services/content/ServiceView.js | 2 +- src/components/services/content/ServiceWebview.js | 2 +- src/components/services/content/Services.js | 2 +- .../services/content/WebviewCrashHandler.js | 2 +- src/components/services/tabs/TabBarSortableList.js | 2 +- src/components/services/tabs/TabItem.js | 2 +- src/components/services/tabs/Tabbar.js | 2 +- src/components/settings/SettingsLayout.js | 2 +- .../settings/account/AccountDashboard.js | 2 +- .../settings/navigation/SettingsNavigation.js | 2 +- src/components/settings/recipes/RecipeItem.js | 2 +- .../settings/recipes/RecipesDashboard.js | 2 +- .../settings/services/EditServiceForm.js | 2 +- src/components/settings/services/ServiceError.js | 2 +- src/components/settings/services/ServiceItem.js | 2 +- .../settings/services/ServicesDashboard.js | 2 +- .../settings/settings/EditSettingsForm.js | 2 +- .../settings/supportFerdi/SupportFerdiDashboard.js | 2 +- src/components/settings/team/TeamDashboard.js | 2 +- src/components/settings/user/EditUserForm.js | 2 +- src/components/ui/AppLoader/index.js | 2 +- src/components/ui/Button.js | 2 +- src/components/ui/FAB.js | 2 +- src/components/ui/FullscreenLoader/index.js | 2 +- src/components/ui/ImageUpload.js | 2 +- src/components/ui/InfoBar.js | 2 +- src/components/ui/Infobox.js | 2 +- src/components/ui/Input.js | 2 +- src/components/ui/Link.js | 2 +- src/components/ui/Loader.js | 2 +- src/components/ui/Modal/index.js | 2 +- src/components/ui/Radio.js | 2 +- src/components/ui/SearchInput.js | 2 +- src/components/ui/Select.js | 4 +- src/components/ui/ServiceIcon.js | 2 +- src/components/ui/Slider.js | 2 +- src/components/ui/StatusBarTargetUrl.js | 2 +- src/components/ui/Tabs/TabItem.tsx | 2 - src/components/ui/Tabs/Tabs.js | 6 +-- src/components/ui/Toggle.js | 2 +- src/components/ui/ToggleRaw.js | 2 +- src/components/ui/WebviewLoader/index.js | 2 +- src/components/ui/effects/Appear.js | 2 +- src/components/util/ErrorBoundary/index.js | 2 +- src/containers/auth/AuthLayoutContainer.js | 2 +- src/containers/auth/ChangeServerScreen.js | 2 +- src/containers/auth/ImportScreen.js | 2 +- src/containers/auth/InviteScreen.js | 2 +- src/containers/auth/LockedScreen.js | 2 +- src/containers/auth/LoginScreen.js | 2 +- src/containers/auth/PasswordScreen.js | 2 +- src/containers/auth/SetupAssistantScreen.js | 2 +- src/containers/auth/SignupScreen.js | 2 +- src/containers/auth/WelcomeScreen.js | 2 +- src/containers/layout/AppLayoutContainer.js | 4 +- src/containers/settings/AccountScreen.js | 2 +- src/containers/settings/EditServiceScreen.js | 2 +- src/containers/settings/EditSettingsScreen.js | 2 +- src/containers/settings/EditUserScreen.js | 2 +- src/containers/settings/InviteScreen.js | 2 +- src/containers/settings/RecipesScreen.js | 2 +- src/containers/settings/ServicesScreen.js | 2 +- src/containers/settings/SettingsWindow.js | 2 +- src/containers/settings/SupportScreen.js | 2 +- src/containers/settings/TeamScreen.js | 2 +- src/features/basicAuth/Component.js | 2 +- src/features/nightlyBuilds/Component.js | 2 +- src/features/publishDebugInfo/Component.js | 2 +- src/features/quickSwitch/Component.js | 2 +- src/features/todos/components/TodosWebview.js | 2 +- src/features/todos/containers/TodosScreen.js | 2 +- src/features/webControls/components/WebControls.js | 4 +- .../webControls/containers/WebControlsScreen.js | 2 +- .../workspaces/components/CreateWorkspaceForm.js | 2 +- .../workspaces/components/EditWorkspaceForm.js | 2 +- .../workspaces/components/WorkspaceDrawer.js | 2 +- .../workspaces/components/WorkspaceDrawerItem.js | 2 +- .../workspaces/components/WorkspaceItem.js | 2 +- .../components/WorkspaceServiceListItem.js | 2 +- .../components/WorkspaceSwitchingIndicator.js | 2 +- .../workspaces/components/WorkspacesDashboard.js | 2 +- .../workspaces/containers/EditWorkspaceScreen.js | 2 +- .../workspaces/containers/WorkspacesScreen.js | 2 +- src/routes.js | 2 +- tsconfig.json | 2 +- uidev/src/app.tsx | 1 - uidev/src/index.tsx | 1 - uidev/src/stories/badge.stories.tsx | 2 - uidev/src/stories/button.stories.tsx | 2 +- uidev/src/stories/headline.stories.tsx | 2 - uidev/src/stories/icon.stories.tsx | 1 - uidev/src/stories/infobox.stories.tsx | 2 +- uidev/src/stories/input.stories.tsx | 2 +- uidev/src/stories/loader.stories.tsx | 2 - uidev/src/stories/select.stories.tsx | 2 +- uidev/src/stories/textarea.stories.tsx | 2 +- uidev/src/stories/toggle.stories.tsx | 1 - uidev/src/withTheme/index.tsx | 2 +- 136 files changed, 164 insertions(+), 217 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 057631708..dc727a196 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -74,6 +74,7 @@ module.exports = { 'react/button-has-type': 0, 'react/forbid-prop-types': 0, 'react/jsx-curly-newline': 0, + 'react/react-in-jsx-scope': 0, 'react/jsx-no-bind': 0, 'react/jsx-no-target-blank': 0, 'react/jsx-props-no-spreading': 0, @@ -151,6 +152,7 @@ module.exports = { 'react/forbid-prop-types': 1, 'react/destructuring-assignment': 0, 'react/jsx-curly-newline': 0, + 'react/react-in-jsx-scope': 0, 'react/jsx-filename-extension': 1, 'react/jsx-one-expression-per-line': 0, 'react/jsx-no-bind': 1, diff --git a/babel.config.json b/babel.config.json index 03f768c6c..7ef38a9a8 100644 --- a/babel.config.json +++ b/babel.config.json @@ -8,7 +8,7 @@ } } ], - "@babel/preset-react" + ["@babel/preset-react", { "runtime": "automatic" }] ], "plugins": [ [ diff --git a/package-lock.json b/package-lock.json index 5ff1d8988..66c375eb6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7809,9 +7809,9 @@ "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==" }, "@types/react": { - "version": "16.14.6", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.6.tgz", - "integrity": "sha512-Ol/aFKune+P0FSFKIgf+XbhGzYGyz0p7g5befSt4rmbzfGLaZR0q7jPew9k7d3bvrcuaL8dPy9Oz3XGZmf9n+w==", + "version": "17.0.27", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.27.tgz", + "integrity": "sha512-zgiJwtsggVGtr53MndV7jfiUESTqrbxOcBvwfe6KS/9bzaVPCTDieTWnFNecVNx6EAaapg5xsLLWFfHHR437AA==", "requires": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -7819,12 +7819,12 @@ } }, "@types/react-dom": { - "version": "16.9.13", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.13.tgz", - "integrity": "sha512-34Hr3XnmUSJbUVDxIw/e7dhQn2BJZhJmlAaPyPwfTQyuVS9mV/CeyghFcXyvkJXxI7notQJz8mF8FeCVvloJrA==", + "version": "17.0.9", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.9.tgz", + "integrity": "sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg==", "dev": true, "requires": { - "@types/react": "^16" + "@types/react": "*" } }, "@types/route-parser": { @@ -26307,25 +26307,12 @@ } }, "react": { - "version": "16.14.0", - "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz", - "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==", + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz", + "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==", "requires": { "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2" - }, - "dependencies": { - "prop-types": { - "version": "15.7.2", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", - "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", - "requires": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.8.1" - } - } + "object-assign": "^4.1.1" } }, "react-addons-css-transition-group": { @@ -26345,26 +26332,13 @@ } }, "react-dom": { - "version": "16.14.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz", - "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==", + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz", + "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", - "prop-types": "^15.6.2", - "scheduler": "^0.19.1" - }, - "dependencies": { - "prop-types": { - "version": "15.7.2", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", - "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", - "requires": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.8.1" - } - } + "scheduler": "^0.20.2" } }, "react-dropzone": { @@ -27645,9 +27619,9 @@ } }, "scheduler": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", - "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz", + "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" diff --git a/package.json b/package.json index 176e59be1..e2ddee394 100644 --- a/package.json +++ b/package.json @@ -107,10 +107,10 @@ "os-name": "4.0.1", "pretty-bytes": "5.6.0", "prop-types": "15.7.2", - "react": "16.14.0", + "react": "17.0.2", "react-addons-css-transition-group": "15.6.2", "react-confetti": "6.0.1", - "react-dom": "16.14.0", + "react-dom": "17.0.2", "react-dropzone": "11.3.4", "react-electron-web-view": "2.0.1", "react-intl": "5.20.10", @@ -149,8 +149,8 @@ "@types/mocha": "9.0.0", "@types/ms": "0.7.31", "@types/node": "14.17.6", - "@types/react": "16.14.6", - "@types/react-dom": "16.9.13", + "@types/react": "17.0.27", + "@types/react-dom": "17.0.9", "@types/route-parser": "0.1.3", "@types/tar": "4.0.5", "@types/uuid": "8.3.1", diff --git a/packages/forms/package.json b/packages/forms/package.json index 5676ed6c3..f073221bc 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -29,11 +29,5 @@ "csstype": "3.0.8", "react-loader": "2.4.7" }, - "peerDependencies": { - "classnames": "2.3.1", - "react": "16.14.0", - "react-dom": "16.14.0", - "react-jss": "8.6.1" - }, "gitHead": "00db2bddccb8bb8ad7d29b8d032876c798b8bbf3" } diff --git a/packages/forms/src/button/index.tsx b/packages/forms/src/button/index.tsx index c9ae47d55..d9f372c4b 100644 --- a/packages/forms/src/button/index.tsx +++ b/packages/forms/src/button/index.tsx @@ -1,7 +1,7 @@ import Icon from '@mdi/react'; import classnames from 'classnames'; import { Property } from 'csstype'; -import React, { Component } from 'react'; +import { Component, MouseEvent } from 'react'; import injectStyle, { withTheme } from 'react-jss'; import Loader from 'react-loader'; @@ -22,9 +22,7 @@ interface IProps extends IFormField, IWithStyle { id?: string; type?: 'button' | 'reset' | 'submit' | undefined; onClick: ( - event: - | React.MouseEvent - | React.MouseEvent, + event: MouseEvent | MouseEvent, ) => void; buttonType?: ButtonType; stretch?: boolean; diff --git a/packages/forms/src/error/index.tsx b/packages/forms/src/error/index.tsx index 243321d97..8439bfc8b 100644 --- a/packages/forms/src/error/index.tsx +++ b/packages/forms/src/error/index.tsx @@ -1,5 +1,5 @@ import { Classes } from 'jss'; -import React, { Component } from 'react'; +import { Component } from 'react'; import injectSheet from 'react-jss'; import styles from './styles'; diff --git a/packages/forms/src/input/index.tsx b/packages/forms/src/input/index.tsx index 41751710a..0b16fe688 100644 --- a/packages/forms/src/input/index.tsx +++ b/packages/forms/src/input/index.tsx @@ -1,7 +1,7 @@ import { mdiEye, mdiEyeOff } from '@mdi/js'; import Icon from '@mdi/react'; import classnames from 'classnames'; -import React, { Component, createRef } from 'react'; +import { Component, createRef, InputHTMLAttributes } from 'react'; import injectSheet from 'react-jss'; import { IFormField, IWithStyle } from '../typings/generic'; @@ -18,7 +18,7 @@ interface IData { } interface IProps - extends React.InputHTMLAttributes, + extends InputHTMLAttributes, IFormField, IWithStyle { focus?: boolean; diff --git a/packages/forms/src/label/index.tsx b/packages/forms/src/label/index.tsx index ad503b785..4d86f23f7 100644 --- a/packages/forms/src/label/index.tsx +++ b/packages/forms/src/label/index.tsx @@ -1,15 +1,13 @@ import classnames from 'classnames'; import { Classes } from 'jss'; -import React, { Component } from 'react'; +import { Component, LabelHTMLAttributes } from 'react'; import injectSheet from 'react-jss'; import { IFormField } from '../typings/generic'; import styles from './styles'; -interface ILabel - extends IFormField, - React.LabelHTMLAttributes { +interface ILabel extends IFormField, LabelHTMLAttributes { classes: Classes; isRequired: boolean; } diff --git a/packages/forms/src/select/index.tsx b/packages/forms/src/select/index.tsx index 7806baa2a..d965d3c93 100644 --- a/packages/forms/src/select/index.tsx +++ b/packages/forms/src/select/index.tsx @@ -5,7 +5,7 @@ import { } from '@mdi/js'; import Icon from '@mdi/react'; import classnames from 'classnames'; -import React, { Component, createRef } from 'react'; +import { ChangeEvent, Component, createRef } from 'react'; import injectStyle from 'react-jss'; import { IFormField, IWithStyle } from '../typings/generic'; @@ -33,7 +33,7 @@ interface IProps extends IFormField, IWithStyle { name: string; options: IOptions; value: string; - onChange: (event: React.ChangeEvent) => void; + onChange: (event: ChangeEvent) => void; showSearch: boolean; data: IData; } diff --git a/packages/forms/src/textarea/index.tsx b/packages/forms/src/textarea/index.tsx index 2d89d1c9f..1b16698eb 100644 --- a/packages/forms/src/textarea/index.tsx +++ b/packages/forms/src/textarea/index.tsx @@ -1,5 +1,5 @@ import classnames from 'classnames'; -import React, { Component, createRef } from 'react'; +import { Component, createRef, TextareaHTMLAttributes } from 'react'; import injectSheet from 'react-jss'; import { IFormField, IWithStyle } from '../typings/generic'; @@ -15,7 +15,7 @@ interface IData { } interface IProps - extends React.TextareaHTMLAttributes, + extends TextareaHTMLAttributes, IFormField, IWithStyle { focus?: boolean; diff --git a/packages/forms/src/toggle/index.tsx b/packages/forms/src/toggle/index.tsx index bdf1d22cf..f9ef5775a 100644 --- a/packages/forms/src/toggle/index.tsx +++ b/packages/forms/src/toggle/index.tsx @@ -1,6 +1,6 @@ import classnames from 'classnames'; import { Property } from 'csstype'; -import React, { Component } from 'react'; +import { Component, InputHTMLAttributes } from 'react'; import injectStyle from 'react-jss'; import { IFormField, IWithStyle } from '../typings/generic'; @@ -11,7 +11,7 @@ import { Label } from '../label'; import { Wrapper } from '../wrapper'; interface IProps - extends React.InputHTMLAttributes, + extends InputHTMLAttributes, IFormField, IWithStyle { className?: string; diff --git a/packages/forms/src/wrapper/index.tsx b/packages/forms/src/wrapper/index.tsx index 3ae551e2c..ffcd6fe0b 100644 --- a/packages/forms/src/wrapper/index.tsx +++ b/packages/forms/src/wrapper/index.tsx @@ -1,10 +1,10 @@ import classnames from 'classnames'; -import React, { Component } from 'react'; +import { Component, ReactNode } from 'react'; import injectStyle from 'react-jss'; import { IWithStyle } from '../typings/generic'; interface IProps extends IWithStyle { - children: React.ReactNode; + children: ReactNode; className?: string; identifier: string; noMargin?: boolean; diff --git a/packages/ui/package.json b/packages/ui/package.json index 23af393f5..0de76a98b 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -27,11 +27,5 @@ "@meetfranz/theme": "file:../theme", "react-loader": "2.4.7" }, - "peerDependencies": { - "classnames": "2.3.1", - "react": "16.14.0", - "react-dom": "16.14.0", - "react-jss": "8.6.1" - }, "gitHead": "254da30f801169fac376bda1439b46cabbb491ad" } diff --git a/packages/ui/src/badge/ProBadge.tsx b/packages/ui/src/badge/ProBadge.tsx index 63d5d673a..be7ed8e58 100644 --- a/packages/ui/src/badge/ProBadge.tsx +++ b/packages/ui/src/badge/ProBadge.tsx @@ -1,6 +1,6 @@ import { mdiStar } from '@mdi/js'; import classnames from 'classnames'; -import React, { Component } from 'react'; +import { Component } from 'react'; import injectStyle from 'react-jss'; import { Badge, Icon } from '..'; diff --git a/packages/ui/src/badge/index.tsx b/packages/ui/src/badge/index.tsx index 5dd735879..a8f3ebcbf 100644 --- a/packages/ui/src/badge/index.tsx +++ b/packages/ui/src/badge/index.tsx @@ -1,5 +1,5 @@ import classnames from 'classnames'; -import React, { Component } from 'react'; +import { Component, ReactNode } from 'react'; import injectStyle from 'react-jss'; import { Theme } from '../../../theme'; @@ -8,7 +8,7 @@ import { IWithStyle } from '../typings/generic'; interface IProps extends IWithStyle { type: string; className?: string; - children: React.ReactNode; + children: ReactNode; } const badgeStyles = (theme: Theme) => { diff --git a/packages/ui/src/headline/index.tsx b/packages/ui/src/headline/index.tsx index bf3d4418c..b534a6298 100644 --- a/packages/ui/src/headline/index.tsx +++ b/packages/ui/src/headline/index.tsx @@ -1,5 +1,5 @@ import classnames from 'classnames'; -import React, { Component } from 'react'; +import { Component, createElement, ReactNode } from 'react'; import injectStyle from 'react-jss'; import { Theme } from '../../../theme'; @@ -8,7 +8,7 @@ import { IWithStyle, Omit } from '../typings/generic'; interface IProps extends IWithStyle { level?: number; className?: string; - children: string | React.ReactNode; + children: string | ReactNode; id?: string; } @@ -39,7 +39,7 @@ class HeadlineComponent extends Component { render() { const { classes, level, className, children, id } = this.props; - return React.createElement( + return createElement( `h${level}`, { id, diff --git a/packages/ui/src/icon/index.tsx b/packages/ui/src/icon/index.tsx index b644a9234..9753b399c 100644 --- a/packages/ui/src/icon/index.tsx +++ b/packages/ui/src/icon/index.tsx @@ -1,6 +1,6 @@ import MdiIcon from '@mdi/react'; import classnames from 'classnames'; -import React, { Component } from 'react'; +import { Component } from 'react'; import injectStyle from 'react-jss'; import { Theme } from '../../../theme'; diff --git a/packages/ui/src/infobox/index.tsx b/packages/ui/src/infobox/index.tsx index 88cfdb620..7bad4a1f2 100644 --- a/packages/ui/src/infobox/index.tsx +++ b/packages/ui/src/infobox/index.tsx @@ -1,6 +1,6 @@ import { mdiClose } from '@mdi/js'; import classnames from 'classnames'; -import React, { Component } from 'react'; +import { Component, ReactNode } from 'react'; import injectStyle from 'react-jss'; import { Icon } from '..'; @@ -16,7 +16,7 @@ interface IProps extends IWithStyle { ctaOnClick?: () => void; ctaLabel?: string; ctaLoading?: boolean; - children: React.ReactNode; + children: ReactNode; className: string; } diff --git a/packages/ui/src/loader/index.tsx b/packages/ui/src/loader/index.tsx index 244aa9dc9..0607bd48b 100644 --- a/packages/ui/src/loader/index.tsx +++ b/packages/ui/src/loader/index.tsx @@ -1,5 +1,5 @@ import classnames from 'classnames'; -import React, { Component } from 'react'; +import { Component } from 'react'; import injectStyle, { withTheme } from 'react-jss'; import ReactLoader from 'react-loader'; diff --git a/src/I18n.js b/src/I18n.js index 6fb4cdc61..2a50050ee 100644 --- a/src/I18n.js +++ b/src/I18n.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { inject, observer } from 'mobx-react'; import { IntlProvider } from 'react-intl'; diff --git a/src/app.js b/src/app.js index 8a1f99320..aea57a673 100644 --- a/src/app.js +++ b/src/app.js @@ -1,6 +1,5 @@ import { webFrame } from 'electron'; -import React from 'react'; import { render } from 'react-dom'; import { Provider } from 'mobx-react'; import { syncHistoryWithStore, RouterStore } from 'mobx-react-router'; diff --git a/src/components/AppUpdateInfoBar.js b/src/components/AppUpdateInfoBar.js index 47b730bde..3f2b1ae95 100644 --- a/src/components/AppUpdateInfoBar.js +++ b/src/components/AppUpdateInfoBar.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js index 17ac221a2..00eded728 100644 --- a/src/components/auth/AuthLayout.js +++ b/src/components/auth/AuthLayout.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { cloneElement, Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { TitleBar } from 'electron-react-titlebar/renderer'; @@ -87,7 +87,7 @@ class AuthLayout extends Component { )}
{/* Inject globalError into children */} - {React.cloneElement(children, { + {cloneElement(children, { error, })}
diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js index b98fb50f7..9aeebc5c8 100644 --- a/src/components/auth/ChangeServer.js +++ b/src/components/auth/ChangeServer.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js index 44cb7e791..fe2fe9872 100644 --- a/src/components/auth/Import.js +++ b/src/components/auth/Import.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js index df8980314..dd71c2450 100644 --- a/src/components/auth/Invite.js +++ b/src/components/auth/Invite.js @@ -1,4 +1,4 @@ -import React, { Component, Fragment } from 'react'; +import { Component, Fragment } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js index a507ba140..5b36b9fc2 100644 --- a/src/components/auth/Locked.js +++ b/src/components/auth/Locked.js @@ -1,5 +1,5 @@ import { systemPreferences } from '@electron/remote'; -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index 2f9986858..9f3f636e3 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js @@ -1,5 +1,5 @@ /* eslint jsx-a11y/anchor-is-valid: 0 */ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer, inject } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js index 3e678f638..d5bc7fa80 100644 --- a/src/components/auth/Password.js +++ b/src/components/auth/Password.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js index 299c40c63..d0efd6361 100644 --- a/src/components/auth/SetupAssistant.js +++ b/src/components/auth/SetupAssistant.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index 816a49669..00625a3ac 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js @@ -1,5 +1,5 @@ /* eslint jsx-a11y/anchor-is-valid: 0 */ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer, inject } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js index 2d2e2ab28..809ec67a7 100644 --- a/src/components/auth/Welcome.js +++ b/src/components/auth/Welcome.js @@ -1,5 +1,5 @@ /* eslint jsx-a11y/anchor-is-valid: 0 */ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 0a65dcffa..9c1dbf139 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 87233f7ca..76edcf2e1 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import ReactTooltip from 'react-tooltip'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/services/content/ConnectionLostBanner.js b/src/components/services/content/ConnectionLostBanner.js index 423edb3c7..236d2739b 100644 --- a/src/components/services/content/ConnectionLostBanner.js +++ b/src/components/services/content/ConnectionLostBanner.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { createRef, Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import injectSheet from 'react-jss'; @@ -78,7 +78,7 @@ class ConnectionLostBanner extends Component { reload: PropTypes.func.isRequired, }; - inputRef = React.createRef(); + inputRef = createRef(); render() { const { classes, name, reload } = this.props; diff --git a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js index b00db8c3f..5c93de80f 100644 --- a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js +++ b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js index e59ed58bd..476b23235 100644 --- a/src/components/services/content/ServiceDisabled.js +++ b/src/components/services/content/ServiceDisabled.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index 81401b1d2..8e44efc5f 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js @@ -1,4 +1,4 @@ -import React, { Component, Fragment } from 'react'; +import { Component, Fragment } from 'react'; import PropTypes from 'prop-types'; import { autorun } from 'mobx'; import { observer, inject } from 'mobx-react'; diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js index d3170be53..b60ed3267 100644 --- a/src/components/services/content/ServiceWebview.js +++ b/src/components/services/content/ServiceWebview.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { observable, reaction } from 'mobx'; diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index fb43fb816..1edf31bd3 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react'; import { Link } from 'react-router'; diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js index a332602be..3607435b3 100644 --- a/src/components/services/content/WebviewCrashHandler.js +++ b/src/components/services/content/WebviewCrashHandler.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js index 1a389991d..146cd93eb 100644 --- a/src/components/services/tabs/TabBarSortableList.js +++ b/src/components/services/tabs/TabBarSortableList.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; import PropTypes from 'prop-types'; import { SortableContainer } from 'react-sortable-hoc'; diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js index 2474682df..d789b6425 100644 --- a/src/components/services/tabs/TabItem.js +++ b/src/components/services/tabs/TabItem.js @@ -1,5 +1,5 @@ import { Menu, dialog, app } from '@electron/remote'; -import React, { Component } from 'react'; +import { Component } from 'react'; import { defineMessages, injectIntl } from 'react-intl'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js index a77799819..4ab0e8611 100644 --- a/src/components/services/tabs/Tabbar.js +++ b/src/components/services/tabs/Tabbar.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; diff --git a/src/components/settings/SettingsLayout.js b/src/components/settings/SettingsLayout.js index 71250bd4d..be11fdb8e 100644 --- a/src/components/settings/SettingsLayout.js +++ b/src/components/settings/SettingsLayout.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 544821e9a..686501267 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js index 72c7faa66..18a71fdeb 100644 --- a/src/components/settings/navigation/SettingsNavigation.js +++ b/src/components/settings/navigation/SettingsNavigation.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { defineMessages, injectIntl } from 'react-intl'; import { inject, observer } from 'mobx-react'; diff --git a/src/components/settings/recipes/RecipeItem.js b/src/components/settings/recipes/RecipeItem.js index ca188aa99..1e910e6dc 100644 --- a/src/components/settings/recipes/RecipeItem.js +++ b/src/components/settings/recipes/RecipeItem.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js index 44f5bc39a..0c521319a 100644 --- a/src/components/settings/recipes/RecipesDashboard.js +++ b/src/components/settings/recipes/RecipesDashboard.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 22089ec45..fd3c4a176 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { Link } from 'react-router'; diff --git a/src/components/settings/services/ServiceError.js b/src/components/settings/services/ServiceError.js index d16d76db2..6dd53a102 100644 --- a/src/components/settings/services/ServiceError.js +++ b/src/components/settings/services/ServiceError.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import { observer } from 'mobx-react'; import { Link } from 'react-router'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/settings/services/ServiceItem.js b/src/components/settings/services/ServiceItem.js index 4916e4ecc..e08b9af1f 100644 --- a/src/components/settings/services/ServiceItem.js +++ b/src/components/settings/services/ServiceItem.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { defineMessages, injectIntl } from 'react-intl'; import ReactTooltip from 'react-tooltip'; diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js index bb52db97f..aae6eb855 100644 --- a/src/components/settings/services/ServicesDashboard.js +++ b/src/components/settings/services/ServicesDashboard.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; import { Link } from 'react-router'; diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 123ab4c2d..063bf7b15 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -1,5 +1,5 @@ import { systemPreferences } from '@electron/remote'; -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import prettyBytes from 'pretty-bytes'; diff --git a/src/components/settings/supportFerdi/SupportFerdiDashboard.js b/src/components/settings/supportFerdi/SupportFerdiDashboard.js index f24e4bd62..b906df5c8 100644 --- a/src/components/settings/supportFerdi/SupportFerdiDashboard.js +++ b/src/components/settings/supportFerdi/SupportFerdiDashboard.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import { defineMessages, injectIntl } from 'react-intl'; import { BrowserWindow } from '@electron/remote'; import InfoBar from '../../ui/InfoBar'; diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js index 06f244997..4a1a02571 100644 --- a/src/components/settings/team/TeamDashboard.js +++ b/src/components/settings/team/TeamDashboard.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js index adc107ccc..55883e65f 100644 --- a/src/components/settings/user/EditUserForm.js +++ b/src/components/settings/user/EditUserForm.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; import { defineMessages, injectIntl } from 'react-intl'; diff --git a/src/components/ui/AppLoader/index.js b/src/components/ui/AppLoader/index.js index fa4a719ab..e00960200 100644 --- a/src/components/ui/AppLoader/index.js +++ b/src/components/ui/AppLoader/index.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import injectSheet, { withTheme } from 'react-jss'; import classnames from 'classnames'; diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js index f6c9fd3d3..67c801d98 100644 --- a/src/components/ui/Button.js +++ b/src/components/ui/Button.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer, inject } from 'mobx-react'; import Loader from 'react-loader'; diff --git a/src/components/ui/FAB.js b/src/components/ui/FAB.js index a3aa06bc9..55fe97e82 100644 --- a/src/components/ui/FAB.js +++ b/src/components/ui/FAB.js @@ -1,7 +1,7 @@ /** * Floating Action Button (FAB) */ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import classnames from 'classnames'; diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js index ab5e2f365..f5943f3f3 100644 --- a/src/components/ui/FullscreenLoader/index.js +++ b/src/components/ui/FullscreenLoader/index.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import injectSheet, { withTheme } from 'react-jss'; diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js index 49aff389b..c51d39a9b 100644 --- a/src/components/ui/ImageUpload.js +++ b/src/components/ui/ImageUpload.js @@ -1,4 +1,4 @@ -import React, { Component, Fragment } from 'react'; +import { Component, Fragment } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { Field } from 'mobx-react-form'; diff --git a/src/components/ui/InfoBar.js b/src/components/ui/InfoBar.js index dc6be10da..3311a949f 100644 --- a/src/components/ui/InfoBar.js +++ b/src/components/ui/InfoBar.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import classnames from 'classnames'; diff --git a/src/components/ui/Infobox.js b/src/components/ui/Infobox.js index 9e34bf110..b88b01bd8 100644 --- a/src/components/ui/Infobox.js +++ b/src/components/ui/Infobox.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import classnames from 'classnames'; diff --git a/src/components/ui/Input.js b/src/components/ui/Input.js index 43fab10ee..8d37d7a05 100644 --- a/src/components/ui/Input.js +++ b/src/components/ui/Input.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { Field } from 'mobx-react-form'; diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js index 94db3f842..40766c984 100644 --- a/src/components/ui/Link.js +++ b/src/components/ui/Link.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { inject, observer } from 'mobx-react'; import { RouterStore } from 'mobx-react-router'; diff --git a/src/components/ui/Loader.js b/src/components/ui/Loader.js index 46c1390bf..71c6b9552 100644 --- a/src/components/ui/Loader.js +++ b/src/components/ui/Loader.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import { observer, inject } from 'mobx-react'; import PropTypes from 'prop-types'; import Loader from 'react-loader'; diff --git a/src/components/ui/Modal/index.js b/src/components/ui/Modal/index.js index 3c7c66c59..c4e47748a 100644 --- a/src/components/ui/Modal/index.js +++ b/src/components/ui/Modal/index.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import ReactModal from 'react-modal'; import PropTypes from 'prop-types'; import classnames from 'classnames'; diff --git a/src/components/ui/Radio.js b/src/components/ui/Radio.js index 65a777ff1..5354dbfe1 100644 --- a/src/components/ui/Radio.js +++ b/src/components/ui/Radio.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { Field } from 'mobx-react-form'; diff --git a/src/components/ui/SearchInput.js b/src/components/ui/SearchInput.js index 2d760beab..2e8793a2b 100644 --- a/src/components/ui/SearchInput.js +++ b/src/components/ui/SearchInput.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import classnames from 'classnames'; diff --git a/src/components/ui/Select.js b/src/components/ui/Select.js index 5ac7ddd6d..a560da332 100644 --- a/src/components/ui/Select.js +++ b/src/components/ui/Select.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { createRef, Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { Field } from 'mobx-react-form'; @@ -24,7 +24,7 @@ class Select extends Component { constructor(props) { super(props); - this.element = React.createRef(); + this.element = createRef(); } multipleChange() { diff --git a/src/components/ui/ServiceIcon.js b/src/components/ui/ServiceIcon.js index b2dadeac3..2e9312d27 100644 --- a/src/components/ui/ServiceIcon.js +++ b/src/components/ui/ServiceIcon.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import injectSheet from 'react-jss'; diff --git a/src/components/ui/Slider.js b/src/components/ui/Slider.js index 6f17eae00..dea6e0563 100644 --- a/src/components/ui/Slider.js +++ b/src/components/ui/Slider.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import classnames from 'classnames'; diff --git a/src/components/ui/StatusBarTargetUrl.js b/src/components/ui/StatusBarTargetUrl.js index ff4e8c795..38b436742 100644 --- a/src/components/ui/StatusBarTargetUrl.js +++ b/src/components/ui/StatusBarTargetUrl.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import classnames from 'classnames'; diff --git a/src/components/ui/Tabs/TabItem.tsx b/src/components/ui/Tabs/TabItem.tsx index bd613ddc7..9fcc3c41e 100644 --- a/src/components/ui/Tabs/TabItem.tsx +++ b/src/components/ui/Tabs/TabItem.tsx @@ -1,3 +1 @@ -import React from 'react'; - export const TabItem = ({ children }) => <>{children}; diff --git a/src/components/ui/Tabs/Tabs.js b/src/components/ui/Tabs/Tabs.js index 195398708..77803974b 100644 --- a/src/components/ui/Tabs/Tabs.js +++ b/src/components/ui/Tabs/Tabs.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Children, Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import classnames from 'classnames'; @@ -36,7 +36,7 @@ class Tab extends Component { return (
- {React.Children.map(children, (child, i) => ( + {Children.map(children, (child, i) => (