Skip to content

Fix SVG currentColor inheritance from active p5 styles (#9246) #9353

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

Open
subhranshudash13-dotcom wants to merge 8 commits into
base: main
Choose a base branch
from
+635 −12
Open

Fix SVG currentColor inheritance from active p5 styles (#9246) #9353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
adcf2a8
Fix SVG currentColor inheritance from active p5 styles (#9246)
subhranshudash13-dotcom Oct 29, 2026
92977c6
Merge branch 'main' into fix/svg-currentcolor-inheritance
subhranshudash13-dotcom Oct 29, 2026
5e3c477
Merge branch 'main' into fix/svg-currentcolor-inheritance
subhranshudash13-dotcom Oct 30, 2026
5081f5f
Merge branch 'main' into fix/svg-currentcolor-inheritance
subhranshudash13-dotcom Nov 4, 2026
0c8a6d7
Merge remote-tracking branch 'upstream/main' into fix/svg-currentcolo…
subhranshudash13-dotcom Nov 4, 2026
88c0f04
fix(svg): respect opacity attributes when using currentColor
subhranshudash13-dotcom Nov 5, 2026
5eac4be
Merge remote-tracking branch 'origin/fix/svg-currentcolor-inheritance…
subhranshudash13-dotcom Nov 5, 2026
ab3193d
Merge branch 'main' into fix/svg-currentcolor-inheritance
subhranshudash13-dotcom Nov 5, 2026
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
26 changes: 20 additions & 6 deletions src/shape/svg/svg_export.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,12 +287,16 @@ export function SVGExportAddon(p5, fn, lifecycles) {
this._currentOpacity = 1;
return 'none';
}
if (color === 'currentColor' || (typeof color === 'string' && color.toLowerCase() === 'currentcolor')) {
this._currentOpacity = 1;
return 'currentColor';
}
const [, , , alpha] = color._getRGBA([255, 255, 255, 255]);

this._currentOpacity = alpha / 255;

return color.toString('#rrggbb');
}
return color.toString('#rrggbb');
}

_applyStyle(el) {
const state = this.currentState;
Expand All @@ -303,11 +307,11 @@ export function SVGExportAddon(p5, fn, lifecycles) {

this._currentOpacity = 1;
const fill = this.colorToSVG(state.fill);
const fillOpacity = this._currentOpacity;
const fillOpacity = fill === 'currentColor' && state.fillOpacity != null ? state.fillOpacity : this._currentOpacity;

this._currentOpacity = 1;
const stroke = this.colorToSVG(state.stroke);
const strokeOpacity = this._currentOpacity;
const strokeOpacity = stroke === 'currentColor' && state.strokeOpacity != null ? state.strokeOpacity : this._currentOpacity;

el.setAttribute('fill', fill);
el.setAttribute('stroke', stroke);
Expand Down Expand Up @@ -941,14 +945,24 @@ export function SVGExportAddon(p5, fn, lifecycles) {
p.applyMatrix(m.a, m.b, m.c, m.d, m.e, m.f);
}

if (state.fill) {
if (state.fill === 'currentColor' || (typeof state.fill === 'string' && state.fill.toLowerCase() === 'currentcolor')) {
if (state.fillOpacity != null && state.fillOpacity < 1 && p._renderer.states.fillColor) {
const [r, g, b, a] = p._renderer.states.fillColor._getRGBA([255, 255, 255, 255]);
p.fill(r, g, b, a * state.fillOpacity);
}
} else if (state.fill) {
const [r, g, b, a] = state.fill._getRGBA([255, 255, 255, 255]);
p.fill(r, g, b, a);
} else {
p.noFill();
}

if (state.stroke) {
if (state.stroke === 'currentColor' || (typeof state.stroke === 'string' && state.stroke.toLowerCase() === 'currentcolor')) {
if (state.strokeOpacity != null && state.strokeOpacity < 1 && p._renderer.states.strokeColor) {
const [r, g, b, a] = p._renderer.states.strokeColor._getRGBA([255, 255, 255, 255]);
p.stroke(r, g, b, a * state.strokeOpacity);
}
} else if (state.stroke) {
const [r, g, b, a] = state.stroke._getRGBA([255, 255, 255, 255]);
p.stroke(r, g, b, a);
} else {
Expand Down
13 changes: 7 additions & 6 deletions src/shape/svg/svg_import.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ class RenderContext {
this.strokeOpacity = 1;
this.visibility = "visible";
this.display = "inline";
this.color = "rgb(0, 0, 0)";
this.color = null;
//todo future properties like blendMode, etc.
}
}
Expand Down Expand Up @@ -396,9 +396,10 @@ export function SVGImportAddon(p5, fn, lifecycles) {
}
let parsedColor = colorStr.trim();
if (parsedColor.toLowerCase() === "currentcolor") {
parsedColor = context.color || "rgb(0, 0, 0)";
if (parsedColor.toLowerCase() === "currentcolor") {
parsedColor = "rgb(0, 0, 0)";
if (context.color) {
parsedColor = context.color;
} else {
return "currentColor";
}
}
try {
Expand All @@ -425,8 +426,8 @@ export function SVGImportAddon(p5, fn, lifecycles) {
strokeWeight: context.strokeWidth,
strokeCap: context.strokeCap,
renderContext: context.clone(),
fillOpacity: context.fillOpacity,
strokeOpacity: context.strokeOpacity,
fillOpacity: context.opacity * context.fillOpacity,
strokeOpacity: context.opacity * context.strokeOpacity,
};
}

Expand Down
Loading