Skip to content

(fix) data-sveltekit attributes are valid on all elements #1773

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
Dec 11, 2022
Merged

(fix) data-sveltekit attributes are valid on all elements #1773

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
12 changes: 6 additions & 6 deletions packages/svelte2tsx/svelte-html-do-not-use.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,12 @@ export interface HTMLAttributes<T extends EventTarget> extends AriaAttributes, D
* Elements with the contenteditable attribute support innerHTML and textContent bindings.
*/
'bind:textContent'?: string | undefined | null;

// SvelteKit
'data-sveltekit-noscroll'?: true | '' | 'off' | undefined | null;
'data-sveltekit-preload-code'?: true | '' | 'eager' | 'viewport' | 'hover' | 'tap' | 'off' | undefined | null;
'data-sveltekit-preload-data'?: true | '' | 'hover' | 'tap' | 'off' | undefined | null;
'data-sveltekit-reload'?: true | '' | 'off' | undefined | null;
}

export type HTMLAttributeAnchorTarget =
Expand All @@ -558,12 +564,6 @@ export interface HTMLAnchorAttributes extends HTMLAttributes<HTMLAnchorElement>
type?: string | undefined | null;
referrerpolicy?: ReferrerPolicy | undefined | null;

// SvelteKit
'data-sveltekit-noscroll'?: true | '' | 'off' | undefined | null;
'data-sveltekit-preload-code'?: true | '' | 'eager' | 'viewport' | 'hover' | 'tap' | 'off' | undefined | null;
'data-sveltekit-preload-data'?: true | '' | 'hover' | 'tap' | 'off' | undefined | null;
'data-sveltekit-reload'?: true | '' | 'off' | undefined | null;

// Sapper
'sapper:noscroll'?: true | undefined | null;
'sapper:prefetch'?: true | undefined | null;
Expand Down
16 changes: 7 additions & 9 deletions packages/svelte2tsx/svelte-jsx.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,11 @@ declare namespace svelte.JSX {
results?: number | undefined | null;
security?: string | undefined | null;
unselectable?: boolean | undefined | null;

'data-sveltekit-noscroll'?: true | '' | 'off' | undefined | null;
'data-sveltekit-preload-code'?: true | '' | 'eager' | 'viewport' | 'hover' | 'tap' | 'off' | undefined | null;
'data-sveltekit-preload-data'?: true | '' | 'hover' | 'tap' | 'off' | undefined | null;
'data-sveltekit-reload'?: true | '' | 'off' | undefined | null;
}

// this list is "complete" in that it contains every SVG attribute
Expand Down Expand Up @@ -1176,13 +1181,6 @@ declare namespace svelte.JSX {
sapperPrefetch?: true | undefined | null;
}

interface SvelteKitAnchorProps {
'data-sveltekit-noscroll'?: true | '' | 'off' | undefined | null;
'data-sveltekit-preload-code'?: true | '' | 'eager' | 'viewport' | 'hover' | 'tap' | 'off' | undefined | null;
'data-sveltekit-preload-data'?: true | '' | 'hover' | 'tap' | 'off' | undefined | null;
'data-sveltekit-reload'?: true | '' | 'off' | undefined | null;
}

interface SvelteMediaTimeRange {
start: number;
end: number;
Expand Down Expand Up @@ -1221,7 +1219,7 @@ declare namespace svelte.JSX {

interface IntrinsicElements {
// HTML
a: HTMLProps<HTMLAnchorElement> & SapperAnchorProps & SvelteKitAnchorProps;
a: HTMLProps<HTMLAnchorElement> & SapperAnchorProps;
abbr: HTMLProps<HTMLElement>;
address: HTMLProps<HTMLElement>;
area: HTMLProps<HTMLAreaElement>;
Expand Down Expand Up @@ -1398,7 +1396,7 @@ declare namespace svelte.JSX {
sveltefragment: { slot?: string; };
svelteoptions: { [name: string]: any };
sveltehead: { [name: string]: any };
svelteelement: { 'this': string | undefined | null; } & HTMLProps<any> & SVGProps<any> & SapperAnchorProps & SvelteKitAnchorProps;
svelteelement: { 'this': string | undefined | null; } & HTMLProps<any> & SVGProps<any> & SapperAnchorProps;
// Needed due to backwards compatibility type which hits these
'svelte:window': HTMLProps<Window> & SvelteWindowProps;
'svelte:body': HTMLProps<HTMLElement>;
Expand Down