Skip to content
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

fix: don't apply text shadows on elements #1795

Merged
merged 5 commits into from
Apr 8, 2019
Merged

fix: don't apply text shadows on elements #1795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
43b184d
Fix for Issue-1638 (https://github.com/niklasvh/html2canvas/issues/1638)
Sep 10, 2018
1ad8363
Fix for Issue-1638 (https://github.com/niklasvh/html2canvas/issues/1638)
Sep 10, 2018
d823e4c
Fix for Issue-1638 (https://github.com/niklasvh/html2canvas/issues/1638)
Sep 12, 2018
4fc2df7
Merge branch 'master' of git://github.com/kcak11/html2canvas into kca…
niklasvh Apr 8, 2019
fc3b14b
refactor: only clear shadow when used
niklasvh Apr 8, 2019
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
5 changes: 5 additions & 0 deletions src/renderer/CanvasRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,11 @@ export default class CanvasRenderer implements RenderTarget<HTMLCanvasElement> {
text.bounds.top + text.bounds.height
);
});

this.ctx.shadowColor = '';
this.ctx.shadowOffsetX = 0;
this.ctx.shadowOffsetY = 0;
this.ctx.shadowBlur = 0;
} else {
this.ctx.fillText(
text.text,
Expand Down
12 changes: 12 additions & 0 deletions tests/reftests/text/shadow.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,18 @@
<span>testing with transparent</span>
<strong>testing with low opacity</strong>
</div>

<div id="capture" style="padding: 10px; background: #f5da55; border:2px solid blue;">
<h4 style="color: #000;text-shadow:0px 0px 5px green;">Hello world!</h4>
<div id="sampleDiv" style="border:2px solid red;padding:5px;margin:5px;">Sample Div with Border</div>
<div style="border:2px solid red;background-color:pink; padding:5px;margin:5px;">Sample Div with Border</div>
<div style="border:2px solid red;color:blue; padding:5px;margin:5px;">Sample Div with Border</div>
<div style="border:2px solid red;padding:5px;margin:5px;">Sample Div with Border</div>
<div style="border:2px solid red;padding:5px;text-shadow:0px 0px 5px red;margin:5px;">Sample Div with Border</div>
<div style="border:2px solid red;padding:5px;margin:5px;">Sample Div with Border</div>
<div style="border:2px solid red;padding:5px;margin:5px;">Sample Div with Border</div>
</div>

<p class="white-text-with-blue-shadow">Sed ut perspiciatis unde omnis iste
natus error sit voluptatem accusantium doloremque laudantium,
totam rem aperiam, eaque ipsa quae ab illo inventore.</p>
Expand Down