diff options
author | Muhamed <unknown> | 2023-05-27 01:32:44 +0530 |
---|---|---|
committer | Vijay Aravamudhan <vraravam@users.noreply.github.com> | 2023-05-27 18:10:24 +0530 |
commit | b8950dde09cb41eac5dba40ae034abf7a5e6bdb2 (patch) | |
tree | 978c1649cd8fc51adc1253b9934491237d3f9ffc /src/components | |
parent | Upgrade 'pnpm' to '8.5.1' (diff) | |
download | ferdium-app-b8950dde09cb41eac5dba40ae034abf7a5e6bdb2.tar.gz ferdium-app-b8950dde09cb41eac5dba40ae034abf7a5e6bdb2.tar.zst ferdium-app-b8950dde09cb41eac5dba40ae034abf7a5e6bdb2.zip |
update react version to 18.2.0 and it related changes
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/layout/AppLayout.tsx | 4 | ||||
-rw-r--r-- | src/components/services/tabs/TabBarSortableList.tsx | 2 | ||||
-rw-r--r-- | src/components/services/tabs/TabItem.tsx | 5 | ||||
-rw-r--r-- | src/components/services/tabs/Tabbar.tsx | 1 | ||||
-rw-r--r-- | src/components/settings/SettingsLayout.tsx | 4 | ||||
-rw-r--r-- | src/components/settings/releaseNotes/ReleaseNotesLayout.tsx | 1 | ||||
-rw-r--r-- | src/components/ui/Select.tsx | 5 | ||||
-rw-r--r-- | src/components/util/ErrorBoundary/index.tsx | 1 |
8 files changed, 16 insertions, 7 deletions
diff --git a/src/components/layout/AppLayout.tsx b/src/components/layout/AppLayout.tsx index 9ea5463a2..86b4e787e 100644 --- a/src/components/layout/AppLayout.tsx +++ b/src/components/layout/AppLayout.tsx | |||
@@ -1,4 +1,4 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component, PropsWithChildren } from 'react'; |
2 | import { observer } from 'mobx-react'; | 2 | import { observer } from 'mobx-react'; |
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; |
4 | import { TitleBar } from 'electron-react-titlebar/renderer'; | 4 | import { TitleBar } from 'electron-react-titlebar/renderer'; |
@@ -99,7 +99,7 @@ interface IState { | |||
99 | } | 99 | } |
100 | 100 | ||
101 | @observer | 101 | @observer |
102 | class AppLayout extends Component<IProps, IState> { | 102 | class AppLayout extends Component<PropsWithChildren<IProps>, IState> { |
103 | constructor(props) { | 103 | constructor(props) { |
104 | super(props); | 104 | super(props); |
105 | 105 | ||
diff --git a/src/components/services/tabs/TabBarSortableList.tsx b/src/components/services/tabs/TabBarSortableList.tsx index e04f6268d..bb889ebef 100644 --- a/src/components/services/tabs/TabBarSortableList.tsx +++ b/src/components/services/tabs/TabBarSortableList.tsx | |||
@@ -10,7 +10,6 @@ interface IProps { | |||
10 | showServiceNameSetting: boolean; | 10 | showServiceNameSetting: boolean; |
11 | showMessageBadgesEvenWhenMuted: boolean; | 11 | showMessageBadgesEvenWhenMuted: boolean; |
12 | services: Service[]; | 12 | services: Service[]; |
13 | |||
14 | setActive: (args: { serviceId: string }) => void; | 13 | setActive: (args: { serviceId: string }) => void; |
15 | openSettings: (args: { path: string }) => void; | 14 | openSettings: (args: { path: string }) => void; |
16 | reload: (args: { serviceId: string }) => void; | 15 | reload: (args: { serviceId: string }) => void; |
@@ -50,6 +49,7 @@ class TabBarSortableList extends Component<IProps> { | |||
50 | {services.map((service, index) => ( | 49 | {services.map((service, index) => ( |
51 | <TabItem | 50 | <TabItem |
52 | key={service.id} | 51 | key={service.id} |
52 | // @ts-ignore | ||
53 | clickHandler={() => setActive({ serviceId: service.id })} | 53 | clickHandler={() => setActive({ serviceId: service.id })} |
54 | service={service} | 54 | service={service} |
55 | index={index} | 55 | index={index} |
diff --git a/src/components/services/tabs/TabItem.tsx b/src/components/services/tabs/TabItem.tsx index fae788764..2ed595919 100644 --- a/src/components/services/tabs/TabItem.tsx +++ b/src/components/services/tabs/TabItem.tsx | |||
@@ -1,4 +1,5 @@ | |||
1 | import { app, dialog, Menu } from '@electron/remote'; | 1 | import { app, dialog, Menu } from '@electron/remote'; |
2 | import { noop } from 'lodash'; | ||
2 | import { Component } from 'react'; | 3 | import { Component } from 'react'; |
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 4 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; |
4 | import { inject, observer } from 'mobx-react'; | 5 | import { inject, observer } from 'mobx-react'; |
@@ -6,7 +7,6 @@ import classnames from 'classnames'; | |||
6 | import { SortableElement } from 'react-sortable-hoc'; | 7 | import { SortableElement } from 'react-sortable-hoc'; |
7 | import injectSheet, { WithStylesProps } from 'react-jss'; | 8 | import injectSheet, { WithStylesProps } from 'react-jss'; |
8 | import ms from 'ms'; | 9 | import ms from 'ms'; |
9 | |||
10 | import { autorun, makeObservable, observable, reaction } from 'mobx'; | 10 | import { autorun, makeObservable, observable, reaction } from 'mobx'; |
11 | import { mdiExclamation, mdiVolumeSource } from '@mdi/js'; | 11 | import { mdiExclamation, mdiVolumeSource } from '@mdi/js'; |
12 | import Service from '../../../models/Service'; | 12 | import Service from '../../../models/Service'; |
@@ -348,6 +348,8 @@ class TabItem extends Component<IProps, IState> { | |||
348 | 'is-label-enabled': showServiceNameSetting, | 348 | 'is-label-enabled': showServiceNameSetting, |
349 | })} | 349 | })} |
350 | onClick={clickHandler} | 350 | onClick={clickHandler} |
351 | onKeyDown={noop} | ||
352 | role="presentation" | ||
351 | onContextMenu={() => menu.popup()} | 353 | onContextMenu={() => menu.popup()} |
352 | data-tip={`${service.name} ${ | 354 | data-tip={`${service.name} ${ |
353 | shortcutIndex <= 9 | 355 | shortcutIndex <= 9 |
@@ -407,5 +409,6 @@ class TabItem extends Component<IProps, IState> { | |||
407 | } | 409 | } |
408 | 410 | ||
409 | export default injectIntl( | 411 | export default injectIntl( |
412 | // @ts-ignore | ||
410 | SortableElement(injectSheet(styles, { injectTheme: true })(TabItem)), | 413 | SortableElement(injectSheet(styles, { injectTheme: true })(TabItem)), |
411 | ); | 414 | ); |
diff --git a/src/components/services/tabs/Tabbar.tsx b/src/components/services/tabs/Tabbar.tsx index 64541cc8f..e3b5a7ba9 100644 --- a/src/components/services/tabs/Tabbar.tsx +++ b/src/components/services/tabs/Tabbar.tsx | |||
@@ -97,6 +97,7 @@ class TabBar extends Component<IProps> { | |||
97 | return ( | 97 | return ( |
98 | <div> | 98 | <div> |
99 | <TabBarSortableList | 99 | <TabBarSortableList |
100 | // @ts-ignore | ||
100 | services={services} | 101 | services={services} |
101 | setActive={setActive} | 102 | setActive={setActive} |
102 | onSortEnd={this.onSortEnd} | 103 | onSortEnd={this.onSortEnd} |
diff --git a/src/components/settings/SettingsLayout.tsx b/src/components/settings/SettingsLayout.tsx index 3b706571e..f96ad7394 100644 --- a/src/components/settings/SettingsLayout.tsx +++ b/src/components/settings/SettingsLayout.tsx | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Component, ReactElement } from 'react'; | 1 | import { Component, PropsWithChildren, ReactElement } from 'react'; |
2 | import { observer } from 'mobx-react'; | 2 | import { observer } from 'mobx-react'; |
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; |
4 | import { mdiClose } from '@mdi/js'; | 4 | import { mdiClose } from '@mdi/js'; |
@@ -21,7 +21,7 @@ interface IProps extends WrappedComponentProps { | |||
21 | } | 21 | } |
22 | 22 | ||
23 | @observer | 23 | @observer |
24 | class SettingsLayout extends Component<IProps> { | 24 | class SettingsLayout extends Component<PropsWithChildren<IProps>> { |
25 | constructor(props: IProps) { | 25 | constructor(props: IProps) { |
26 | super(props); | 26 | super(props); |
27 | 27 | ||
diff --git a/src/components/settings/releaseNotes/ReleaseNotesLayout.tsx b/src/components/settings/releaseNotes/ReleaseNotesLayout.tsx index 64ff25eab..bc38aa603 100644 --- a/src/components/settings/releaseNotes/ReleaseNotesLayout.tsx +++ b/src/components/settings/releaseNotes/ReleaseNotesLayout.tsx | |||
@@ -19,6 +19,7 @@ const messages = defineMessages({ | |||
19 | 19 | ||
20 | interface IProps extends WrappedComponentProps { | 20 | interface IProps extends WrappedComponentProps { |
21 | actions?: Actions; | 21 | actions?: Actions; |
22 | children?: React.ReactNode; | ||
22 | } | 23 | } |
23 | 24 | ||
24 | @inject('stores', 'actions') | 25 | @inject('stores', 'actions') |
diff --git a/src/components/ui/Select.tsx b/src/components/ui/Select.tsx index 1d69a9acf..e8e305fdd 100644 --- a/src/components/ui/Select.tsx +++ b/src/components/ui/Select.tsx | |||
@@ -4,6 +4,7 @@ import { | |||
4 | ReactElement, | 4 | ReactElement, |
5 | RefObject, | 5 | RefObject, |
6 | ChangeEvent, | 6 | ChangeEvent, |
7 | ReactNode, | ||
7 | } from 'react'; | 8 | } from 'react'; |
8 | import { observer } from 'mobx-react'; | 9 | import { observer } from 'mobx-react'; |
9 | import classnames from 'classnames'; | 10 | import classnames from 'classnames'; |
@@ -103,7 +104,9 @@ class Select extends Component<IProps> { | |||
103 | </option> | 104 | </option> |
104 | ))} | 105 | ))} |
105 | </select> | 106 | </select> |
106 | {field.error && <div className="franz-form__error">{field.error}</div>} | 107 | {field.error && ( |
108 | <div className="franz-form__error">{field.error as ReactNode}</div> | ||
109 | )} | ||
107 | </div> | 110 | </div> |
108 | ); | 111 | ); |
109 | } | 112 | } |
diff --git a/src/components/util/ErrorBoundary/index.tsx b/src/components/util/ErrorBoundary/index.tsx index b042e62c8..bef211ef9 100644 --- a/src/components/util/ErrorBoundary/index.tsx +++ b/src/components/util/ErrorBoundary/index.tsx | |||
@@ -20,6 +20,7 @@ const messages = defineMessages({ | |||
20 | 20 | ||
21 | interface ErrorBoundaryProps extends WithStylesProps<typeof styles> { | 21 | interface ErrorBoundaryProps extends WithStylesProps<typeof styles> { |
22 | intl: IntlShape; | 22 | intl: IntlShape; |
23 | children?: React.ReactNode; | ||
23 | } | 24 | } |
24 | 25 | ||
25 | class ErrorBoundary extends Component<ErrorBoundaryProps> { | 26 | class ErrorBoundary extends Component<ErrorBoundaryProps> { |