Merge branch 'two-way-binding' into new

dist/vue-highlights.common.js

@@ -1751,16 +1751,21 @@ function src_autoLink (text, options) {
   },
   data () {
     return {
-      focused: false,
+      focused: false
-      body: ''
     }
   },
   computed: {
+    valueModel: {
+      get () { return this.value },
+      set (value) {
+        this.$emit('input', value)
+      }
+    },
     showPlaceholder () {
-      return !this.body.replace(/^\s*\n/gm, '').length
+      return !this.valueModel.replace(/^\s*\n/gm, '').length
     },
     computedBody () {
-      return highlight(this.body, {
+      return highlight(this.valueModel, {
         extractUrlsWithoutProtocol: this.extractUrlsWithoutProtocol,
         mentionsWithDots: this.mentionsWithDots
       })
@@ -1789,7 +1794,7 @@ function src_autoLink (text, options) {
     },
     clear () {
       this.$refs.mbody.innerText = ''
-      this.body = ''
+      this.valueModel = ''
     },
     onKeyUp (e) {
       const keysToIgnore = ['Shift', 'Meta', 'Control', 'Alt', 'ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight']
@@ -1799,8 +1804,7 @@ function src_autoLink (text, options) {
       if (e.key === 'Enter') {
         caretPosition++
       }
-      this.body = e.target.innerText
+      this.valueModel = e.target.innerText
-      this.$emit('input', this.body)
       this.$nextTick(() => {
         this.setCaretPos(caretPosition)
       })

dist/vue-highlights.umd.js

@@ -1760,16 +1760,21 @@ function src_autoLink (text, options) {
   },
   data () {
     return {
-      focused: false,
+      focused: false
-      body: ''
     }
   },
   computed: {
+    valueModel: {
+      get () { return this.value },
+      set (value) {
+        this.$emit('input', value)
+      }
+    },
     showPlaceholder () {
-      return !this.body.replace(/^\s*\n/gm, '').length
+      return !this.valueModel.replace(/^\s*\n/gm, '').length
     },
     computedBody () {
-      return highlight(this.body, {
+      return highlight(this.valueModel, {
         extractUrlsWithoutProtocol: this.extractUrlsWithoutProtocol,
         mentionsWithDots: this.mentionsWithDots
       })
@@ -1798,7 +1803,7 @@ function src_autoLink (text, options) {
     },
     clear () {
       this.$refs.mbody.innerText = ''
-      this.body = ''
+      this.valueModel = ''
     },
     onKeyUp (e) {
       const keysToIgnore = ['Shift', 'Meta', 'Control', 'Alt', 'ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight']
@@ -1808,8 +1813,7 @@ function src_autoLink (text, options) {
       if (e.key === 'Enter') {
         caretPosition++
       }
-      this.body = e.target.innerText
+      this.valueModel = e.target.innerText
-      this.$emit('input', this.body)
       this.$nextTick(() => {
         this.setCaretPos(caretPosition)
       })

src/index.js

@@ -31,16 +31,21 @@ export default {
   },
   data () {
     return {
-      focused: false,
+      focused: false
-      body: ''
     }
   },
   computed: {
+    valueModel: {
+      get () { return this.value },
+      set (value) {
+        this.$emit('input', value)
+      }
+    },
     showPlaceholder () {
-      return !this.body.replace(/^\s*\n/gm, '').length
+      return !this.valueModel.replace(/^\s*\n/gm, '').length
     },
     computedBody () {
-      return highlight(this.body, {
+      return highlight(this.valueModel, {
         extractUrlsWithoutProtocol: this.extractUrlsWithoutProtocol,
         mentionsWithDots: this.mentionsWithDots
       })
@@ -69,7 +74,7 @@ export default {
     },
     clear () {
       this.$refs.mbody.innerText = ''
-      this.body = ''
+      this.valueModel = ''
     },
     onKeyUp (e) {
       const keysToIgnore = ['Shift', 'Meta', 'Control', 'Alt', 'ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight']
@@ -79,8 +84,7 @@ export default {
       if (e.key === 'Enter') {
         caretPosition++
       }
-      this.body = e.target.innerText
+      this.valueModel = e.target.innerText
-      this.$emit('input', this.body)
       this.$nextTick(() => {
         this.setCaretPos(caretPosition)
       })