@cocreate/text 1.15.10 → 1.15.13

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [1.15.13](https://github.com/CoCreate-app/CoCreate-text/compare/v1.15.12...v1.15.13) (2022-03-22)
+
+
+### Bug Fixes
+
+* removed emit from message.send and message.listen ([b672bb5](https://github.com/CoCreate-app/CoCreate-text/commit/b672bb57ee7005a0d1933bd014c079a6faa96cbd))
+
+## [1.15.12](https://github.com/CoCreate-app/CoCreate-text/compare/v1.15.11...v1.15.12) (2022-03-21)
+
+
+### Bug Fixes
+
+* string formating differs between various OS \r\n and  \r are replaced with \n ([87b0183](https://github.com/CoCreate-app/CoCreate-text/commit/87b018354240d6f25b57fb9fc272f52103c4072c))
+
+## [1.15.11](https://github.com/CoCreate-app/CoCreate-text/compare/v1.15.10...v1.15.11) (2022-03-07)
+
+
+### Bug Fixes
+
+* if crdt=false return before event prevent default for crud ([342411c](https://github.com/CoCreate-app/CoCreate-text/commit/342411c4ec654b554e9d92e071a932d1155cec09))
+
 ## [1.15.10](https://github.com/CoCreate-app/CoCreate-text/compare/v1.15.9...v1.15.10) (2022-02-24)
 
 

package/package.json

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

package/src/index.js

@@ -27,11 +27,11 @@ 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' || 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;
+    if (document_id == "pending") 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;
 
         if (!isCrdt) {
             if (element.tagName == 'IFRAME'){
@@ -47,7 +47,7 @@ function initElement (element) {
         element.setAttribute('crdt', 'true');
         element.crdt = {init: true};
         crdt.getText({ collection, document_id, name, crud: isCrud, save: isSave, read: isRead }).then(response => {
-            if(response === undefined) 
+            if (response === undefined) 
                 return;
             if (!response){
                 let value;
@@ -111,12 +111,15 @@ function _mousedown (event) {
     let target = event.target;
     // const path = event.path || (event.composedPath && event.composedPath());
     // console.log(path)
-	if(!target.id){
-	    let eid = target.getAttribute('eid');
-		if(!eid){
-			eid = uuid.generate(6);
-            setAttribute({ domTextEditor, target, name: 'eid', value: eid });
-		}
+	if (!target.id){
+        let isEid = domTextEditor.getAttribute('eid');
+		if (isEid != 'false' && isEid != null && isEid != undefined){
+            let eid = target.getAttribute('eid');
+            if (!eid){
+                eid = uuid.generate(6);
+                setAttribute({ domTextEditor, target, name: 'eid', value: eid });
+            }
+        }
 	}
 	let contentEditable = target.closest('[collection][document_id][name]');
 	if (contentEditable){
@@ -138,6 +141,8 @@ function _blur (event) {
 
 function _cut (event) {
     let element = event.currentTarget;
+    if (element.getAttribute('crdt') == 'false')
+        return;
     const { start, end, range } = getSelection(element);
     const selection = document.getSelection();
     console.log(selection.toString());
@@ -151,7 +156,7 @@ function _cut (event) {
           /* clipboard write failed */
         });
     }
-    if(start != end) {
+    if (start != end) {
         updateText({element, start, end, range});
     }
     event.preventDefault();
@@ -159,9 +164,11 @@ function _cut (event) {
 
 function _paste (event) {
     let element = event.currentTarget;
-    let value = event.clipboardData.getData('Text');
+    if (element.getAttribute('crdt') == 'false')
+        return;
+    let value = event.clipboardData.getData('text/plain').replace(/(\r\n|\r)/gm, "\n");;
     const { start, end, range } = getSelection(element);
-    if(start != end) {
+    if (start != end) {
         updateText({element, start, end, range});
     }
     updateText({element, value, start, range});
@@ -169,22 +176,24 @@ function _paste (event) {
 }
 
 function _keydown (event) {
-    if(event.stopCCText) return;
+    if (event.stopCCText) return;
     let element = event.currentTarget;
+    if (element.getAttribute('crdt') == 'false')
+        return;
     const { start, end, range } = getSelection(element);
-    if(event.key == "Backspace" || event.key == "Tab" || event.key == "Enter") {
+    if (event.key == "Backspace" || event.key == "Tab" || event.key == "Enter") {
         eventObj = event;
-        if(start != end) {
+        if (start != end) {
             updateText({element, start, end, range});
         }
         
-        if(event.key == "Backspace" && start == end) {
+        if (event.key == "Backspace" && start == end) {
             updateText({element, start: start - 1, end, range});
         }
-        else if(event.key == 'Tab') {
+        else if (event.key == 'Tab') {
             updateText({element, value: "\t", start, range});
         }
-        else if(event.key == "Enter") {
+        else if (event.key == "Enter") {
             updateText({element, value: "\n", start, range});
         }
         event.preventDefault();
@@ -198,11 +207,13 @@ function _keydown (event) {
 }
 
 function _beforeinput (event) {
-    if(event.stopCCText) return;
+    if (event.stopCCText) return;
     let element = event.currentTarget;
+    if (element.getAttribute('crdt') == 'false')
+        return;
     let { start, end, range } = getSelection(element);
     if (event.data) {
-        if(start != end) {
+        if (start != end) {
             updateText({element, start, end, range});
         }
         eventObj = event;
@@ -212,7 +223,7 @@ function _beforeinput (event) {
 }
 
 function _input (event) {
-    if(event.stopCCText) return;
+    if (event.stopCCText) return;
     if (event.data) {
         eventObj = event;
     }
@@ -230,7 +241,7 @@ let previousPosition = {};
 export function sendPosition (element) {
     // if (!element) return;
     const { start, end, range } = getSelection(element);
-    if(range) {
+    if (range) {
         if (range.element){
             element = range.element;
         }
@@ -250,7 +261,7 @@ export function sendPosition (element) {
 }
 
 function updateText ({element, value, start, end, range}) {
-    if(range) {
+    if (range) {
         if (range.element)
             element = range.element;
         
@@ -258,7 +269,7 @@ function updateText ({element, value, start, end, range}) {
             element = element.ownerDocument.defaultView.frameElement;
     }
     const { collection, document_id, name, isCrud, isCrdt, isSave } = crud.getAttr(element);
-    if(isCrdt == "false") return;
+    if (isCrdt == "false") return;
     
     let length = end - start;
     if (element.tagName === "INPUT" || element.tagName === "TEXTAREA") {
@@ -282,15 +293,15 @@ function _crdtUpdateListener () {
 }
 
 function updateElements({elements, collection, document_id, name, value, start, length, string}){
-    if(!elements){
+    if (!elements){
         let selectors = `[collection='${collection}'][document_id='${document_id}'][name='${name}']`;
         elements = document.querySelectorAll(`input${selectors}, textarea${selectors}, [contenteditable]${selectors}, [editor='dom']${selectors}`);
     }
     
     elements.forEach((element) => {
         let isCrdt = element.getAttribute('crdt');
-        // if(isCrdt == 'false' && !element.hasAttribute('crdt') && !element.contentEditable) return;
-        // if(element.hasAttribute('contenteditable')){
+        // if (isCrdt == 'false' && !element.hasAttribute('crdt') && !element.contentEditable) return;
+        // if (element.hasAttribute('contenteditable')){
             // let isEditable = element.getAttribute('contenteditable');
         if (!element.hasAttribute('contenteditable') && isCrdt == 'false') return;
 
@@ -300,16 +311,19 @@ function updateElements({elements, collection, document_id, name, value, start,
 
 async function updateElement ({element, collection, document_id, name, value, start, length, string }) {
     if (element.tagName == 'IFRAME') {
+        let eid = element.getAttribute('eid')
         element = element.contentDocument.documentElement;
+        if (eid != 'false' && eid != null && eid != undefined)
+            element.setAttribute('eid', eid)
         if (element.contenteditable != 'false')
             element.contentEditable = true;
     }
-    if(value || length) {
+    if (value || length) {
         if (element.tagName === "INPUT" || element.tagName === "TEXTAREA") {
-            if(length) {
+            if (length) {
                 _updateElementText(element, "", start, start + length);
             }
-            if(value) {
+            if (value) {
                 _updateElementText(element, value, start, start);
             }
         } 
@@ -338,14 +352,14 @@ function _updateElementText (element, value, start, end) {
     let activeElement = element.ownerDocument.activeElement;
     element.setRangeText(value, start, end, "end");
 	let p = processSelection(element, value, prev_start, prev_end, start, end);
-	if(activeElement == element)
+	if (activeElement == element)
 	    sendPosition(element);
 	_dispatchInputEvent(element, p.value, p.start, p.end, p.prev_start, p.prev_end);
 }
 
 export function _dispatchInputEvent(element, content, start, end, prev_start, prev_end) {
     let detail = {value: content, start, end, prev_start, prev_end, skip: true};
-    if(eventObj) {
+    if (eventObj) {
         let event = new CustomEvent(eventObj.type, { bubbles: true });
         Object.defineProperty(event, 'stopCCText', { writable: false, value: true });
         Object.defineProperty(event, 'target', { writable: false, value: element });