@livingdocs/editable.js 3.0.4 → 3.0.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@livingdocs/editable.js",
   "description": "Friendly contenteditable API",
-  "version": "3.0.4",
+  "version": "3.0.8",
   "dependencies": {
     "@babel/runtime": "^7.13.17",
     "bowser": "2.11.0",
@@ -9,21 +9,21 @@
     "rangy": "^1.3.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.13.16",
-    "@babel/core": "^7.13.16",
-    "@babel/plugin-transform-runtime": "^7.13.15",
-    "@babel/preset-env": "^7.13.15",
+    "@babel/cli": "^7.15.7",
+    "@babel/core": "^7.15.8",
+    "@babel/plugin-transform-runtime": "^7.15.8",
+    "@babel/preset-env": "^7.15.8",
     "@babel/preset-react": "^7.13.13",
     "@esm-bundle/chai": "^4.3.4-fix.0",
-    "babel-loader": "^8.2.2",
+    "babel-loader": "^8.2.3",
     "babel-plugin-add-module-exports": "^1.0.4",
-    "babel-plugin-istanbul": "^6.0.0",
-    "css-loader": "^5.2.4",
-    "eslint": "^7.24.0",
+    "babel-plugin-istanbul": "^6.1.1",
+    "css-loader": "^6.4.0",
+    "eslint": "^7.32.0",
     "eslint-plugin-react": "^7.23.2",
     "font-awesome": "^4.7.0",
     "gh-pages": "^3.1.0",
-    "karma": "^6.3.2",
+    "karma": "^6.3.6",
     "karma-chrome-launcher": "^3.1.0",
     "karma-coverage": "^2.0.3",
     "karma-firefox-launcher": "^2.1.0",
@@ -31,9 +31,9 @@
     "karma-safari-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.8",
     "karma-webpack": "^5.0.0",
-    "mocha": "^9.0.3",
+    "mocha": "^9.1.3",
     "normalize.css": "^8.0.1",
-    "prismjs": "^1.23.0",
+    "prismjs": "^1.25.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-transition-group": "^4.4.1",
@@ -41,9 +41,9 @@
     "sinon": "^10.0.0",
     "style-loader": "^2.0.0",
     "url-loader": "^4.1.1",
-    "webpack": "^5.35.0",
-    "webpack-cli": "^4.6.0",
-    "webpack-dev-server": "^4.0.0-beta.3"
+    "webpack": "^5.60.0",
+    "webpack-cli": "^4.9.1",
+    "webpack-dev-server": "^4.3.1"
   },
   "engines": {
     "node": ">=12"
@@ -74,8 +74,7 @@
     "test:all": "npm run test:karma -s -- --browsers Chrome,Firefox,Safari",
     "test:karma": "karma start",
     "test:watch": "npm run test:karma -s -- --single-run false",
-    "lint": "eslint --ignore-path .gitignore .",
-    "postversion": "/release/node_modules/.bin/set-ci"
+    "lint": "eslint --ignore-path .gitignore ."
   },
   "release": {
     "extends": "@livingdocs/semantic-release-presets/npm-github-verify"
@@ -84,11 +83,11 @@
     "isCi": true,
     "name": "Drone",
     "service": "drone",
-    "commit": "ad5e43330e0f2b32687c86346775766167593cb5",
-    "build": "351",
+    "commit": "e4c7383e5620ccbb13b71e155a8f26d5f245b64d",
+    "build": "398",
     "branch": "master",
     "isPr": false,
     "slug": "livingdocsIO/editable.js",
-    "date": "2021-09-09T12:40:33.657Z"
+    "date": "2021-12-15T14:59:21.802Z"
   }
 }

package/src/content.js

@@ -29,6 +29,12 @@ export function tidyHtml (element) {
 export function normalizeTags (element) {
   const fragment = document.createDocumentFragment()
 
+  // Remove line breaks at the beginning of a content block
+  removeWhitespaces(element, 'firstChild')
+
+  // Remove line breaks at the end of a content block
+  removeWhitespaces(element, 'lastChild')
+
   for (const node of element.childNodes) {
     // skip empty tags, so they'll get removed
     if (node.nodeName !== 'BR' && !node.textContent) continue
@@ -136,7 +142,7 @@ export function cloneRangeContents (range) {
   return fragment
 }
 
-function removeWhitespaces (node, type) {
+function removeWhitespaces (node, type, firstCall = true) {
   let elem
   while ((elem = node[type])) {
     if (elem.nodeType === nodeType.textNode) {
@@ -145,10 +151,17 @@ function removeWhitespaces (node, type) {
     } else if (elem.nodeName === 'BR') {
       elem.remove()
     } else {
-      if (elem[type]) removeWhitespaces(elem, type)
+      if (elem[type]) removeWhitespaces(elem, type, false)
       break
     }
   }
+
+  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'
+  elem.textContent = elem.textContent.replace(type.startsWith('last') ? /\s+$/ : /^\s+/, '')
 }
 
 // Remove elements that were inserted for internal or user interface purposes

package/src/cursor.js

@@ -96,7 +96,7 @@ export default class Cursor {
     hostRange.collapse(false)
     const hostCoords = getRangeBoundingClientRect(hostRange, this.win)
     const cursorCoords = getRangeBoundingClientRect(this.range.nativeRange, this.win)
-    return hostCoords.bottom === cursorCoords.bottom
+    return isCloseTo(hostCoords.bottom, cursorCoords.bottom)
   }
 
   isAtFirstLine () {
@@ -105,7 +105,7 @@ export default class Cursor {
     hostRange.collapse(true)
     const hostCoords = getRangeBoundingClientRect(hostRange, this.win)
     const cursorCoords = getRangeBoundingClientRect(this.range.nativeRange, this.win)
-    return hostCoords.top === cursorCoords.top
+    return isCloseTo(hostCoords.top, cursorCoords.top)
   }
 
   isAtBeginning () {
@@ -368,3 +368,9 @@ function getRangeBoundingClientRect (range, win) {
   el.remove()
   return coords
 }
+
+function isCloseTo (a, b) {
+  if (a === b) return true
+  if (Math.abs(a - b) <= 2) return true
+  return false
+}

package/src/plugins/highlighting/text-highlighting.js

@@ -9,8 +9,8 @@ export default class WordHighlighting {
 
   isElement (obj) {
     try {
-      // Using W3 DOM2 (works for FF, Opera and Chrome)
-      return obj instanceof HTMLElement
+      if (!obj) return false
+      return obj instanceof obj.ownerDocument?.defaultView.HTMLElement
     } catch (e) {
       // Browsers not supporting W3 DOM2 don't have HTMLElement and
       // an exception is thrown and we end up here. Testing some

package/src/selection.js

@@ -78,7 +78,15 @@ export default class Selection extends Cursor {
   link (href, attrs = {}) {
     if (href) attrs.href = href
     const link = this.createElement(config.linkMarkup.name, config.linkMarkup.attribs)
-    for (const key in attrs) link.setAttribute(key, attrs[key])
+    for (const key in attrs) {
+      const value = attrs[key]
+      if (value === undefined) continue
+      if (value === null) {
+        link.removeAttribute(key)
+      } else {
+        link.setAttribute(key, value)
+      }
+    }
     this.forceWrap(link)
   }