@livingdocs/editable.js 5.0.6 → 5.0.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@livingdocs/editable.js",
   "description": "Friendly contenteditable API",
-  "version": "5.0.6",
+  "version": "5.0.7",
   "dependencies": {
     "@babel/runtime": "^7.16.7",
     "lodash-es": "^4.17.21"
@@ -39,7 +39,7 @@
     "url-loader": "^4.1.1",
     "webpack": "^5.68.0",
     "webpack-cli": "^5.0.0",
-    "webpack-dev-server": "^4.7.3"
+    "webpack-dev-server": "^5.0.0"
   },
   "engines": {
     "node": ">=16",
@@ -80,11 +80,11 @@
     "isCi": true,
     "name": "Drone",
     "service": "drone",
-    "commit": "0c9f2822e9727cc03b715b7574cdf076bead4400",
-    "build": "1438",
+    "commit": "c234c7ebb846f50a490747cca6d97093e4447d58",
+    "build": "1475",
     "branch": "master",
     "isPr": false,
     "slug": "livingdocsIO/editable.js",
-    "date": "2024-01-31T09:15:54.845Z"
+    "date": "2024-02-28T13:53:13.641Z"
   }
 }

package/src/content.js

@@ -15,6 +15,10 @@ const zeroWidthSpace = /\u200B/g
 const zeroWidthNonBreakingSpace = /\uFEFF/g
 const whitespaceExceptSpace = /[^\S ]/g
 
+const everythingWhitespace = /^\s+$/
+const leadingWhitespace = /^\s+/
+const trailingWhitespace = /\s+$/
+
 // Clean up the Html.
 export function tidyHtml (element) {
   // if (element.normalize) element.normalize()
@@ -143,25 +147,34 @@ export function cloneRangeContents (range) {
 
 function removeWhitespaces (node, type, firstCall = true) {
   let elem
+  // loop through all children:
+  // from left to right if type = 'firstChild',
+  // from right to left if type = 'lastChild'
   while ((elem = node[type])) {
     if (elem.nodeType === nodeType.textNode) {
-      if (/^\s+$/.test(elem.textContent)) node.removeChild(elem)
+      // Just remove text nodes if they consist only of whitespace
+      if (everythingWhitespace.test(elem.textContent)) node.removeChild(elem)
       else break
     } else if (elem.nodeName === 'BR') {
       elem.remove()
     } else {
+      // For element nodes (e.g. <strong> tags), we repeat the logic recursively
+      // to remove empty text nodes or <br> tags.
       if (elem[type]) removeWhitespaces(elem, type, false)
       break
     }
   }
 
+  // Text nodes with leading/trailing whitespace can be trimmed if config allows.
+  // We only do it to the outermost text node. Once a text was wrapped in
+  // another element, we preserve the whitespace.
   if (!firstCall) return
   elem = node[type]
   if (elem?.nodeType !== nodeType.textNode) return
   // Remove whitespaces at the end or start of a block with content
   //   e.g. '  Hello world' > 'Hello World'
   if (config.trimLeadingAndTrailingWhitespaces) {
-    elem.textContent = elem.textContent.replace(type.startsWith('last') ? / +$/ : /^ +/, '')
+    elem.textContent = elem.textContent.replace(type.startsWith('last') ? trailingWhitespace : leadingWhitespace, '')
   }
 }