@cocreate/cursors 1.11.6 → 1.11.10

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [1.11.10](https://github.com/CoCreate-app/CoCreate-cursors/compare/v1.11.9...v1.11.10) (2022-02-01)
+
+
+### Bug Fixes
+
+* update dependency versions ([21eb6ef](https://github.com/CoCreate-app/CoCreate-cursors/commit/21eb6ef01911e8128274285c11e7673b5ec8ccd3))
+
+## [1.11.9](https://github.com/CoCreate-app/CoCreate-cursors/compare/v1.11.8...v1.11.9) (2022-01-15)
+
+
+### Bug Fixes
+
+* cursor was not displaying on inputs ([d608657](https://github.com/CoCreate-app/CoCreate-cursors/commit/d608657598178c16bae66b715f1b79fc4610b1c1))
+
+## [1.11.8](https://github.com/CoCreate-app/CoCreate-cursors/compare/v1.11.7...v1.11.8) (2022-01-13)
+
+
+### Bug Fixes
+
+* If element is not contenteditable do not display cursors unless cursors=true ([be7d653](https://github.com/CoCreate-app/CoCreate-cursors/commit/be7d65339d73234f95bbec4400d6ead0adfec9ef))
+
+## [1.11.7](https://github.com/CoCreate-app/CoCreate-cursors/compare/v1.11.6...v1.11.7) (2022-01-13)
+
+
+### Bug Fixes
+
+* commented parentElement.style postion:relative and display:inline ([b2123b6](https://github.com/CoCreate-app/CoCreate-cursors/commit/b2123b6ffe9e197f2f071b36c1c3419d9db71619))
+
 ## [1.11.6](https://github.com/CoCreate-app/CoCreate-cursors/compare/v1.11.5...v1.11.6) (2022-01-11)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/cursors",
-  "version": "1.11.6",
+  "version": "1.11.10",
   "description": "Collaborative user cursor position for inputs, textarea's and contenteditable elements.",
   "keywords": [
     "cursors",
@@ -62,12 +62,12 @@
     "webpack-log": "^3.0.1"
   },
   "dependencies": {
-    "@cocreate/crud-client": "^1.4.41",
-    "@cocreate/docs": "^1.2.63",
-    "@cocreate/message-client": "^1.1.59",
-    "@cocreate/observer": "^1.3.55",
-    "@cocreate/random-color": "^1.2.16",
-    "@cocreate/selection": "^1.3.2",
-    "@cocreate/uuid": "^1.1.52"
+    "@cocreate/crud-client": "^1.4.43",
+    "@cocreate/docs": "^1.2.65",
+    "@cocreate/message-client": "^1.1.60",
+    "@cocreate/observer": "^1.4.0",
+    "@cocreate/random-color": "^1.2.17",
+    "@cocreate/selection": "^1.4.0",
+    "@cocreate/uuid": "^1.1.55"
   }
 }

package/src/index.js

@@ -54,7 +54,7 @@ function drawCursors(selection) {
     let elements = selection.element;
     if (!elements) {
         let selector = '[collection="' + collection + '"][document_id="' + document_id + '"][name="' + name + '"]';
-        selector += ':not(.codemirror, .quill, .monaco, [actions])';
+        selector += ':not(.codemirror, .monaco, [actions])';
         elements = document.querySelectorAll(selector);
     }
     for (let element of elements) {
@@ -64,7 +64,12 @@ function drawCursors(selection) {
         }
         let realtime = element.getAttribute('realtime');
         let cursors = element.getAttribute('cursors');
+        let contenteditable = element.getAttribute('contenteditable');
         if (realtime == 'false' || cursors == 'false') continue;
+        if (element.tagName != 'INPUT' && element.tagName != 'TEXTAREA')
+            if (contenteditable == 'false' || contenteditable == null)
+                if (cursors != 'true') continue;
+        
         if (element.hasAttribute('contenteditable')) {
             let domTextEditor = element;
             if (element.tagName == 'IFRAME'){
@@ -84,6 +89,7 @@ function drawCursors(selection) {
                 start = pos.start;
             }
         }
+
         if(!element) continue;
         let document = element.ownerDocument;
         let mirrorDiv;
@@ -98,11 +104,14 @@ function drawCursors(selection) {
             mirrorDiv.contentEditable = false;
             mirrorDiv.element = element;
             element.insertAdjacentElement('afterend', mirrorDiv);
-            let parent = element.parentElement;
-            let parentComputed = getComputedStyle(parent);
-            let parentStylePosition = parentComputed['position'];
-            if (parentStylePosition == 'static')
-                parent.style.position = 'relative';
+            // let parent = element.parentElement;
+            // let parentComputed = getComputedStyle(parent);
+            // let parentStylePosition = parentComputed['position'];
+            // if (parentStylePosition == 'static')
+            //     parent.style.position = 'relative';
+            // let parentStyleDisplay = parentComputed['display'];
+            // if (parentStyleDisplay == 'inline')
+            //     parent.style.display = 'inline';
 
             _initEvents(element);
             initDocument(document);
@@ -117,10 +126,8 @@ function drawCursors(selection) {
         if (element.clientWidth != 0)
             scrollBarWidth = element.offsetWidth - element.clientWidth - borderWidth;
         let style = mirrorDiv.style;
-    
+        
         style.position = 'absolute';
-        style.top = element.offsetTop + 'px';
-        style.left = element.offsetLeft + 'px';
         style.width = rect.width + 'px';
         style.height = rect.height + 'px';
         style.visibility = 'visible';
@@ -130,7 +137,16 @@ function drawCursors(selection) {
         style.paddingRight = parseInt(computed['paddingRight']) + scrollBarWidth + 'px';
         style.border = computed['border'];
         style.borderColor = 'transparent';
-    
+        
+        if (element.parentElement.style['display'] == 'inline') {
+            style.top = element.clientTop + 'px';
+            style.left = element.clientLeft + 'px';
+        }
+        else {
+            style.top = element.offsetTop + 'px';
+            style.left = element.offsetLeft + 'px';
+        }
+        
         if (element.nodeName !== 'INPUT') {
             style.wordWrap = 'break-word';
             style.whiteSpace = 'pre-wrap';