@cocreate/text 1.16.2 → 1.16.5

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [1.16.5](https://github.com/CoCreate-app/CoCreate-text/compare/v1.16.4...v1.16.5) (2022-06-22)
+
+
+### Bug Fixes
+
+* ifactiveElement  inputEvent skip = false ([0b61519](https://github.com/CoCreate-app/CoCreate-text/commit/0b61519e2bd9592502ebb7a2ba88b71a16e11e55))
+
+## [1.16.4](https://github.com/CoCreate-app/CoCreate-text/compare/v1.16.3...v1.16.4) (2022-06-18)
+
+
+### Bug Fixes
+
+* bump dependencies ([2128b8d](https://github.com/CoCreate-app/CoCreate-text/commit/2128b8d11122a2024d7549e571b286ae6aa1d463))
+
+## [1.16.3](https://github.com/CoCreate-app/CoCreate-text/compare/v1.16.2...v1.16.3) (2022-06-16)
+
+
+### Bug Fixes
+
+* when iframe need to get iframe elements attributes to send to crdt undo and redo ([ddfc15e](https://github.com/CoCreate-app/CoCreate-text/commit/ddfc15e1184ff7adf4bfabb9a7d147a531b645d6))
+
 ## [1.16.2](https://github.com/CoCreate-app/CoCreate-text/compare/v1.16.1...v1.16.2) (2022-06-13)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/text",
-  "version": "1.16.2",
+  "version": "1.16.5",
   "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.4.2",
-    "@cocreate/crdt": "^1.11.0",
-    "@cocreate/crud-client": "^1.7.0",
-    "@cocreate/cursors": "^1.11.20",
-    "@cocreate/docs": "^1.3.2",
-    "@cocreate/hosting": "^1.3.2",
-    "@cocreate/observer": "^1.5.2",
-    "@cocreate/selection": "^1.4.10",
-    "@cocreate/uuid": "^1.2.2"
+    "@cocreate/actions": "^1.4.3",
+    "@cocreate/crdt": "^1.11.1",
+    "@cocreate/crud-client": "^1.7.1",
+    "@cocreate/cursors": "^1.11.21",
+    "@cocreate/docs": "^1.3.3",
+    "@cocreate/hosting": "^1.3.3",
+    "@cocreate/observer": "^1.5.3",
+    "@cocreate/selection": "^1.4.11",
+    "@cocreate/uuid": "^1.2.4"
   }
 }

package/src/index.js

@@ -193,12 +193,11 @@ function _keydown (event) {
         event.preventDefault();
     }
     else if (event.ctrlKey) {
-        const { collection, document_id, name, isCrud, isCrdt, isSave } = crud.getAttr(element);
         if (event.keyCode == 90) {
-            crdt.undoText({ collection, document_id, name, isCrud, isCrdt, isSave })
+            updateText({element, range, undoRedo: 'undo'});
         }
         else if (event.keyCode == 89) {
-            crdt.redoText({ collection, document_id, name, isCrud, isCrdt, isSave })
+            updateText({element, range, undoRedo: 'redo'});
         }
     }
 }
@@ -258,7 +257,7 @@ export function sendPosition (element) {
     cursors.sendPosition({ collection, document_id, name, start, end });
 }
 
-function updateText ({element, value, start, end, range}) {
+function updateText ({element, value, start, end, range, undoRedo}) {
     if (range) {
         if (range.element)
             element = range.element;
@@ -269,6 +268,11 @@ function updateText ({element, value, start, end, range}) {
     const { collection, document_id, name, isCrud, isCrdt, isSave } = crud.getAttr(element);
     if (isCrdt == "false") return;
     
+    if (undoRedo == 'undo')
+        return crdt.undoText({ collection, document_id, name, isCrud, isCrdt, isSave })
+    if (undoRedo == 'redo')
+        return crdt.redoText({ collection, document_id, name, isCrud, isCrdt, isSave })
+
     let length = end - start;
     if (element.tagName === "INPUT" || element.tagName === "TEXTAREA") {
         crdt.updateText({ collection, document_id, name, value, start, length, crud: isCrud, save: isSave });
@@ -355,6 +359,9 @@ function _updateElementText (element, value, start, end) {
 
 export function _dispatchInputEvent(element, content, start, end, prev_start, prev_end) {
     let detail = {value: content, start, end, prev_start, prev_end, skip: true};
+    let activeElement = element.ownerDocument.activeElement;
+    if (activeElement == element)
+        detail.skip = false;
     if (eventObj) {
         let event = new CustomEvent(eventObj.type, { bubbles: true });
         Object.defineProperty(event, 'stopCCText', { writable: false, value: true });