@microsoft/omnichannel-chat-widget 0.1.0-main.ae3aa42 → 0.1.0-main.b59a07c

package/lib/esm/components/livechatwidget/common/endChat.js

@@ -7,8 +7,8 @@ import { WebChatStoreLoader } from "../../webchatcontainerstateful/webchatcontro
 import { defaultWebChatContainerStatefulProps } from "../../webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps";
 import { PostChatSurveyMode } from "../../postchatsurveypanestateful/enums/PostChatSurveyMode";
 import { Constants } from "../../../common/Constants";
+import { getWidgetEndChatEventName } from "../../../common/utils"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const prepareEndChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, state) => {
   var _state$domainStates$l, _state$domainStates$l2, _state$domainStates$l3, _state$domainStates$l4;
 
@@ -19,7 +19,7 @@ const prepareEndChat = async (props, chatSDK, setAdapter, setWebChatStyles, disp
   if (isPostChatEnabled === "true" && (conversationDetails === null || conversationDetails === void 0 ? void 0 : conversationDetails.canRenderPostChat) === Constants.truePascal) {
     const skipEndChatSDK = false;
     const skipCloseChat = true;
-    await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat);
+    await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat, true);
 
     if (postChatSurveyMode === PostChatSurveyMode.Embed) {
       const loadPostChatEvent = {
@@ -33,18 +33,27 @@ const prepareEndChat = async (props, chatSDK, setAdapter, setWebChatStyles, disp
       });
     }
   } else {
-    await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter);
+    await endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, false, false, true);
   }
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
-const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat) => {
+const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab) => {
   if (!skipEndChatSDK) {
     try {
       TelemetryHelper.logSDKEvent(LogLevel.INFO, {
         Event: TelemetryEvent.EndChatSDKCall
       });
-      await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.endChat());
+      await (chatSDK === null || chatSDK === void 0 ? void 0 : chatSDK.endChat()); // Need to clear these states immediately when chat ended from OC.
+
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
+        payload: undefined
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+        payload: undefined
+      });
     } catch (ex) {
       TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
         Event: TelemetryEvent.EndChatSDKCallFailed,
@@ -52,6 +61,7 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
           exception: ex
         }
       });
+      postMessageToOtherTab = false;
     }
   }
 
@@ -81,17 +91,18 @@ const endChat = async (props, chatSDK, setAdapter, setWebChatStyles, dispatch, a
         type: LiveChatWidgetActionType.SET_AUDIO_NOTIFICATION,
         payload: null
       });
-      dispatch({
-        type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
-        payload: undefined
-      });
-      dispatch({
-        type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
-        payload: undefined
-      });
       BroadcastService.postMessage({
-        eventName: BroadcastEvent.EndChat
+        eventName: BroadcastEvent.ChatEnded
       });
+
+      if (postMessageToOtherTab) {
+        var _chatSDK$omnichannelC, _chatSDK$omnichannelC2;
+
+        const endChatEventName = getWidgetEndChatEventName(chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC === void 0 ? void 0 : _chatSDK$omnichannelC.orgId, chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC2 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC2 === void 0 ? void 0 : _chatSDK$omnichannelC2.widgetId);
+        BroadcastService.postMessage({
+          eventName: endChatEventName
+        });
+      }
     } catch (error) {
       TelemetryHelper.logActionEvent(LogLevel.ERROR, {
         Event: TelemetryEvent.CloseChatMethodException,

package/lib/esm/components/livechatwidget/common/initWebChatComposer.js

@@ -84,6 +84,10 @@ export const initWebChatComposer = (props, chatSDK, state, dispatch, setWebChatS
         type: LiveChatWidgetActionType.SET_CHAT_TOKEN,
         payload: undefined
       });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_LIVE_CHAT_CONTEXT,
+        payload: undefined
+      });
     };
 
     webChatStore = createStore({}, //initial state

package/lib/esm/components/livechatwidget/common/startChat.js

@@ -1,5 +1,5 @@
-import { ChatSDKError, Constants } from "../../../common/Constants";
-import { LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
+import { ChatSDKError } from "../../../common/Constants";
+import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/telemetry/TelemetryConstants";
 import { ConversationState } from "../../../contexts/common/ConversationState";
 import { DataStoreManager } from "../../../common/contextDataStore/DataStoreManager";
 import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidgetActionType";
@@ -9,10 +9,13 @@ import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { TelemetryTimers } from "../../../common/telemetry/TelemetryManager";
 import { createAdapter } from "./createAdapter";
 import { createOnNewAdapterActivityHandler } from "../../../plugins/newMessageEventHandler";
-import { createTimer } from "../../../common/utils";
+import { createTimer, getWidgetCacheId } from "../../../common/utils";
 import { getReconnectIdForAuthenticatedChat, handleRedirectUnauthenticatedReconnectChat } from "./reconnectChatHelper";
 import { setPostChatContextAndLoadSurvey } from "./setPostChatContextAndLoadSurvey";
-import { updateSessionDataForTelemetry } from "./updateSessionDataForTelemetry"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+import { updateSessionDataForTelemetry } from "./updateSessionDataForTelemetry";
+import { BroadcastService } from "@microsoft/omnichannel-chat-components"; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+let optionalParams = {}; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) => {
   var _props$reconnectChatP;
@@ -52,11 +55,13 @@ const prepareStartChat = async (props, chatSDK, state, dispatch, setAdapter) =>
         type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
         payload: ConversationState.Prechat
       });
