diff options
author | 2023-07-21 10:52:49 +0530 | |
---|---|---|
committer | 2023-07-21 10:52:49 +0530 | |
commit | d348bc10ea600d70ee006316fdcb56eb1dba457b (patch) | |
tree | 4d72b183c92d70b442b23e4d98cde2c4242002e2 /src/features/workspaces/components/WorkspaceDrawer.tsx | |
parent | 6.4.1-nightly.8 [skip ci] (diff) | |
download | ferdium-app-d348bc10ea600d70ee006316fdcb56eb1dba457b.tar.gz ferdium-app-d348bc10ea600d70ee006316fdcb56eb1dba457b.tar.zst ferdium-app-d348bc10ea600d70ee006316fdcb56eb1dba457b.zip |
Revert "update react-router-dom to version 6.14.1"
and "update react-router-dom,react-tooltip& react-transition-group"
This reverts commit 0a4a0497bb630dc85cfa0145d57f954feb9c052a and 345fd98dc52a3b7f0d69022b6a19818e559e4557.
Diffstat (limited to 'src/features/workspaces/components/WorkspaceDrawer.tsx')
-rw-r--r-- | src/features/workspaces/components/WorkspaceDrawer.tsx | 13 |
1 files changed, 4 insertions, 9 deletions
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 | } |