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.

Sign up for GitHub

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: legend visual still with decal when user set 'legend.itemStyle.decal' to 'none' #16922

Merged
merged 9 commits into from
Apr 22, 2022
Merged

fix: legend visual still with decal when user set 'legend.itemStyle.decal' to 'none' #16922

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b2897ac
Add 'decal' to ITEM_STYLE_KEY_MAP and add check if it is 'none'
jiawulin001 Apr 21, 2022
11e37cc
Update legend decal style dealer
jiawulin001 Apr 21, 2022
ec1db26
fix lint error
jiawulin001 Apr 21, 2022
94856a9
added passed down api for functions in legendView
jiawulin001 Apr 21, 2022
7c029ee
remove decal from ITEM_STYLE_KEY_MAP
jiawulin001 Apr 21, 2022
66d064c
Update with ternary expression
jiawulin001 Apr 21, 2022
6626f48
fix lint errors
jiawulin001 Apr 21, 2022
a956d3e
fix: fix names legendItemModel->itemStyleModel, legendModel->legendIt…
jiawulin001 Apr 22, 2022
e9d1f83
fix: remove explicit input 'false'(default) from getShallow
jiawulin001 Apr 22, 2022
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
33 changes: 20 additions & 13 deletions src/component/legend/LegendView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import Model from '../../model/Model';
import {LineStyleProps} from '../../model/mixin/lineStyle';
import {createSymbol, ECSymbol} from '../../util/symbol';
import SeriesModel from '../../model/Series';
import { createOrUpdatePatternFromDecal } from '../../util/decal';

const curry = zrUtil.curry;
const each = zrUtil.each;
Expand Down Expand Up @@ -217,7 +218,7 @@ class LegendView extends ComponentView {
const itemGroup = this._createItem(
seriesModel, name, dataIndex,
legendItemModel, legendModel, itemAlign,
lineVisualStyle, style, legendIcon, selectMode
lineVisualStyle, style, legendIcon, selectMode, api
);

itemGroup.on('click', curry(dispatchSelectAction, name, null, api, excludeSeriesId))
Expand Down Expand Up @@ -258,7 +259,7 @@ class LegendView extends ComponentView {
const itemGroup = this._createItem(
seriesModel, name, dataIndex,
legendItemModel, legendModel, itemAlign,
{}, style, legendIcon, selectMode
{}, style, legendIcon, selectMode, api
);

// FIXME: consider different series has items with the same name.
Expand Down Expand Up @@ -339,7 +340,8 @@ class LegendView extends ComponentView {
lineVisualStyle: LineStyleProps,
itemVisualStyle: PathStyleProps,
legendIcon: string,
selectMode: LegendOption['selectedMode']
selectMode: LegendOption['selectedMode'],
api: ExtensionAPI
) {
const drawType = seriesModel.visualDrawType;
const itemWidth = legendModel.get('itemWidth');
Expand All @@ -358,7 +360,8 @@ class LegendView extends ComponentView {
lineVisualStyle,
itemVisualStyle,
drawType,
isSelected
isSelected,
api
);

const itemGroup = new Group();
Expand Down Expand Up @@ -539,11 +542,12 @@ class LegendView extends ComponentView {

function getLegendStyle(
iconType: string,
legendModel: LegendModel['_data'][number],
legendItemModel: LegendModel['_data'][number],
lineVisualStyle: PathStyleProps,
itemVisualStyle: PathStyleProps,
drawType: 'fill' | 'stroke',
isSelected: boolean
isSelected: boolean,
api: ExtensionAPI
) {
/**
* Use series style if is inherit;
Expand All @@ -561,11 +565,14 @@ function getLegendStyle(
}

// itemStyle
const legendItemModel = legendModel.getModel('itemStyle') as Model<LegendItemStyleOption>;
const itemStyle = legendItemModel.getItemStyle();
const itemStyleModel = legendItemModel.getModel('itemStyle') as Model<LegendItemStyleOption>;
const itemStyle = itemStyleModel.getItemStyle();
const iconBrushType = iconType.lastIndexOf('empty', 0) === 0 ? 'fill' : 'stroke';
const decalStyle = itemStyleModel.getShallow('decal');
itemStyle.decal = (!decalStyle || decalStyle === 'inherit')
? itemVisualStyle.decal
: createOrUpdatePatternFromDecal(decalStyle, api);

itemStyle.decal = itemVisualStyle.decal;
if (itemStyle.fill === 'inherit') {
/**
* Series with visualDrawType as 'stroke' should have
Expand All @@ -589,7 +596,7 @@ function getLegendStyle(
handleCommonProps(itemStyle, itemVisualStyle);

// lineStyle
const legendLineModel = legendModel.getModel('lineStyle') as Model<LegendLineStyleOption>;
const legendLineModel = legendItemModel.getModel('lineStyle') as Model<LegendLineStyleOption>;
const lineStyle: LineStyleProps = legendLineModel.getLineStyle();
handleCommonProps(lineStyle, lineVisualStyle);

Expand All @@ -599,7 +606,7 @@ function getLegendStyle(
(lineStyle.stroke === 'auto') && (lineStyle.stroke = itemVisualStyle.fill);

if (!isSelected) {
const borderWidth = legendModel.get('inactiveBorderWidth');
const borderWidth = legendItemModel.get('inactiveBorderWidth');
/**
* Since stroke is set to be inactiveBorderColor, it may occur that
* there is no border in series but border in legend, so we need to
Expand All @@ -609,8 +616,8 @@ function getLegendStyle(
itemStyle.lineWidth = borderWidth === 'auto'
? (itemVisualStyle.lineWidth > 0 && visualHasBorder ? 2 : 0)
: itemStyle.lineWidth;
itemStyle.fill = legendModel.get('inactiveColor');
itemStyle.stroke = legendModel.get('inactiveBorderColor');
itemStyle.fill = legendItemModel.get('inactiveColor');
itemStyle.stroke = legendItemModel.get('inactiveBorderColor');
lineStyle.stroke = legendLineModel.get('inactiveColor');
lineStyle.lineWidth = legendLineModel.get('inactiveWidth');
}
Expand Down