+      setCustomContextParams(props, state);
     } else {
       dispatch({
         type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
         payload: ConversationState.Loading
       });
+      setCustomContextParams(props, state);
       await initStartChat(chatSDK, dispatch, setAdapter);
     }
   }
@@ -67,12 +72,29 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
   try {
     var _newAdapter$activity$, _TelemetryTimers$Widg;
 
+    let isStartChatSuccessful = false;
+
+    if (persistedState || params !== null && params !== void 0 && params.liveChatContext) {
+      var _persistedState$domai, _persistedState$domai2, _persistedState$domai3, _persistedState$domai4, _persistedState$domai5;
+
+      // Broadcasting limited cached chat details
+      BroadcastService.postMessage({
+        eventName: BroadcastEvent.ChatRetrievedFromCache,
+        payload: {
+          chatId: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai = persistedState.domainStates) === null || _persistedState$domai === void 0 ? void 0 : (_persistedState$domai2 = _persistedState$domai.liveChatContext) === null || _persistedState$domai2 === void 0 ? void 0 : (_persistedState$domai3 = _persistedState$domai2.chatToken) === null || _persistedState$domai3 === void 0 ? void 0 : _persistedState$domai3.chatId,
+          requestId: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai4 = persistedState.domainStates) === null || _persistedState$domai4 === void 0 ? void 0 : (_persistedState$domai5 = _persistedState$domai4.liveChatContext) === null || _persistedState$domai5 === void 0 ? void 0 : _persistedState$domai5.requestId
+        }
+      });
+    }
+
     try {
       TelemetryTimers.WidgetLoadTimer = createTimer();
       TelemetryHelper.logSDKEvent(LogLevel.INFO, {
         Event: TelemetryEvent.StartChatSDKCall
       });
-      await chatSDK.startChat(params);
+      optionalParams = Object.assign({}, params, optionalParams);
+      await chatSDK.startChat(optionalParams);
+      isStartChatSuccessful = true;
     } catch (error) {
       TelemetryHelper.logSDKEvent(LogLevel.ERROR, {
         Event: TelemetryEvent.StartChatMethodException,
@@ -80,6 +102,7 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
           exception: `Failed to setup startChat: ${error}`
         }
       });
+      isStartChatSuccessful = false;
     }
 
     const newAdapter = await createAdapter(chatSDK);
@@ -107,10 +130,12 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
       await setPostChatContextAndLoadSurvey(chatSDK, dispatch);
       await updateSessionDataForTelemetry(chatSDK, dispatch); // Set app state to Active
 
