[MM-60170] Migrate tooltips of "components/user_settings/display/user_settings_theme/custom_theme_chooser/custom_theme_chooser.tsx" to WithTooltip (#28009)
Этот коммит содержится в:
@@ -426,27 +426,19 @@ exports[`components/user_settings/display/CustomThemeChooser should match, init
|
|||||||
Monokai
|
Monokai
|
||||||
</option>
|
</option>
|
||||||
</select>
|
</select>
|
||||||
<OverlayTrigger
|
<WithTooltip
|
||||||
defaultOverlayShown={false}
|
id="code-popover"
|
||||||
overlay={
|
placement="top"
|
||||||
<Memo(Popover)
|
title={
|
||||||
|
<div
|
||||||
className="code-popover"
|
className="code-popover"
|
||||||
id="code-popover"
|
|
||||||
popoverStyle="info"
|
|
||||||
>
|
>
|
||||||
<img
|
<img
|
||||||
alt="code theme image"
|
alt="code theme image"
|
||||||
src=""
|
src=""
|
||||||
width="200"
|
width="200"
|
||||||
/>
|
/>
|
||||||
</Memo(Popover)>
|
</div>
|
||||||
}
|
|
||||||
placement="top"
|
|
||||||
trigger={
|
|
||||||
Array [
|
|
||||||
"hover",
|
|
||||||
"focus",
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
@@ -457,7 +449,7 @@ exports[`components/user_settings/display/CustomThemeChooser should match, init
|
|||||||
src=""
|
src=""
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
</OverlayTrigger>
|
</WithTooltip>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -9,9 +9,7 @@ import type {IntlShape, MessageDescriptor} from 'react-intl';
|
|||||||
import type {Theme} from 'mattermost-redux/selectors/entities/preferences';
|
import type {Theme} from 'mattermost-redux/selectors/entities/preferences';
|
||||||
import {setThemeDefaults} from 'mattermost-redux/utils/theme_utils';
|
import {setThemeDefaults} from 'mattermost-redux/utils/theme_utils';
|
||||||
|
|
||||||
import OverlayTrigger from 'components/overlay_trigger';
|
import WithTooltip from 'components/with_tooltip';
|
||||||
import type {BaseOverlayTrigger} from 'components/overlay_trigger';
|
|
||||||
import Popover from 'components/widgets/popover';
|
|
||||||
|
|
||||||
import Constants from 'utils/constants';
|
import Constants from 'utils/constants';
|
||||||
|
|
||||||
@@ -134,7 +132,6 @@ export class CustomThemeChooser extends React.PureComponent<Props, State> {
|
|||||||
centerChannelStylesHeaderRef: RefObject<HTMLDivElement>;
|
centerChannelStylesHeaderRef: RefObject<HTMLDivElement>;
|
||||||
linkAndButtonStylesHeaderRef: RefObject<HTMLDivElement>;
|
linkAndButtonStylesHeaderRef: RefObject<HTMLDivElement>;
|
||||||
sidebarStylesRef: RefObject<HTMLDivElement>;
|
sidebarStylesRef: RefObject<HTMLDivElement>;
|
||||||
headerOverlayRef: RefObject<BaseOverlayTrigger>;
|
|
||||||
centerChannelStylesRef: RefObject<HTMLDivElement>;
|
centerChannelStylesRef: RefObject<HTMLDivElement>;
|
||||||
linkAndButtonStylesRef: RefObject<HTMLDivElement>;
|
linkAndButtonStylesRef: RefObject<HTMLDivElement>;
|
||||||
|
|
||||||
@@ -145,7 +142,6 @@ export class CustomThemeChooser extends React.PureComponent<Props, State> {
|
|||||||
this.centerChannelStylesHeaderRef = createRef();
|
this.centerChannelStylesHeaderRef = createRef();
|
||||||
this.linkAndButtonStylesHeaderRef = createRef();
|
this.linkAndButtonStylesHeaderRef = createRef();
|
||||||
this.sidebarStylesRef = createRef();
|
this.sidebarStylesRef = createRef();
|
||||||
this.headerOverlayRef = createRef();
|
|
||||||
this.centerChannelStylesRef = createRef();
|
this.centerChannelStylesRef = createRef();
|
||||||
this.linkAndButtonStylesRef = createRef();
|
this.linkAndButtonStylesRef = createRef();
|
||||||
|
|
||||||
@@ -311,20 +307,6 @@ export class CustomThemeChooser extends React.PureComponent<Props, State> {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
const popoverContent = (
|
|
||||||
<Popover
|
|
||||||
popoverStyle='info'
|
|
||||||
id='code-popover'
|
|
||||||
className='code-popover'
|
|
||||||
>
|
|
||||||
<img
|
|
||||||
width='200'
|
|
||||||
alt={'code theme image'}
|
|
||||||
src={codeThemeURL}
|
|
||||||
/>
|
|
||||||
</Popover>
|
|
||||||
);
|
|
||||||
|
|
||||||
centerChannelElements.push(
|
centerChannelElements.push(
|
||||||
<div
|
<div
|
||||||
className='col-sm-6 form-group'
|
className='col-sm-6 form-group'
|
||||||
@@ -345,10 +327,18 @@ export class CustomThemeChooser extends React.PureComponent<Props, State> {
|
|||||||
>
|
>
|
||||||
{codeThemeOptions}
|
{codeThemeOptions}
|
||||||
</select>
|
</select>
|
||||||
<OverlayTrigger
|
<WithTooltip
|
||||||
placement='top'
|
placement='top'
|
||||||
overlay={popoverContent}
|
id='code-popover'
|
||||||
ref={this.headerOverlayRef}
|
title={
|
||||||
|
<div className='code-popover'>
|
||||||
|
<img
|
||||||
|
width='200'
|
||||||
|
alt={'code theme image'}
|
||||||
|
src={codeThemeURL}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<span className='input-group-addon'>
|
<span className='input-group-addon'>
|
||||||
<img
|
<img
|
||||||
@@ -356,7 +346,7 @@ export class CustomThemeChooser extends React.PureComponent<Props, State> {
|
|||||||
src={codeThemeURL}
|
src={codeThemeURL}
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
</OverlayTrigger>
|
</WithTooltip>
|
||||||
</div>
|
</div>
|
||||||
</div>,
|
</div>,
|
||||||
);
|
);
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user