Merge branch 'master' into dev

Author: hawkeye64

README.md

@@ -102,7 +102,6 @@ and finally:
 | Vue Event | Description |
 |---|---|
 | data | If the `toc` proerty is set to `true`, this event will occur containing any TOC data, if there is any. This is an array of flat data |
-| tree | If the `toc` proerty is set to `true`, this event will occur containing any TOC data, if there is any. This is an array of hierarchial data |
 
 Given markdown that looks like this:
 ```
@@ -114,13 +113,28 @@ Given markdown that looks like this:
 The TOC data looks like this:
 ```
 [
-  {id: 'h2-Heading', title: 'h2 Heading', level: 2},
-  {id: 'h3-Heading', title: 'h3 Heading', level: 3}
+  {id: 'h2-Heading', title: 'h2 Heading', level: 2, children: []},
+  {id: 'h3-Heading', title: 'h3 Heading', level: 3, children: []}
 ]
 ```
 
+# QMarkdown Vue Methods
+| Vue Method | Description |
+|---|---|
+| makeTree | Pass into this function the results from the @data to have the data array transformed into a hieracrhial tree. |
+
+The TOC data will be transformed to the following:
+```
+[
+  {id: 'h2-Heading', title: 'h2 Heading', level: 2, children: [
+    {id: 'h3-Heading', title: 'h3 Heading', level: 3, children: []}
+  ]}
+  
+]
+```
 
 # QMarkdown Vue Slots
-| Vue Property | Description |
+| Vue Slot | Description |
 |---|---|
 | default | The default slot - this slot overrides anything that may be passed in via the `src` property. |
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quasar/quasar-app-extension-qmarkdown",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "description": "A Quasar UI App Extension to display inline markdown",
   "author": "Hawkeye64 <[email protected]>",
   "main": "src/index.js",

src/component/QMarkdown.js

@@ -223,7 +223,7 @@ export default Vue.extend({
       return val === void 0 || val === false
     },
 
-    __buildTocTree (list) {
+    makeTree (list) {
       let tree = []
       let root = null
 
@@ -331,8 +331,6 @@ export default Vue.extend({
 
     if (this.toc && tocData.length > 0) {
       this.$emit('data', tocData)
-      let tocTree = this.__buildTocTree(tocData)
-      this.$emit('tree', tocTree)
     }
 
     return h('div', {

src/component/markdown.styl

@@ -160,8 +160,8 @@
     .q-markdown--link
       color darken($grey-6, 35%)
 
-    > p
-      margin-bottom 0
+    // > p
+    //   margin-bottom 0
 
     // TODO: ???
     &--
@@ -216,7 +216,8 @@
       margin-left -4px
       margin-right -4px
       padding 0 4px
-      // border-bottom 1px solid lighten($grey-8, .10)
+      margin-bottom 4px
+      border-bottom: 2px solid rgba(0,0,0,0.3)
 
   &--table
     width fit-content