simplify functional component usage

yyx990803 · yyx990803 · commit 4e12b25d785a · 2017-04-05T14:38:46.000+08:00
diff --git a/src/core/vdom/create-functional-component.js b/src/core/vdom/create-functional-component.js
@@ -6,6 +6,7 @@ import { resolveSlots } from '../instance/render-helpers/resolve-slots'
 
 import {
   isDef,
+  camelize,
   validateProp
 } from '../util/index'
 
@@ -22,13 +23,17 @@ export function createFunctionalComponent (
     for (const key in propOptions) {
       props[key] = validateProp(key, propOptions, propsData)
     }
+  } else {
+    if (isDef(data.attrs)) mergeProps(props, data.attrs)
+    if (isDef(data.props)) mergeProps(props, data.props)
   }
   // ensure the createElement function in functional components
   // gets a unique context - this is necessary for correct named slot check
   const _context = Object.create(context)
   const h = (a, b, c, d) => createElement(_context, a, b, c, d, true)
   const vnode = Ctor.options.render.call(null, h, {
     props,
+    listeners: data.on || {},
     data,
     parent: context,
     children,
@@ -42,3 +47,9 @@ export function createFunctionalComponent (
   }
   return vnode
 }
+
+function mergeProps (to, from) {
+  for (const key in from) {
+    to[camelize(key)] = from[key]
+  }
+}
