Merge branch 'develop'

syshex · May 29, 2019 · 52ebb34 · 52ebb34
2 parents e771ea2 + aef7c62
commit 52ebb34
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 33 deletions.
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
@@ -91,6 +91,10 @@ module.exports = {
           }
         },
       }
+    },
+    algolia: {
+      indexName: 'vue-chartjs',
+      apiKey: 'b3544f7387612693644777553675d56a'
     }
   },
   locales: {

diff --git a/docs/README.md b/docs/README.md
@@ -8,7 +8,7 @@ features:
   details: Easy for both beginners and pros 🙌
 - title: Extendable
   details: Simple to use, easy to extend 💪
-- title: Powerfull
+- title: Powerful
   details: With the full power of chart.js 💯
 footer: MIT Licensed | Copyright © 2018-present Jakub Juszczak
 ---
diff --git a/docs/fr-fr/README.md b/docs/fr-fr/README.md
@@ -8,7 +8,7 @@ features:
   details: Easy for both beginners and pros 🙌
 - title: Extendable
   details: Simple to use, easy to extend 💪
-- title: Powerfull
+- title: Powerful
   details: With the full power of chart.js 💯
 footer: MIT Licensed | Copyright © 2018-present Jakub Juszczak
 ---
diff --git a/docs/guide/README.md b/docs/guide/README.md
@@ -288,8 +288,8 @@ export default {
 After that you can add your chart component to a parent component
 
 ```js
- <line-chart :chartdata="chartData" :options="chartOptions"/>
- ```
+<line-chart :chartdata="chartData" :options="chartOptions"/>
+```
 
 ### Chart with local data
 
@@ -302,16 +302,14 @@ export default {
   extends: Bar,
   data: () => ({
     chartdata: {
-      datacollection: {
-        labels: ['January', 'February'],
-        datasets: [
-          {
-            label: 'Data One',
-            backgroundColor: '#f87979',
-            data: [40, 20]
-          }
-        ]
-      }
+      labels: ['January', 'February'],
+      datasets: [
+        {
+          label: 'Data One',
+          backgroundColor: '#f87979',
+          data: [40, 20]
+        }
+      ]
     },
     options: {
       responsive: true,
@@ -320,7 +318,7 @@ export default {
   }),
 
   mounted () {
-    this.renderChart(this.datacollection, this.options)
+    this.renderChart(this.chartdata, this.options)
   }
 }
 ```
@@ -381,13 +379,13 @@ export default {
   }),
   async mounted () {
     this.loaded = false
-      try {
-        const { userlist } = await fetch('/api/userlist')
-        this.chartData = userlist
-        this.loaded = true
-      } catch (e) {
-        console.error(e)
-      }
+    try {
+      const { userlist } = await fetch('/api/userlist')
+      this.chartdata = userlist
+      this.loaded = true
+    } catch (e) {
+      console.error(e)
+    }
   }
 }
 </script>
@@ -403,10 +401,10 @@ You can set `responsive: true` and pass in a styles object which get applied as
 
 ```html
 <template>
-     <div>
-       <line-chart :styles="myStyles"/>
-       <button @click="increase()">Increase height</button>
-     </div>
+  <div>
+    <line-chart :styles="myStyles"/>
+    <button @click="increase()">Increase height</button>
+  </div>
 </template>
 
 <script>

diff --git a/docs/id/README.md b/docs/id/README.md
@@ -8,7 +8,7 @@ features:
   details: Easy for both beginners and pros 🙌
 - title: Extendable
   details: Simple to use, easy to extend 💪
-- title: Powerfull
+- title: Powerful
   details: With the full power of chart.js 💯
 footer: MIT Licensed | Copyright © 2018-present Jakub Juszczak
 ---
diff --git a/docs/ja/README.md b/docs/ja/README.md
@@ -2,7 +2,7 @@
 home: true
 heroImage: /vue-chartjs.png
 actionText: 初めに →
-actionLink: /guide/
+actionLink: /ja/guide/
 features:
 - title: 簡単
   details: 初心者にもプロにも簡単に始められる 🙌

diff --git a/docs/pt-br/README.md b/docs/pt-br/README.md
@@ -8,7 +8,7 @@ features:
   details: Easy for both beginners and pros 🙌
 - title: Extendable
   details: Simple to use, easy to extend 💪
-- title: Powerfull
+- title: Powerful
   details: With the full power of chart.js 💯
 footer: MIT Licensed | Copyright © 2018-present Jakub Juszczak
 ---
diff --git a/docs/ru/README.md b/docs/ru/README.md
@@ -8,7 +8,7 @@ features:
   details: Easy for both beginners and pros 🙌
 - title: Extendable
   details: Simple to use, easy to extend 💪
-- title: Powerfull
+- title: Powerful
   details: With the full power of chart.js 💯
 footer: MIT Licensed | Copyright © 2018-present Jakub Juszczak
 ---
diff --git a/docs/zh-cn/README.md b/docs/zh-cn/README.md
@@ -8,7 +8,7 @@ features:
   details: Easy for both beginners and pros 🙌
 - title: Extendable
   details: Simple to use, easy to extend 💪
-- title: Powerfull
+- title: Powerful
   details: With the full power of chart.js 💯
 footer: MIT Licensed | Copyright © 2018-present Jakub Juszczak
 ---
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -1,4 +1,5 @@
 import { BaseChart } from './components'
+import { ReactiveDataMixin, ReactivePropMixin } from './mixins'
 
 declare module 'vue-chartjs' {
   export function generateChart(chartId: string, chartType: string): any;
@@ -12,8 +13,8 @@ declare module 'vue-chartjs' {
   export class Bubble extends BaseChart {}
   export class Scatter extends BaseChart {}
   export const mixins: {
-    reactiveData: any
-    reactiveProp: any
+    reactiveData: typeof ReactiveDataMixin
+    reactiveProp: typeof ReactivePropMixin
   }
 }
 
diff --git a/types/mixins.d.ts b/types/mixins.d.ts
@@ -0,0 +1,9 @@
+import Vue from 'vue'
+
+export declare class ReactiveDataMixin extends Vue {
+  chartData: any;
+}
+
+export declare class ReactivePropMixin extends Vue {
+  readonly chartData: any;
+}