clay-server 2.31.0 → 2.32.0-beta.10

package/lib/public/modules/app-cursors.js

@@ -2,8 +2,10 @@
 // Extracted from app.js (PR-27)
 
 import { avatarUrl } from './avatar.js';
-
-var _ctx = null;
+import { getWs } from './ws-ref.js';
+import { store } from './store.js';
+import { getMessagesEl } from './dom-refs.js';
+import { registerTooltip } from './tooltip.js';
 
 // --- Module-owned state ---
 var cursorSharingEnabled = localStorage.getItem("cursorSharing") !== "off";
@@ -122,7 +124,7 @@ function getNodeAtCharOffset(container, charOffset) {
 
 // Find parent [data-turn] element from a DOM node
 function findParentTurn(node) {
-  var messagesEl = _ctx.messagesEl;
+  var messagesEl = getMessagesEl();
   var el = node.nodeType === 3 ? node.parentElement : node;
   while (el && el !== messagesEl) {
     if (el.dataset && el.dataset.turn != null) return el;
@@ -158,7 +160,7 @@ function createOffscreenIndicator(userId, displayName, color) {
 }
 
 function updateCursorVisibility(entry) {
-  var messagesEl = _ctx.messagesEl;
+  var messagesEl = getMessagesEl();
   var visibleTop = messagesEl.scrollTop;
   var visibleBottom = visibleTop + messagesEl.clientHeight;
   var y = entry.lastY || 0;
@@ -176,7 +178,7 @@ function updateCursorVisibility(entry) {
 
 // Find the closest [data-turn] element to a given clientY
 function findClosestTurn(clientY) {
-  var messagesEl = _ctx.messagesEl;
+  var messagesEl = getMessagesEl();
   var turns = messagesEl.querySelectorAll("[data-turn]");
   if (!turns.length) return null;
   // First: exact hit
@@ -198,7 +200,7 @@ function findClosestTurn(clientY) {
 
 // Cursor sharing toggle button in user island (multi-user only)
 export function initCursorToggle() {
-  if (!_ctx.isMultiUserMode) return;
+  if (!store.get('isMultiUserMode')) return;
   var actionsEl = document.querySelector(".user-island-actions");
   if (!actionsEl) return;
   if (document.getElementById("cursor-share-toggle")) return;
@@ -218,11 +220,11 @@ export function initCursorToggle() {
     if (cursorSharingEnabled) {
       btn.classList.remove("off");
       btn.classList.add("on");
-      _ctx.registerTooltip(btn, "Cursor sharing on");
+      registerTooltip(btn, "Cursor sharing on");
     } else {
       btn.classList.remove("on");
       btn.classList.add("off");
-      _ctx.registerTooltip(btn, "Cursor sharing off");
+      registerTooltip(btn, "Cursor sharing off");
     }
   }
 
@@ -233,7 +235,7 @@ export function initCursorToggle() {
     cursorSharingEnabled = !cursorSharingEnabled;
     localStorage.setItem("cursorSharing", cursorSharingEnabled ? "on" : "off");
     updateToggleStyle();
-    var ws = _ctx.ws;
+    var ws = getWs();
     if (!cursorSharingEnabled && ws && ws.readyState === 1) {
       ws.send(JSON.stringify({ type: "cursor_leave" }));
       ws.send(JSON.stringify({ type: "text_select", ranges: [] }));
@@ -244,7 +246,7 @@ export function initCursorToggle() {
 // --- Exported functions ---
 
 export function handleRemoteSelection(msg) {
-  var messagesEl = _ctx.messagesEl;
+  var messagesEl = getMessagesEl();
   var userId = msg.userId;
   var color = getCursorColor(userId);
 
@@ -305,7 +307,7 @@ export function handleRemoteSelection(msg) {
 }
 
 export function handleRemoteCursorMove(msg) {
-  var messagesEl = _ctx.messagesEl;
+  var messagesEl = getMessagesEl();
   var userId = msg.userId;
 
   var entry = remoteCursors[userId];
@@ -379,16 +381,15 @@ export function clearRemoteCursors() {
   remoteSelections = {};
 }
 
-export function initCursors(ctx) {
-  _ctx = ctx;
-  var messagesEl = _ctx.messagesEl;
+export function initCursors() {
+  var messagesEl = getMessagesEl();
 
   initCursorToggle();
 
   // Track local cursor and send to server
   messagesEl.addEventListener("mousemove", function (e) {
     if (!cursorSharingEnabled) return;
-    var ws = _ctx.ws;
+    var ws = getWs();
     if (!ws || ws.readyState !== 1) return;
     if (cursorThrottleTimer) return;
     cursorThrottleTimer = setTimeout(function () { cursorThrottleTimer = null; }, CURSOR_THROTTLE_MS);
@@ -412,7 +413,7 @@ export function initCursors(ctx) {
 
   messagesEl.addEventListener("mouseleave", function () {
     if (!cursorSharingEnabled) return;
-    var ws = _ctx.ws;
+    var ws = getWs();
     if (!ws || ws.readyState !== 1) return;
     ws.send(JSON.stringify({ type: "cursor_leave" }));
   });
@@ -429,7 +430,7 @@ export function initCursors(ctx) {
   // Track local text selection and send to server
   document.addEventListener("selectionchange", function () {
     if (!cursorSharingEnabled) return;
-    var ws = _ctx.ws;
+    var ws = getWs();
     if (!ws || ws.readyState !== 1) return;
     if (selectionThrottleTimer) return;
     selectionThrottleTimer = setTimeout(function () { selectionThrottleTimer = null; }, 100);

package/lib/public/modules/app-debate-ui.js

@@ -20,7 +20,7 @@ export function showDebateConcludeConfirm(msg) {
 
 function showDebateConcludeMode() {
   removeDebateBottomBar();
-  store.setState({ debateConcludeMode: true });
+  store.set({ debateConcludeMode: true });
   var inputArea = document.getElementById("input-area");
   if (inputArea) {
     inputArea.classList.add("debate-floor-mode");
@@ -57,7 +57,7 @@ function showDebateConcludeMode() {
 }
 
 export function exitDebateConcludeMode() {
-  store.setState({ debateConcludeMode: false });
+  store.set({ debateConcludeMode: false });
   var inputArea = document.getElementById("input-area");
   if (inputArea) inputArea.classList.remove("debate-floor-mode");
   var banner = document.getElementById("debate-floor-banner");
@@ -82,7 +82,7 @@ export function handleDebateConcludeSend() {
 
 export function showDebateEndedMode(msg) {
   removeDebateBottomBar();
-  store.setState({ debateEndedMode: true });
+  store.set({ debateEndedMode: true });
   var inputArea = document.getElementById("input-area");
   if (inputArea) {
     inputArea.classList.add("debate-floor-mode");
@@ -122,7 +122,7 @@ export function showDebateEndedMode(msg) {
 }
 
 export function exitDebateEndedMode() {
-  store.setState({ debateEndedMode: false });
+  store.set({ debateEndedMode: false });
   var inputArea = document.getElementById("input-area");
   if (inputArea) inputArea.classList.remove("debate-floor-mode");
   var banner = document.getElementById("debate-floor-banner");
@@ -146,7 +146,7 @@ function handleDebateEndedSend() {
 
 export function showDebateUserFloor(msg) {
   removeDebateBottomBar();
-  store.setState({ debateFloorMode: true });
+  store.set({ debateFloorMode: true });
   var inputArea = document.getElementById("input-area");
   if (inputArea) {
     inputArea.classList.add("debate-floor-mode");
@@ -184,7 +184,7 @@ export function showDebateUserFloor(msg) {
 }
 
 export function exitDebateFloorMode() {
-  store.setState({ debateFloorMode: false });
+  store.set({ debateFloorMode: false });
   var inputArea = document.getElementById("input-area");
   if (inputArea) inputArea.classList.remove("debate-floor-mode");
   var banner = document.getElementById("debate-floor-banner");
@@ -230,9 +230,9 @@ export function renderDebateUserFloorDone(msg) {
 
 export function showDebateSticky(phase, msg) {
   if (phase === "ended" || phase === "hide") {
-    store.setState({ debateStickyState: null });
+    store.set({ debateStickyState: null });
   } else {
-    store.setState({ debateStickyState: { phase: phase, msg: msg } });
+    store.set({ debateStickyState: { phase: phase, msg: msg } });
   }
 
   var stickyEl = document.getElementById("debate-sticky");
@@ -343,7 +343,7 @@ export function removeDebateBottomBar() {
   var handBar = document.getElementById("debate-hand-raise-bar");
   if (handBar) handBar.remove();
   debateHandRaiseOpen = false;
-  var _ds = store.getState();
+  var _ds = store.snap();
   if (_ds.debateFloorMode) exitDebateFloorMode();
   if (_ds.debateConcludeMode) exitDebateConcludeMode();
   if (_ds.debateEndedMode) exitDebateEndedMode();