@microsoft/omnichannel-chat-widget 1.2.2-main.03f3121 → 1.2.2-main.26c48a5

package/lib/cjs/components/chatbuttonstateful/ChatButtonStateful.js

@@ -8,12 +8,12 @@ var _TelemetryConstants = require("../../common/telemetry/TelemetryConstants");
 var _react = _interopRequireWildcard(require("react"));
 var _omnichannelChatComponents = require("@microsoft/omnichannel-chat-components");
 var _Constants = require("../../common/Constants");
-var _utils = require("../../common/utils");
 var _ConversationState = require("../../contexts/common/ConversationState");
 var _LiveChatWidgetActionType = require("../../contexts/common/LiveChatWidgetActionType");
 var _TelemetryHelper = require("../../common/telemetry/TelemetryHelper");
 var _TelemetryManager = require("../../common/telemetry/TelemetryManager");
 var _defaultOutOfOfficeChatButtonStyleProps = require("./common/styleProps/defaultOutOfOfficeChatButtonStyleProps");
+var _utils = require("../../common/utils");
 var _useChatContextStore = _interopRequireDefault(require("../../hooks/useChatContextStore"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -28,6 +28,22 @@ const ChatButtonStateful = props => {
   } = props;
   //Setting OutOfOperatingHours Flag
   const [outOfOperatingHours, setOutOfOperatingHours] = (0, _react.useState)(((_state$domainStates$l = state.domainStates.liveChatConfig) === null || _state$domainStates$l === void 0 ? void 0 : (_state$domainStates$l2 = _state$domainStates$l.LiveWSAndLiveChatEngJoin) === null || _state$domainStates$l2 === void 0 ? void 0 : _state$domainStates$l2.OutOfOperatingHours) === "True");
+  const ref = (0, _react.useRef)(() => {
+    return;
+  });
+  ref.current = async () => {
+    _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
+      Event: _TelemetryConstants.TelemetryEvent.LCWChatButtonClicked
+    });
+    if (state.appStates.isMinimized) {
+      dispatch({
+        type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_MINIMIZED,
+        payload: false
+      });
+    } else {
+      await startChat();
+    }
+  };
   const outOfOfficeStyleProps = Object.assign({}, _defaultOutOfOfficeChatButtonStyleProps.defaultOutOfOfficeChatButtonStyleProps, outOfOfficeButtonProps === null || outOfOfficeButtonProps === void 0 ? void 0 : outOfOfficeButtonProps.styleProps);
   const controlProps = {
     id: "oc-lcw-chat-button",
@@ -36,19 +52,7 @@ const ChatButtonStateful = props => {
     subtitleText: "We're online.",
     hideNotificationBubble: (buttonProps === null || buttonProps === void 0 ? void 0 : (_buttonProps$controlP = buttonProps.controlProps) === null || _buttonProps$controlP === void 0 ? void 0 : _buttonProps$controlP.hideNotificationBubble) === true || state.appStates.isMinimized === false,
     unreadMessageCount: state.appStates.unreadMessageCount ? state.appStates.unreadMessageCount > _Constants.Constants.maximumUnreadMessageCount ? (_props$buttonProps = props.buttonProps) === null || _props$buttonProps === void 0 ? void 0 : (_props$buttonProps$co = _props$buttonProps.controlProps) === null || _props$buttonProps$co === void 0 ? void 0 : _props$buttonProps$co.largeUnreadMessageString : state.appStates.unreadMessageCount.toString() : "0",
-    onClick: async () => {
-      _TelemetryHelper.TelemetryHelper.logActionEvent(_TelemetryConstants.LogLevel.INFO, {
-        Event: _TelemetryConstants.TelemetryEvent.LCWChatButtonClicked
-      });
-      if (state.appStates.isMinimized) {
-        dispatch({
-          type: _LiveChatWidgetActionType.LiveChatWidgetActionType.SET_MINIMIZED,
-          payload: false
-        });
-      } else {
-        await startChat();
-      }
-    },
+    onClick: () => ref.current(),
     unreadMessageString: (_props$buttonProps2 = props.buttonProps) === null || _props$buttonProps2 === void 0 ? void 0 : (_props$buttonProps2$c = _props$buttonProps2.controlProps) === null || _props$buttonProps2$c === void 0 ? void 0 : _props$buttonProps2$c.unreadMessageString,
     ...(buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.controlProps)
   };

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

@@ -88,12 +88,12 @@ const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProact
   const optionalParams = {
     isProactiveChat
   };
-  await initStartChat(chatSDK, dispatch, setAdapter, props, optionalParams);
+  await initStartChat(chatSDK, dispatch, setAdapter, state, props, optionalParams);
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.setPreChatAndInitiateChat = setPreChatAndInitiateChat;
-const initStartChat = async (chatSDK, dispatch, setAdapter, props, params, persistedState) => {
+const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params, persistedState) => {
   var _props$controlProps2;
   let isStartChatSuccessful = false;
   const chatConfig = props === null || props === void 0 ? void 0 : props.chatConfig;
@@ -131,7 +131,7 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, props, params, persi
     try {
       var _window$Microsoft, _window$Microsoft$Dyn, _window$Microsoft$Dyn2, _window$Microsoft$Dyn3;
       // Set custom context params
-      await setCustomContextParams(props);
+      await setCustomContextParams(state, props);
       const defaultOptionalParams = {
         sendDefaultInitContext: true,
         isProactiveChat: !!(params !== null && params !== void 0 && params.isProactiveChat),
@@ -295,14 +295,14 @@ const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdap
     const optionalParams = {
       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, props, optionalParams, persistedState);
+    await initStartChat(chatSDK, dispatch, setAdapter, state, props, optionalParams, persistedState);
     return true;
   }
   return false;
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const setCustomContextParams = async props => {
+const setCustomContextParams = async (state, props) => {
   var _props$chatConfig, _props$chatConfig$Liv, _persistedState$domai8;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const isAuthenticatedChat = props !== null && props !== void 0 && (_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && (_props$chatConfig$Liv = _props$chatConfig.LiveChatConfigAuthSettings) !== null && _props$chatConfig$Liv !== void 0 && _props$chatConfig$Liv.msdyn_javascriptclientfunction ? true : false;
@@ -310,6 +310,12 @@ const setCustomContextParams = async props => {
   if (isAuthenticatedChat) {
     return;
   }
+  if (state !== null && state !== void 0 && state.domainStates.customContext) {
+    optionalParams = Object.assign({}, optionalParams, {
+      customContext: JSON.parse(JSON.stringify(state === null || state === void 0 ? void 0 : state.domainStates.customContext))
+    });
+    return;
+  }
   if ((0, _utils.isNullOrEmptyString)(widgetInstanceId)) {
     widgetInstanceId = (0, _utils.getWidgetCacheIdfromProps)(props);
   }
@@ -322,13 +328,13 @@ const setCustomContextParams = async props => {
       Description: "Setting custom context for unauthenticated chat"
     });
     optionalParams = Object.assign({}, optionalParams, {
-      customContext: customContextLocal
+      customContext: JSON.parse(JSON.stringify(customContextLocal))
     });
   } else {
     const customContextFromParent = await getInitContextParamsForPopout();
     if (!(0, _utils.isUndefinedOrEmpty)(customContextFromParent === null || customContextFromParent === void 0 ? void 0 : customContextFromParent.contextVariables)) {
       optionalParams = Object.assign({}, optionalParams, {
-        customContext: customContextFromParent.contextVariables
+        customContext: JSON.parse(JSON.stringify(customContextFromParent.contextVariables))
       });
     }
   }

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

@@ -138,7 +138,7 @@ const LiveChatWidgetStateful = props => {
             return;
           }
         }
-        await (0, _startChat.initStartChat)(chatSDK, dispatch, setAdapter, props, optionalParams);
+        await (0, _startChat.initStartChat)(chatSDK, dispatch, setAdapter, state, props, optionalParams);
         return;
       }
     }
@@ -609,7 +609,7 @@ const LiveChatWidgetStateful = props => {
   const endChatRelay = (adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab) => (0, _endChat.endChat)(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab, uwid.current);
   const prepareStartChatRelay = () => (0, _startChat.prepareStartChat)(props, chatSDK, state, dispatch, setAdapter);
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const initStartChatRelay = (optionalParams, persistedState) => (0, _startChat.initStartChat)(chatSDK, dispatch, setAdapter, props, optionalParams, persistedState);
+  const initStartChatRelay = (optionalParams, persistedState) => (0, _startChat.initStartChat)(chatSDK, dispatch, setAdapter, state, props, optionalParams, persistedState);
   const confirmationPaneProps = (0, _initConfirmationPropsComposer.initConfirmationPropsComposer)(props);
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const prepareEndChatRelay = () => (0, _endChat.prepareEndChat)(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, uwid.current);

package/lib/esm/components/chatbuttonstateful/ChatButtonStateful.js

@@ -1,13 +1,13 @@
 import { LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { ChatButton } from "@microsoft/omnichannel-chat-components";
 import { Constants } from "../../common/Constants";
-import { setFocusOnElement } from "../../common/utils";
 import { ConversationState } from "../../contexts/common/ConversationState";
 import { LiveChatWidgetActionType } from "../../contexts/common/LiveChatWidgetActionType";
 import { TelemetryHelper } from "../../common/telemetry/TelemetryHelper";
 import { TelemetryTimers } from "../../common/telemetry/TelemetryManager";
 import { defaultOutOfOfficeChatButtonStyleProps } from "./common/styleProps/defaultOutOfOfficeChatButtonStyleProps";
+import { setFocusOnElement } from "../../common/utils";
 import useChatContextStore from "../../hooks/useChatContextStore";
 export const ChatButtonStateful = props => {
   var _state$domainStates$l, _state$domainStates$l2, _buttonProps$controlP, _props$buttonProps, _props$buttonProps$co, _props$buttonProps2, _props$buttonProps2$c, _props$buttonProps3, _props$buttonProps3$c;
@@ -19,6 +19,22 @@ export const ChatButtonStateful = props => {
   } = props;
   //Setting OutOfOperatingHours Flag
   const [outOfOperatingHours, setOutOfOperatingHours] = useState(((_state$domainStates$l = state.domainStates.liveChatConfig) === null || _state$domainStates$l === void 0 ? void 0 : (_state$domainStates$l2 = _state$domainStates$l.LiveWSAndLiveChatEngJoin) === null || _state$domainStates$l2 === void 0 ? void 0 : _state$domainStates$l2.OutOfOperatingHours) === "True");
+  const ref = useRef(() => {
+    return;
+  });
+  ref.current = async () => {
+    TelemetryHelper.logActionEvent(LogLevel.INFO, {
+      Event: TelemetryEvent.LCWChatButtonClicked
+    });
+    if (state.appStates.isMinimized) {
+      dispatch({
+        type: LiveChatWidgetActionType.SET_MINIMIZED,
+        payload: false
+      });
+    } else {
+      await startChat();
+    }
+  };
   const outOfOfficeStyleProps = Object.assign({}, defaultOutOfOfficeChatButtonStyleProps, outOfOfficeButtonProps === null || outOfOfficeButtonProps === void 0 ? void 0 : outOfOfficeButtonProps.styleProps);
   const controlProps = {
     id: "oc-lcw-chat-button",
@@ -27,19 +43,7 @@ export const ChatButtonStateful = props => {
     subtitleText: "We're online.",
     hideNotificationBubble: (buttonProps === null || buttonProps === void 0 ? void 0 : (_buttonProps$controlP = buttonProps.controlProps) === null || _buttonProps$controlP === void 0 ? void 0 : _buttonProps$controlP.hideNotificationBubble) === true || state.appStates.isMinimized === false,
     unreadMessageCount: state.appStates.unreadMessageCount ? state.appStates.unreadMessageCount > Constants.maximumUnreadMessageCount ? (_props$buttonProps = props.buttonProps) === null || _props$buttonProps === void 0 ? void 0 : (_props$buttonProps$co = _props$buttonProps.controlProps) === null || _props$buttonProps$co === void 0 ? void 0 : _props$buttonProps$co.largeUnreadMessageString : state.appStates.unreadMessageCount.toString() : "0",
-    onClick: async () => {
-      TelemetryHelper.logActionEvent(LogLevel.INFO, {
-        Event: TelemetryEvent.LCWChatButtonClicked
-      });
-      if (state.appStates.isMinimized) {
-        dispatch({
-          type: LiveChatWidgetActionType.SET_MINIMIZED,
-          payload: false
-        });
-      } else {
-        await startChat();
-      }
-    },
+    onClick: () => ref.current(),
     unreadMessageString: (_props$buttonProps2 = props.buttonProps) === null || _props$buttonProps2 === void 0 ? void 0 : (_props$buttonProps2$c = _props$buttonProps2.controlProps) === null || _props$buttonProps2$c === void 0 ? void 0 : _props$buttonProps2$c.unreadMessageString,
     ...(buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.controlProps)
   };

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

@@ -82,11 +82,11 @@ const setPreChatAndInitiateChat = async (chatSDK, dispatch, setAdapter, isProact
   const optionalParams = {
     isProactiveChat
   };
-  await initStartChat(chatSDK, dispatch, setAdapter, props, optionalParams);
+  await initStartChat(chatSDK, dispatch, setAdapter, state, props, optionalParams);
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const initStartChat = async (chatSDK, dispatch, setAdapter, props, params, persistedState) => {
+const initStartChat = async (chatSDK, dispatch, setAdapter, state, props, params, persistedState) => {
   var _props$controlProps2;
   let isStartChatSuccessful = false;
   const chatConfig = props === null || props === void 0 ? void 0 : props.chatConfig;
@@ -124,7 +124,7 @@ const initStartChat = async (chatSDK, dispatch, setAdapter, props, params, persi
     try {
       var _window$Microsoft, _window$Microsoft$Dyn, _window$Microsoft$Dyn2, _window$Microsoft$Dyn3;
       // Set custom context params
-      await setCustomContextParams(props);
+      await setCustomContextParams(state, props);
       const defaultOptionalParams = {
         sendDefaultInitContext: true,
         isProactiveChat: !!(params !== null && params !== void 0 && params.isProactiveChat),
@@ -287,14 +287,14 @@ const canConnectToExistingChat = async (props, chatSDK, state, dispatch, setAdap
     const optionalParams = {
       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, props, optionalParams, persistedState);
+    await initStartChat(chatSDK, dispatch, setAdapter, state, props, optionalParams, persistedState);
     return true;
   }
   return false;
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const setCustomContextParams = async props => {
+const setCustomContextParams = async (state, props) => {
   var _props$chatConfig, _props$chatConfig$Liv, _persistedState$domai8;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const isAuthenticatedChat = props !== null && props !== void 0 && (_props$chatConfig = props.chatConfig) !== null && _props$chatConfig !== void 0 && (_props$chatConfig$Liv = _props$chatConfig.LiveChatConfigAuthSettings) !== null && _props$chatConfig$Liv !== void 0 && _props$chatConfig$Liv.msdyn_javascriptclientfunction ? true : false;
@@ -302,6 +302,12 @@ const setCustomContextParams = async props => {
   if (isAuthenticatedChat) {
     return;
   }
+  if (state !== null && state !== void 0 && state.domainStates.customContext) {
+    optionalParams = Object.assign({}, optionalParams, {
+      customContext: JSON.parse(JSON.stringify(state === null || state === void 0 ? void 0 : state.domainStates.customContext))
+    });
+    return;
+  }
   if (isNullOrEmptyString(widgetInstanceId)) {
     widgetInstanceId = getWidgetCacheIdfromProps(props);
   }
@@ -314,13 +320,13 @@ const setCustomContextParams = async props => {
       Description: "Setting custom context for unauthenticated chat"
     });
     optionalParams = Object.assign({}, optionalParams, {
-      customContext: customContextLocal
+      customContext: JSON.parse(JSON.stringify(customContextLocal))
     });
   } else {
     const customContextFromParent = await getInitContextParamsForPopout();
     if (!isUndefinedOrEmpty(customContextFromParent === null || customContextFromParent === void 0 ? void 0 : customContextFromParent.contextVariables)) {
       optionalParams = Object.assign({}, optionalParams, {
-        customContext: customContextFromParent.contextVariables
+        customContext: JSON.parse(JSON.stringify(customContextFromParent.contextVariables))
       });
     }
   }

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

@@ -130,7 +130,7 @@ export const LiveChatWidgetStateful = props => {
             return;
           }
         }
-        await initStartChat(chatSDK, dispatch, setAdapter, props, optionalParams);
+        await initStartChat(chatSDK, dispatch, setAdapter, state, props, optionalParams);
         return;
       }
     }
@@ -601,7 +601,7 @@ export const LiveChatWidgetStateful = props => {
   const endChatRelay = (adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab) => endChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, skipEndChatSDK, skipCloseChat, postMessageToOtherTab, uwid.current);
   const prepareStartChatRelay = () => prepareStartChat(props, chatSDK, state, dispatch, setAdapter);
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const initStartChatRelay = (optionalParams, persistedState) => initStartChat(chatSDK, dispatch, setAdapter, props, optionalParams, persistedState);
+  const initStartChatRelay = (optionalParams, persistedState) => initStartChat(chatSDK, dispatch, setAdapter, state, props, optionalParams, persistedState);
   const confirmationPaneProps = initConfirmationPropsComposer(props);
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const prepareEndChatRelay = () => prepareEndChat(props, chatSDK, state, dispatch, setAdapter, setWebChatStyles, adapter, uwid.current);

package/lib/types/components/livechatwidget/common/startChat.d.ts

@@ -5,6 +5,6 @@ import { ILiveChatWidgetProps } from "../interfaces/ILiveChatWidgetProps";
 import StartChatOptionalParams from "@microsoft/omnichannel-chat-sdk/lib/core/StartChatOptionalParams";
 declare const prepareStartChat: (props: ILiveChatWidgetProps, chatSDK: any, state: ILiveChatWidgetContext, dispatch: Dispatch<ILiveChatWidgetAction>, setAdapter: any) => Promise<void>;
 declare const setPreChatAndInitiateChat: (chatSDK: any, dispatch: Dispatch<ILiveChatWidgetAction>, setAdapter: any, isProactiveChat?: boolean | undefined, proactiveChatEnablePrechatState?: boolean | undefined, state?: ILiveChatWidgetContext | undefined, props?: ILiveChatWidgetProps | undefined) => Promise<void>;
-declare const initStartChat: (chatSDK: any, dispatch: Dispatch<ILiveChatWidgetAction>, setAdapter: any, props?: ILiveChatWidgetProps | undefined, params?: StartChatOptionalParams | undefined, persistedState?: any) => Promise<void>;
+declare const initStartChat: (chatSDK: any, dispatch: Dispatch<ILiveChatWidgetAction>, setAdapter: any, state: ILiveChatWidgetContext | undefined, props?: ILiveChatWidgetProps | undefined, params?: StartChatOptionalParams | undefined, persistedState?: any) => Promise<void>;
 declare const checkIfConversationStillValid: (chatSDK: any, dispatch: Dispatch<ILiveChatWidgetAction>, state: ILiveChatWidgetContext) => Promise<boolean>;
 export { prepareStartChat, initStartChat, setPreChatAndInitiateChat, checkIfConversationStillValid };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/omnichannel-chat-widget",
-  "version": "1.2.2-main.03f3121",
+  "version": "1.2.2-main.26c48a5",
   "description": "Microsoft Omnichannel Chat Widget",
   "main": "lib/cjs/index.js",
   "types": "lib/types/index.d.ts",