support falsy values null & false

vuejs · Mar 28, 2023 · 6263cfd · 6263cfd
1 parent a001a20
commit 6263cfd
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/packages/dts-test/tsx.test-d.tsx b/packages/dts-test/tsx.test-d.tsx
@@ -15,10 +15,34 @@ expectType<JSX.Element>(<div style={[{ color: 'red' }]} />)
 expectType<JSX.Element>(
   <div style={[{ color: 'red' }, [{ fontSize: '1em' }]]} />
 )
+
+// #7955
 expectType<JSX.Element>(
-  <div style={[undefined, {background: 'green'}]} />
+  <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" />
 

diff --git a/packages/vue/jsx-runtime/dom.d.ts b/packages/vue/jsx-runtime/dom.d.ts
@@ -234,7 +234,7 @@ interface AriaAttributes {
 }
 
 // Vue's style normalization supports nested arrays
-export type StyleValue = undefined | string | CSSProperties | Array<StyleValue>
+export type StyleValue = false | null | undefined | string | CSSProperties | Array<StyleValue>
 
 export interface HTMLAttributes extends AriaAttributes, EventHandlers<Events> {
   innerHTML?: string