Discard invalid color declarations instead of dropping the property (…#1083
Open
StefanoD wants to merge 1 commit into
Open
Discard invalid color declarations instead of dropping the property (…#1083StefanoD wants to merge 1 commit into
StefanoD wants to merge 1 commit into
Conversation
…inebender#914) Figma exports SVGs with a dual stroke definition: a valid hex fallback followed by a wide-gamut value, e.g. style="stroke:#FAFAFA;stroke:color(display-p3 0.9804 0.9804 0.9804);" When splitting a `style` attribute (or applying a CSS rule), the last declaration for a property always won, regardless of validity. The unsupported `color(display-p3 ...)` value thus overwrote the valid `#FAFAFA` one, and since stroke parsing later fell back to "no stroke", the element was rendered invisibly. Per CSS error recovery, a declaration with an invalid value must be discarded so a previously declared valid value (or the presentation attribute) is kept. We validate the color-bearing presentation properties (`fill`, `stroke`, `color`, `flood-color`, `lighting-color`, `stop-color`) and skip an invalid declaration, but only when it would override an existing attribute. A lone invalid value keeps the previous behavior (fallback at conversion), so the common, conflict-free path incurs no extra parse. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #914.
Figma exports SVGs with a dual stroke definition: a valid hex fallback
followed by a wide-gamut value, e.g.
When splitting a
styleattribute (or applying a CSS rule), the lastdeclaration for a property always won, regardless of validity. The
unsupported
color(display-p3 ...)value overwrote the valid#FAFAFAone, and since stroke parsing later falls back to "no stroke", the
element was rendered invisibly.
Per CSS error recovery, a declaration with an invalid value must be
discarded so a previously declared valid value (or the presentation
attribute) is kept. This PR validates the color-bearing presentation
properties (
fill,stroke,color,flood-color,lighting-color,stop-color) before inserting them and skips invalid declarations.Behavior for a single invalid declaration is unchanged (stroke → none,
fill → default/inherited).
Testing
invalid_style_declaration_falls_back_to_valid_one(fails before, passes after).
usvgtest suite passes;cargo buildclean with no new clippy warnings.Generated by Claude
Note: I accidentally closed the original PR (#1065) by deleting my fork, which auto-closed it. This reopens the same change — the branch and commits are unchanged.