fix(runtime-core): skip prop type check when null included

vuejs · Jan 17, 2023 · 85dec14 · 85dec14
1 parent bef85e7
commit 85dec14
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/packages/runtime-core/__tests__/componentProps.spec.ts b/packages/runtime-core/__tests__/componentProps.spec.ts
@@ -331,7 +331,8 @@ describe('component props', () => {
         arr: { type: Array },
         obj: { type: Object },
         cls: { type: MyClass },
-        fn: { type: Function }
+        fn: { type: Function },
+        fnAny: { type: [Function, null] }
       },
       setup() {
         return () => null
@@ -345,7 +346,8 @@ describe('component props', () => {
         arr: {},
         obj: 'false',
         cls: {},
-        fn: true
+        fn: true,
+        fnAny: true
       }),
       nodeOps.createElement('div')
     )
@@ -370,6 +372,10 @@ describe('component props', () => {
     expect(
       `Invalid prop: type check failed for prop "cls". Expected MyClass, got Object`
     ).toHaveBeenWarned()
+
+    expect(
+      `Invalid prop: type check failed for prop "fnAny". Expected Function, got Boolean with value true.`
+    ).not.toHaveBeenWarned()
   })
 
   // #3495

diff --git a/packages/runtime-core/src/componentProps.ts b/packages/runtime-core/src/componentProps.ts
@@ -622,6 +622,9 @@ function validateProp(
   if (type != null && type !== true) {
     let isValid = false
     const types = isArray(type) ? type : [type]
+    if (types.includes(null as any)) {
+      return
+    }
     const expectedTypes = []
     // value is valid as long as one of the specified types match
     for (let i = 0; i < types.length && !isValid; i++) {