@natoe/colab 0.1.11 → 0.1.12

package/dist/index.mjs

@@ -569,7 +569,11 @@ function buildChannelName(patientData) {
   const patientPart = patientData.patientName?.trim() || "Unknown";
   const labPart = patientData.labName?.trim()?.slice(0, 24) || "";
   const last4 = (patientData.displayOrderId ?? "").trim().slice(-4) || "0000";
-  return `${patientPart} - ${labPart} - ${last4}`;
+  return labPart ? `${patientPart} - ${labPart} - ${last4}` : `${patientPart} - ${last4}`;
+}
+function cleanChannelName(name) {
+  if (!name) return "";
+  return name.replace(/\s+-\s+-\s+/g, " - ").trim();
 }
 
 // src/hooks/useConversation.ts
@@ -604,8 +608,11 @@ function useConversation({
   const ensureConversationInFlight = useRef(null);
   const markedReadIdsRef = useRef(/* @__PURE__ */ new Set());
   const buildName = useCallback(
-    () => buildChannelName(patientData),
-    [patientData]
+    () => {
+      const labName = patientData.labName ?? (config.userRole === "lab" ? config.userName : void 0);
+      return buildChannelName({ ...patientData, labName });
+    },
+    [patientData, config.userRole, config.userName]
   );
   const joinChannel = useCallback(
     (conv) => {
@@ -1295,7 +1302,7 @@ var Z_INDEX = {
 function resolveDisplayName(patientData, displayName) {
   const localComplete = !!patientData.labName && !!patientData.displayOrderId;
   if (localComplete) return buildChannelName(patientData);
-  return displayName ?? buildChannelName(patientData);
+  return cleanChannelName(displayName) || buildChannelName(patientData);
 }
 function PatientHeader({
   patientData,
@@ -3760,6 +3767,7 @@ function CollabPanel({
   showSeenBy = true,
   onBack,
   hidePatientName = false,
+  onConversationChange,
   className,
   style
 }) {
@@ -3788,6 +3796,9 @@ function CollabPanel({
     pinMessage,
     unpinMessage
   } = useConversation({ orderId, patientData, participantIds });
+  useEffect(() => {
+    onConversationChange?.(conversation);
+  }, [conversation, onConversationChange]);
   const channelSettings = useChannelSettings({
     conversationId: conversation?.id ?? null
   });
@@ -4009,10 +4020,12 @@ function CollabPopup({
   );
   const [isDragging, setIsDragging] = useState(false);
   const [isMinimized, setIsMinimized] = useState(false);
+  const [loadedConversation, setLoadedConversation] = useState(null);
   const dragOffset = useRef({ x: 0, y: 0 });
   const containerRef = useRef(null);
   const previouslyFocused = useRef(null);
   const titleId = useId();
+  const titleText = cleanChannelName(loadedConversation?.name) || buildChannelName(patientData);
   const handleMouseDown = useCallback(
     (e) => {
       if (!e.target.closest("[data-drag-handle]")) return;
@@ -4116,7 +4129,7 @@ function CollabPopup({
               children: "\u2190"
             }
           ),
-          /* @__PURE__ */ jsx("span", { id: titleId, style: { ...styles13.titleText, flex: 1 }, children: buildChannelName(patientData) }),
+          /* @__PURE__ */ jsx("span", { id: titleId, style: { ...styles13.titleText, flex: 1 }, children: titleText }),
           /* @__PURE__ */ jsxs("div", { style: styles13.titleActions, children: [
             /* @__PURE__ */ jsx(
               "button",
@@ -4142,7 +4155,16 @@ function CollabPopup({
             )
           ] })
         ] }),
-        !isMinimized && /* @__PURE__ */ jsx("div", { style: styles13.panelWrapper, children: /* @__PURE__ */ jsx(CollabPanel, { orderId, patientData, participantIds, hidePatientName: true }) })
+        !isMinimized && /* @__PURE__ */ jsx("div", { style: styles13.panelWrapper, children: /* @__PURE__ */ jsx(
+          CollabPanel,
+          {
+            orderId,
+            patientData,
+            participantIds,
+            hidePatientName: true,
+            onConversationChange: setLoadedConversation
+          }
+        ) })
       ]
     }
   );