@cocreate/text 1.14.9 → 1.15.3

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [1.15.3](https://github.com/CoCreate-app/CoCreate-text/compare/v1.15.2...v1.15.3) (2022-02-01)
+
+
+### Bug Fixes
+
+* update dependency versions ([4079711](https://github.com/CoCreate-app/CoCreate-text/commit/407971197a1fc21dbefdc4419ca836afb369bcad))
+
+## [1.15.2](https://github.com/CoCreate-app/CoCreate-text/compare/v1.15.1...v1.15.2) (2022-01-31)
+
+
+### Bug Fixes
+
+* use string param provided by crdt-update event ([6c05759](https://github.com/CoCreate-app/CoCreate-text/commit/6c05759ac0dd45e5c8123324192d5993ae25b05c))
+
+## [1.15.1](https://github.com/CoCreate-app/CoCreate-text/compare/v1.15.0...v1.15.1) (2022-01-23)
+
+
+### Bug Fixes
+
+* return if name == _id ([5bd2ce1](https://github.com/CoCreate-app/CoCreate-text/commit/5bd2ce1a21c639f870cbab70288963c126a0ac42))
+
+# [1.15.0](https://github.com/CoCreate-app/CoCreate-text/compare/v1.14.9...v1.15.0) (2022-01-22)
+
+
+### Features
+
+* removeClass and removeStyle to remove the className or property from CRDT string ([3e91719](https://github.com/CoCreate-app/CoCreate-text/commit/3e917190ef6a61d240d6dec955a76c5dbef651d8))
+
 ## [1.14.9](https://github.com/CoCreate-app/CoCreate-text/compare/v1.14.8...v1.14.9) (2022-01-14)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/text",
-  "version": "1.14.9",
+  "version": "1.15.3",
   "description": "A simple text component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "text",
@@ -61,14 +61,14 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/actions": "^1.3.25",
-    "@cocreate/crdt": "^1.8.28",
-    "@cocreate/crud-client": "^1.4.40",
-    "@cocreate/cursors": "^1.11.0",
-    "@cocreate/docs": "^1.2.62",
-    "@cocreate/hosting": "^1.2.58",
-    "@cocreate/observer": "^1.3.54",
-    "@cocreate/selection": "^1.3.1",
-    "@cocreate/uuid": "^1.1.51"
+    "@cocreate/actions": "^1.3.28",
+    "@cocreate/crdt": "^1.9.0",
+    "@cocreate/crud-client": "^1.4.43",
+    "@cocreate/cursors": "^1.11.9",
+    "@cocreate/docs": "^1.2.65",
+    "@cocreate/hosting": "^1.2.60",
+    "@cocreate/observer": "^1.4.0",
+    "@cocreate/selection": "^1.4.0",
+    "@cocreate/uuid": "^1.1.55"
   }
 }

package/src/index.js

@@ -28,7 +28,7 @@ function initElements (elements) {
 function initElement (element) {
     const { collection, document_id, name, isRealtime, isCrdt, isCrud, isSave, isRead } = crud.getAttr(element);
     if(document_id == "pending") return;
-    if(isCrdt == "false" || isRealtime == "false" || element.type == 'number') return;
+    if(isCrdt == "false" || isRealtime == "false" || element.type == 'number' || name == '_id') return;
     if(!crud.checkAttrValue(collection) || !crud.checkAttrValue(document_id)) return;
     if(element.tagName === "INPUT" && ["text", "email", "tel", "url"].includes(element.type) || element.tagName === "TEXTAREA" || element.hasAttribute('contenteditable')) {
         if(!collection || !document_id || !name) return;
@@ -279,7 +279,7 @@ function _crdtUpdateListener () {
     });
 }
 
-function updateElements({elements, collection, document_id, name, value, start, length}){
+function updateElements({elements, collection, document_id, name, value, start, length, string}){
     if(!elements){
         let selectors = `[collection='${collection}'][document_id='${document_id}'][name='${name}']`;
         elements = document.querySelectorAll(`input${selectors}, textarea${selectors}, [contenteditable]${selectors}, [editor='dom']${selectors}`);
@@ -292,11 +292,11 @@ function updateElements({elements, collection, document_id, name, value, start,
             // let isEditable = element.getAttribute('contenteditable');
         if (!element.hasAttribute('contenteditable') && isCrdt == 'false') return;
 
-        updateElement({element, collection, document_id, name, value, start, length});
+        updateElement({element, collection, document_id, name, value, start, length, string});
     });
 }
 
-async function updateElement ({element, collection, document_id, name, value, start, length }) {
+async function updateElement ({element, collection, document_id, name, value, start, length, string }) {
     if (element.tagName == 'IFRAME') {
         element = element.contentDocument.documentElement;
         if (element.contenteditable != 'false')
@@ -313,14 +313,15 @@ async function updateElement ({element, collection, document_id, name, value, st
         } 
         else {
 			let domTextEditor = element;
-            let html = await crdt.getText({collection, document_id, name});
+            if (string == undefined)
+                string = await crdt.getText({collection, document_id, name});
+            let html = string;
 			if (length) {
                 let end = start + length;
 				updateDom({ domTextEditor, start, end, html });
 			}
 			if (value) {
 			    if (element.innerHTML != value) {
-				// 	domTextEditor.htmlString = html;
 					updateDom({ domTextEditor, value, start, end: start, html });
 			    }
 			}

package/src/updateText.js

@@ -31,16 +31,19 @@ export function setInnerText({ domTextEditor, target, value, start, end }) {
 	updateDomText({ domTextEditor, target, value, pos: {start, end} });
 }
 
-export function setClass({ domTextEditor, target, classname }) {
-	updateDomText({ domTextEditor, target, attribute: 'class', value: classname });
+export function setClass({ domTextEditor, target, value }) {
+	updateDomText({ domTextEditor, target, attribute: 'class', value });
+}
+export function removeClass({ domTextEditor, target, value }) {
+	updateDomText({ domTextEditor, target, attribute: 'class', value, remove: true });
 }
 
-export function setClassStyle({ domTextEditor, target, classname, value, unit }) {
-	updateDomText({ domTextEditor, target, attribute: 'class', value: `${classname}:${value}${unit}` });
+export function setStyle({ domTextEditor, target, property, value }) {
+	updateDomText({ domTextEditor, target, attribute: 'style', property, value });
 }
 
-export function setStyle({ domTextEditor, target, styleName }) {
-	updateDomText({ domTextEditor, target, attribute: 'style', value: styleName });
+export function removeStyle({ domTextEditor, target, property }) {
+	updateDomText({ domTextEditor, target, attribute: 'style', property, remove: true });
 }
 
 export function setAttribute({ domTextEditor, target, name, value }) {
@@ -48,22 +51,22 @@ export function setAttribute({ domTextEditor, target, name, value }) {
 }
 
 export function removeAttribute({ domTextEditor, target, name }) {
-	updateDomText({ domTextEditor, target, attribute: name, removeAttribute: 'true'});
+	updateDomText({ domTextEditor, target, attribute: name, remove: 'true'});
 }
 
 export function replaceInnerText({ domTextEditor, target, value }) {
 	updateDomText({ domTextEditor, target, value });
 }
 
-export function updateDomText({ domTextEditor, target, position, element, elementValue, attribute, value, pos, removeAttribute }) {
-	let	{start, end, newValue} = getStringPosition({ string: domTextEditor.htmlString, target, attribute, value });
+export function updateDomText({ domTextEditor, target, position, element, elementValue, attribute, value, property, pos, remove }) {
+	let	{start, end, newValue} = getStringPosition({ string: domTextEditor.htmlString, target, attribute, property, value, remove });
 	if (pos){
 		start += pos.start;
 		end += pos.end;
 	}
 	if(start != end)
 		_updateText({domTextEditor, start, end});
-	if(attribute && removeAttribute != 'true')
+	if(attribute && remove != 'true' || attribute && value)
 		_updateText({ domTextEditor, value: ` ${attribute}="${newValue}"`, start });
 	else if(value)
 		_updateText({ domTextEditor, value, start });