Skip to content

Respect fill: false with custom draw times #10414

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

Merged
merged 9 commits into from
Jun 22, 2022
Merged

Respect fill: false with custom draw times #10414

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2e1e028
Resolve canvasgradient is not defined in node
LeeLenaleee Apr 29, 2022
733fe22
Remove trailing white space
LeeLenaleee Apr 29, 2022
6a6270f
export isPaternOrGradient helper with typings
LeeLenaleee May 2, 2022
079f690
fix lint failure, single qoute
LeeLenaleee May 2, 2022
e36e13e
Respect `fill: false` with custom draw times
LeeLenaleee Jun 9, 2022
fcc9a10
resolve merge conflict
LeeLenaleee Jun 9, 2022
d4438da
correctly listen to fill property
LeeLenaleee Jun 9, 2022
82d83e7
remove console log and lint errors
LeeLenaleee Jun 9, 2022
959e2ca
implement feedback, still update control points
LeeLenaleee Jun 21, 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
7 changes: 5 additions & 2 deletions src/plugins/plugin.filler/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default {
const area = chart.chartArea;
for (let i = metasets.length - 1; i >= 0; --i) {
const source = metasets[i].$filler;
if (!source) {
if (!source || source.fill === false) {
continue;
}

Expand All @@ -65,9 +65,12 @@ export default {
},

beforeDatasetsDraw(chart, _args, options) {
if (options.drawTime !== 'beforeDatasetsDraw') {
const source = args.meta.$filler;

if (!source || source.fill === false || options.drawTime !== 'beforeDatasetsDraw') {
return;
}

const metasets = chart.getSortedVisibleDatasetMetas();
for (let i = metasets.length - 1; i >= 0; --i) {
const source = metasets[i].$filler;
Expand Down
2 changes: 1 addition & 1 deletion types/helpers/helpers.color.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export function color(
| [number, number, number, number]
): ColorModel;

export function isPatternOrGradient(value: AnyObject): boolean;
export function isPatternOrGradient(value: string | AnyObject): boolean;

export interface ColorModel {
rgbString(): string;
Expand Down