@cocreate/text 1.12.22 → 1.12.26

package/CHANGELOG.md

@@ -1,3 +1,32 @@
+## [1.12.26](https://github.com/CoCreate-app/CoCreate-text/compare/v1.12.25...v1.12.26) (2021-11-24)
+
+
+### Bug Fixes
+
+* improved on logical conditons on when to processSelection ([53f8ad4](https://github.com/CoCreate-app/CoCreate-text/commit/53f8ad4e075c77b89ade24e56b6512431ac17b35))
+
+## [1.12.25](https://github.com/CoCreate-app/CoCreate-text/compare/v1.12.24...v1.12.25) (2021-11-23)
+
+
+### Bug Fixes
+
+* update dependencies ([c0f3d30](https://github.com/CoCreate-app/CoCreate-text/commit/c0f3d3033a4806b82f16555ed3dc02cc059ed4fa))
+
+## [1.12.24](https://github.com/CoCreate-app/CoCreate-text/compare/v1.12.23...v1.12.24) (2021-11-23)
+
+
+### Bug Fixes
+
+* update crud dependency ([19e931d](https://github.com/CoCreate-app/CoCreate-text/commit/19e931dc1234a5209412ca2bcccaf246d154f557))
+* update selction and crdt dependencies ([a7dc2ca](https://github.com/CoCreate-app/CoCreate-text/commit/a7dc2ca004eb945e51b93d8a20f8095cc8d9b1b3))
+
+## [1.12.23](https://github.com/CoCreate-app/CoCreate-text/compare/v1.12.22...v1.12.23) (2021-11-23)
+
+
+### Bug Fixes
+
+* handleing textNode and activeElement for curCaret ([a73b1d9](https://github.com/CoCreate-app/CoCreate-text/commit/a73b1d9ad0b32819779b9aaaebec13176e5cab1c))
+
 ## [1.12.22](https://github.com/CoCreate-app/CoCreate-text/compare/v1.12.21...v1.12.22) (2021-11-22)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/text",
-  "version": "1.12.22",
+  "version": "1.12.26",
   "description": "A simple text component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "text",
@@ -61,13 +61,13 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/action": "^1.3.15",
-    "@cocreate/crdt": "^1.8.17",
-    "@cocreate/crud-client": "^1.4.29",
-    "@cocreate/cursors": "^1.10.9",
-    "@cocreate/docs": "^1.2.53",
-    "@cocreate/hosting": "^1.2.48",
-    "@cocreate/observer": "^1.3.45",
-    "@cocreate/selection": "^1.2.9"
+    "@cocreate/action": "^1.3.17",
+    "@cocreate/crdt": "^1.8.21",
+    "@cocreate/crud-client": "^1.4.33",
+    "@cocreate/cursors": "^1.10.11",
+    "@cocreate/docs": "^1.2.55",
+    "@cocreate/hosting": "^1.2.51",
+    "@cocreate/observer": "^1.3.47",
+    "@cocreate/selection": "^1.2.13"
   }
 }

package/src/index.js

@@ -51,7 +51,7 @@ function initElement (element) {
                 if (value)
                     crdt.replaceText({ collection, document_id, name, value, crud: isCrud, save: isSave, read: isRead });
             }
-            else
+            else {
                 if (element.hasAttribute('contenteditable')){
                    element.innerHTML = '';
                 }
@@ -59,6 +59,7 @@ function initElement (element) {
                     element.value = '';
                 }
                 updateElement({ element, collection, document_id, name, value: response, start: 0 })
+            }
         });
     }
 }

package/src/updateDom.js

@@ -7,81 +7,91 @@ export function updateDom({domTextEditor, value, start, end, html}) {
 		throw new Error('position is out of range');
     
     let {element, path, position, type} = getElementPosition(domTextEditor.htmlString, start, end);
-	
-	if (element) {
 		parseHtml(domTextEditor);
-		let domEl, newEl = element, oldEl, curCaret;
 		
-		if(element.tagName == 'HTML') {
-			domEl = domTextEditor;
-			curCaret = getSelection(domEl);
-			type = 'innerHTML';
-		}
-		else if(path) {
-			domEl = domTextEditor.querySelector(path);
-			oldEl = domTextEditor.oldHtml.querySelector(path);
-			curCaret = getSelection(domEl);
-		}
-		else {
-			curCaret = getSelection(domEl);
-		}
-		if (!value && type != 'isStartTag' && type != 'textNode'){
-			type = 'innerHTML';
-		}
+	let domEl, newEl = element, oldEl, curCaret;
+	if(!newEl){
+		newEl = domTextEditor.cloneNode(true);
+		if (html != undefined)
+			newEl.innerHTML = html;
+		else
+			newEl.innerHTML = domTextEditor.htmlString;
+		domEl = domTextEditor;
+		type = 'innerHTML';
+	}
+	else if(element.tagName == 'HTML') {
+		domEl = domTextEditor;
+		type = 'innerHTML';
+	}
+	else if(path) {
+		domEl = domTextEditor.querySelector(path);
+		oldEl = domTextEditor.oldHtml.querySelector(path);
+	}
+
+	let activeElement = domEl.ownerDocument.activeElement;
+	if (activeElement == domEl)
+		curCaret = getSelection(activeElement);
+	else if (activeElement.tagName == 'BODY')
+		curCaret = getSelection(domEl);
 		
-		if(domEl && newEl) {
-			if(start != end && type == 'innerHTML') {
-				domTextEditor.htmlString = html;
-				if (domEl.tagName != 'HTML')
+	if (!value && type != 'isStartTag' && type != 'textNode'){
+		type = 'innerHTML';
+	}
+	
+	if(domEl && newEl) {
+		if(start != end && type == 'innerHTML') {
+			domTextEditor.htmlString = html;
+			if (domEl.tagName != 'HTML'){
+				if (newEl.parentElement)
 					domEl.parentElement.replaceChildren(...newEl.parentElement.childNodes);
 				else
-					domEl.replaceChildren(...newEl.childNodes);	
-				domEl = newEl;
-				if (curCaret.range) {
-					curCaret.range.startContainer = domEl;
-					curCaret.range.endContainer = domEl;
-				}
-			}
-			else if (type == 'isStartTag')
-				assignAttributes(newEl, oldEl, domEl);
-			else if (type == 'insertAdjacent')
-				domEl.insertAdjacentHTML(position, value);
-			else if (type == 'textNode'){
-				if(start != end)
-					domTextEditor.htmlString = html;
-				domEl.innerHTML = newEl.innerHTML;
+					domEl.replaceChildren(...newEl.childNodes);
 			}
-			else if (type == 'innerHTML') {
-				domEl.replaceChildren(...newEl.childNodes);
+			else
+				domEl.replaceChildren(...newEl.childNodes);	
+			// domEl = newEl;
+			if (curCaret && curCaret.range) {
+				curCaret.range.startContainer = domEl;
+				curCaret.range.endContainer = domEl;
 			}
 		}
-		if(start && end) {
+		else if (type == 'isStartTag')
+			assignAttributes(newEl, oldEl, domEl);
+		else if (type == 'insertAdjacent')
+			domEl.insertAdjacentHTML(position, value);
+		else if (type == 'textNode'){
+			if(start != end)
+				domTextEditor.htmlString = html;
+			domEl.innerHTML = newEl.innerHTML;
+		}
+		else if (type == 'innerHTML') {
+			domEl.replaceChildren(...newEl.childNodes);
+		}
+	}
+	if(curCaret && start >= 0 && end >= 0) {
+		if (curCaret.range && curCaret.start >= curCaret.range.startOffset) {
 	    	let p = processSelection(domEl, value, curCaret.start, curCaret.end, start, end, curCaret.range);
 	    	sendPosition(domEl);
 			_dispatchInputEvent(p.element, p.value, p.start, p.end, p.prev_start, p.prev_end);
 		}
-		
-		if (newEl.tagName == 'HTML' || 'HEAD' || 'BODY' || 'SCRIPT'){
-			let scripts;
-			if (newEl.tagName == 'SCRIPT'){
-				scripts = [newEl]
-			}
-			else{
-				scripts = domEl.querySelectorAll('script');
-			}
-			for (let script of scripts) {
-				let newScript = domEl.ownerDocument.createElement('script');
-				for(let attribute of script.attributes) {
-					newScript.setAttribute(attribute.name, attribute.value);
-				}
-				newScript.innerHTML = script.innerHTML;
-				script.replaceWith(newScript);
-			}	
-		}
 	}
-	else {
-		element = domTextEditor;
-		element.innerHTML = value;
+	
+	if (newEl.tagName == 'HTML' || 'HEAD' || 'BODY' || 'SCRIPT'){
+		let scripts;
+		if (newEl.tagName == 'SCRIPT'){
+			scripts = [newEl];
+		}
+		else{
+			scripts = domEl.querySelectorAll('script');
+		}
+		for (let script of scripts) {
+			let newScript = domEl.ownerDocument.createElement('script');
+			for(let attribute of script.attributes) {
+				newScript.setAttribute(attribute.name, attribute.value);
+			}
+			newScript.innerHTML = script.innerHTML;
+			script.replaceWith(newScript);
+		}	
 	}
 }