feat: move most smartQuote logic from dispatcher to smartQuotes

Author: eileenoo

src/dispatcher.js

@@ -6,7 +6,7 @@ import config from './config.js'
 import Keyboard from './keyboard.js'
 import {closest} from './util/dom.js'
 import {replaceLast, endsWithSingleSpace} from './util/string.js'
-import {shouldApplySmartQuotes, isQuote, isOpeningQuote, isClosingQuote} from './smartQuotes.js'
+import {applySmartQuotes, shouldApplySmartQuotes} from './smartQuotes.js'
 
 /**
  * The Dispatcher module is responsible for dealing with events and their handlers.
@@ -147,36 +147,14 @@ export default class Dispatcher {
         if (!block) return
 
         const target = evt.target
-        const currentChar = evt.data
-
-
-        if (target.isContentEditable && shouldApplySmartQuotes(config)) {
-          if (isQuote(currentChar)) {
-            const selection = this.selectionWatcher.getFreshSelection()
-            const wholeText = selection.range.startContainer.wholeText
-            // const firstPart = selection.range.startContainer.textContent
-            const offset = selection.range.startOffset
-            if (isClosingQuote([...wholeText], offset - 2)) {
-              const textArr = [...target.innerText]
-              const index = offset - 1
-              if (index >= 0 && index < textArr.length) {
-                textArr[index] = '»'
-                target.innerText = textArr.join('')
-              }
-              this.editable.createCursorAtCharacterOffset({element: block, offset})
-            }
-
-            if (isOpeningQuote([...wholeText], offset - 2)) {
-              const textArr = [...target.innerText]
-              const index = offset - 1
-              if (index >= 0 && index < textArr.length) {
-                textArr[index] = '«'
-                target.innerText = textArr.join('')
-              }
-              this.editable.createCursorAtCharacterOffset({element: block, offset})
-            }
-          }
 
+        if (shouldApplySmartQuotes(config, target)) {
+          const currentChar = evt.data
+          const selection = this.selectionWatcher.getFreshSelection()
+          const offset = selection.range.startOffset
+          const wholeText = [...target.innerText]
+          const resetCursor = () => this.editable.createCursorAtCharacterOffset({element: block, offset})
+          applySmartQuotes(config, currentChar, wholeText, offset, target, resetCursor)
         }
         this.notify('change', block)
       })

src/smartQuotes.js

@@ -1,15 +1,43 @@
 const isValidQuotePairConfig = (quotePair) => Array.isArray(quotePair) && quotePair.length === 2
 
-export const shouldApplySmartQuotes = (config) => {
+export const shouldApplySmartQuotes = (config, target) => {
   const {smartQuotes, quotes, singleQuotes} = config
-  return !!smartQuotes && isValidQuotePairConfig(quotes) && isValidQuotePairConfig(singleQuotes)
+  return !!smartQuotes && isValidQuotePairConfig(quotes) && isValidQuotePairConfig(singleQuotes) && target.isContentEditable
 }
 
-export const isQuote = (char) => /^[‘’‹›‚'«»"“”„]$/.test(char)
-export const isDoubleQuote = (char) => /^[«»"“”„]$/.test(char)
-export const isSingleQuote = (char) => /^[‘’‹›‚']$/.test(char)
+// export const isQuote = (char) => /^[‘’‹›‚'«»"“”„]$/.test(char)
+const isDoubleQuote = (char) => /^[«»"“”„]$/.test(char)
+const isSingleQuote = (char) => /^[‘’‹›‚']$/.test(char)
 
 // Test: '>', ' ', no space & all kinds of dashes dash
-export const isOpeningQuote = (text, indexCharBefore) => indexCharBefore < 0 || /\s|[>\-–—]/.test(text[indexCharBefore])
+const isOpeningQuote = (text, indexCharBefore) => indexCharBefore < 0 || /\s|[>\-–—]/.test(text[indexCharBefore])
+const isClosingQuote = (text, indexCharBefore) => text[indexCharBefore] !== ' '
 
-export const isClosingQuote = (text, indexCharBefore) => text[indexCharBefore] !== ' '
+const applySmartQuote = (textArr, index, target, quoteType) => {
+  if (index >= 0 && index < textArr.length) {
+    textArr[index] = quoteType
+    target.innerText = textArr.join('')
+  }
+}
+
+export const applySmartQuotes = (config, char, wholeText, offset, target, resetCursor) => {
+  const isCharSingleQuote = isSingleQuote(char)
+  const isCharDoubleQuote = isDoubleQuote(char)
+
+  if (!isCharDoubleQuote && !isCharSingleQuote) {
+    return
+  }
+
+  const {quotes, singleQuotes} = config
+  if (isClosingQuote(wholeText, offset - 2)) {
+    const closingQuote = isCharSingleQuote ? singleQuotes[1] : quotes[1]
+    applySmartQuote(wholeText, offset - 1, target, closingQuote)
+  }
+
+  if (isOpeningQuote(wholeText, offset - 2)) {
+    const openingQuote = isCharSingleQuote ? singleQuotes[0] : quotes[0]
+    applySmartQuote(wholeText, offset - 1, target, openingQuote)
+  }
+
+  resetCursor()
+}