@cocreate/selection 1.2.12 → 1.2.16

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [1.2.16](https://github.com/CoCreate-app/CoCreate-selection/compare/v1.2.15...v1.2.16) (2021-11-26)
+
+
+### Bug Fixes
+
+* update dependencies ([754df39](https://github.com/CoCreate-app/CoCreate-selection/commit/754df39e8831d33c4cdaaea4e1ff804a687faabf))
+
+## [1.2.15](https://github.com/CoCreate-app/CoCreate-selection/compare/v1.2.14...v1.2.15) (2021-11-24)
+
+
+### Bug Fixes
+
+* processSelection when at position 0 ([2143e31](https://github.com/CoCreate-app/CoCreate-selection/commit/2143e313e1dcf744980df298790f13442e5715bd))
+
+## [1.2.14](https://github.com/CoCreate-app/CoCreate-selection/compare/v1.2.13...v1.2.14) (2021-11-23)
+
+
+### Bug Fixes
+
+* update dependencies ([8fd30ea](https://github.com/CoCreate-app/CoCreate-selection/commit/8fd30ea76af01c89e46f7c4e3f97ba0f4101f7e1))
+
+## [1.2.13](https://github.com/CoCreate-app/CoCreate-selection/compare/v1.2.12...v1.2.13) (2021-11-23)
+
+
+### Bug Fixes
+
+* if node begins with a textNode ([0be3739](https://github.com/CoCreate-app/CoCreate-selection/commit/0be373961d2da5c79b9abc2311133621a163c350))
+
 ## [1.2.12](https://github.com/CoCreate-app/CoCreate-selection/compare/v1.2.11...v1.2.12) (2021-11-20)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/selection",
-  "version": "1.2.12",
+  "version": "1.2.16",
   "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.53",
-    "@cocreate/hosting": "^1.2.48",
-    "@cocreate/utils": "^1.3.10"
+    "@cocreate/docs": "^1.2.56",
+    "@cocreate/hosting": "^1.2.52",
+    "@cocreate/utils": "^1.3.12"
   }
 }

package/src/index.js

@@ -20,7 +20,7 @@ export function getSelection(element) {
         let start = range.startOffset;
         let end = range.endOffset;
         let previousSibling = range.startContainer.previousSibling;
-		if(previousSibling && previousSibling.nodeType == 3) {
+		if(element.innerHTML && previousSibling && previousSibling.nodeType == 3) {
 			let length = 0;
 			do {
 				length += previousSibling.length;
@@ -29,6 +29,7 @@ export function getSelection(element) {
 			start += length;
 			end += length;
 		}
+		
 		if(range.startContainer != range.endContainer) {
             // toDo: replace common ancestor value
 		}
@@ -37,7 +38,7 @@ export function getSelection(element) {
 			domTextEditor = element.closest('[contenteditable]');
 		}
 		let elementStart = start, elementEnd = end;
-		if (domTextEditor){
+		if (domTextEditor && domTextEditor.htmlString){
             let nodePos = getStringPosition({ string: domTextEditor.htmlString, target: range.startContainer.parentElement, position: 'afterbegin'});
             if (nodePos){
                 elementStart = nodePos.start;
@@ -46,11 +47,20 @@ export function getSelection(element) {
                 end = end + nodePos.end;
             }
 		}
+		
+		let startContainer = range.startContainer;
+		if (startContainer.nodeType == 3)
+		    startContainer = range.startContainer.parentElement;
+		
+		let endContainer = range.endContainer;
+		if (endContainer.nodeType == 3)
+		    endContainer = range.endContainer.parentElement;
+
         let rangeObj = {
         	startOffset: range.startOffset, 
         	endOffset: range.endOffset, 
-        	startContainer: range.startContainer.parentElement, 
-        	endContainer: range.endContainer.parentElement,
+        	startContainer, 
+        	endContainer,
         	elementStart,
         	elementEnd
         };
@@ -85,8 +95,9 @@ export function processSelection(element, value = "", prev_start, prev_end, star
     	}
     	else if (prevStart < prev_start){
     	    let length = prev_start - prevStart;
-    	    if(Math.sign(length) === 1 && range.startOffset >= length)
-    	        range.startOffset += length;
+    	    if(Math.sign(length) === 1)
+    	        if (range.startOffset == 0 || range.startOffset >= length)
+    	            range.startOffset += length;
     	}    
     	if (prevEnd > prev_end){
     	    let length = prevEnd - prev_end;
@@ -95,8 +106,9 @@ export function processSelection(element, value = "", prev_start, prev_end, star
     	}
     	else if (prevEnd < prev_end){
     	    let length = prev_end - prevEnd;
-    	    if(Math.sign(length) === 1 && range.endOffset >= length)
-    	        range.endOffset += length;
+    	    if(Math.sign(length) === 1)
+    	        if (range.endOffset == 0 || range.endOffset >= length)
+    	            range.endOffset += length;
     	}
 	}  
 	    
@@ -177,6 +189,9 @@ export function getElementPosition(str, start, end) {
             findEl.remove();
         }
     }
+    else if (angleStart == -1) {
+        type = 'textNode';
+    }
     else {
         let node = str.slice(angleStart, startString.length + endStringAngleEnd + 1);
         if (node.startsWith("</")) {