Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(toolbox): fix toolbox title may be outside of the chart #16704

Merged
merged 2 commits into from
Mar 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions src/component/toolbox/ToolboxView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import {
import { getUID } from '../../util/component';
import Displayable from 'zrender/src/graphic/Displayable';
import ZRText from 'zrender/src/graphic/Text';
import { getECData } from '../../util/innerStore';

type IconPath = ToolboxFeatureModel['iconPaths'][string];

Expand Down Expand Up @@ -70,6 +69,7 @@ class ToolboxView extends ComponentView {
}

const itemSize = +toolboxModel.get('itemSize');
const isVertical = toolboxModel.get('orient') === 'vertical';
const featureOpts = toolboxModel.get('feature') || {};
const features = this._features || (this._features = {});

Expand Down Expand Up @@ -238,15 +238,21 @@ class ToolboxView extends ComponentView {
}
});

// graphic.enableHoverEmphasis(path);

(path as ExtendedPath).__title = titlesMap[iconName];
(path as graphic.Path).on('mouseover', function () {
// Should not reuse above hoverStyle, which might be modified.
const hoverStyle = iconStyleEmphasisModel.getItemStyle();
const defaultTextPosition = toolboxModel.get('orient') === 'vertical'
? (toolboxModel.get('right') == null ? 'right' as const : 'left' as const)
: (toolboxModel.get('bottom') == null ? 'bottom' as const : 'top' as const);
const defaultTextPosition = isVertical
? (
toolboxModel.get('right') == null && toolboxModel.get('left') !== 'right'
? 'right' as const
: 'left' as const
)
: (
toolboxModel.get('bottom') == null && toolboxModel.get('top') !== 'bottom'
? 'bottom' as const
: 'top' as const
);
textContent.setStyle({
fill: (iconStyleEmphasisModel.get('textFill')
|| hoverStyle.fill || hoverStyle.stroke || '#000') as string,
Expand All @@ -259,11 +265,11 @@ class ToolboxView extends ComponentView {

// Use enterEmphasis and leaveEmphasis provide by ec.
// There are flags managed by the echarts.
enterEmphasis(this);
api.enterEmphasis(this);
})
.on('mouseout', function () {
if (featureModel.get(['iconStatus', iconName]) !== 'emphasis') {
leaveEmphasis(this);
api.leaveEmphasis(this);
}
textContent.hide();
});
Expand All @@ -284,15 +290,15 @@ class ToolboxView extends ComponentView {
group.add(listComponentHelper.makeBackground(group.getBoundingRect(), toolboxModel));

// Adjust icon title positions to avoid them out of screen
group.eachChild(function (icon: IconPath) {
isVertical || group.eachChild(function (icon: IconPath) {
const titleText = (icon as ExtendedPath).__title;
// const hoverStyle = icon.hoverStyle;

// TODO simplify code?
const emphasisState = icon.ensureState('emphasis');
const emphasisTextConfig = emphasisState.textConfig || (emphasisState.textConfig = {});
const textContent = icon.getTextContent();
const emphasisTextState = textContent && textContent.states.emphasis;
const emphasisTextState = textContent && textContent.ensureState('emphasis');
// May be background element
if (emphasisTextState && !zrUtil.isFunction(emphasisTextState) && titleText) {
const emphasisTextStyle = emphasisTextState.style || (emphasisTextState.style = {});
Expand All @@ -307,7 +313,7 @@ class ToolboxView extends ComponentView {
emphasisTextConfig.position = 'top';
needPutOnTop = true;
}
const topOffset = needPutOnTop ? (-5 - rect.height) : (itemSize + 8);
const topOffset = needPutOnTop ? (-5 - rect.height) : (itemSize + 10);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to make the adjusted y aligns with the one not adjusted. The original value 8 seems not perfact.

if (offsetX + rect.width / 2 > api.getWidth()) {
emphasisTextConfig.position = ['100%', topOffset];
emphasisTextStyle.align = 'right';
Expand Down
4 changes: 2 additions & 2 deletions test/toolbox-title.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.