Skip to content

(fix) infer svg element type #448

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 1 commit into from
Aug 11, 2020
Merged

(fix) infer svg element type #448

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
15 changes: 8 additions & 7 deletions packages/svelte2tsx/src/htmlxtojsx/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export function convertHtmlxToJsx(
case 'InlineComponent':
return getTypeForComponent(node);
case 'Element':
return 'HTMLElement';
return `__sveltets_ctorOf(__sveltets_mapElementTag('${node.name}'))`;
case 'Body':
return 'HTMLBodyElement';
default:
Expand Down Expand Up @@ -360,12 +360,13 @@ export function convertHtmlxToJsx(
//skip Attribute shorthand, that is handled below
const sapperNoScroll = attr.name === 'sapper:noscroll';
if (
attr.value !== true &&
!(
attr.value.length &&
attr.value.length == 1 &&
attr.value[0].type == 'AttributeShorthand'
) || sapperNoScroll
(attr.value !== true &&
!(
attr.value.length &&
attr.value.length == 1 &&
attr.value[0].type == 'AttributeShorthand'
)) ||
sapperNoScroll
) {
let name = attr.name;
if (!svgAttributes.find((x) => x == name)) {
Expand Down
1 change: 1 addition & 0 deletions packages/svelte2tsx/svelte-shims.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ declare function __sveltets_ensureAction<U extends any[], El extends any>(
declare function __sveltets_ensureTransition<U extends any[]>(transition: SvelteTransition<U>, ...args: U): {};
declare function __sveltets_ensureFunction(expression: (e: Event & { detail?: any }) => unknown ): {};
declare function __sveltets_ensureType<T>(type: AConstructorTypeOf<T>, el: T): {};
declare function __sveltets_ctorOf<T>(type: T): AConstructorTypeOf<T>;
declare function __sveltets_instanceOf<T>(type: AConstructorTypeOf<T>): T;
declare function __sveltets_allPropsType(): SvelteAllProps
declare function __sveltets_restPropsType(): SvelteRestProps
Expand Down
2 changes: 1 addition & 1 deletion packages/svelte2tsx/test/htmlx2jsx/samples/binding-this/expected.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<><input type="radio" {...__sveltets_ensureType(HTMLElement, element)} value="Plain"/></>
<><input type="radio" {...__sveltets_ensureType(__sveltets_ctorOf(__sveltets_mapElementTag('input')), element)} value="Plain"/></>
2 changes: 1 addition & 1 deletion packages/svelte2tsx/test/sourcemaps/repl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
<TableOfContents sections={sections} slug={slug} selected={selected}/>
</div>

<div class="chapter-markup" {...__sveltets_ensureType(HTMLElement, scrollable)}>
<div class="chapter-markup" {...__sveltets_ensureType(__sveltets_ctorOf(__sveltets_mapElementTag('div')), scrollable)}>
{ chapter.html}

<div class="controls">
Expand Down