Merge pull request #21 from Tresky/add-mixin-support

Add Support for loading fromMobx attributes from mixins on components.

src/install.ts

@@ -69,7 +69,14 @@ function createComputedProperty(
 }
 
 function getFromStoreEntries(vm: VueClass): FromMobxEntry[] {
- const fromStore = vm.$options.fromMobx
+ let fromStore = vm.$options.fromMobx
+ if (vm.$options.mixins) {
+ var fromStoreNew = vm.$options.mixins
+ .map(mixin => mixin.fromMobx)
+ .reduce((accum, mobx) => mobx ? Object.assign({}, accum, mobx) : accum, {})
+ fromStore = Object.assign({}, fromStore, fromStoreNew)
+ }
+
  if (!fromStore) {
  return []
  }

test/index.ts

@@ -453,3 +453,36 @@ test('normal components destroy well', () => {
 
  vm.$destroy()
 })
+
+test('fromMobx attributes pulled from mixins', () => {
+ Vue.use(Movue)
+
+ const data = observable({
+ foo: 1
+ })
+
+ const mixin = {
+ fromMobx: {
+ foo () {
+ return data.foo
+ }
+ }
+ }
+
+ const vm = new Vue({
+ mixins: [mixin],
+ computed: {
+ value () {
+ return this.foo
+ }
+ },
+ render (h) {
+ const vm: any = this
+ return h('div', `${vm.value}`)
+ }
+ }).$mount()
+
+ expect(vm.foo).toBe(1)
+
+ vm.$destroy()
+})