diff options
author | Alphrag <34252790+Alphrag@users.noreply.github.com> | 2023-05-30 23:49:55 +0100 |
---|---|---|
committer | Alphrag <34252790+Alphrag@users.noreply.github.com> | 2023-05-30 23:49:55 +0100 |
commit | 4b62661d58e56f03e6d4888df80473150126e5a8 (patch) | |
tree | fcbbd8f1d393cfa1efbcbbbfa94b9ef8e5a5d462 /src/features | |
parent | 6.3.0-nightly.14 [skip ci] (diff) | |
download | ferdium-app-4b62661d58e56f03e6d4888df80473150126e5a8.tar.gz ferdium-app-4b62661d58e56f03e6d4888df80473150126e5a8.tar.zst ferdium-app-4b62661d58e56f03e6d4888df80473150126e5a8.zip |
Revert "Update react-router-dom, react-tooltip & react-transition-group latest version (#1199)"
This reverts commit 05ddc542cc6a5a309d90350636cc1d2aee999c19.
Diffstat (limited to 'src/features')
3 files changed, 10 insertions, 28 deletions
diff --git a/src/features/webControls/components/WebControls.tsx b/src/features/webControls/components/WebControls.tsx index 54f45c843..e76fca6a2 100644 --- a/src/features/webControls/components/WebControls.tsx +++ b/src/features/webControls/components/WebControls.tsx | |||
@@ -9,7 +9,6 @@ import { | |||
9 | mdiHomeOutline, | 9 | mdiHomeOutline, |
10 | mdiEarth, | 10 | mdiEarth, |
11 | } from '@mdi/js'; | 11 | } from '@mdi/js'; |
12 | import { Tooltip as ReactTooltip } from 'react-tooltip'; | ||
13 | import Icon from '../../../components/ui/icon'; | 12 | import Icon from '../../../components/ui/icon'; |
14 | 13 | ||
15 | const messages = defineMessages({ | 14 | const messages = defineMessages({ |
@@ -152,8 +151,7 @@ class WebControls extends Component<IProps, IState> { | |||
152 | onClick={goHome} | 151 | onClick={goHome} |
153 | type="button" | 152 | type="button" |
154 | className={classes.button} | 153 | className={classes.button} |
155 | data-tooltip-id="tooltip-web-controls" | 154 | data-tip={intl.formatMessage(messages.goHome)} |
156 | data-tooltip-content={intl.formatMessage(messages.goHome)} | ||
157 | data-place="bottom" | 155 | data-place="bottom" |
158 | > | 156 | > |
159 | <Icon icon={mdiHomeOutline} className={classes.icon} /> | 157 | <Icon icon={mdiHomeOutline} className={classes.icon} /> |
@@ -163,8 +161,7 @@ class WebControls extends Component<IProps, IState> { | |||
163 | type="button" | 161 | type="button" |
164 | className={classes.button} | 162 | className={classes.button} |
165 | disabled={!canGoBack} | 163 | disabled={!canGoBack} |
166 | data-tooltip-id="tooltip-web-controls" | 164 | data-tip={intl.formatMessage(messages.back)} |
167 | data-tooltip-content={intl.formatMessage(messages.back)} | ||
168 | data-place="bottom" | 165 | data-place="bottom" |
169 | > | 166 | > |
170 | <Icon icon={mdiArrowLeft} className={classes.icon} /> | 167 | <Icon icon={mdiArrowLeft} className={classes.icon} /> |
@@ -174,8 +171,7 @@ class WebControls extends Component<IProps, IState> { | |||
174 | type="button" | 171 | type="button" |
175 | className={classes.button} | 172 | className={classes.button} |
176 | disabled={!canGoForward} | 173 | disabled={!canGoForward} |
177 | data-tooltip-id="tooltip-web-controls" | 174 | data-tip={intl.formatMessage(messages.forward)} |
178 | data-tooltip-content={intl.formatMessage(messages.forward)} | ||
179 | data-place="bottom" | 175 | data-place="bottom" |
180 | > | 176 | > |
181 | <Icon icon={mdiArrowRight} className={classes.icon} /> | 177 | <Icon icon={mdiArrowRight} className={classes.icon} /> |
@@ -184,8 +180,7 @@ class WebControls extends Component<IProps, IState> { | |||
184 | onClick={reload} | 180 | onClick={reload} |
185 | type="button" | 181 | type="button" |
186 | className={classes.button} | 182 | className={classes.button} |
187 | data-tooltip-id="tooltip-web-controls" | 183 | data-tip={intl.formatMessage(messages.reload)} |
188 | data-tooltip-content={intl.formatMessage(messages.reload)} | ||
189 | data-place="bottom" | 184 | data-place="bottom" |
190 | > | 185 | > |
191 | <Icon icon={mdiReload} className={classes.icon} /> | 186 | <Icon icon={mdiReload} className={classes.icon} /> |
@@ -237,18 +232,11 @@ class WebControls extends Component<IProps, IState> { | |||
237 | onClick={openInBrowser} | 232 | onClick={openInBrowser} |
238 | type="button" | 233 | type="button" |
239 | className={classes.button} | 234 | className={classes.button} |
240 | data-tooltip-id="tooltip-web-controls" | 235 | data-tip={intl.formatMessage(messages.openInBrowser)} |
241 | data-tooltip-content={intl.formatMessage(messages.openInBrowser)} | ||
242 | data-place="bottom" | 236 | data-place="bottom" |
243 | > | 237 | > |
244 | <Icon icon={mdiEarth} className={classes.icon} /> | 238 | <Icon icon={mdiEarth} className={classes.icon} /> |
245 | </button> | 239 | </button> |
246 | <ReactTooltip | ||
247 | id="tooltip-web-controls" | ||
248 | place="bottom" | ||
249 | variant="dark" | ||
250 | style={{ height: 'auto' }} | ||
251 | /> | ||
252 | </div> | 240 | </div> |
253 | ); | 241 | ); |
254 | } | 242 | } |
diff --git a/src/features/workspaces/components/WorkspaceDrawer.tsx b/src/features/workspaces/components/WorkspaceDrawer.tsx index 1c827e9dd..61284d81a 100644 --- a/src/features/workspaces/components/WorkspaceDrawer.tsx +++ b/src/features/workspaces/components/WorkspaceDrawer.tsx | |||
@@ -2,7 +2,7 @@ import { Component, ReactElement } from 'react'; | |||
2 | import { observer } from 'mobx-react'; | 2 | import { observer } from 'mobx-react'; |
3 | import withStyles, { WithStylesProps } from 'react-jss'; | 3 | import withStyles, { WithStylesProps } from 'react-jss'; |
4 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 4 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; |
5 | import { Tooltip as ReactTooltip } from 'react-tooltip'; | 5 | import ReactTooltip from 'react-tooltip'; |
6 | import { mdiPlusBox, mdiCog } from '@mdi/js'; | 6 | import { mdiPlusBox, mdiCog } from '@mdi/js'; |
7 | import { noop } from 'lodash'; | 7 | import { noop } from 'lodash'; |
8 | import { H1 } from '../../../components/ui/headline'; | 8 | import { H1 } from '../../../components/ui/headline'; |
@@ -96,6 +96,7 @@ interface IProps extends WithStylesProps<typeof styles>, WrappedComponentProps { | |||
96 | class WorkspaceDrawer extends Component<IProps> { | 96 | class WorkspaceDrawer extends Component<IProps> { |
97 | componentDidMount(): void { | 97 | componentDidMount(): void { |
98 | try { | 98 | try { |
99 | ReactTooltip.rebuild(); | ||
99 | getUserWorkspacesRequest.execute(); | 100 | getUserWorkspacesRequest.execute(); |
100 | } catch (error) { | 101 | } catch (error) { |
101 | console.log(error); | 102 | console.log(error); |
@@ -120,8 +121,7 @@ class WorkspaceDrawer extends Component<IProps> { | |||
120 | onClick={() => { | 121 | onClick={() => { |
121 | workspaceActions.openWorkspaceSettings(); | 122 | workspaceActions.openWorkspaceSettings(); |
122 | }} | 123 | }} |
123 | data-tooltip-id="tooltip-workspaces-drawer" | 124 | data-tip={`${intl.formatMessage( |
124 | data-tooltip-content={`${intl.formatMessage( | ||
125 | messages.workspacesSettingsTooltip, | 125 | messages.workspacesSettingsTooltip, |
126 | )}`} | 126 | )}`} |
127 | > | 127 | > |
@@ -176,12 +176,7 @@ class WorkspaceDrawer extends Component<IProps> { | |||
176 | <span>{intl.formatMessage(messages.addNewWorkspaceLabel)}</span> | 176 | <span>{intl.formatMessage(messages.addNewWorkspaceLabel)}</span> |
177 | </div> | 177 | </div> |
178 | </div> | 178 | </div> |
179 | <ReactTooltip | 179 | <ReactTooltip place="right" type="dark" effect="solid" /> |
180 | id="tooltip-workspaces-drawer" | ||
181 | place="right" | ||
182 | variant="dark" | ||
183 | style={{ height: 'auto', zIndex: 210 }} | ||
184 | /> | ||
185 | </div> | 180 | </div> |
186 | ); | 181 | ); |
187 | } | 182 | } |
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.tsx b/src/features/workspaces/components/WorkspaceDrawerItem.tsx index 172b4192c..cf8c3b2ba 100644 --- a/src/features/workspaces/components/WorkspaceDrawerItem.tsx +++ b/src/features/workspaces/components/WorkspaceDrawerItem.tsx | |||
@@ -119,8 +119,7 @@ class WorkspaceDrawerItem extends Component<IProps> { | |||
119 | } | 119 | } |
120 | }} | 120 | }} |
121 | onKeyDown={noop} | 121 | onKeyDown={noop} |
122 | data-tooltip-id="tooltip-workspaces-drawer" | 122 | data-tip={acceleratorString( |
123 | data-tooltip-content={acceleratorString( | ||
124 | shortcutIndex, | 123 | shortcutIndex, |
125 | `${cmdOrCtrlShortcutKey(false)}+${altKey(false)}`, | 124 | `${cmdOrCtrlShortcutKey(false)}+${altKey(false)}`, |
126 | )} | 125 | )} |