Skip to content
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

Jump to bottom

fix(types): allow undefined in StyleValue #7954

Merged
merged 2 commits into from
Nov 10, 2023
Merged

fix(types): allow undefined in StyleValue #7954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8912c9f
fix(type): Allow undefined in StyleValue Array
yuwu9145 Mar 25, 2023
924059d
support falsy values null & false
yuwu9145 Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 27 additions & 0 deletions packages/dts-test/tsx.test-d.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,33 @@ expectType<JSX.Element>(
<div style={[{ color: 'red' }, [{ fontSize: '1em' }]]} />
)

// #7955
expectType<JSX.Element>(
<div style={[undefined, '', null, false]} />
)

expectType<JSX.Element>(
<div style={undefined} />
)

expectType<JSX.Element>(
<div style={null} />
)

expectType<JSX.Element>(
<div style={''} />
)

expectType<JSX.Element>(
<div style={false} />
)

// @ts-expect-error
;<div style={[0]} />

// @ts-expect-error
;<div style={0} />

// @ts-expect-error unknown prop
;<div foo="bar" />

Expand Down
2 changes: 1 addition & 1 deletion packages/runtime-dom/src/jsx.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ interface AriaAttributes {
}

// Vue's style normalization supports nested arrays
export type StyleValue = string | CSSProperties | Array<StyleValue>
export type StyleValue = false | null | undefined | string | CSSProperties | Array<StyleValue>

export interface HTMLAttributes extends AriaAttributes, EventHandlers<Events> {
innerHTML?: string
Expand Down