Skip to content

fix(canvas): fix unexpected none or null value for ctx.strokeStyle & ctx.fillStyle #784

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
pissang merged 2 commits into from
Jul 15, 2021
Merged

fix(canvas): fix unexpected none or null value for ctx.strokeStyle & ctx.fillStyle #784

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c36025e
fix(canvas): fix unexpected `none` or `null` value for ctx.strokeStyl…
plainheart Jul 12, 2021
bb4a978
fix(canvas): check if stroke/fill color is valid before setting strok…
plainheart Jul 15, 2021
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
12 changes: 10 additions & 2 deletions src/canvas/graphic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ function styleHasStroke(style: PathStyleProps) {
return !(stroke == null || stroke === 'none' || !(style.lineWidth > 0));
}

// ignore lineWidth and must be string
// Expected color but found '[' when color is gradient
function isValidStrokeFillStyle(
strokeOrFill: PathStyleProps['stroke'] | PathStyleProps['fill']
): strokeOrFill is string {
return strokeOrFill != null && strokeOrFill !== 'none' && typeof strokeOrFill === 'string';
}

function styleHasFill(style: PathStyleProps) {
const fill = style.fill;
return fill != null && fill !== 'none';
Expand Down Expand Up @@ -459,14 +467,14 @@ function bindPathAndTextCommonStyle(
flushPathDrawn(ctx, scope);
styleChanged = true;
}
ctx.fillStyle = style.fill as string;
isValidStrokeFillStyle(style.fill) && (ctx.fillStyle = style.fill);
}
if (forceSetAll || style.stroke !== prevStyle.stroke) {
if (!styleChanged) {
flushPathDrawn(ctx, scope);
styleChanged = true;
}
ctx.strokeStyle = style.stroke as string;
isValidStrokeFillStyle(style.stroke) && (ctx.strokeStyle = style.stroke);
}
if (forceSetAll || style.opacity !== prevStyle.opacity) {
if (!styleChanged) {
Expand Down