Skip to content

fix: Render types #344

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

Open
maiieul wants to merge 1 commit into
base: v2-migration
Choose a base branch
from
Open

fix: Render types #344

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
17 changes: 12 additions & 5 deletions libs/components/src/render/render.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
type JSXOutput,
type QwikIntrinsicElements,
type Signal,
Slot
Slot,
} from "@qwik.dev/core";

// keyof slows the type server a bunch, instead we use the most common fallbacks
Expand All @@ -19,7 +19,8 @@ export type AllowedFallbacks =
| "ul"
| "li";

type RenderInternalProps<T extends AllowedFallbacks> = {
type RenderInternalProps<T extends AllowedFallbacks> =
{
/** The default element and types if a render prop is not provided */
fallback: T;
/**
Expand All @@ -29,8 +30,12 @@ type RenderInternalProps<T extends AllowedFallbacks> = {

jsxType?: unknown;
movedProps?: Record<string, unknown>;
} & QwikIntrinsicElements[T] &
Record<`${string}$`, unknown>;
} & QwikIntrinsicElements[T];

type RenderProps<
P extends object = object,
T extends AllowedFallbacks = AllowedFallbacks,
> = RenderInternalProps<T> & P;

/**
* Creates an object that overrides bind:* props with undefined to prevent them from rendering in the DOM.
Expand Down Expand Up @@ -60,7 +65,9 @@ function getBindOverrides(props: Record<string, unknown>): Record<string, undefi
* Qwik's reactivity tracking while preventing these attributes from appearing in the DOM.
*/
export const Render = component$(
<T extends AllowedFallbacks>(props: RenderInternalProps<T>): JSXOutput => {
<P extends object = object, T extends AllowedFallbacks = AllowedFallbacks>(
props: RenderProps<P | object, T>,
): JSXOutput => {
const {
fallback: _fallback,
jsxType: _jsxType,
Expand Down
Loading