@cocreate/selection 1.2.20 → 1.3.2

package/CHANGELOG.md

@@ -1,3 +1,36 @@
+## [1.3.2](https://github.com/CoCreate-app/CoCreate-selection/compare/v1.3.1...v1.3.2) (2021-12-15)
+
+
+### Bug Fixes
+
+* update dependencies ([4204d0b](https://github.com/CoCreate-app/CoCreate-selection/commit/4204d0b9d2848c11b832b556fd184bf1da1610d4))
+
+## [1.3.1](https://github.com/CoCreate-app/CoCreate-selection/compare/v1.3.0...v1.3.1) (2021-12-14)
+
+
+### Bug Fixes
+
+* update dependencies ([584a23c](https://github.com/CoCreate-app/CoCreate-selection/commit/584a23c2fafbc2410356f7ac5bff3f9149f5152f))
+
+# [1.3.0](https://github.com/CoCreate-app/CoCreate-selection/compare/v1.2.21...v1.3.0) (2021-12-14)
+
+
+### Bug Fixes
+
+* update dependencies ([4fa877a](https://github.com/CoCreate-app/CoCreate-selection/commit/4fa877ad1df7ec4a58f050a7132aa3f071ccfd5d))
+
+
+### Features
+
+* support nested contenteditable and selections for cursor positions ([8efc22d](https://github.com/CoCreate-app/CoCreate-selection/commit/8efc22d303ba88dbb6fdbf4d65cb2988afec73ca))
+
+## [1.2.21](https://github.com/CoCreate-app/CoCreate-selection/compare/v1.2.20...v1.2.21) (2021-12-08)
+
+
+### Bug Fixes
+
+* check parent for closest contenteditable, return range.element ([dbe5d32](https://github.com/CoCreate-app/CoCreate-selection/commit/dbe5d32fbfdb3912ddcbe005f24c315fc444f17b))
+
 ## [1.2.20](https://github.com/CoCreate-app/CoCreate-selection/compare/v1.2.19...v1.2.20) (2021-11-27)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/selection",
-  "version": "1.2.20",
+  "version": "1.3.2",
   "description": "A simple selection component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API.",
   "keywords": [
     "selection",
@@ -61,8 +61,8 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/docs": "^1.2.60",
-    "@cocreate/hosting": "^1.2.56",
-    "@cocreate/utils": "^1.3.16"
+    "@cocreate/docs": "^1.2.62",
+    "@cocreate/hosting": "^1.2.58",
+    "@cocreate/utils": "^1.4.0"
   }
 }

package/src/index.js

@@ -33,6 +33,10 @@ export function getSelection(element) {
 		if(range.startContainer != range.endContainer) {
             // toDo: replace common ancestor value
 		}
+        let contenteditable = range.startContainer.parentElement.closest('[contenteditable][collection][document_id][name]');
+        if (contenteditable){
+            element = contenteditable;
+        }
 		let domTextEditor = element;
 		if (!domTextEditor.htmlString){
 			domTextEditor = element.closest('[contenteditable]');
@@ -57,6 +61,8 @@ export function getSelection(element) {
 		    endContainer = range.endContainer.parentElement;
 
         let rangeObj = {
+            element: contenteditable,
+            // domTextEditor,
         	startOffset: range.startOffset, 
         	endOffset: range.endOffset, 
         	startContainer, 
@@ -283,9 +289,17 @@ function getInsertPosition(element){
 
 export function getStringPosition({string, target, position, attribute, property, value}) {
     try {
+        let element;
         let selector = cssPath(target, '[contenteditable]');
         let dom = domParser(string);
-        let element = dom.querySelector(selector);
+        if (!selector.includes('[eid=') && dom.tagName == "DOM-PARSER"){
+            let containerEl = document.createElement('div');
+            containerEl.appendChild(dom)
+            selector = `dom-parser > ${selector}`
+            element = containerEl.querySelector(selector);
+        }
+        else
+            element = dom.querySelector(selector);
         if (!element){
             console.log('element could not be found using selector:', selector);
             return;
@@ -418,7 +432,11 @@ function getElFromString(dom, string, element, position, isAttribute) {
 }
 
 function getPosition(string, subString, index) {
-  return string.split(subString, index).join(subString).length;
+    let angleArray = string.split(subString, index);
+    let startstring = angleArray.join(subString);
+    let start = startstring.length;
+    return start;
+    // return string.split(subString, index).join(subString).length;
 }
 
 export default {getSelection, setSelection, hasSelection, processSelection, getStringPosition, getElementPosition};