[MM-60157] Migrate tooltips of 'components/advanced_text_editor/use_emoji_picker.tsx' to WithTooltip (#27950)
Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
742d6d1e4a
Коммит
39dc6183b5
@@ -15,10 +15,8 @@ import {getEmojiName} from 'mattermost-redux/utils/emoji_utils';
|
|||||||
import useDidUpdate from 'components/common/hooks/useDidUpdate';
|
import useDidUpdate from 'components/common/hooks/useDidUpdate';
|
||||||
import EmojiPickerOverlay from 'components/emoji_picker/emoji_picker_overlay';
|
import EmojiPickerOverlay from 'components/emoji_picker/emoji_picker_overlay';
|
||||||
import KeyboardShortcutSequence, {KEYBOARD_SHORTCUTS} from 'components/keyboard_shortcuts/keyboard_shortcuts_sequence';
|
import KeyboardShortcutSequence, {KEYBOARD_SHORTCUTS} from 'components/keyboard_shortcuts/keyboard_shortcuts_sequence';
|
||||||
import OverlayTrigger from 'components/overlay_trigger';
|
import WithTooltip from 'components/with_tooltip';
|
||||||
import Tooltip from 'components/tooltip';
|
|
||||||
|
|
||||||
import Constants from 'utils/constants';
|
|
||||||
import {splitMessageBasedOnCaretPosition} from 'utils/post_utils';
|
import {splitMessageBasedOnCaretPosition} from 'utils/post_utils';
|
||||||
|
|
||||||
import type {GlobalState} from 'types/store';
|
import type {GlobalState} from 'types/store';
|
||||||
@@ -119,15 +117,6 @@ const useEmojiPicker = (
|
|||||||
let emojiPicker = null;
|
let emojiPicker = null;
|
||||||
|
|
||||||
if (enableEmojiPicker && !readOnlyChannel) {
|
if (enableEmojiPicker && !readOnlyChannel) {
|
||||||
const emojiPickerTooltip = (
|
|
||||||
<Tooltip id='upload-tooltip'>
|
|
||||||
<KeyboardShortcutSequence
|
|
||||||
shortcut={KEYBOARD_SHORTCUTS.msgShowEmojiPicker}
|
|
||||||
hoistDescription={true}
|
|
||||||
isInsideTooltip={true}
|
|
||||||
/>
|
|
||||||
</Tooltip>
|
|
||||||
);
|
|
||||||
emojiPicker = (
|
emojiPicker = (
|
||||||
<>
|
<>
|
||||||
<EmojiPickerOverlay
|
<EmojiPickerOverlay
|
||||||
@@ -139,11 +128,16 @@ const useEmojiPicker = (
|
|||||||
enableGifPicker={enableGifPicker}
|
enableGifPicker={enableGifPicker}
|
||||||
topOffset={-7}
|
topOffset={-7}
|
||||||
/>
|
/>
|
||||||
<OverlayTrigger
|
<WithTooltip
|
||||||
|
id='upload-tooltip'
|
||||||
placement='top'
|
placement='top'
|
||||||
delayShow={Constants.OVERLAY_TIME_DELAY}
|
title={
|
||||||
trigger={Constants.OVERLAY_DEFAULT_TRIGGER}
|
<KeyboardShortcutSequence
|
||||||
overlay={emojiPickerTooltip}
|
shortcut={KEYBOARD_SHORTCUTS.msgShowEmojiPicker}
|
||||||
|
hoistDescription={true}
|
||||||
|
isInsideTooltip={true}
|
||||||
|
/>
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<IconContainer
|
<IconContainer
|
||||||
id={'emojiPickerButton'}
|
id={'emojiPickerButton'}
|
||||||
@@ -159,7 +153,7 @@ const useEmojiPicker = (
|
|||||||
size={18}
|
size={18}
|
||||||
/>
|
/>
|
||||||
</IconContainer>
|
</IconContainer>
|
||||||
</OverlayTrigger>
|
</WithTooltip>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user