Skip to content

fix: infer svg namespace correctly #10027

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 11 commits into from
Jan 9, 2024
Merged

fix: infer svg namespace correctly #10027

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ba8de99
fix: infer `svg` namespace correctly
navorite Dec 29, 2023
30e9baa
changeset
navorite Dec 29, 2023
ef725ea
reset namespace on block change
navorite Dec 30, 2023
f82f804
err
navorite Dec 30, 2023
4c68f63
test
navorite Dec 31, 2023
c34f3d0
revert
navorite Jan 2, 2024
92cd4cf
test
navorite Jan 2, 2024
5598c4c
incorrect
navorite Jan 2, 2024
1175362
comment fix + test case
navorite Jan 2, 2024
399d81f
Merge branch 'main' into svg-template
dummdidumm Jan 9, 2024
eb8475f
implement recursive check
dummdidumm Jan 9, 2024
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 .changeset/dull-roses-relate.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': patch
---

fix: infer `svg` namespace correctly
7 changes: 5 additions & 2 deletions packages/svelte/src/compiler/phases/3-transform/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,10 @@ export function infer_namespace(namespace, parent, nodes, path) {
parent_node.type === 'Component' ||
parent_node.type === 'SvelteComponent' ||
parent_node.type === 'SvelteFragment' ||
parent_node.type === 'SnippetBlock')
parent_node.type === 'SnippetBlock' ||
parent_node.type === 'IfBlock' ||
parent_node.type === 'EachBlock' ||
parent_node.type === 'AwaitBlock')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
parent_node.type === 'SnippetBlock' ||
parent_node.type === 'IfBlock' ||
parent_node.type === 'EachBlock' ||
parent_node.type === 'AwaitBlock')
parent_node.type === 'SnippetBlock')

) {
// Heuristic: Keep current namespace, unless we find a regular element,
// in which case we always want html, or we only find svg nodes,
Expand All @@ -222,7 +225,7 @@ export function infer_namespace(namespace, parent, nodes, path) {
only_svg = false;
break;
}
} else if (node.type !== 'Text' || node.data.trim() !== '') {
} else if (node.type !== 'ConstTag' && (node.type !== 'Text' || node.data.trim() !== '')) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for tackling this, but this is not quite right. We need to keep the check above as-is, and instead need to check that if we discover if/await/each blocks while traversing the nodes here, that the top level children of those are all svg elements (basically this loop needs to become recursive). Also, could you add a test case for this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I realized that is the correct approach while trying to fix it, that's why I kept it a draft. I will add a test case shortly and maybe implement this.

only_svg = false;
}
}
Expand Down