props with object default

Author: yyx990803

source/guide/components.md

@@ -209,9 +209,9 @@ The two-way binding will sync the change of child's `msg` property back to the p
 
 <p class="tip">Note that if the prop being passed down is an Object or an Array, it is passed by reference. Mutating the Object or Array itself inside the child will affect parent state, regardless of the binding type you are using.</p>
 
-### Prop Validation
+### Prop Specification
 
-It is possible for a component to validate the props it is receiving. This is useful when you are authoring a component that is intended to be used by others, as these prop validation requirements essentially constitute your component's API, and ensure your users are using your component correctly. Instead of defining the props as strings, you can use Objects that contain validation requirements:
+It is possible for a component to specify the requirements for the props it is receiving. This is useful when you are authoring a component that is intended to be used by others, as these prop validation requirements essentially constitute your component's API, and ensure your users are using your component correctly. Instead of defining the props as strings, you can use Objects that contain validation requirements:
 
 ``` js
 Vue.component('example', {
@@ -228,6 +228,14 @@ Vue.component('example', {
       type: Number,
       default: 100
     },
+    // object/array defaults should be returned from a
+    // factory function
+    propWithObjectDefault: {
+      type: Object,
+      default: function () {
+        return { msg: 'hello' }
+      }
+    },
     // a two-way prop. will throw warning if binding type
     // does not match.
     twoWayProp: {
@@ -256,8 +264,6 @@ In addition, `type` can also be a custom constructor function and the the assert
 
 When a prop validation fails, Vue will refuse the set the value on the child component, and throw a warning if using the development build.
 
-You can still use strings if your props don't need any validation, and you can mix string and object props in the option array.
-
 ### Inheriting Parent Scope
 
 If you want, you can also use the `inherit: true` option for your child component to make it prototypally inherit all parent properties: