2.5: inject default values

yyx990803 · yyx990803 · commit 31f6f9259b2d · 2017-10-12T16:26:56.000-04:00
diff --git a/src/v2/api/index.md b/src/v2/api/index.md
@@ -976,7 +976,7 @@ type: api
 
 - **Type:**
   - **provide:** `Object | () => Object`
-  - **inject:** `Array<string> | { [key: string]: string | Symbol }`
+  - **inject:** `Array<string> | { [key: string]: string | Symbol | Object }`
 
 - **Details:**
 
@@ -1055,6 +1055,42 @@ type: api
   }
   ```
 
+  > In 2.5.0+ injections can be optional with default value:
+
+  ``` js
+  const Child = {
+    inject: {
+      foo: { default: 'foo' }
+    }
+  }
+  ```
+
+  If it needs to be injected from a property with a different name, use `from` to denote the source property:
+
+  ``` js
+  const Child = {
+    inject: {
+      foo: {
+        from: 'bar',
+        default: 'foo'
+      }
+    }
+  }
+  ```
+
+  Similar to prop defaults, you need to use a factory function for non primitive values:
+
+  ``` js
+  const Child = {
+    inject: {
+      foo: {
+        from: 'bar',
+        default: () => [1, 2, 3]
+      }
+    }
+  }
+  ```
+
 ## Options / Misc
 
 ### name
