diff options
Diffstat (limited to 'src/features/workspaces')
-rw-r--r-- | src/features/workspaces/components/WorkspaceDrawer.tsx | 13 | ||||
-rw-r--r-- | src/features/workspaces/components/WorkspaceDrawerItem.tsx | 3 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/features/workspaces/components/WorkspaceDrawer.tsx b/src/features/workspaces/components/WorkspaceDrawer.tsx index 61284d81a..1c827e9dd 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 ReactTooltip from 'react-tooltip'; | 5 | import { Tooltip as 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,7 +96,6 @@ 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(); | ||
100 | getUserWorkspacesRequest.execute(); | 99 | getUserWorkspacesRequest.execute(); |
101 | } catch (error) { | 100 | } catch (error) { |
102 | console.log(error); | 101 | console.log(error); |
@@ -121,7 +120,8 @@ class WorkspaceDrawer extends Component<IProps> { | |||
121 | onClick={() => { | 120 | onClick={() => { |
122 | workspaceActions.openWorkspaceSettings(); | 121 | workspaceActions.openWorkspaceSettings(); |
123 | }} | 122 | }} |
124 | data-tip={`${intl.formatMessage( | 123 | data-tooltip-id="tooltip-workspaces-drawer" |
124 | data-tooltip-content={`${intl.formatMessage( | ||
125 | messages.workspacesSettingsTooltip, | 125 | messages.workspacesSettingsTooltip, |
126 | )}`} | 126 | )}`} |
127 | > | 127 | > |
@@ -176,7 +176,12 @@ 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 place="right" type="dark" effect="solid" /> | 179 | <ReactTooltip |
180 | id="tooltip-workspaces-drawer" | ||
181 | place="right" | ||
182 | variant="dark" | ||
183 | style={{ height: 'auto', zIndex: 210 }} | ||
184 | /> | ||
180 | </div> | 185 | </div> |
181 | ); | 186 | ); |
182 | } | 187 | } |
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.tsx b/src/features/workspaces/components/WorkspaceDrawerItem.tsx index cf8c3b2ba..172b4192c 100644 --- a/src/features/workspaces/components/WorkspaceDrawerItem.tsx +++ b/src/features/workspaces/components/WorkspaceDrawerItem.tsx | |||
@@ -119,7 +119,8 @@ class WorkspaceDrawerItem extends Component<IProps> { | |||
119 | } | 119 | } |
120 | }} | 120 | }} |
121 | onKeyDown={noop} | 121 | onKeyDown={noop} |
122 | data-tip={acceleratorString( | 122 | data-tooltip-id="tooltip-workspaces-drawer" |
123 | data-tooltip-content={acceleratorString( | ||
123 | shortcutIndex, | 124 | shortcutIndex, |
124 | `${cmdOrCtrlShortcutKey(false)}+${altKey(false)}`, | 125 | `${cmdOrCtrlShortcutKey(false)}+${altKey(false)}`, |
125 | )} | 126 | )} |