+ ISSUE-46 Code blocks and block italic-bold issue.

Author: cloverhearts

.npmignore

@@ -0,0 +1,4 @@
+docs
+.cache
+.github
+tests

dist/quilljs-markdown.js

@@ -1,8 +1,16 @@
 import Quill from 'quill'
 import QuillMarkdown from '../src/app'
 
+const toolbarOptions = [
+  ['bold', 'italic', 'underline', 'strike'],
+  [ 'link', 'image'],          // add's image support
+];
+
 const options = {
-  theme: 'snow'
+  theme: 'snow',
+  modules: {
+    toolbar: toolbarOptions
+  }
 }
 
 document.addEventListener('DOMContentLoaded', () => {

dist/quilljs-markdown.js.map

@@ -12,7 +12,7 @@
   <meta name="google-site-verification" content="lNpyIBBVvsIatDauJyTfU6q2VtxEMP8npAGigr3gj4Q" />
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/quill.min.js"></script>
   <script src="./bundle/demojs.js"></script>
-<!--  <script src="./demo.js"></script>-->
+ <!-- <script src="./demo.js"></script> -->
   <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/quill.snow.css" rel="stylesheet">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/kotton-style.min.css">
   <link rel="stylesheet" href="../quilljs-markdown-common-style.scss" />

docs/bundle/demojs.js

@@ -37,7 +37,6 @@ class MarkdownActivity {
     }
 
     if (!inputText) return
-
     if (inputText.length > 1) {
       setTimeout(async () => {
         const cursorOffsetFixed = cursorOffset
@@ -51,7 +50,7 @@ class MarkdownActivity {
           }
           const firstIndex = this.quillJS.getIndex(line)
           let _targetText = ''
-          let result = await this.onFullTextExecute.bind(this)({ index: firstIndex, length: 0 })
+          let result = await this.onFullTextExecute.bind(this)({ index: firstIndex, delta, length: 0 })
 
           if (result) {
             while (result) {
@@ -63,7 +62,7 @@ class MarkdownActivity {
               }
 
               _targetText = line.domNode.textContent || ''
-              result = await this.onFullTextExecute.bind(this)({ index: firstIndex, length: 0 })
+              result = await this.onFullTextExecute.bind(this)({ index: firstIndex, delta, length: 0 })
             }
           } else {
             _targetText = line.domNode.textContent || ''
@@ -115,14 +114,25 @@ class MarkdownActivity {
 
   async onFullTextExecute (virtualSelection) {
     let selection = virtualSelection || this.quillJS.getSelection()
+    const delta = virtualSelection.delta
     if (!selection) return false
     const [line, offset] = this.quillJS.getLine(selection.index)
 
     if (!line || offset < 0) return false
+    const retain = (delta && delta.ops && delta.ops[0].retain) || 0
     const lineStart = selection.index - offset
-    const format = this.quillJS.getFormat(lineStart)
+    const formatLineStart = retain ? retain - 1 : lineStart
+    const format = this.quillJS.getFormat(formatLineStart)
     if (format['code-block'] || format['code']) {
       // if exists text in code-block, to skip.
+
+      if (format['code']) {
+        // ignore all styles when copied text in code block.
+        const copiedTexts = delta.ops.filter(d => d.insert).map(d => d.insert).join('')
+        this.quillJS.deleteText(retain, copiedTexts.length)
+        this.quillJS.insertText(retain, copiedTexts.replace(/\n/g, ''), { code: true })
+        this.quillJS.format('code', false)
+      }
       return false
     }
     const beforeNode = this.quillJS.getLine(lineStart - 1)[0]

docs/bundle/demojs.js.map

@@ -18,7 +18,6 @@ class Bold extends AbstractTag {
       pattern: this.pattern,
       action: (text, selection, pattern, lineStart) => new Promise((resolve) => {
         let match = pattern.exec(text)
-
         const [annotatedText, , matchedText] = match
         const startIndex = lineStart + match.index
         if (text.match(/^([*_ \n]+)$/g) || !this.activeTags.length) {

docs/demo.js

@@ -6,7 +6,7 @@ class Bold extends AbstractTag {
     super()
     this.quillJS = quillJS
     this.name = 'italic'
-    this.pattern = this._getCustomPatternOrDefault(options, this.name, /(\*|_){1}(.+?)(?:\1){1}/g)
+    this.pattern = this._getCustomPatternOrDefault(options, this.name, /(?:^|(?<=\s))(?:(\*|_)\s*(?<text1>[^*_]+)\s*?\1|(\*|_){3}\s*(?<text3>[^*_]*)\s*\1{3})(?:$|(?=\s))/g)
     this.getAction.bind(this)
     this._meta = meta()
     this.activeTags = this._getActiveTagsWithoutIgnore(this._meta.applyHtmlTags, options.ignoreTags)
@@ -18,7 +18,6 @@ class Bold extends AbstractTag {
       pattern: this.pattern,
       action: (text, selection, pattern, lineStart) => new Promise((resolve) => {
         let match = pattern.exec(text)
-
         if (!match || !this.activeTags.length) {
           resolve(false)
           return