@livingdocs/editable.js 3.0.14 → 3.1.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@livingdocs/editable.js",
   "description": "Friendly contenteditable API",
-  "version": "3.0.14",
+  "version": "3.1.0",
   "dependencies": {
     "@babel/runtime": "^7.16.7",
     "bowser": "2.11.0",
@@ -83,11 +83,11 @@
     "isCi": true,
     "name": "Drone",
     "service": "drone",
-    "commit": "7118df530cd823cb0da198a546b99cd16192739a",
-    "build": "440",
+    "commit": "2e7b8ed5efd8fb418a159ded67be45ddf9941999",
+    "build": "482",
     "branch": "master",
     "isPr": false,
     "slug": "livingdocsIO/editable.js",
-    "date": "2022-02-03T20:50:51.262Z"
+    "date": "2022-03-22T20:40:52.111Z"
   }
 }

package/src/config.js

@@ -10,6 +10,7 @@ export default {
   editableClass: 'js-editable',
   editableDisabledClass: 'js-editable-disabled',
   pastingAttribute: 'data-editable-is-pasting',
+  trimLeadingAndTrailingWhitespaces: true,
   boldMarkup: {
     type: 'tag',
     name: 'strong',

package/src/content.js

@@ -4,6 +4,7 @@ import * as rangeSaveRestore from './range-save-restore'
 import * as parser from './parser'
 import * as string from './util/string'
 import {createElement} from './util/dom'
+import config from './config'
 
 function restoreRange (host, range, func) {
   range = rangeSaveRestore.save(range)
@@ -161,7 +162,9 @@ function removeWhitespaces (node, type, firstCall = true) {
   if (elem?.nodeType !== nodeType.textNode) return
   // Remove whitespaces at the end or start of a block with content
   //   e.g. '  Hello world' > 'Hello World'
-  elem.textContent = elem.textContent.replace(type.startsWith('last') ? /\s+$/ : /^\s+/, '')
+  if (config.trimLeadingAndTrailingWhitespaces) {
+    elem.textContent = elem.textContent.replace(type.startsWith('last') ? / +$/ : /^ +/, '')
+  }
 }
 
 // Remove elements that were inserted for internal or user interface purposes

package/src/dispatcher.js

@@ -5,6 +5,7 @@ import SelectionWatcher from './selection-watcher'
 import config from './config'
 import Keyboard from './keyboard'
 import {closest} from './util/dom'
+import {replaceLast, endsWithSingleSpace} from './util/string'
 
 // This will be set to true once we detect the input event is working.
 // Input event description on MDN:
@@ -134,7 +135,12 @@ export default class Dispatcher {
 
         const {blocks, cursor} = clipboard.paste(block, selection, clipboardContent)
         if (blocks.length) {
-          this.notify('paste', block, blocks, cursor)
+          if (endsWithSingleSpace(evt.target.innerText)) {
+            block.innerHTML = replaceLast(block.innerHTML, ' ', ' ')
+            this.notify('paste', block, blocks, this.editable.createCursorAtEnd(block))
+          } else {
+            this.notify('paste', block, blocks, cursor)
+          }
 
           // The input event does not fire when we process the content manually
           // and insert it via script

package/src/highlight-text.js

@@ -134,7 +134,7 @@ export default {
 // This has two notable behaviours:
 // - It uses a NodeIterator which will skip elements
 //   with data-editable="remove"
-// - It returns a space for <br> elements
+// - It returns a \n for <br> elements
 //   (The only block level element allowed inside of editables)
 function getText (element, callback) {
   const iterator = new NodeIterator(element)
@@ -143,7 +143,7 @@ function getText (element, callback) {
     if (next.nodeType === nodeType.textNode && next.data !== '') {
       callback(next.data)
     } else if (next.nodeType === nodeType.elementNode && next.nodeName === 'BR') {
-      callback(' ')
+      callback('\n')
     }
   }
 }

package/src/selection.js

@@ -94,10 +94,10 @@ export default class Selection extends Cursor {
 
   // trims whitespaces on the left and right of a selection, i.e. what you want in case of links
   trimRange () {
-    const textToLink = this.range.toString()
-    const whitespacesOnTheLeft = textToLink.search(/\S|$/)
-    const lastNonWhitespace = textToLink.search(/\S[\s]+$/)
-    const whitespacesOnTheRight = lastNonWhitespace === -1 ? 0 : textToLink.length - (lastNonWhitespace + 1)
+    const textToTrim = this.range.toString()
+    const whitespacesOnTheLeft = textToTrim.search(/\S|$/)
+    const lastNonWhitespace = textToTrim.search(/\S[\s]+$/)
+    const whitespacesOnTheRight = lastNonWhitespace === -1 ? 0 : textToTrim.length - (lastNonWhitespace + 1)
     this.range.setStart(this.range.startContainer, this.range.startOffset + whitespacesOnTheLeft)
     this.range.setEnd(this.range.endContainer, this.range.endOffset - whitespacesOnTheRight)
   }

package/src/util/string.js

@@ -61,3 +61,21 @@ export function browserEscapeHtml (str) {
   div.appendChild(document.createTextNode(str))
   return div.innerHTML
 }
+
+export function replaceLast (text, searchValue, replaceValue) {
+  if (!text) return ''
+  text = `${text}`
+  if (!searchValue || replaceValue == null) return text
+  const lastOccurrenceIndex = text.lastIndexOf(searchValue)
+  return `${
+    text.slice(0, lastOccurrenceIndex)
+  }${
+    replaceValue
+  }${
+    text.slice(lastOccurrenceIndex + searchValue.length)
+  }`
+}
+
+export function endsWithSingleSpace (text) {
+  return /\S+\s{1}$/.test(text)
+}