@cocreate/text 1.14.6 → 1.15.0

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+# [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)
+
+
+### Bug Fixes
+
+* saveDomText.js updated to awiat value from crdt.getText ([1b7a433](https://github.com/CoCreate-app/CoCreate-text/commit/1b7a433acda72f4cf12ad283b6aa37b4367fbea5))
+
+## [1.14.8](https://github.com/CoCreate-app/CoCreate-text/compare/v1.14.7...v1.14.8) (2022-01-13)
+
+
+### Bug Fixes
+
+* removed if case that resulted in value not inserting if oldValue and newValue where equal ([187167e](https://github.com/CoCreate-app/CoCreate-text/commit/187167e03fb1cfc5132848f443d32d4f2d3ffe8e))
+
+## [1.14.7](https://github.com/CoCreate-app/CoCreate-text/compare/v1.14.6...v1.14.7) (2022-01-11)
+
+
+### Bug Fixes
+
+* addEvents if isCrdt != true ([b57f83b](https://github.com/CoCreate-app/CoCreate-text/commit/b57f83ba299f4a27802f48a14c2a252095cb91ba))
+
 ## [1.14.6](https://github.com/CoCreate-app/CoCreate-text/compare/v1.14.5...v1.14.6) (2022-01-01)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/text",
-  "version": "1.14.6",
+  "version": "1.15.0",
   "description": "A simple text component in vanilla javascript. Easily configured using HTML5 attributes and/or JavaScript API.",
   "keywords": [
     "text",

package/src/index.js

@@ -35,11 +35,12 @@ function initElement (element) {
 
         if (!isCrdt) {
             if (element.tagName == 'IFRAME'){
-                _addEventListeners(element.contentDocument.documentElement);
+                if (isCrdt != 'true')
+                    _addEventListeners(element.contentDocument.documentElement);
                 let Document = element.contentDocument;
                 initDocument(Document);
             }  
-            else{ 
+            else if (isCrdt != 'true'){ 
                 _addEventListeners(element);
             }
         }   
@@ -307,8 +308,7 @@ async function updateElement ({element, collection, document_id, name, value, st
                 _updateElementText(element, "", start, start + length);
             }
             if(value) {
-                if (element.value != value)
-                    _updateElementText(element, value, start, start);
+                _updateElementText(element, value, start, start);
             }
         } 
         else {

package/src/saveDomText.js

@@ -5,21 +5,22 @@ import crdt from '@cocreate/crdt';
 
 function save(btn){
 	const { collection, document_id, name, namespace, room, isBroadcast, isBroadcastSender, isUpsert} = crud.getAttr(btn);
-	let data = crdt.getText({collection, document_id, name});
-	crud.updateDocument({
-		collection: collection,
-		document_id: document_id,
-		data: {
-			[name]: data
-		},
-		upsert: isUpsert,
-		namespace: namespace,
-		room: room,
-		broadcast: isBroadcast,
-		broadcast_sender: isBroadcastSender
+	crdt.getText({collection, document_id, name}).then(response => {
+		crud.updateDocument({
+			collection: collection,
+			document_id: document_id,
+			data: {
+				[name]: response
+			},
+			upsert: isUpsert,
+			namespace: namespace,
+			room: room,
+			broadcast: isBroadcast,
+			broadcast_sender: isBroadcastSender
+		});
+		
+		document.dispatchEvent(new CustomEvent('savedDomText'));
 	});
-	
-	document.dispatchEvent(new CustomEvent('savedDomText'));
 }
 
 action.init({

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 });