From b946a6b7f7e9655551cbf461f55cc5fb3603709f Mon Sep 17 00:00:00 2001 From: Evan You Date: Tue, 25 Sep 2018 14:19:58 -0400 Subject: [PATCH] refactor: use more descriptive argument name --- packages/core/src/componentProps.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/core/src/componentProps.ts b/packages/core/src/componentProps.ts index 6686fb91..dd1b3509 100644 --- a/packages/core/src/componentProps.ts +++ b/packages/core/src/componentProps.ts @@ -72,7 +72,7 @@ const EMPTY_PROPS = { props: EMPTY_OBJ } // - if has declared props: put declared ones in `props`, the rest in `attrs` // - else: everything goes in `props`. export function resolveProps( - raw: any, + rawData: any, rawOptions: ComponentPropsOptions | void, Component: ComponentClass | FunctionalComponent ): { props: Data; attrs?: Data } { @@ -81,13 +81,13 @@ export function resolveProps( normalizePropsOptions( rawOptions as ComponentPropsOptions )) as NormalizedPropsOptions - if (!raw && !hasDeclaredProps) { + if (!rawData && !hasDeclaredProps) { return EMPTY_PROPS } const props: any = {} let attrs: any = void 0 - if (raw) { - for (const key in raw) { + if (rawData != null) { + for (const key in rawData) { // key, ref, slots are reserved if (key === 'key' || key === 'ref' || key === 'slots') { continue @@ -105,12 +105,12 @@ export function resolveProps( (hasDeclaredProps && !options.hasOwnProperty(key)) ) { const newKey = isNativeOn ? 'on' + key.slice(8) : key - ;(attrs || (attrs = {}))[newKey] = raw[key] + ;(attrs || (attrs = {}))[newKey] = rawData[key] } else { if (__DEV__ && hasDeclaredProps && options.hasOwnProperty(key)) { - validateProp(key, raw[key], options[key], Component) + validateProp(key, rawData[key], options[key], Component) } - props[key] = raw[key] + props[key] = rawData[key] } } }