Skip to content

Commit

Permalink
fix(runtime-core): fix warning for absent props (#3363)
Browse files Browse the repository at this point in the history
fix #3362
  • Loading branch information
HcySunYang committed Mar 25, 2021
1 parent e4a5712 commit 86ceef4
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 6 deletions.
17 changes: 17 additions & 0 deletions packages/runtime-core/__tests__/componentProps.spec.ts
Expand Up @@ -301,6 +301,23 @@ describe('component props', () => {
}).not.toThrow(TypeError)
})

test('warn absent required props', () => {
const Comp = {
props: {
bool: { type: Boolean, required: true },
str: { type: String, required: true },
num: { type: Number, required: true }
},
setup() {
return () => null
}
}
render(h(Comp), nodeOps.createElement('div'))
expect(`Missing required prop: "bool"`).toHaveBeenWarned()
expect(`Missing required prop: "str"`).toHaveBeenWarned()
expect(`Missing required prop: "num"`).toHaveBeenWarned()
})

test('merging props from mixins and extends', () => {
let setupProps: any
let renderProxy: any
Expand Down
16 changes: 10 additions & 6 deletions packages/runtime-core/src/componentProps.ts
Expand Up @@ -142,7 +142,7 @@ export function initProps(
setFullProps(instance, rawProps, props, attrs)
// validation
if (__DEV__) {
validateProps(props, instance)
validateProps(rawProps || {}, props, instance)
}

if (isStateful) {
Expand Down Expand Up @@ -264,8 +264,8 @@ export function updateProps(
// trigger updates for $attrs in case it's used in component slots
trigger(instance, TriggerOpTypes.SET, '$attrs')

if (__DEV__ && rawProps) {
validateProps(props, instance)
if (__DEV__) {
validateProps(rawProps || {}, props, instance)
}
}

Expand Down Expand Up @@ -462,13 +462,17 @@ function getTypeIndex(
/**
* dev only
*/
function validateProps(props: Data, instance: ComponentInternalInstance) {
const rawValues = toRaw(props)
function validateProps(
rawProps: Data,
props: Data,
instance: ComponentInternalInstance
) {
const resolvedValues = toRaw(props)
const options = instance.propsOptions[0]
for (const key in options) {
let opt = options[key]
if (opt == null) continue
validateProp(key, rawValues[key], opt, !hasOwn(rawValues, key))
validateProp(key, resolvedValues[key], opt, !hasOwn(rawProps, key))
}
}

Expand Down

0 comments on commit 86ceef4

Please sign in to comment.