diff options
author | muhamedsalih-tw <104364298+muhamedsalih-tw@users.noreply.github.com> | 2023-05-29 06:37:07 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-29 06:37:07 +0530 |
commit | 05ddc542cc6a5a309d90350636cc1d2aee999c19 (patch) | |
tree | 33942d14edf172c1b8e4cae733b49b75ebf111b9 /src/components/settings | |
parent | 6.3.0-nightly.13 [skip ci] (diff) | |
download | ferdium-app-05ddc542cc6a5a309d90350636cc1d2aee999c19.tar.gz ferdium-app-05ddc542cc6a5a309d90350636cc1d2aee999c19.tar.zst ferdium-app-05ddc542cc6a5a309d90350636cc1d2aee999c19.zip |
Update react-router-dom, react-tooltip & react-transition-group latest version (#1199)
Diffstat (limited to 'src/components/settings')
-rw-r--r-- | src/components/settings/account/AccountDashboard.tsx | 9 | ||||
-rw-r--r-- | src/components/settings/services/ServiceItem.tsx | 20 | ||||
-rw-r--r-- | src/components/settings/team/TeamDashboard.tsx | 9 |
3 files changed, 29 insertions, 9 deletions
diff --git a/src/components/settings/account/AccountDashboard.tsx b/src/components/settings/account/AccountDashboard.tsx index 163b0a160..de323c06e 100644 --- a/src/components/settings/account/AccountDashboard.tsx +++ b/src/components/settings/account/AccountDashboard.tsx | |||
@@ -1,7 +1,7 @@ | |||
1 | import { Component } from 'react'; | 1 | import { Component } 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 ReactTooltip from 'react-tooltip'; | 4 | import { Tooltip as ReactTooltip } from 'react-tooltip'; |
5 | import { H1, H2 } from '../../ui/headline'; | 5 | import { H1, H2 } from '../../ui/headline'; |
6 | 6 | ||
7 | import Loader from '../../ui/Loader'; | 7 | import Loader from '../../ui/Loader'; |
@@ -215,7 +215,12 @@ class AccountDashboard extends Component<IProp> { | |||
215 | </> | 215 | </> |
216 | )} | 216 | )} |
217 | </div> | 217 | </div> |
218 | <ReactTooltip place="right" type="dark" effect="solid" /> | 218 | <ReactTooltip |
219 | place="right" | ||
220 | variant="dark" | ||
221 | float | ||
222 | style={{ height: 'auto' }} | ||
223 | /> | ||
219 | </div> | 224 | </div> |
220 | ); | 225 | ); |
221 | } | 226 | } |
diff --git a/src/components/settings/services/ServiceItem.tsx b/src/components/settings/services/ServiceItem.tsx index bf2dfa9da..babe06b5a 100644 --- a/src/components/settings/services/ServiceItem.tsx +++ b/src/components/settings/services/ServiceItem.tsx | |||
@@ -1,6 +1,6 @@ | |||
1 | import { Component, ReactElement } from 'react'; | 1 | import { Component, ReactElement } from 'react'; |
2 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 2 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; |
3 | import ReactTooltip from 'react-tooltip'; | 3 | import { Tooltip as ReactTooltip } from 'react-tooltip'; |
4 | import { observer } from 'mobx-react'; | 4 | import { observer } from 'mobx-react'; |
5 | import classnames from 'classnames'; | 5 | import classnames from 'classnames'; |
6 | import { mdiBellOff, mdiMessageBulletedOff, mdiPower } from '@mdi/js'; | 6 | import { mdiBellOff, mdiMessageBulletedOff, mdiPower } from '@mdi/js'; |
@@ -73,7 +73,8 @@ class ServiceItem extends Component<IProps> { | |||
73 | {service.isMuted && ( | 73 | {service.isMuted && ( |
74 | <Icon | 74 | <Icon |
75 | icon={mdiBellOff} | 75 | icon={mdiBellOff} |
76 | data-tip={intl.formatMessage(messages.tooltipIsMuted)} | 76 | data-tooltip-id="tooltip-service-item" |
77 | data-tooltip-content={intl.formatMessage(messages.tooltipIsMuted)} | ||
77 | /> | 78 | /> |
78 | )} | 79 | )} |
79 | </td> | 80 | </td> |
@@ -85,7 +86,10 @@ class ServiceItem extends Component<IProps> { | |||
85 | {!service.isEnabled && ( | 86 | {!service.isEnabled && ( |
86 | <Icon | 87 | <Icon |
87 | icon={mdiPower} | 88 | icon={mdiPower} |
88 | data-tip={intl.formatMessage(messages.tooltipIsDisabled)} | 89 | data-tooltip-id="tooltip-service-item" |
90 | data-tooltip-content={intl.formatMessage( | ||
91 | messages.tooltipIsDisabled, | ||
92 | )} | ||
89 | /> | 93 | /> |
90 | )} | 94 | )} |
91 | </td> | 95 | </td> |
@@ -97,12 +101,18 @@ class ServiceItem extends Component<IProps> { | |||
97 | {!service.isNotificationEnabled && ( | 101 | {!service.isNotificationEnabled && ( |
98 | <Icon | 102 | <Icon |
99 | icon={mdiMessageBulletedOff} | 103 | icon={mdiMessageBulletedOff} |
100 | data-tip={intl.formatMessage( | 104 | data-tooltip-id="tooltip-service-item" |
105 | data-tooltip-content={intl.formatMessage( | ||
101 | messages.tooltipNotificationsDisabled, | 106 | messages.tooltipNotificationsDisabled, |
102 | )} | 107 | )} |
103 | /> | 108 | /> |
104 | )} | 109 | )} |
105 | <ReactTooltip place="top" type="dark" effect="solid" /> | 110 | <ReactTooltip |
111 | id="tooltip-service-item" | ||
112 | place="right" | ||
113 | variant="dark" | ||
114 | style={{ height: 'auto' }} | ||
115 | /> | ||
106 | </td> | 116 | </td> |
107 | </tr> | 117 | </tr> |
108 | ); | 118 | ); |
diff --git a/src/components/settings/team/TeamDashboard.tsx b/src/components/settings/team/TeamDashboard.tsx index 6fd2d4426..77bccb8c3 100644 --- a/src/components/settings/team/TeamDashboard.tsx +++ b/src/components/settings/team/TeamDashboard.tsx | |||
@@ -3,7 +3,7 @@ | |||
3 | import { Component, ReactElement } from 'react'; | 3 | import { Component, ReactElement } from 'react'; |
4 | import { observer } from 'mobx-react'; | 4 | import { observer } from 'mobx-react'; |
5 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 5 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; |
6 | import ReactTooltip from 'react-tooltip'; | 6 | import { Tooltip as ReactTooltip } from 'react-tooltip'; |
7 | import withStyles, { WithStylesProps } from 'react-jss'; | 7 | import withStyles, { WithStylesProps } from 'react-jss'; |
8 | import classnames from 'classnames'; | 8 | import classnames from 'classnames'; |
9 | import Loader from '../../ui/Loader'; | 9 | import Loader from '../../ui/Loader'; |
@@ -173,7 +173,12 @@ class TeamDashboard extends Component<IProps> { | |||
173 | </> | 173 | </> |
174 | )} | 174 | )} |
175 | </div> | 175 | </div> |
176 | <ReactTooltip place="right" type="dark" effect="solid" /> | 176 | <ReactTooltip |
177 | place="right" | ||
178 | variant="dark" | ||
179 | float | ||
180 | style={{ height: 'auto' }} | ||
181 | /> | ||
177 | </div> | 182 | </div> |
178 | ) : ( | 183 | ) : ( |
179 | <div className="settings__main"> | 184 | <div className="settings__main"> |