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 rx and ry element problems #4

Closed
wants to merge 1 commit into from
Closed

Fix rx and ry element problems #4

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
24 changes: 23 additions & 1 deletion src/containers/paper-canvas.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ class PaperCanvas extends React.Component {
// the viewBox to start at (0, 0), and we need to translate it back for some costumes to render
// correctly.
const parser = new DOMParser();
const serializer = new XMLSerializer();
const svgDom = parser.parseFromString(svg, 'text/xml');
const viewBox = svgDom.documentElement.attributes.viewBox ?
svgDom.documentElement.attributes.viewBox.value.match(/\S+/g) : null;
Expand All @@ -231,7 +232,28 @@ class PaperCanvas extends React.Component {
}
}

paper.project.importSVG(svg, {
// TW: paper.js for some reason ignores rx or ry values if it's missing the other.
svgDom.querySelectorAll('[rx], [ry]').forEach(element => {
if (
element.hasAttribute('rx') &&
!element.hasAttribute('ry')
) {
element.setAttribute(
element.getAttribute('rx'),
'ry'
);
} else if (
!element.hasAttribute('rx') &&
element.hasAttribute('ry')
) {
element.setAttribute(
'rx',
element.getAttribute('ry')
);
}
});

paper.project.importSVG(serializer.serializeToString(svgDom), {
expandShapes: true,
insert: false,
onLoad: function (item) {
Expand Down