Skip to content

[svelte] add types to renderComponent #4516

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
tannerlinsley merged 1 commit into from
Nov 12, 2022
Merged

[svelte] add types to renderComponent #4516

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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@
"react": "^17.0.2",
"react-dom": "^17.0.2",
"rollup": "^2.70.2",
"rollup-plugin-dts": "^4.2.2",
"rollup-plugin-size": "^0.2.2",
"rollup-plugin-svelte": "^7.1.0",
"rollup-plugin-terser": "^7.0.2",
"rollup-plugin-visualizer": "^5.6.0",
"rollup-plugin-dts": "^4.2.2",
"solid-js": "^1.3.15",
"stream-to-array": "^2.3.0",
"svelte": "^3.48.0",
"svelte": "^3.49.0",
"ts-node": "^10.7.0",
"typescript": "^4.7.4",
"vue": "^3.2.33"
Expand Down
2 changes: 1 addition & 1 deletion packages/svelte-table/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
"@tanstack/table-core": "8.5.22"
},
"peerDependencies": {
"svelte": "^3.48.0"
"svelte": "^3.49.0"
}
}
19 changes: 17 additions & 2 deletions packages/svelte-table/src/render-component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ import {
create_ssr_component,
validate_component,
} from 'svelte/internal'
import type {
ComponentProps,
ComponentType,
SvelteComponentTyped,
} from 'svelte'

function create_fragment(ctx: any, Comp: any, props: any) {
let c: any
Expand Down Expand Up @@ -46,7 +51,12 @@ function create_fragment(ctx: any, Comp: any, props: any) {
}
}

function renderClient(Comp: any, props: any): any {
function renderClient<Component extends SvelteComponentTyped>(
Comp: ComponentType<Component>,
...props: Record<string, unknown> extends ComponentProps<Component>
? []
: [ComponentProps<Component>]
): any {
return class WrapperComp extends SvelteComponent {
constructor(options: any) {
super()
Expand All @@ -63,7 +73,12 @@ function renderClient(Comp: any, props: any): any {
}
}

function renderServer(Comp: any, props: any) {
function renderServer<Component extends SvelteComponentTyped>(
Comp: ComponentType<Component>,
...props: Record<string, unknown> extends ComponentProps<Component>
? []
: [ComponentProps<Component>]
): any {
const WrapperComp = create_ssr_component(
($$result: any, $$props: any, $$bindings: any, slots: any) => {
return `${validate_component(Comp, 'TableComponent').$$render(
Expand Down