From: Evan You <yyx990803@gmail.com>
Date: Mon, 24 Sep 2018 03:28:21 +0000 (-0400)
Subject: feat: inheritAttrs
X-Git-Tag: v3.0.0-alpha.0~1202
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5db956f9a4c8a38d20bf6bc23b34309313d6d9c;p=thirdparty%2Fvuejs%2Fcore.git

feat: inheritAttrs
---

diff --git a/packages/core/src/component.ts b/packages/core/src/component.ts
index 1790aa330d..bb98101287 100644
--- a/packages/core/src/component.ts
+++ b/packages/core/src/component.ts
@@ -21,6 +21,7 @@ export interface ComponentClass extends Flatten<typeof Component> {
 export interface FunctionalComponent<P = Data> extends RenderFunction<P> {
   pure?: boolean
   props?: ComponentPropsOptions<P>
+  inheritAttrs?: boolean
 }
 
 // this interface is merged with the class type
diff --git a/packages/core/src/componentOptions.ts b/packages/core/src/componentOptions.ts
index d459a82e70..c8ce0caa16 100644
--- a/packages/core/src/componentOptions.ts
+++ b/packages/core/src/componentOptions.ts
@@ -13,6 +13,7 @@ export interface ComponentOptions<D = Data, P = Data> {
   computed?: ComponentComputedOptions<D, P>
   watch?: ComponentWatchOptions<D, P>
   render?: RenderFunction<P>
+  inheritAttrs?: boolean
   // TODO other options
   readonly [key: string]: any
 }
diff --git a/packages/core/src/componentUtils.ts b/packages/core/src/componentUtils.ts
index ff893b66b2..d4c4dc7e0c 100644
--- a/packages/core/src/componentUtils.ts
+++ b/packages/core/src/componentUtils.ts
@@ -71,7 +71,11 @@ export function renderInstanceRoot(instance: MountedComponent) {
       }
     }
   }
-  return normalizeComponentRoot(vnode, instance.$parentVNode)
+  return normalizeComponentRoot(
+    vnode,
+    instance.$parentVNode,
+    instance.$options.inheritAttrs
+  )
 }
 
 export function teardownComponentInstance(instance: MountedComponent) {
@@ -88,7 +92,8 @@ export function teardownComponentInstance(instance: MountedComponent) {
 
 export function normalizeComponentRoot(
   vnode: any,
-  componentVNode: VNode | null
+  componentVNode: VNode | null,
+  inheritAttrs: boolean | void
 ): VNode {
   if (vnode == null) {
     vnode = createTextVNode('')
@@ -104,7 +109,7 @@ export function normalizeComponentRoot(
       (flags & VNodeFlags.COMPONENT || flags & VNodeFlags.ELEMENT)
     ) {
       const parentData = componentVNode.data
-      if (parentData != null) {
+      if (parentData != null && inheritAttrs !== false) {
         let extraData: any = null
         for (const key in parentData) {
           // attrs/class/style bindings on parentVNode are merged down to child
diff --git a/packages/core/src/createRenderer.ts b/packages/core/src/createRenderer.ts
index 4c8ebb4f6e..1deb16305b 100644
--- a/packages/core/src/createRenderer.ts
+++ b/packages/core/src/createRenderer.ts
@@ -278,7 +278,8 @@ export function createRenderer(options: RendererOptions) {
       // functional component
       const subTree = (vnode.children = normalizeComponentRoot(
         (tag as FunctionalComponent)(data || EMPTY_OBJ, slots || EMPTY_OBJ),
-        vnode
+        vnode,
+        (tag as FunctionalComponent).inheritAttrs
       ))
       el = vnode.el = mount(subTree, null, parentComponent, isSVG, null)
     }
@@ -562,7 +563,8 @@ export function createRenderer(options: RendererOptions) {
     if (shouldUpdate) {
       const nextTree = (nextVNode.children = normalizeComponentRoot(
         render(nextProps || EMPTY_OBJ, nextSlots || EMPTY_OBJ),
-        nextVNode
+        nextVNode,
+        render.inheritAttrs
       ))
       patch(prevTree, nextTree, container, parentComponent, isSVG)
       nextVNode.el = nextTree.el