-      dispatch({
-        type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
-        payload: ConversationState.Active
-      });
+      if (isStartChatSuccessful) {
+        dispatch({
+          type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
+          payload: ConversationState.Active
+        });
+      }
     } else {
       dispatch({
         type: LiveChatWidgetActionType.SET_WIDGET_STATE,
@@ -148,20 +173,21 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, params, persistedSta
 
 
 const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdapter) => {
-  var _DataStoreManager$cli, _persistedState$domai;
+  var _chatSDK$omnichannelC, _chatSDK$omnichannelC2, _DataStoreManager$cli, _persistedState$domai6;
 
-  const widgetStateFromCache = (_DataStoreManager$cli = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(Constants.widgetStateDataKey, "localStorage");
+  const widgetStateEventName = getWidgetCacheId((chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC === void 0 ? void 0 : _chatSDK$omnichannelC.orgId) ?? "", (chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC2 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC2 === void 0 ? void 0 : _chatSDK$omnichannelC2.widgetId) ?? "");
+  const widgetStateFromCache = (_DataStoreManager$cli = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(widgetStateEventName, "localStorage");
   const persistedState = widgetStateFromCache ? JSON.parse(widgetStateFromCache) : undefined;
 
-  if (persistedState !== null && persistedState !== void 0 && (_persistedState$domai = persistedState.domainStates) !== null && _persistedState$domai !== void 0 && _persistedState$domai.liveChatContext) {
-    var _persistedState$domai2;
+  if (persistedState !== null && persistedState !== void 0 && (_persistedState$domai6 = persistedState.domainStates) !== null && _persistedState$domai6 !== void 0 && _persistedState$domai6.liveChatContext) {
+    var _persistedState$domai7;
 
     dispatch({
       type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
       payload: ConversationState.Loading
     });
     const optionalParams = {
-      liveChatContext: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai2 = persistedState.domainStates) === null || _persistedState$domai2 === void 0 ? void 0 : _persistedState$domai2.liveChatContext
+      liveChatContext: persistedState === null || persistedState === void 0 ? void 0 : (_persistedState$domai7 = persistedState.domainStates) === null || _persistedState$domai7 === void 0 ? void 0 : _persistedState$domai7.liveChatContext
     };
     await initStartChat(chatSDK, dispatch, setAdapter, optionalParams, persistedState);
     return true;
@@ -170,4 +196,15 @@ const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdap
   }
 };
 
+const setCustomContextParams = (props, state) => {
+  var _props$chatConfig, _state$domainStates;
+
+  // Add custom context if any only for unauthenticated chat
+  if (!((_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && _props$chatConfig.LiveChatConfigAuthSettings) && (_state$domainStates = state.domainStates) !== null && _state$domainStates !== void 0 && _state$domainStates.customContext) {
+    optionalParams = Object.assign({}, optionalParams, {
+      customContext: state.domainStates.customContext
+    });
+  }
+};
+
 export { prepareStartChat, initStartChat };

package/lib/esm/components/livechatwidget/livechatwidgetstateful/LiveChatWidgetStateful.js

@@ -4,7 +4,7 @@ import { BroadcastEvent, LogLevel, TelemetryEvent } from "../../../common/teleme
 import { BroadcastService, decodeComponentString } from "@microsoft/omnichannel-chat-components";
 import { Stack } from "@fluentui/react";
 import React, { useEffect, useRef, useState } from "react";
-import { createTimer, getLocaleDirection } from "../../../common/utils";
+import { createTimer, getLocaleDirection, getWidgetCacheId, getWidgetEndChatEventName } from "../../../common/utils";
 import { getReconnectIdForAuthenticatedChat, handleUnauthenticatedReconnectChat, startUnauthenticatedReconnectChat } from "../common/reconnectChatHelper";
 import { initStartChat, prepareStartChat } from "../common/startChat";
 import { shouldShowCallingContainer, shouldShowChatButton, shouldShowConfirmationPane, shouldShowEmailTranscriptPane, shouldShowHeader, shouldShowLoadingPane, shouldShowOutOfOfficeHoursPane, shouldShowPostChatLoadingPane, shouldShowPostChatSurveyPane, shouldShowPreChatSurveyPane, shouldShowProactiveChatPane, shouldShowReconnectChatPane, shouldShowWebChatContainer } from "../../../controller/componentController";
@@ -53,7 +53,8 @@ export const LiveChatWidgetStateful = props => {
     ...((_props$webChatContain = props.webChatContainerProps) === null || _props$webChatContain === void 0 ? void 0 : _props$webChatContain.webChatStyles)
   }); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-  const chatSDK = useChatSDKStore();
+  const chatSDK = useChatSDKStore(); // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
   const [voiceVideoCallingSDK, setVoiceVideoCallingSDK] = useState(undefined);
   const {
     Composer
@@ -81,6 +82,10 @@ export const LiveChatWidgetStateful = props => {
       type: LiveChatWidgetActionType.SET_SKIP_CHAT_BUTTON_RENDERING,
       payload: ((_props$controlProps2 = props.controlProps) === null || _props$controlProps2 === void 0 ? void 0 : _props$controlProps2.skipChatButtonRendering) || false
     });
+    dispatch({
+      type: LiveChatWidgetActionType.SET_E2VV_ENABLED,
+      payload: false
+    });
     initCallingSdk(chatSDK, setVoiceVideoCallingSDK).then(sdkCreated => {
       sdkCreated && dispatch({
         type: LiveChatWidgetActionType.SET_E2VV_ENABLED,
@@ -145,7 +150,20 @@ export const LiveChatWidgetStateful = props => {
     }
   }, [state.appStates.skipChatButtonRendering]);
   useEffect(() => {
-    BroadcastService.getMessageByEventName("StartProactiveChat").subscribe(msg => {
+    var _chatSDK$omnichannelC, _chatSDK$omnichannelC2;
+
+    // Add the custom context on receiving the SetCustomContext event
+    BroadcastService.getMessageByEventName(BroadcastEvent.SetCustomContext).subscribe(msg => {
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.CustomContextReceived,
+        Description: "CustomContext received."
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_CUSTOM_CONTEXT,
+        payload: msg === null || msg === void 0 ? void 0 : msg.payload
+      });
+    });
+    BroadcastService.getMessageByEventName(BroadcastEvent.StartProactiveChat).subscribe(msg => {
       TelemetryHelper.logActionEvent(LogLevel.INFO, {
         Event: TelemetryEvent.StartProactiveChatEventReceived,
         Description: "Start proactive chat event received."
@@ -163,7 +181,7 @@ export const LiveChatWidgetStateful = props => {
       }
     }); // start chat from SDK Event
 
-    BroadcastService.getMessageByEventName("StartChat").subscribe(() => {
+    BroadcastService.getMessageByEventName(BroadcastEvent.StartChat).subscribe(() => {
       TelemetryHelper.logActionEvent(LogLevel.INFO, {
         Event: TelemetryEvent.StartChatEventRecevied,
         Description: "Start chat event received."
@@ -179,7 +197,7 @@ export const LiveChatWidgetStateful = props => {
       }
     }); // end chat from SDK Event
 
-    BroadcastService.getMessageByEventName("EndChat").subscribe(async () => {
+    BroadcastService.getMessageByEventName(BroadcastEvent.EndChat).subscribe(async () => {
       TelemetryHelper.logActionEvent(LogLevel.INFO, {
         Event: TelemetryEvent.EndChatEventReceived,
         Description: "End chat event received."
@@ -192,6 +210,26 @@ export const LiveChatWidgetStateful = props => {
         const skipCloseChat = false;
         endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, skipEndChatSDK, skipCloseChat);
       }
+    }); // Listen to end chat event from other tabs
+
+    const endChatEventName = getWidgetEndChatEventName(chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC === void 0 ? void 0 : _chatSDK$omnichannelC.orgId, chatSDK === null || chatSDK === void 0 ? void 0 : (_chatSDK$omnichannelC2 = chatSDK.omnichannelConfig) === null || _chatSDK$omnichannelC2 === void 0 ? void 0 : _chatSDK$omnichannelC2.widgetId);
+    BroadcastService.getMessageByEventName(endChatEventName).subscribe(async () => {
+      endChat(props, chatSDK, setAdapter, setWebChatStyles, dispatch, adapter, false, false, false);
+    }); // Close popout window
+
+    BroadcastService.getMessageByEventName(BroadcastEvent.ClosePopoutWindow).subscribe(() => {
+      TelemetryHelper.logActionEvent(LogLevel.INFO, {
+        Event: TelemetryEvent.ClosePopoutWindowEventRecevied,
+        Description: "Close popout window event received."
+      });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_PROACTIVE_CHAT_PARAMS,
+        payload: {
+          proactiveChatBodyTitle: "",
+          proactiveChatEnablePrechat: false,
+          proactiveChatInNewWindow: false
+        }
+      });
     });
     window.addEventListener("beforeunload", () => {
       disposeTelemetryLoggers();
@@ -274,8 +312,11 @@ export const LiveChatWidgetStateful = props => {
   const confirmationPaneProps = initConfirmationPropsComposer(props); // publish chat widget state
 
   useEffect(() => {
+    var _props$chatSDK, _props$chatSDK$omnich, _props$chatSDK2, _props$chatSDK2$omnic;
+
+    const widgetStateEventName = getWidgetCacheId(props === null || props === void 0 ? void 0 : (_props$chatSDK = props.chatSDK) === null || _props$chatSDK === void 0 ? void 0 : (_props$chatSDK$omnich = _props$chatSDK.omnichannelConfig) === null || _props$chatSDK$omnich === void 0 ? void 0 : _props$chatSDK$omnich.orgId, props === null || props === void 0 ? void 0 : (_props$chatSDK2 = props.chatSDK) === null || _props$chatSDK2 === void 0 ? void 0 : (_props$chatSDK2$omnic = _props$chatSDK2.omnichannelConfig) === null || _props$chatSDK2$omnic === void 0 ? void 0 : _props$chatSDK2$omnic.widgetId);
     const chatWidgetStateChangeEvent = {
-      eventName: BroadcastEvent.ChatWidgetStateChanged,
+      eventName: widgetStateEventName,
       payload: { ...state
       }
     };

package/lib/esm/components/prechatsurveypanestateful/PreChatSurveyPaneStateful.js

@@ -1,7 +1,7 @@
-import { Constants, HtmlAttributeNames, Regex } from "../../common/Constants";
+import { HtmlAttributeNames, Regex } from "../../common/Constants";
 import { LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
 import React, { useEffect } from "react";
-import { extractPreChatSurveyResponseValues, findAllFocusableElement, parseAdaptiveCardPayload } from "../../common/utils";
+import { extractPreChatSurveyResponseValues, findAllFocusableElement, getWidgetCacheId, parseAdaptiveCardPayload } from "../../common/utils";
 import { ConversationState } from "../../contexts/common/ConversationState";
 import { DataStoreManager } from "../../common/contextDataStore/DataStoreManager";
 import { LiveChatWidgetActionType } from "../../contexts/common/LiveChatWidgetActionType";
@@ -67,9 +67,10 @@ export const PreChatSurveyPaneStateful = props => {
       });
 
       try {
-        var _DataStoreManager$cli, _persistedState$domai;
+        var _state$domainStates, _state$domainStates$t, _state$domainStates$t2, _DataStoreManager$cli, _persistedState$domai;
 
-        const widgetStateFromCache = (_DataStoreManager$cli = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(Constants.widgetStateDataKey, "localStorage");
+        const widgetStateCacheId = getWidgetCacheId(((_state$domainStates = state.domainStates) === null || _state$domainStates === void 0 ? void 0 : (_state$domainStates$t = _state$domainStates.telemetryInternalData) === null || _state$domainStates$t === void 0 ? void 0 : _state$domainStates$t.orgId) ?? "", ((_state$domainStates$t2 = state.domainStates.telemetryInternalData) === null || _state$domainStates$t2 === void 0 ? void 0 : _state$domainStates$t2.widgetId) ?? "");
+        const widgetStateFromCache = (_DataStoreManager$cli = DataStoreManager.clientDataStore) === null || _DataStoreManager$cli === void 0 ? void 0 : _DataStoreManager$cli.getData(widgetStateCacheId, "localStorage");
         const persistedState = widgetStateFromCache ? JSON.parse(widgetStateFromCache) : undefined;
         let optionalParams = {};
 
@@ -83,9 +84,7 @@ export const PreChatSurveyPaneStateful = props => {
         } else {
           const prechatResponseValues = extractPreChatSurveyResponseValues(state.domainStates.preChatSurveyResponse, values);
           optionalParams = {
-            initContext: {
-              preChatResponse: prechatResponseValues
-            }
+            preChatResponse: prechatResponseValues
           };
           setPreChatResponseEmail(values);
           await initStartChat(optionalParams);

package/lib/esm/components/proactivechatpanestateful/ProactiveChatPaneStateful.js

@@ -24,6 +24,14 @@ export const ProactiveChatPaneStateful = props => {
   const handleProactiveChatInviteTimeout = () => {
     if (!timeoutRemoved) {
       setTimeoutRemoved(true);
+      dispatch({
+        type: LiveChatWidgetActionType.SET_PROACTIVE_CHAT_PARAMS,
+        payload: {
+          proactiveChatBodyTitle: "",
+          proactiveChatEnablePrechat: false,
+          proactiveChatInNewWindow: false
+        }
+      });
       dispatch({
         type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
         payload: ConversationState.Closed
@@ -81,6 +89,14 @@ export const ProactiveChatPaneStateful = props => {
         Event: TelemetryEvent.ProactiveChatClosed,
         Description: "Proactive chat closed."
       });
+      dispatch({
+        type: LiveChatWidgetActionType.SET_PROACTIVE_CHAT_PARAMS,
+        payload: {
+          proactiveChatBodyTitle: "",
+          proactiveChatEnablePrechat: false,
+          proactiveChatInNewWindow: false
+        }
+      });
       dispatch({
         type: LiveChatWidgetActionType.SET_CONVERSATION_STATE,
         payload: ConversationState.Closed

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/webchattelemetry/WebChatLogger.js

@@ -1,6 +1,7 @@
 import { LogLevel } from "../../../../common/telemetry/TelemetryConstants";
 import { TelemetryHelper } from "../../../../common/telemetry/TelemetryHelper";
 export function createWebChatTelemetry() {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const handleTelemetry = event => {
     const {
       level

package/lib/esm/contexts/common/LiveChatWidgetActionType.js

@@ -10,25 +10,26 @@ export let LiveChatWidgetActionType;
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_PREVIOUS_FOCUSED_ELEMENT"] = 6] = "SET_PREVIOUS_FOCUSED_ELEMENT";
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_OUTSIDE_OPERATING_HOURS"] = 7] = "SET_OUTSIDE_OPERATING_HOURS";
   LiveChatWidgetActionType[LiveChatWidgetActionType["SET_PRE_CHAT_SURVEY_RESPONSE"] = 8] = "SET_PRE_CHAT_SURVEY_RESPONSE";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_SHOW_CONFIRMATION"] = 9] = "SET_SHOW_CONFIRMATION";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_SHOW_EMAIL_TRANSCRIPT_PANE"] = 10] = "SET_SHOW_EMAIL_TRANSCRIPT_PANE";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_PRECHAT_RESPONSE_EMAIL"] = 11] = "SET_PRECHAT_RESPONSE_EMAIL";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_AUDIO_NOTIFICATION"] = 12] = "SET_AUDIO_NOTIFICATION";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_E2VV_ENABLED"] = 13] = "SET_E2VV_ENABLED";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_POST_CHAT_CONTEXT"] = 14] = "SET_POST_CHAT_CONTEXT";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SHOW_CALLING_CONTAINER"] = 15] = "SHOW_CALLING_CONTAINER";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_INCOMING_CALL"] = 16] = "SET_INCOMING_CALL";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["DISABLE_VIDEO_CALL"] = 17] = "DISABLE_VIDEO_CALL";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["DISABLE_LOCAL_VIDEO"] = 18] = "DISABLE_LOCAL_VIDEO";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["DISABLE_REMOTE_VIDEO"] = 19] = "DISABLE_REMOTE_VIDEO";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_CHAT_TOKEN"] = 20] = "SET_CHAT_TOKEN";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_SKIP_CHAT_BUTTON_RENDERING"] = 21] = "SET_SKIP_CHAT_BUTTON_RENDERING";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_PROACTIVE_CHAT_PARAMS"] = 22] = "SET_PROACTIVE_CHAT_PARAMS";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_TELEMETRY_DATA"] = 23] = "SET_TELEMETRY_DATA";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_RECONNECT_ID"] = 24] = "SET_RECONNECT_ID";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_UNREAD_MESSAGE_COUNT"] = 25] = "SET_UNREAD_MESSAGE_COUNT";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_FOCUS_CHAT_BUTTON"] = 26] = "SET_FOCUS_CHAT_BUTTON";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_CONVERSATION_ENDED_BY_AGENT"] = 27] = "SET_CONVERSATION_ENDED_BY_AGENT";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_WIDGET_STATE"] = 28] = "SET_WIDGET_STATE";
-  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_LIVE_CHAT_CONTEXT"] = 29] = "SET_LIVE_CHAT_CONTEXT";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_CUSTOM_CONTEXT"] = 9] = "SET_CUSTOM_CONTEXT";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_SHOW_CONFIRMATION"] = 10] = "SET_SHOW_CONFIRMATION";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_SHOW_EMAIL_TRANSCRIPT_PANE"] = 11] = "SET_SHOW_EMAIL_TRANSCRIPT_PANE";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_PRECHAT_RESPONSE_EMAIL"] = 12] = "SET_PRECHAT_RESPONSE_EMAIL";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_AUDIO_NOTIFICATION"] = 13] = "SET_AUDIO_NOTIFICATION";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_E2VV_ENABLED"] = 14] = "SET_E2VV_ENABLED";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_POST_CHAT_CONTEXT"] = 15] = "SET_POST_CHAT_CONTEXT";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SHOW_CALLING_CONTAINER"] = 16] = "SHOW_CALLING_CONTAINER";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_INCOMING_CALL"] = 17] = "SET_INCOMING_CALL";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["DISABLE_VIDEO_CALL"] = 18] = "DISABLE_VIDEO_CALL";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["DISABLE_LOCAL_VIDEO"] = 19] = "DISABLE_LOCAL_VIDEO";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["DISABLE_REMOTE_VIDEO"] = 20] = "DISABLE_REMOTE_VIDEO";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_CHAT_TOKEN"] = 21] = "SET_CHAT_TOKEN";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_SKIP_CHAT_BUTTON_RENDERING"] = 22] = "SET_SKIP_CHAT_BUTTON_RENDERING";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_PROACTIVE_CHAT_PARAMS"] = 23] = "SET_PROACTIVE_CHAT_PARAMS";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_TELEMETRY_DATA"] = 24] = "SET_TELEMETRY_DATA";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_RECONNECT_ID"] = 25] = "SET_RECONNECT_ID";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_UNREAD_MESSAGE_COUNT"] = 26] = "SET_UNREAD_MESSAGE_COUNT";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_FOCUS_CHAT_BUTTON"] = 27] = "SET_FOCUS_CHAT_BUTTON";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_CONVERSATION_ENDED_BY_AGENT"] = 28] = "SET_CONVERSATION_ENDED_BY_AGENT";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_WIDGET_STATE"] = 29] = "SET_WIDGET_STATE";
+  LiveChatWidgetActionType[LiveChatWidgetActionType["SET_LIVE_CHAT_CONTEXT"] = 30] = "SET_LIVE_CHAT_CONTEXT";
 })(LiveChatWidgetActionType || (LiveChatWidgetActionType = {}));

