Skip to content

Handle a bug where early return didn't update fill and stroke width #68

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 2 commits into from
Dec 18, 2018
Merged

Handle a bug where early return didn't update fill and stroke width #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d37021
Handle a bug where early return accidentally didnt update the fill an…
fsih Dec 17, 2018
343ddb2
Change the test to also make sure that stroke width is passed down
fsih Dec 17, 2018
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
2 changes: 2 additions & 0 deletions src/transform-applier.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,8 @@ const transformStrokeWidths = function (svgTag, windowRef, bboxForTesting) {
matrix = Matrix.compose(matrix, _parseTransform(element));
if (Matrix.toString(matrix) === Matrix.toString(Matrix.identity())) {
element.removeAttribute('transform');
element.setAttribute('stroke-width', strokeWidth);
element.setAttribute('fill', fill);
return;
}

Expand Down
20 changes: 20 additions & 0 deletions test/test-output/transform-applier-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,26 @@
<stop offset="1" stop-color="#FF9400" stop-opacity="1"/>
</radialGradient></defs>
<path id="path" fill="url(#grad_8-.75,0,-0.20096189432334202,0.75,0,0)" stroke="#003FFF" stroke-width="3.75" d="M 21.9615 30 A 25.6495 32.8953 -33.003 1 1 43.923 60 "/>
</svg>
</div><p>blackFillsBugFix</p>
<div style="width: 500px; border-style: solid; border-width: 1px;">
<svg width="26px" height="14px" viewBox="0 0 26 14" version="1.1" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g id="Page-1" stroke="none" stroke-width="5" fill="none" fill-rule="evenodd">
<path d="M23.87,0.75 C20.19,0.75 16.38,4.75 16.38,4.75 L16.38,9.25 C16.38,9.25 20.19,13.25 23.87,13.25
C24.6811343,11.269062 25.0661499,9.139551 25,7 C25.0661499,4.860449 24.6811343,2.73093802 23.87,0.75 Z"
id="Shape" stroke="#149948"/>
</g>
</g>
</svg>
</div>
<div style="width: 500px; border-style: solid; border-width: 0 1px 1px 1px;">
<svg width="26px" height="14px" viewBox="0 0 26 14" version="1.1" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g id="Page-1" stroke="none" fill-rule="evenodd">
<path d="M23.87,0.75 C20.19,0.75 16.38,4.75 16.38,4.75 L16.38,9.25 C16.38,9.25 20.19,13.25 23.87,13.25&#xA; C24.6811343,11.269062 25.0661499,9.139551 25,7 C25.0661499,4.860449 24.6811343,2.73093802 23.87,0.75 Z" id="Shape" stroke="#149948" stroke-width="5" fill="none"/>
</g>
</g>
</svg>
</div>
</body></html>
26 changes: 26 additions & 0 deletions test/transform-applier.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,4 +767,30 @@ test('userSpaceRadialGradientTransform', t => {
t.end();
});

test('blackFillsBugFix', t => {
const svgString =
`<svg width="26px" height="14px" viewBox="0 0 26 14" version="1.1" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g>
<g id="Page-1" stroke="none" stroke-width="5" fill="none" fill-rule="evenodd">
<path d="M23.87,0.75 C20.19,0.75 16.38,4.75 16.38,4.75 L16.38,9.25 C16.38,9.25 20.19,13.25 23.87,13.25
C24.6811343,11.269062 25.0661499,9.139551 25,7 C25.0661499,4.860449 24.6811343,2.73093802 23.87,0.75 Z"
id="Shape" stroke="#149948"/>
</g>
</g>
</svg>`;
const svgElement = parser.parseFromString(svgString, 'text/xml').documentElement;
transformStrokeWidths(svgElement, window,
{
height: 12.5,
width: 24.020904541015625,
x: 0.9896308183670044,
y: 0.75
});
comparisonFileAppend(svgString, svgElement, 'blackFillsBugFix');
t.equals('none', svgElement.getElementById('Shape').attributes.fill.value);
t.equals('5', svgElement.getElementById('Shape').attributes['stroke-width'].value);

t.end();
});

outputComparisonFile();