@cocreate/cursors 1.11.14 → 1.11.17

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [1.11.17](https://github.com/CoCreate-app/CoCreate-cursors/compare/v1.11.16...v1.11.17) (2022-04-30)
+
+
+### Bug Fixes
+
+* activeCursor element defined on window object ([c571c2d](https://github.com/CoCreate-app/CoCreate-cursors/commit/c571c2d707fc87d866c027753ffdbc9ea7eea498))
+
+## [1.11.16](https://github.com/CoCreate-app/CoCreate-cursors/compare/v1.11.15...v1.11.16) (2022-03-22)
+
+
+### Bug Fixes
+
+* removed emit from message.send and message.listen ([344cb05](https://github.com/CoCreate-app/CoCreate-cursors/commit/344cb0599ae4d50706c9e9fe48cb55a5b678740e))
+
+## [1.11.15](https://github.com/CoCreate-app/CoCreate-cursors/compare/v1.11.14...v1.11.15) (2022-02-24)
+
+
+### Bug Fixes
+
+* CoCreate.config replace CoCreate.app with * ([b35233f](https://github.com/CoCreate-app/CoCreate-cursors/commit/b35233f7fd94378bd75af295e78ec82d5794e4fe))
+* typo enviroment to environment ([572e06b](https://github.com/CoCreate-app/CoCreate-cursors/commit/572e06b9e0db5ea698bfbc7027ef331d95263df1))
+
 ## [1.11.14](https://github.com/CoCreate-app/CoCreate-cursors/compare/v1.11.13...v1.11.14) (2022-02-16)
 
 

package/CoCreate.config.js

@@ -14,7 +14,7 @@ module.exports = {
                 "name": "index.html",
                 "path": "/docs/cursors/index.html",
                 "domains": [
-                    "cocreate.app",
+                    "*",
                     "general.cocreate.app"
                 ],
                 "directory": "/docs/cursors",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/cursors",
-  "version": "1.11.14",
+  "version": "1.11.17",
   "description": "Collaborative user cursor position for inputs, textarea's and contenteditable elements.",
   "keywords": [
     "cursors",

package/src/index.js

@@ -9,7 +9,7 @@ import './index.css';
 const clientId = window.CoCreateSockets.clientId || uuid.generate(12);
 const cursorBackground = randomColor();
 
-let enviroment_prod = true;
+let environment_prod = true;
 
 let selector = "[collection][document_id][name]:not([contentEditable='false'])";
 
@@ -58,8 +58,7 @@ function drawCursors(selection) {
         elements = document.querySelectorAll(selector);
     }
     for (let element of elements) {
-        if (element.activeElement && selection.clientId == clientId) {
-            // element.activeElement = '';
+        if (window.activeElement == element && selection.clientId == clientId) {
             continue;
         }
         let realtime = element.getAttribute('realtime');
@@ -73,8 +72,8 @@ function drawCursors(selection) {
         if (element.hasAttribute('contenteditable')) {
             let domTextEditor = element;
             if (element.tagName == 'IFRAME'){
-                let frameClientId = element.contentDocument.defaultView.CoCreateSockets.clientId;
-                if (frameClientId == selection.clientId) continue;
+                // let frameClientId = element.contentDocument.defaultView.CoCreateSockets.clientId;
+                // if (frameClientId == selection.clientId) continue;
                 domTextEditor = element.contentDocument.documentElement;
             }
             let pos = getElementPosition(domTextEditor.htmlString, start, end);
@@ -100,7 +99,7 @@ function drawCursors(selection) {
             
             mirrorDiv = document.createElement('cursor-container');
             mirrorDiv.id = id_mirror;
-            mirrorDiv.className = (enviroment_prod) ? 'mirror mirror_scroll mirror_color' : 'mirror mirror_scroll';
+            mirrorDiv.className = (environment_prod) ? 'mirror mirror_scroll mirror_color' : 'mirror mirror_scroll';
             mirrorDiv.contentEditable = false;
             mirrorDiv.element = element;
             element.insertAdjacentElement('afterend', mirrorDiv);
@@ -311,21 +310,19 @@ function sendPosition(info) {
     try {
         message.send({
             room: "",
-            emit: {
-                message: "cursor",
-                data: {
-                    collection: info.collection,
-                    document_id: info.document_id,
-                    name: info.name,
-                    start: info.start,
-                    end: info.end,
-                    clientId: clientId,
-                    color: info.color || localStorage.getItem("cursorColor"),
-                    background: info.background || localStorage.getItem("cursorBackground") || cursorBackground,
-                    userName: info.userName || localStorage.getItem("userName") || clientId,
-                    user_id: info.user_id || localStorage.getItem("user_id") || clientId
-                }
-            },
+            message: "cursor",
+            data: {
+                collection: info.collection,
+                document_id: info.document_id,
+                name: info.name,
+                start: info.start,
+                end: info.end,
+                clientId: clientId,
+                color: info.color || localStorage.getItem("cursorColor"),
+                background: info.background || localStorage.getItem("cursorBackground") || cursorBackground,
+                userName: info.userName || localStorage.getItem("userName") || clientId,
+                user_id: info.user_id || localStorage.getItem("user_id") || clientId
+            }
         });
     }
     catch (e) {
@@ -334,8 +331,9 @@ function sendPosition(info) {
 }
 
 
-message.listen('cursor', function(selection) {
+message.listen('cursor', function(response) {
     // if (selection.clientId == clientId) return;
+    let selection = response.data
     if (selection.start != null && selection.end != null)
         drawCursors(selection);
     else