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

Add Custom Attribute to Hide UI Controls on Image Capture #357

Merged
merged 1 commit into from
Oct 5, 2017
Merged

Add Custom Attribute to Hide UI Controls on Image Capture #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion src/components/Header/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const Header = ({onHeaderClick, showTooltipMenu}) => {
<img src={require('../../assets/img/logo.png')} alt="InLoco" className="application-header--logo"/>
</a>
</div>
<a className="application-header--menu-button fa fa-bars focus-menu" role="button" onClick={onHeaderClick}>
<a className="application-header--menu-button fa fa-bars focus-menu" role="button" onClick={onHeaderClick} data-html2canvas-ignore={true}>
<span className={className}>Comece por aqui.</span>
</a>
</div>
Expand Down
3 changes: 2 additions & 1 deletion src/components/Toolbar/Toolbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ const Toolbar = ({
}
}
return (
<div className={className}>
// the data-html2canvas-ignore attribute tells html2canvas to ignore rendering this element on image capture
<div className={className} data-html2canvas-ignore={true}>
{
items.map( (item, index) => {
var itemClassName = "toolbar-item " + item.className
Expand Down
26 changes: 19 additions & 7 deletions tests/Header/__snapshots__/Header.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,27 @@ exports[`Header component renders correctly with no data 1`] = `
<div
className="application-header--logo-placeholder"
>
<img
alt="InLoco"
className="application-header--logo"
src={Object {}}
/>
<a
href="http://apps.mprj.mp.br/sistema/mpmapas/home.html"
target="_blank"
>
<img
alt="InLoco"
className="application-header--logo"
src={Object {}}
/>
</a>
</div>
<a
className="application-header--menu-button fa fa-bars"
className="application-header--menu-button fa fa-bars focus-menu"
data-html2canvas-ignore={true}
role="button"
/>
>
<span
className="menu-button--tootltip hidden"
>
Comece por aqui.
</span>
</a>
</div>
`;
3 changes: 2 additions & 1 deletion tests/SearchLayer/__snapshots__/SearchLayer.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ exports[`SearchLayer component renders correctly with no data 1`] = `
<input
className="search-layer--input"
id="searchLayer"
onClick={[Function]}
onKeyUp={[Function]}
placeholder="Ex.: Educação"
placeholder="Ex.: Escolas"
type="text"
/>
</label>
Expand Down