diff options
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/auth/Welcome.tsx | 1 | ||||
-rw-r--r-- | src/components/services/content/ServiceView.tsx | 2 | ||||
-rw-r--r-- | src/components/services/content/ServiceWebview.tsx | 2 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.tsx | 4 | ||||
-rw-r--r-- | src/components/ui/Tabs/TabItem.tsx | 4 | ||||
-rw-r--r-- | src/components/ui/button/index.tsx | 1 | ||||
-rw-r--r-- | src/components/ui/select/index.tsx | 38 |
7 files changed, 28 insertions, 24 deletions
diff --git a/src/components/auth/Welcome.tsx b/src/components/auth/Welcome.tsx index 047512ea4..259e3c335 100644 --- a/src/components/auth/Welcome.tsx +++ b/src/components/auth/Welcome.tsx | |||
@@ -91,6 +91,7 @@ class Welcome extends Component<IProps> { | |||
91 | className="settings__hr-sections" | 91 | className="settings__hr-sections" |
92 | style={{ marginTop: 24, marginBottom: 24, borderStyle: 'solid' }} | 92 | style={{ marginTop: 24, marginBottom: 24, borderStyle: 'solid' }} |
93 | /> | 93 | /> |
94 | {/* eslint-disable-next-line react/button-has-type */} | ||
94 | <button | 95 | <button |
95 | className="button" | 96 | className="button" |
96 | onClick={this.useLocalServer.bind(this)} | 97 | onClick={this.useLocalServer.bind(this)} |
diff --git a/src/components/services/content/ServiceView.tsx b/src/components/services/content/ServiceView.tsx index 19dcdd07a..37dcafbe4 100644 --- a/src/components/services/content/ServiceView.tsx +++ b/src/components/services/content/ServiceView.tsx | |||
@@ -136,6 +136,7 @@ class ServiceView extends Component<IProps, IState> { | |||
136 | </> | 136 | </> |
137 | )} | 137 | )} |
138 | {service.isEnabled ? ( | 138 | {service.isEnabled ? ( |
139 | // eslint-disable-next-line react/jsx-no-useless-fragment | ||
139 | <> | 140 | <> |
140 | {service.isHibernating ? ( | 141 | {service.isHibernating ? ( |
141 | <div | 142 | <div |
@@ -173,6 +174,7 @@ class ServiceView extends Component<IProps, IState> { | |||
173 | )} | 174 | )} |
174 | </> | 175 | </> |
175 | ) : ( | 176 | ) : ( |
177 | // eslint-disable-next-line react/jsx-no-useless-fragment | ||
176 | <> | 178 | <> |
177 | {service.isActive && ( | 179 | {service.isActive && ( |
178 | <ServiceDisabled | 180 | <ServiceDisabled |
diff --git a/src/components/services/content/ServiceWebview.tsx b/src/components/services/content/ServiceWebview.tsx index 008e1b227..50b5d478f 100644 --- a/src/components/services/content/ServiceWebview.tsx +++ b/src/components/services/content/ServiceWebview.tsx | |||
@@ -2,7 +2,7 @@ import { Component, ReactElement } from 'react'; | |||
2 | import { observer } from 'mobx-react'; | 2 | import { observer } from 'mobx-react'; |
3 | import { action, makeObservable, observable, reaction } from 'mobx'; | 3 | import { action, makeObservable, observable, reaction } from 'mobx'; |
4 | import ElectronWebView from 'react-electron-web-view'; | 4 | import ElectronWebView from 'react-electron-web-view'; |
5 | import { join } from 'path'; | 5 | import { join } from 'node:path'; |
6 | import ServiceModel from '../../../models/Service'; | 6 | import ServiceModel from '../../../models/Service'; |
7 | 7 | ||
8 | const debug = require('../../../preload-safe-debug')('Ferdium:Services'); | 8 | const debug = require('../../../preload-safe-debug')('Ferdium:Services'); |
diff --git a/src/components/settings/settings/EditSettingsForm.tsx b/src/components/settings/settings/EditSettingsForm.tsx index 099a27ebe..0b5d4374d 100644 --- a/src/components/settings/settings/EditSettingsForm.tsx +++ b/src/components/settings/settings/EditSettingsForm.tsx | |||
@@ -386,8 +386,8 @@ class EditSettingsForm extends Component<IProps, IState> { | |||
386 | const { lockingFeatureEnabled, scheduledDNDEnabled, reloadAfterResume } = | 386 | const { lockingFeatureEnabled, scheduledDNDEnabled, reloadAfterResume } = |
387 | window['ferdium'].stores.settings.all.app; | 387 | window['ferdium'].stores.settings.all.app; |
388 | 388 | ||
389 | let cacheSize: string; | 389 | let cacheSize; |
390 | let notCleared: boolean; | 390 | let notCleared; |
391 | 391 | ||
392 | if (this.state.activeSetttingsTab === 'advanced') { | 392 | if (this.state.activeSetttingsTab === 'advanced') { |
393 | const cacheSizeBytes = getCacheSize(); | 393 | const cacheSizeBytes = getCacheSize(); |
diff --git a/src/components/ui/Tabs/TabItem.tsx b/src/components/ui/Tabs/TabItem.tsx index 815dced8c..55dee42c6 100644 --- a/src/components/ui/Tabs/TabItem.tsx +++ b/src/components/ui/Tabs/TabItem.tsx | |||
@@ -12,8 +12,8 @@ export interface IProps { | |||
12 | title?: string; // it is used on Tabs.tsx | 12 | title?: string; // it is used on Tabs.tsx |
13 | } | 13 | } |
14 | 14 | ||
15 | function TabItem({ children, title = '' }: IProps): ReactElement { | 15 | const TabItem = ({ children, title = '' }: IProps): ReactElement => { |
16 | return <Fragment key={title}>{children}</Fragment>; | 16 | return <Fragment key={title}>{children}</Fragment>; |
17 | } | 17 | }; |
18 | 18 | ||
19 | export default TabItem; | 19 | export default TabItem; |
diff --git a/src/components/ui/button/index.tsx b/src/components/ui/button/index.tsx index 3c31ca952..c37a88afa 100644 --- a/src/components/ui/button/index.tsx +++ b/src/components/ui/button/index.tsx | |||
@@ -237,6 +237,7 @@ class ButtonComponent extends Component<IProps, IState> { | |||
237 | ) : ( | 237 | ) : ( |
238 | <button | 238 | <button |
239 | id={id} | 239 | id={id} |
240 | // eslint-disable-next-line react/button-has-type | ||
240 | type={type} | 241 | type={type} |
241 | onClick={onClick} | 242 | onClick={onClick} |
242 | className={classnames({ | 243 | className={classnames({ |
diff --git a/src/components/ui/select/index.tsx b/src/components/ui/select/index.tsx index 902eb7748..650600fb3 100644 --- a/src/components/ui/select/index.tsx +++ b/src/components/ui/select/index.tsx | |||
@@ -191,12 +191,23 @@ class SelectComponent extends Component<IProps, IState> { | |||
191 | this.arrowKeysHandler = this.arrowKeysHandler.bind(this); | 191 | this.arrowKeysHandler = this.arrowKeysHandler.bind(this); |
192 | } | 192 | } |
193 | 193 | ||
194 | componentDidUpdate(): void { | 194 | UNSAFE_componentWillMount(): void { |
195 | const { open } = this.state; | 195 | const { value } = this.props; |
196 | 196 | ||
197 | if (this.searchInputRef?.current && open) { | 197 | if (this.componentRef?.current) { |
198 | this.searchInputRef.current.focus(); | 198 | this.componentRef.current.removeEventListener( |
199 | 'keydown', | ||
200 | this.keyListener, | ||
201 | ); | ||
199 | } | 202 | } |
203 | |||
204 | if (value) { | ||
205 | this.setState({ | ||
206 | value, | ||
207 | }); | ||
208 | } | ||
209 | |||
210 | this.setFilter(); | ||
200 | } | 211 | } |
201 | 212 | ||
202 | componentDidMount(): void { | 213 | componentDidMount(): void { |
@@ -212,23 +223,12 @@ class SelectComponent extends Component<IProps, IState> { | |||
212 | window.addEventListener('keydown', this.arrowKeysHandler, false); | 223 | window.addEventListener('keydown', this.arrowKeysHandler, false); |
213 | } | 224 | } |
214 | 225 | ||
215 | UNSAFE_componentWillMount(): void { | 226 | componentDidUpdate(): void { |
216 | const { value } = this.props; | 227 | const { open } = this.state; |
217 | |||
218 | if (this.componentRef?.current) { | ||
219 | this.componentRef.current.removeEventListener( | ||
220 | 'keydown', | ||
221 | this.keyListener, | ||
222 | ); | ||
223 | } | ||
224 | 228 | ||
225 | if (value) { | 229 | if (this.searchInputRef?.current && open) { |
226 | this.setState({ | 230 | this.searchInputRef.current.focus(); |
227 | value, | ||
228 | }); | ||
229 | } | 231 | } |
230 | |||
231 | this.setFilter(); | ||
232 | } | 232 | } |
233 | 233 | ||
234 | componentWillUnmount(): void { | 234 | componentWillUnmount(): void { |