@axos-web-dev/shared-components 2.2.29 → 2.2.30

package/dist/Chatbot/ChatWindow.d.ts

@@ -3,6 +3,7 @@ import { default as React } from 'react';
 
 interface MessageResponse extends BaseMessageResponse {
     to_agent?: HumanAgent;
+    pending?: boolean;
 }
 export interface ChatBubble {
     id: string | number;

package/dist/Chatbot/ChatWindow.js

@@ -18,7 +18,6 @@ import { useOpenChat } from "./store/chat.js";
 import { ThankYouMessage } from "./ThankYouMessage.js";
 const ChatWindow = ({
   messages,
-  status = "connected",
   onSend,
   inputDisabled = false,
   onClose,
@@ -43,7 +42,6 @@ const ChatWindow = ({
     showThankyouMessage,
     toggleThankyouMessage,
     hasEscalated,
-    isBlockedInput,
     isOpen,
     hasOpenedOnce,
     chatStatus,
@@ -65,7 +63,6 @@ const ChatWindow = ({
   const handleSend = (e) => {
     e.preventDefault();
     const cleaned = cleanInput(input);
-    if (isBlockedInput) return;
     if (cleaned != "") {
       onSend(cleaned);
       setInput("");
@@ -460,7 +457,7 @@ const ChatWindow = ({
           }
         ) }) : null,
         /* @__PURE__ */ jsxs("div", { className: clsx(messagesContainerStyle), children: [
-          (status === "idle" && messages.length == 0 || messages.length == 0) && /* @__PURE__ */ jsx(
+          !messages.some((msg) => !msg.pending) && /* @__PURE__ */ jsx(
             "div",
             {
               className: clsx(),
@@ -525,9 +522,7 @@ const ChatWindow = ({
             /* @__PURE__ */ jsx(
               "div",
               {
-                className: clsx(
-                  focused && !inputDisabled && !isBlockedInput ? focusAnimation : ""
-                ),
+                className: clsx(focused && !inputDisabled ? focusAnimation : ""),
                 style: {
                   position: "absolute",
                   left: "10%",
@@ -544,7 +539,7 @@ const ChatWindow = ({
                 style: {
                   display: "flex",
                   padding: "12px 16px",
-                  background: isBlockedInput || inputDisabled || status !== "connected" || messages.length == 0 || escalationDeflected ? "light-dark(rgba(239, 239, 239, 0.3), rgba(59, 59, 59, 0.3))" : "#ffffff",
+                  background: inputDisabled || escalationDeflected ? "light-dark(rgba(239, 239, 239, 0.3), rgba(59, 59, 59, 0.3))" : "#ffffff",
                   borderRadius: 12
                 },
                 children: [
@@ -568,7 +563,7 @@ const ChatWindow = ({
                       "aria-label": "Ask anything...",
                       className: clsx(inputStyle, autoResize),
                       autoFocus: true,
-                      disabled: isBlockedInput || inputDisabled || status !== "connected" || messages.length == 0 || escalationDeflected,
+                      disabled: inputDisabled || escalationDeflected,
                       rows: 1
                     }
                   ),
@@ -582,7 +577,7 @@ const ChatWindow = ({
                       type: "submit",
                       title: "Send message",
                       "aria-label": "Send message",
-                      disabled: isBlockedInput || inputDisabled || status !== "connected" || !input.trim() || messages.length == 0 || escalationDeflected,
+                      disabled: inputDisabled || !input.trim() || escalationDeflected,
                       children: /* @__PURE__ */ jsx(
                         "svg",
                         {

package/dist/Chatbot/Chatbot.js

@@ -40,17 +40,34 @@ const Chatbot = ({
     hideDisplayThankyouMessage
   } = useOpenChat();
   const isVisible = usePageVisibility();
-  const { addMessage, addMessages, clearMessages, messages } = useMessages();
+  const {
+    addMessage,
+    addMessages,
+    clearMessages,
+    messages,
+    addPendingMessage,
+    resolvePendingMessage
+  } = useMessages();
   const clientRef = useRef(null);
   const menuRef = useRef(null);
   const isMountedRef = useRef(false);
   const chatRef = useRef(null);
   const chatLoading = useRef(false);
   const agent_virtual = useRef(null);
+  const messageQueueRef = useRef([]);
+  const sendInFlightRef = useRef(false);
+  const flushingRef = useRef(false);
+  const statusRef = useRef("idle");
   const [status, setStatus] = useState("idle");
   const [menusLoaded, setMenusLoaded] = useState(false);
   const [isTyping, setIsTyping] = useState(false);
   const [scalationStarted, setScalationStarted] = useState(false);
+  useEffect(() => {
+    statusRef.current = status;
+    if (status === "connected") {
+      flushQueuedMessages();
+    }
+  }, [status]);
   useEffect(() => {
     if (messages.length === 0) return;
     const hasScalation = messages.some(
@@ -67,6 +84,9 @@ const Chatbot = ({
     ["axos", 1],
     ["ufb", 3]
   ]);
+  const hasRealReply = () => useMessages.getState().messages.some(
+    (m) => !m.pending && m.$userType !== "end_user" && m.type !== "noti" && m.$sid !== "typing-1"
+  );
   const typingMessage = {
     $sid: "typing-1",
     type: "system",
@@ -107,7 +127,7 @@ const Chatbot = ({
       menuRef.current = await clientRef.current.getMenus();
       setMenusLoaded(true);
       console.log("menus:", menuRef.current);
-      if (menuRef.current !== null) {
+      if (menuRef.current !== null && useOpenChat.getState().isOpen) {
         await startChat("onReady");
       }
     }
@@ -121,10 +141,11 @@ const Chatbot = ({
   const onChatMessageHandler = async (message) => {
     console.log("Received message:", message);
     const { event, $userType } = message;
-    if (["system", "virtual_agent", "user"].includes($userType) && event === void 0) {
+    if (["virtual_agent", "user"].includes($userType) && event === void 0) {
       addMessage(message);
       if (!hasEscalated) {
         unblockInput?.();
+        flushQueuedMessages();
       }
       return;
     }
@@ -205,6 +226,7 @@ const Chatbot = ({
           startEscalation?.();
         }
       }
+      flushQueuedMessages();
     } catch (error) {
       console.error("Error fetching messages on chat connected:", error);
     }
@@ -226,7 +248,7 @@ const Chatbot = ({
   const deregisterEventHandlers = () => {
     clientRef.current?.off("ready", onReadyHandler);
     clientRef.current?.off("authenticated", onAuthenticatedHandler);
-    clientRef.current?.off("chat.ongoing", onDismissedHandler);
+    clientRef.current?.off("chat.ongoing", onChatOngoingHandler);
     clientRef.current?.off("chat.message", onChatMessageHandler);
     clientRef.current?.off("chat.typingStarted", onChatTypingStartedHandler);
     clientRef.current?.off("chat.typingEnded", onChatTypingEndedHandler);
@@ -340,6 +362,41 @@ const Chatbot = ({
       setChatStarted();
     }
   };
+  const sendNow = async (msg) => {
+    sendInFlightRef.current = true;
+    let success = true;
+    try {
+      await clientRef.current?.sendTextMessage(msg);
+    } catch (error) {
+      console.log(error);
+      success = false;
+    } finally {
+      sendInFlightRef.current = false;
+      if (!hasEscalated) {
+        blockInput?.();
+      }
+    }
+    return success;
+  };
+  const flushQueuedMessages = async () => {
+    if (flushingRef.current) return;
+    if (messageQueueRef.current.length === 0) return;
+    if (!clientRef.current || statusRef.current !== "connected") return;
+    if (!hasRealReply()) return;
+    flushingRef.current = true;
+    try {
+      while (messageQueueRef.current.length > 0 && !useOpenChat.getState().isBlockedInput && !sendInFlightRef.current) {
+        const next = messageQueueRef.current[0];
+        const success = await sendNow(next.text);
+        messageQueueRef.current.shift();
+        if (!success) {
+          resolvePendingMessage(next.id);
+        }
+      }
+    } finally {
+      flushingRef.current = false;
+    }
+  };
   const onSendMessage = async (msg) => {
     const clientChatId = clientRef.current?.chat?.id;
     const refChatId = chatRef.current?.id;
@@ -351,15 +408,16 @@ const Chatbot = ({
       "| chatRef.id:",
       refChatId
     );
-    try {
-      await clientRef.current?.sendTextMessage(msg);
-    } catch (error) {
-      console.log(error);
-    } finally {
-      if (!hasEscalated) {
-        blockInput?.();
-      }
+    const notReady = !clientRef.current || statusRef.current !== "connected";
+    const isThinking = useOpenChat.getState().isBlockedInput;
+    const noReplyYet = !hasRealReply();
+    if (notReady || isThinking || sendInFlightRef.current || noReplyYet) {
+      const id = `pending-${Date.now()}-${Math.random().toString(36).slice(2)}`;
+      messageQueueRef.current.push({ id, text: msg });
+      addPendingMessage(id, msg);
+      return;
     }
+    await sendNow(msg);
   };
   const onEndChat = async () => {
     console.log(`Ending chat [end chat]`);
@@ -373,6 +431,9 @@ const Chatbot = ({
           clearMessages();
           chatRef.current = null;
           resetChatStarted();
+          messageQueueRef.current = [];
+          sendInFlightRef.current = false;
+          flushingRef.current = false;
           console.log("Chat ended");
           endEscalation?.();
         } finally {
@@ -399,6 +460,8 @@ const Chatbot = ({
     console.log("Chatbot unmounted");
     deregisterEventHandlers();
     chatLoading.current = false;
+    messageQueueRef.current = [];
+    sendInFlightRef.current = false;
     reset();
     resetChatStarted();
     setStatus("idle");
@@ -443,36 +506,6 @@ const Chatbot = ({
       }
     }
   }, [isOpen, isVisible]);
-  useMount(() => {
-    const hasParams = () => {
-      return window.location.search.includes("utm_");
-    };
-    const tryStart = () => {
-      if (hasParams()) {
-        startChat("utm-ready");
-        return true;
-      }
-      return false;
-    };
-    if (tryStart()) return;
-    const original = history.replaceState;
-    history.replaceState = function(...args) {
-      original.apply(this, args);
-      if (tryStart()) {
-        history.replaceState = original;
-      }
-    };
-    const interval = setInterval(() => {
-      if (tryStart()) {
-        clearInterval(interval);
-        history.replaceState = original;
-      }
-    }, 100);
-    return () => {
-      clearInterval(interval);
-      history.replaceState = original;
-    };
-  });
   return menusLoaded && /* @__PURE__ */ jsxs(
     "div",
     {

package/dist/Chatbot/ChatbotMessage.d.ts

@@ -3,6 +3,7 @@ import { MessageResponse as BaseMessageResponse, HumanAgent, VirtualAgent } from
 
 interface MessageResponse extends BaseMessageResponse {
     to_agent?: HumanAgent;
+    pending?: boolean;
 }
 interface ChatbotMessageProps {
     msg: MessageResponse;

package/dist/Chatbot/ChatbotMessage.js

@@ -108,6 +108,7 @@ const ChatbotMessage = ({
               messageStyle,
               msg.$userType == "end_user" ? user_msg : agent_msg
             ),
+            style: msg.pending ? { opacity: 0.65 } : void 0,
             children: /* @__PURE__ */ jsxs(
               "div",
               {
@@ -253,7 +254,7 @@ const ChatbotMessage = ({
               textTransform: "capitalize",
               fontFamily: "inherit"
             },
-            children: timeText
+            children: msg.pending ? "Sending..." : timeText
           }
         )
       ]

package/dist/Chatbot/store/messages.d.ts

@@ -1,12 +1,17 @@
 import { MessageResponse } from '@ujet/websdk-headless';
 
+export type PendingMessage = MessageResponse & {
+    pending?: boolean;
+};
 interface MessageStore {
-    messages: Array<MessageResponse>;
+    messages: Array<PendingMessage>;
     addMessage: (message: MessageResponse) => void;
     removeMessage: (id: string) => void;
     addMessages: (newMessages: MessageResponse[]) => void;
     clearMessages: () => void;
     isEscalated: boolean;
+    addPendingMessage: (id: string, text: string) => void;
+    resolvePendingMessage: (id: string) => void;
 }
 export interface Message {
     id: string;

package/dist/Chatbot/store/messages.js

@@ -3,18 +3,77 @@ const useMessages = create((set, get) => ({
   messages: [],
   addMessage: (message) => set((state) => {
     const cleaned = state.messages.filter((m) => m.$sid !== "typing-1");
-    return { messages: [...cleaned, message] };
+    const isPending = message.pending;
+    if (!isPending && message.$userType === "end_user") {
+      const pendingIdx = cleaned.findIndex(
+        (m) => m.pending && m.content === message.content
+      );
+      if (pendingIdx !== -1) {
+        return {
+          messages: [
+            ...cleaned.slice(0, pendingIdx),
+            message,
+            ...cleaned.slice(pendingIdx + 1)
+          ]
+        };
+      }
+      return { messages: [...cleaned, message] };
+    }
+    const insertBeforeIdx = !isPending ? cleaned.findIndex((m) => m.pending) : -1;
+    if (insertBeforeIdx === -1) {
+      return { messages: [...cleaned, message] };
+    }
+    return {
+      messages: [
+        ...cleaned.slice(0, insertBeforeIdx),
+        message,
+        ...cleaned.slice(insertBeforeIdx)
+      ]
+    };
   }),
   removeMessage: (id) => set((state) => ({
     messages: state.messages.filter(
       (msg) => "$sid" in msg && msg.$sid !== id
     )
   })),
-  addMessages: (newMessages) => set((state) => ({ messages: [...state.messages, ...newMessages] })),
+  addMessages: (newMessages) => set((state) => {
+    const pendingIdx = state.messages.findIndex(
+      (m) => m.pending
+    );
+    if (pendingIdx === -1) {
+      return { messages: [...state.messages, ...newMessages] };
+    }
+    return {
+      messages: [
+        ...state.messages.slice(0, pendingIdx),
+        ...newMessages,
+        ...state.messages.slice(pendingIdx)
+      ]
+    };
+  }),
   clearMessages: () => set({ messages: [] }),
   isEscalated: get()?.messages?.some(
     (msg) => ["escalationAccepted", "escalationStarted"].includes(msg.event)
-  )
+  ),
+  addPendingMessage: (id, text) => set((state) => ({
+    messages: [
+      ...state.messages,
+      {
+        $sid: id,
+        type: "text",
+        content: text,
+        sender: { id: "end_user", type: "end_user" },
+        $timestamp: /* @__PURE__ */ new Date(),
+        $userType: "end_user",
+        $index: Date.now(),
+        $userId: 0,
+        pending: true
+      }
+    ]
+  })),
+  resolvePendingMessage: (id) => set((state) => ({
+    messages: state.messages.filter((msg) => msg.$sid !== id)
+  }))
 }));
 export {
   useMessages

package/dist/assets/ImageBillboard/ImageBillboard.css

@@ -293,6 +293,12 @@ main > div:nth-last-child(2) > ._1m7m2a0:not(._1m7m2ax) {
 .page_body_contents > div:has(._1m7m2ax._1m7m2a4) + div:has(._1m7m2ax._1m7m2a4) {
   padding-top: 0;
 }
+.page_body_contents > div:has(.stacked) {
+  padding-bottom: 40px;
+}
+.page_body_contents > div:has(> ._1m7m2ax) {
+  padding-block: 56px;
+}
 .page_body_contents > div:has(._1m7m2ax) + div:has(._1m7m2ax) {
   margin-top: 0;
 }
@@ -459,6 +465,9 @@ main > div:nth-last-child(2) > ._1m7m2a0:not(._1m7m2ax) {
   .stacked:first-child {
     padding-top: 42px;
   }
+  .page_body_contents > div:has(> ._1m7m2ax) {
+    padding-block: 42px;
+  }
 }
 @media screen and (max-width: 768px) {
   ._1m7m2av {
@@ -476,6 +485,9 @@ main > div:nth-last-child(2) > ._1m7m2a0:not(._1m7m2ax) {
   .stacked:first-child {
     padding-top: 2rem;
   }
+  .page_body_contents > div:has(> ._1m7m2ax) {
+    padding-block: 2rem;
+  }
 }
 @media screen and (max-width: 327px) {
   ._1m7m2av {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@axos-web-dev/shared-components",
   "description": "Axos shared components library for web.",
-  "version": "2.2.29",
+  "version": "2.2.30",
   "type": "module",
   "main": "dist/main.js",
   "module": "dist/main.js",