From 757da7db1b6edbbbc138490ab216b41766090974 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Thu, 30 Jun 2016 20:19:48 +0900
Subject: [PATCH] fix props validation fails (#3183)

---
 src/compiler/compile-props.js                 |  4 +++
 .../specs/directives/internal/prop_spec.js    | 30 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/compiler/compile-props.js b/src/compiler/compile-props.js
index ab5912b34db..74665be8178 100644
--- a/src/compiler/compile-props.js
+++ b/src/compiler/compile-props.js
@@ -38,6 +38,7 @@ const settablePathRE = /^[A-Za-z_$][\w$]*(\.[A-Za-z_$][\w$]*|\[[^\[\]]+\])*$/
 
 export function compileProps (el, propOptions, vm) {
   var props = []
+  var propsData = vm.$options.propsData
   var names = Object.keys(propOptions)
   var i = names.length
   var options, name, attr, value, path, parsed, prop
@@ -122,6 +123,9 @@ export function compileProps (el, propOptions, vm) {
     } else if ((value = getAttr(el, attr)) !== null) {
       // has literal binding!
       prop.raw = value
+    } else if (propsData && ((value = propsData[name] || propsData[path]) !== null)) {
+      // has propsData
+      prop.raw = value
     } else if (process.env.NODE_ENV !== 'production') {
       // check possible camelCase prop usage
       var lowerCaseName = path.toLowerCase()
diff --git a/test/unit/specs/directives/internal/prop_spec.js b/test/unit/specs/directives/internal/prop_spec.js
index 95995f24589..084e2eeebf8 100644
--- a/test/unit/specs/directives/internal/prop_spec.js
+++ b/test/unit/specs/directives/internal/prop_spec.js
@@ -621,6 +621,36 @@ describe('prop', function () {
     expect(vm.a).toBe(123)
   })
 
+  // # GitHub issues #3183
+  it('pass propsData to create component that props is defined', function () {
+    var Comp = Vue.extend({
+      template: '<div>{{propA.a}}:{{propB.b}}</div>',
+      props: {
+        propA: {
+          type: Object,
+          required: true
+        },
+        'prop-b': {
+          type: Object,
+          required: true
+        }
+      }
+    })
+    var vm = new Comp({
+      el: el,
+      propsData: {
+        propA: { a: 123 },
+        propB: { b: '456' }
+      }
+    })
+    expect(vm.propA.a).toBe(123)
+    expect(vm.propB.b).toBe('456')
+    expect('Missing required prop: propA').not.toHaveBeenWarned()
+    expect('Invalid prop: type check failed for prop "propA". Expected Object, got Undefined').not.toHaveBeenWarned()
+    expect('Missing required prop: prop-b').not.toHaveBeenWarned()
+    expect('Invalid prop: type check failed for prop "prop-b". Expected Object, got Undefined').not.toHaveBeenWarned()
+  })
+
   it('should warn using propsData during extension', function () {
     Vue.extend({
       propsData: {