@cocreate/cursors 1.20.0 → 1.20.1

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.20.1](https://github.com/CoCreate-app/CoCreate-cursors/compare/v1.20.0...v1.20.1) (2023-10-09)
+
+
+### Bug Fixes
+
+* replaced socketId with socket.has(data.sockeId) ([b3515d7](https://github.com/CoCreate-app/CoCreate-cursors/commit/b3515d7d13758210624b0e4d0ee6cda2a0c3a382))
+* update to use data.socketId and data.clientId ([1d780ec](https://github.com/CoCreate-app/CoCreate-cursors/commit/1d780ec9998235075347e8da0ed7d753b43cf46c))
+
 # [1.20.0](https://github.com/CoCreate-app/CoCreate-cursors/compare/v1.19.2...v1.20.0) (2023-09-19)
 
 

package/CoCreate.config.js

@@ -1,24 +1,24 @@
-module.exports = {
-    "organization_id": "",
-    "key": "",
-    "host": "",
-    "sources": [
-        {
-            "array": "files",
-            "object": {
-                "_id": "6019eae64eea0817df303b12",
-                "name": "index.html",
-                "path": "/docs/cursors",
-                "pathname": "/docs/cursors/index.html",
-                "src": "{{./docs/index.html}}",
-                "host": [
-                    "*",
-                    "general.cocreate.app"
-                ],
-                "directory": "cursors",
-                "content-type": "{{content-type}}",
-                "public": "true"
-            }
-        }
-    ]
-}
+module.exports = {
+    "organization_id": "",
+    "key": "",
+    "host": "",
+    "sources": [
+        {
+            "array": "files",
+            "object": {
+                "_id": "6019eae64eea0817df303b12",
+                "name": "index.html",
+                "path": "/docs/cursors",
+                "pathname": "/docs/cursors/index.html",
+                "src": "{{./docs/index.html}}",
+                "host": [
+                    "*",
+                    "general.cocreate.app"
+                ],
+                "directory": "cursors",
+                "content-type": "{{content-type}}",
+                "public": "true"
+            }
+        }
+    ]
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/cursors",
-  "version": "1.20.0",
+  "version": "1.20.1",
   "description": "Collaborative user cursor position for inputs, textarea's and contenteditable elements.",
   "keywords": [
     "cursors",
@@ -60,7 +60,7 @@
   },
   "dependencies": {
     "@cocreate/local-storage": "^1.10.2",
-    "@cocreate/message-client": "^1.7.0",
+    "@cocreate/message-client": "^1.8.0",
     "@cocreate/observer": "^1.11.2",
     "@cocreate/random-color": "^1.7.2",
     "@cocreate/selection": "^1.9.2",

package/src/index.js

@@ -79,7 +79,7 @@ function initDocument(doc) {
 }
 
 function drawCursors(selection) {
-    const socket_id = selection['clientId'];
+    const socket_id = selection['socketId'];
     const array = selection['array'];
     const object = selection['object'];
     const key = selection['key'];
@@ -92,7 +92,7 @@ function drawCursors(selection) {
         elements = document.querySelectorAll(selector);
     }
     for (let element of elements) {
-        if (window.activeElement == element && selection.clientId == clientId) {
+        if (window.activeElement == element && message.socket.has(selection.socketId)) {
             continue;
         }
         let realtime = element.getAttribute('realtime');
@@ -106,8 +106,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.id;
+                // if (frameClientId == selection.socketId) continue;
                 domTextEditor = element.contentDocument.documentElement;
             }
             if (!domTextEditor.htmlString)
@@ -283,7 +283,7 @@ function updateCursors(element) {
         let cursors = mirrorDiv.querySelectorAll('cursor');
 
         cursors.forEach(function (child_cursor, index, array) {
-            let clientId = child_cursor.getAttribute('socket_id');
+            let socketId = child_cursor.getAttribute('socket_id');
             let userName = child_cursor.getAttribute('user-name');
             let background = child_cursor.getAttribute('user-background');
             let color = child_cursor.getAttribute('user-color');
@@ -293,7 +293,7 @@ function updateCursors(element) {
                 element: [element],
                 start,
                 end,
-                clientId,
+                socketId,
                 userName,
                 background,
                 color
@@ -303,13 +303,13 @@ function updateCursors(element) {
     }
 }
 
-function removeCursor(clientId) {
-    let elements = document.querySelectorAll(`cursor[socket_id="${clientId}"]`);
+function removeCursor(socketId) {
+    let elements = document.querySelectorAll(`cursor[socket_id="${socketId}"]`);
     elements.forEach(function (element, index, array) {
         element.parentNode.removeChild(element);
     });
 
-    let sel_elements = document.querySelectorAll(`selection[socket_id="${clientId}"]`);
+    let sel_elements = document.querySelectorAll(`selection[socket_id="${socketId}"]`);
     sel_elements.forEach(function (sel_element, index, array) {
         sel_element.parentNode.removeChild(sel_element);
     });
@@ -351,13 +351,12 @@ function sendPosition(info) {
                 key: info.key,
                 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
             },
-            broadcastBrowser: 'once'
+            broadcastBrowser: true
         });
     }
     catch (e) {
@@ -367,12 +366,12 @@ function sendPosition(info) {
 
 
 message.listen('cursor', function (response) {
-    // if (selection.clientId == clientId) return;
+    // if (message.socket.has(selection.socketId)) return;
     let selection = response.data
     if (selection.start != null && selection.end != null)
         drawCursors(selection);
     else
-        removeCursor(selection.clientId);
+        removeCursor(selection.socketId);
 });
 
 observer.init({