package/lib/esm/contexts/common/LiveChatWidgetContextInitialState.js

@@ -18,7 +18,8 @@ export const getLiveChatWidgetContextInitialState = props => {
       postChatContext: undefined,
       telemetryInternalData: {},
       globalDir: "ltr",
-      liveChatContext: undefined
+      liveChatContext: undefined,
+      customContext: undefined
     },
     appStates: {
       conversationState: ConversationState.Closed,

package/lib/esm/contexts/createReducer.js

@@ -61,6 +61,14 @@ export const createReducer = () => {
           }
         };
 
+      case LiveChatWidgetActionType.SET_CUSTOM_CONTEXT:
+        return { ...state,
+          domainStates: { ...state.domainStates,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            customContext: action.payload
+          }
+        };
+
       case LiveChatWidgetActionType.SET_PREVIOUS_FOCUSED_ELEMENT:
         return { ...state,
           appStates: { ...state.appStates,

package/lib/esm/plugins/newMessageEventHandler.js

@@ -2,7 +2,6 @@ import { BroadcastEvent, LogLevel, TelemetryEvent } from "../common/telemetry/Te
 import { BroadcastService } from "@microsoft/omnichannel-chat-components";
 import { Constants } from "../common/Constants";
 import { TelemetryHelper } from "../common/telemetry/TelemetryHelper";
-import { TelemetryManager } from "../common/telemetry/TelemetryManager";
 export const createOnNewAdapterActivityHandler = (chatId, userId) => {
   const onNewAdapterActivityHandler = activity => {
     var _activity$channelData, _activity$channelData2, _activity$channelData3;
@@ -17,18 +16,16 @@ export const createOnNewAdapterActivityHandler = (chatId, userId) => {
 
   const raiseMessageEvent = activity => {
     if ((activity === null || activity === void 0 ? void 0 : activity.type) === Constants.message) {
-      var _TelemetryManager$Int, _activity$from;
+      var _text, _text2, _activity$channelData4, _activity$from;
 
       const payload = {
+        // To identify hidden contents vs empty content
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        text: activity === null || activity === void 0 ? void 0 : activity.text,
-        id: activity === null || activity === void 0 ? void 0 : activity.id,
+        text: (activity === null || activity === void 0 ? void 0 : (_text = activity.text) === null || _text === void 0 ? void 0 : _text.length) >= 1 ? `*contents hidden (${activity === null || activity === void 0 ? void 0 : (_text2 = activity.text) === null || _text2 === void 0 ? void 0 : _text2.length} chars)*` : "",
         type: activity === null || activity === void 0 ? void 0 : activity.type,
         timestamp: activity === null || activity === void 0 ? void 0 : activity.timestamp,
-        chatId: chatId,
         userId: userId,
-        conversationId: ((_TelemetryManager$Int = TelemetryManager.InternalTelemetryData) === null || _TelemetryManager$Int === void 0 ? void 0 : _TelemetryManager$Int.conversationId) ?? "",
-        channelData: activity === null || activity === void 0 ? void 0 : activity.channelData,
+        tags: activity === null || activity === void 0 ? void 0 : (_activity$channelData4 = activity.channelData) === null || _activity$channelData4 === void 0 ? void 0 : _activity$channelData4.tags,
         messageType: ""
       };
 
@@ -45,18 +42,18 @@ export const createOnNewAdapterActivityHandler = (chatId, userId) => {
           Description: "New message sent"
         });
       } else {
-        var _activity$channelData4, _activity$channelData5;
+        var _activity$channelData5, _activity$channelData6;
 
-        if (activity !== null && activity !== void 0 && (_activity$channelData4 = activity.channelData) !== null && _activity$channelData4 !== void 0 && (_activity$channelData5 = _activity$channelData4.tags) !== null && _activity$channelData5 !== void 0 && _activity$channelData5.includes(Constants.systemMessageTag)) {
+        if (activity !== null && activity !== void 0 && (_activity$channelData5 = activity.channelData) !== null && _activity$channelData5 !== void 0 && (_activity$channelData6 = _activity$channelData5.tags) !== null && _activity$channelData6 !== void 0 && _activity$channelData6.includes(Constants.systemMessageTag)) {
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
           payload.messageType = Constants.systemMessageTag;
         } else {
-          var _activity$channelData6, _activity$channelData7, _activity$channelData8;
+          var _activity$channelData7, _activity$channelData8, _activity$channelData9;
 
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
           const messageHasNoText = !(activity !== null && activity !== void 0 && activity.text); // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-          const messageHasNoTags = !(activity !== null && activity !== void 0 && activity.channelData) || !(activity !== null && activity !== void 0 && (_activity$channelData6 = activity.channelData) !== null && _activity$channelData6 !== void 0 && _activity$channelData6.tags) || (activity === null || activity === void 0 ? void 0 : (_activity$channelData7 = activity.channelData) === null || _activity$channelData7 === void 0 ? void 0 : (_activity$channelData8 = _activity$channelData7.tags) === null || _activity$channelData8 === void 0 ? void 0 : _activity$channelData8.length) === 0; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          const messageHasNoTags = !(activity !== null && activity !== void 0 && activity.channelData) || !(activity !== null && activity !== void 0 && (_activity$channelData7 = activity.channelData) !== null && _activity$channelData7 !== void 0 && _activity$channelData7.tags) || (activity === null || activity === void 0 ? void 0 : (_activity$channelData8 = activity.channelData) === null || _activity$channelData8 === void 0 ? void 0 : (_activity$channelData9 = _activity$channelData8.tags) === null || _activity$channelData9 === void 0 ? void 0 : _activity$channelData9.length) === 0; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
           const messageHasNoAttachments = !(activity !== null && activity !== void 0 && activity.attachments) || (activity === null || activity === void 0 ? void 0 : activity.attachments.length) === 0;
 
@@ -74,7 +71,8 @@ export const createOnNewAdapterActivityHandler = (chatId, userId) => {
         BroadcastService.postMessage(newMessageReceivedEvent);
         TelemetryHelper.logActionEvent(LogLevel.INFO, {
           Event: TelemetryEvent.MessageReceived,
-          Description: "New message received"
+          Description: "New message received",
+          Data: payload
         });
       }
     }

package/lib/types/common/Constants.d.ts

@@ -15,7 +15,6 @@ export declare class Constants {
     static readonly true = "true";
     static readonly false = "false";
     static readonly maximumUnreadMessageCount = 99;
-    static readonly widgetStateDataKey = "LcwChatWidgetState";
     static readonly channelIdKey = "ChannelId-";
     static readonly ChannelId = "lcw";
     static readonly CustomerTag = "FromCustomer";
@@ -70,6 +69,7 @@ export declare class Constants {
     static readonly OpenLinkIconCssClass = "webchat__markdown__external-link-icon";
     static readonly internetConnectionTestUrl = "https://ocsdk-prod.azureedge.net/public/connecttest.txt";
     static readonly internetConnectionTestUrlText = "Omnichannel Connect Test";
+    static readonly ChatWidgetStateChangedPrefix = "ChatWidgetStateChanged";
 }
 export declare const Regex: {
     new (): {};

package/lib/types/common/telemetry/TelemetryConstants.d.ts

@@ -19,18 +19,24 @@ export declare enum LogLevel {
 }
 export declare enum BroadcastEvent {
     LoadPostChatSurvey = "LoadPostChatSurvey",
-    EndChat = "ChatEnded",
+    ChatEnded = "ChatEnded",
     NewMessageNotification = "NewMessageNotification",
     UnreadMessageCount = "UnreadMessageCount",
-    ChatWidgetStateChanged = "ChatWidgetStateChanged",
+    StartProactiveChat = "StartProactiveChat",
     ProactiveChatStartChat = "ProactiveChatStartChat",
     ProactiveChatStartPopoutChat = "ProactiveChatStartPopoutChat",
+    ProactiveChatIsInPopoutMode = "ProactiveChatIsInPopoutMode",
+    ClosePopoutWindow = "ClosePopoutWindow",
     InvalidAdaptiveCardFormat = "InvalidAdaptiveCardFormat",
     NewMessageSent = "NewMessageSent",
     NewMessageReceived = "NewMessageReceived",
     RedirectPageRequest = "RedirectPageRequest",
+    StartChat = "StartChat",
     StartChatSkippingChatButtonRendering = "StartChatSkippingChatButtonRendering",
-    StartUnauthenticatedReconnectChat = "StartUnauthenticatedReconnectChat"
+    StartUnauthenticatedReconnectChat = "StartUnauthenticatedReconnectChat",
+    EndChat = "EndChat",
+    SetCustomContext = "SetCustomContext",
+    ChatRetrievedFromCache = "ChatRetrievedFromCache"
 }
 export declare enum TelemetryEvent {
     CallAdded = "CallAdded",
@@ -81,6 +87,7 @@ export declare enum TelemetryEvent {
     StartChatEventRecevied = "StartChatEventReceived",
     EndChatSDKCall = "EndChatCall",
     EndChatEventReceived = "EndChatEventReceived",
+    ClosePopoutWindowEventRecevied = "ClosePopoutWindowEventRecevied",
     OnNewMessageFailed = "OnNewMessageFailed",
     OnNewMessageAudioNotificationFailed = "OnNewMessageAudioNotificationFailed",
     DownloadTranscriptResponseNullOrUndefined = "DownloadTranscriptResponseNullOrUndefined",
@@ -129,11 +136,13 @@ export declare enum TelemetryEvent {
     ReconnectChatStartNewConversation = "ReconnectChatStartNewConversation",
     ReconnectChatMinimize = "ReconnectChatMinimize",
     MessageSent = "MessageSent",
-    MessageReceived = "MessageReceived"
+    MessageReceived = "MessageReceived",
+    CustomContextReceived = "CustomContextReceived"
 }
 export interface TelemetryInput {
     scenarioType: ScenarioType;
     payload: TelemetryData;
+    telemetryInfo?: any;
 }
 export declare class TelemetryConstants {
     private static map;