@microsoft/omnichannel-chat-widget 1.7.6-main.dca3f60 → 1.7.7-main.37d9c4a

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

@@ -136,11 +136,6 @@ export const PreChatSurveyPaneStateful = props => {
         }
       }
     }
-    // Move focus to the first button
-    const firstElement = findAllFocusableElement(`#${controlProps.id}`);
-    if (firstElement && firstElement[0]) {
-      firstElement[0].focus();
-    }
     TelemetryHelper.logLoadingEvent(LogLevel.INFO, {
       Event: TelemetryEvent.PrechatSurveyLoaded
     });
@@ -149,6 +144,16 @@ export const PreChatSurveyPaneStateful = props => {
       ElapsedTimeInMilliseconds: uiTimer.milliSecondsElapsed
     });
   }, []);
+
+  // Set focus to the first element
+  useEffect(() => {
+    if (!state.appStates.isMinimized) {
+      const firstElement = findAllFocusableElement(`#${controlProps.id}`);
+      if (firstElement && firstElement[0]) {
+        firstElement[0].focus();
+      }
+    }
+  }, [state.appStates.isMinimized]);
   return /*#__PURE__*/React.createElement(PreChatSurveyPane, {
     controlProps: controlProps,
     styleProps: styleProps

package/lib/esm/components/webchatcontainerstateful/WebChatContainerStateful.js

@@ -3,10 +3,10 @@
 import { Stack } from "@fluentui/react";
 import { LogLevel, TelemetryEvent } from "../../common/telemetry/TelemetryConstants";
 import React, { useEffect } from "react";
-import { createTimer, setFocusOnSendBox } from "../../common/utils";
+import { createTimer, getDeviceType, setFocusOnSendBox } from "../../common/utils";
 import { BotMagicCodeStore } from "./webchatcontroller/BotMagicCodeStore";
 import { Components } from "botframework-webchat";
-import { Constants } from "../../common/Constants";
+import { Constants, HtmlAttributeNames, HtmlClassNames } from "../../common/Constants";
 import { LiveChatWidgetActionType } from "../../contexts/common/LiveChatWidgetActionType";
 import { NotificationHandler } from "./webchatcontroller/notification/NotificationHandler";
 import { NotificationScenarios } from "./webchatcontroller/enums/NotificationScenarios";
@@ -75,7 +75,12 @@ export const WebChatContainerStateful = props => {
   };
   useEffect(() => {
     var _props$webChatContain, _props$webChatContain2;
-    setFocusOnSendBox();
+    if (getDeviceType() !== "standard" && (webChatContainerProps === null || webChatContainerProps === void 0 ? void 0 : webChatContainerProps.webChatHistoryMobileAccessibilityLabel) !== undefined) {
+      const chatHistoryElement = document.querySelector(`.${HtmlClassNames.webChatHistoryContainer}`);
+      if (chatHistoryElement) {
+        chatHistoryElement.setAttribute(HtmlAttributeNames.ariaLabel, webChatContainerProps.webChatHistoryMobileAccessibilityLabel);
+      }
+    }
     dispatch({
       type: LiveChatWidgetActionType.SET_RENDERING_MIDDLEWARE_PROPS,
       payload: webChatContainerProps === null || webChatContainerProps === void 0 ? void 0 : webChatContainerProps.renderingMiddlewareProps
@@ -156,6 +161,13 @@ export const WebChatContainerStateful = props => {
       ElapsedTimeInMilliseconds: uiTimer.milliSecondsElapsed
     });
   }, []);
+
+  // Set focus to the sendbox
+  useEffect(() => {
+    if (!state.appStates.isMinimized) {
+      setFocusOnSendBox();
+    }
+  }, [state.appStates.isMinimized]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("style", null, `
         .webchat__stacked-layout__content .ac-pushButton {
             cursor: pointer;

package/lib/esm/components/webchatcontainerstateful/common/defaultProps/defaultWebChatContainerStatefulProps.js

@@ -9,6 +9,8 @@ export const defaultWebChatContainerStatefulProps = {
   containerStyles: defaultWebChatStatefulContainerStyles,
   disableNewLineMarkdownSupport: false,
   disableMarkdownMessageFormatting: false,
+  opensMarkdownLinksInSameTab: false,
+  honorsTargetInHTMLLinks: false,
   hyperlinkTextOverride: false,
   directLine: new MockAdapter(),
   adaptiveCardStyles: defaultAdaptiveCardStyles

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/markdownrenderers/HyperlinkTextOverrideRenderer.js

@@ -11,7 +11,9 @@ class HyperlinkTextOverrideRenderer {
   convertTextToHtmlNode(text) {
     const htmlNode = document.createElement(HtmlAttributeNames.div);
     try {
-      text = DOMPurify.sanitize(text); // eslint-disable-line @typescript-eslint/no-explicit-any
+      text = DOMPurify.sanitize(text, {
+        ADD_ATTR: ["target"]
+      });
       htmlNode.innerHTML = text;
     } catch {
       return htmlNode;

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/timestamps/DeliveredTimestamp.js

@@ -25,14 +25,27 @@ export const DeliveredTimestamp = _ref => {
       timestamp
     }
   } = args;
+  const getTimeElement = timestamp => {
+    const timeString = getTimestampHourMinute(timestamp);
+    const isAmPmFormat = timeString.toLowerCase().includes("am") || timeString.toLowerCase().includes("pm");
+
+    // For clients that use languages that are written right-to-left, but still use AM/PM time format, we need to
+    // make sure the "rtl" direction doesn't produce "PM 1:23", but remains "1:23 PM"
+    if (dir === "rtl" && isAmPmFormat) {
+      return /*#__PURE__*/React.createElement("span", {
+        dir: "ltr"
+      }, getTimestampHourMinute(timestamp));
+    }
+    return timeString;
+  };
   return /*#__PURE__*/React.createElement(Stack, {
     style: contentStyles,
     dir: dir
   }, role === DirectLineSenderRole.Bot && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
     dir: dir,
     "aria-hidden": "false"
-  }, name, " - ", getTimestampHourMinute(timestamp))), role === DirectLineSenderRole.User && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
+  }, name, " - ", getTimeElement(timestamp))), role === DirectLineSenderRole.User && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
     "aria-hidden": "false",
     dir: dir
-  }, " ", getTimestampHourMinute(timestamp), " - ", ((_state$domainStates$m = state.domainStates.middlewareLocalizedTexts) === null || _state$domainStates$m === void 0 ? void 0 : _state$domainStates$m.MIDDLEWARE_MESSAGE_DELIVERED) ?? defaultMiddlewareLocalizedTexts.MIDDLEWARE_MESSAGE_DELIVERED)));
+  }, " ", getTimeElement(timestamp), " - ", ((_state$domainStates$m = state.domainStates.middlewareLocalizedTexts) === null || _state$domainStates$m === void 0 ? void 0 : _state$domainStates$m.MIDDLEWARE_MESSAGE_DELIVERED) ?? defaultMiddlewareLocalizedTexts.MIDDLEWARE_MESSAGE_DELIVERED)));
 };

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/htmlTextMiddleware.js

@@ -16,8 +16,9 @@ const convertTextToHtmlNode = text => {
   if (!text) return "";
   const element = document.createElement(HtmlAttributeNames.div);
   try {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    text = DOMPurify.sanitize(text);
+    text = DOMPurify.sanitize(text, {
+      ADD_ATTR: ["target"]
+    });
     element.innerHTML = text;
   } catch (e) {
     const errorMessage = `Failed to purify and set innertHTML with text: ${text}`;
@@ -33,7 +34,7 @@ const convertTextToHtmlNode = text => {
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const processHTMLText = (action, text) => {
+const processHTMLText = (action, text, honorsTargetInHTMLLinks) => {
   const htmlNode = convertTextToHtmlNode(text);
   const aNodes = htmlNode.getElementsByTagName(HtmlAttributeNames.aTagName);
   if ((aNodes === null || aNodes === void 0 ? void 0 : aNodes.length) > 0) {
@@ -46,8 +47,8 @@ const processHTMLText = (action, text) => {
           continue;
         }
 
-        // Add target to 'a' node if target is missing or does not equal to blank
-        if (!aNode.target || aNode.target !== Constants.blank) {
+        // Add target to 'a' node if target is missing or if honorsTargetInHTMLLinks is false
+        if (!aNode.target || !honorsTargetInHTMLLinks) {
           aNode.target = Constants.blank;
         }
 
@@ -86,7 +87,7 @@ const processHTMLText = (action, text) => {
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
-const htmlTextMiddleware = _ref => {
+const htmlTextMiddleware = honorsTargetInHTMLLinks => _ref => {
   let {
     dispatch
   } = _ref;
@@ -96,7 +97,7 @@ const htmlTextMiddleware = _ref => {
         var _action$payload, _action$payload$activ;
         const text = (_action$payload = action.payload) === null || _action$payload === void 0 ? void 0 : (_action$payload$activ = _action$payload.activity) === null || _action$payload$activ === void 0 ? void 0 : _action$payload$activ.text;
         if (text) {
-          action = processHTMLText(action, text);
+          action = processHTMLText(action, text, honorsTargetInHTMLLinks ?? false);
         }
       } catch (e) {
         let errorMessage = "Failed to validate action.";

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/sanitizationMiddleware.js

@@ -20,7 +20,9 @@ const sanitizationMiddleware = _ref => {
         var _action$payload;
         let text = (_action$payload = action.payload) === null || _action$payload === void 0 ? void 0 : _action$payload.text;
         if (text) {
-          text = DOMPurify.sanitize(text) ?? " ";
+          text = DOMPurify.sanitize(text, {
+            ADD_ATTR: ["target"]
+          }) ?? " ";
         }
       } catch (e) {
         const copyDataForTelemetry = {

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

@@ -74,6 +74,8 @@ export declare class Constants {
     static readonly Title = "title";
     static readonly Target = "target";
     static readonly Blank = "_blank";
+    static readonly TargetSelf = "_self";
+    static readonly TargetTop = "_top";
     static readonly TargetRelationship = "rel";
     static readonly TargetRelationshipAttributes = "noopener noreferrer";
     static readonly OpenLinkIconCssClass = "webchat__render-markdown__external-link-icon";
@@ -102,6 +104,7 @@ export declare class HtmlIdNames {
 export declare class HtmlClassNames {
     static readonly webChatBannerCloseButton = "webchat__toast__dismissButton";
     static readonly webChatBannerExpandButton = "webchat__toaster__expandIcon";
+    static readonly webChatHistoryContainer = "webchat__basic-transcript";
 }
 export declare class HtmlElementSelectors {
     static readonly sendBoxSelector = "textarea[data-id=\"webchat-sendbox-input\"]";

package/lib/types/common/facades/FacadeChatSDK.d.ts

@@ -32,13 +32,16 @@ export declare class FacadeChatSDK {
     private isAuthenticated;
     private getAuthToken?;
     private sdkMocked;
+    private disableReauthentication;
     isSDKMocked(): boolean;
     getChatSDK(): OmnichannelChatSDK;
     destroy(): void;
     isTokenSet(): boolean;
-    constructor(input: IFacadeChatSDKInput);
+    constructor(input: IFacadeChatSDKInput, disableReauthentication: boolean);
     private convertExpiration;
     private isTokenExpired;
+    private enforceBase64Encoding;
+    private extractExpFromToken;
     private setToken;
     private tokenRing;
     private validateAndExecuteCall;
@@ -55,7 +58,7 @@ export declare class FacadeChatSDK {
     getMessages(): Promise<IMessage[] | OmnichannelMessage[] | undefined>;
     getDataMaskingRules(): Promise<MaskingRules>;
     sendMessage(message: ChatSDKMessage): Promise<void>;
-    onNewMessage(onNewMessageCallback: CallableFunction, optionalParams?: OnNewMessageOptionalParams | unknown): Promise<void>;
+    onNewMessage(onNewMessageCallback: CallableFunction, optionalParams?: OnNewMessageOptionalParams): Promise<void>;
     sendTypingEvent(): Promise<void>;
     onTypingEvent(onTypingEventCallback: CallableFunction): Promise<void>;
     onAgentEndSession(onAgentEndSessionCallback: (message: IRawThread | ParticipantsRemovedEvent) => void): Promise<void>;

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

@@ -46,3 +46,4 @@ export declare const createFileAndDownload: (fileName: string, blobData: string,
 export declare const formatTemplateString: (templateMessage: string, values: any) => string;
 export declare const parseLowerCaseString: (property: string | boolean | undefined) => string;
 export declare const setOcUserAgent: (chatSDK: any) => void;
+export declare function getDeviceType(): string;

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

@@ -1,2 +1,2 @@
 import MarkdownIt from "markdown-it";
-export declare const createMarkdown: (disableMarkdownMessageFormatting: boolean, disableNewLineMarkdownSupport: boolean) => MarkdownIt;
+export declare const createMarkdown: (disableMarkdownMessageFormatting: boolean, disableNewLineMarkdownSupport: boolean, opensMarkdownLinksInSameTab?: boolean) => MarkdownIt;

package/lib/types/components/livechatwidget/interfaces/IFeatureConfigProps.d.ts

@@ -0,0 +1,3 @@
+export interface IFeatureConfigProps {
+    disableReauthentication?: boolean;
+}

package/lib/types/components/livechatwidget/interfaces/ILiveChatWidgetProps.d.ts

@@ -3,29 +3,30 @@ import { IAudioNotificationProps } from "../../footerstateful/audionotifications
 import { ICallingContainerProps } from "@microsoft/omnichannel-chat-components/lib/types/components/callingcontainer/interfaces/ICallingContainerProps";
 import { IChatButtonProps } from "@microsoft/omnichannel-chat-components/lib/types/components/chatbutton/interfaces/IChatButtonProps";
 import { IConfirmationPaneStatefulProps } from "../../confirmationpanestateful/interfaces/IConfirmationPaneStatefulProps";
+import { IContextDataStore } from "../../../common/interfaces/IContextDataStore";
 import { IDownloadTranscriptProps } from "../../footerstateful/downloadtranscriptstateful/interfaces/IDownloadTranscriptProps";
+import { IDraggableChatWidgetProps } from "./IDraggableChatWidgetProps";
 import { IEmailTranscriptPaneProps } from "../../emailtranscriptpanestateful/interfaces/IEmailTranscriptPaneProps";
+import { IFeatureConfigProps } from "./IFeatureConfigProps";
 import { IFooterProps } from "@microsoft/omnichannel-chat-components/lib/types/components/footer/interfaces/IFooterProps";
 import { IHeaderProps } from "@microsoft/omnichannel-chat-components/lib/types/components/header/interfaces/IHeaderProps";
 import { ILiveChatWidgetComponentOverrides } from "./ILiveChatWidgetComponentOverrides";
+import { ILiveChatWidgetContext } from "../../../contexts/common/ILiveChatWidgetContext";
 import { ILiveChatWidgetControlProps } from "./ILiveChatWidgetControlProps";
 import { ILiveChatWidgetStyleProps } from "./ILiveChatWidgetStyleProps";
 import { ILoadingPaneProps } from "@microsoft/omnichannel-chat-components/lib/types/components/loadingpane/interfaces/ILoadingPaneProps";
+import { IMockProps } from "./IMockProps";
+import { INotificationPaneProps } from "@microsoft/omnichannel-chat-components/lib/types/components/notificationpane/interfaces/INotificationPaneProps";
 import { IOOOHPaneProps } from "@microsoft/omnichannel-chat-components/lib/types/components/outofofficehourspane/interfaces/IOOOHPaneProps";
+import { IPostChatSurveyPaneStatefulProps } from "../../postchatsurveypanestateful/interfaces/IPostChatSurveyPaneStatefulProps";
 import { IPreChatSurveyPaneProps } from "@microsoft/omnichannel-chat-components/lib/types/components/prechatsurveypane/interfaces/IPreChatSurveyPaneProps";
 import { IProactiveChatPaneStatefulProps } from "../../proactivechatpanestateful/interfaces/IProactiveChatPaneStatefulProps";
 import { IReconnectChatPaneStatefulProps } from "../../reconnectchatpanestateful/interfaces/IReconnectChatPaneStatefulProps";
+import { IScrollBarProps } from "./IScrollBarProps";
 import { IStartChatErrorPaneProps } from "../../startchaterrorpanestateful/interfaces/IStartChatErrorPaneProps";
 import { ITelemetryConfig } from "../../../common/telemetry/interfaces/ITelemetryConfig";
 import { IWebChatContainerStatefulProps } from "../../webchatcontainerstateful/interfaces/IWebChatContainerStatefulProps";
 import { OmnichannelChatSDK } from "@microsoft/omnichannel-chat-sdk";
-import { ILiveChatWidgetContext } from "../../../contexts/common/ILiveChatWidgetContext";
-import { IContextDataStore } from "../../../common/interfaces/IContextDataStore";
-import { IPostChatSurveyPaneStatefulProps } from "../../postchatsurveypanestateful/interfaces/IPostChatSurveyPaneStatefulProps";
-import { IScrollBarProps } from "./IScrollBarProps";
-import { IDraggableChatWidgetProps } from "./IDraggableChatWidgetProps";
-import { INotificationPaneProps } from "@microsoft/omnichannel-chat-components/lib/types/components/notificationpane/interfaces/INotificationPaneProps";
-import { IMockProps } from "./IMockProps";
 export interface ILiveChatWidgetProps {
     audioNotificationProps?: IAudioNotificationProps;
     callingContainerProps?: ICallingContainerProps;
@@ -63,4 +64,5 @@ export interface ILiveChatWidgetProps {
     initialCustomContext?: any;
     draggableChatWidgetProps?: IDraggableChatWidgetProps;
     mock?: IMockProps;
+    featureConfigProps?: IFeatureConfigProps;
 }

package/lib/types/components/livechatwidget/interfaces/ISendBox.d.ts

@@ -0,0 +1,12 @@
+export interface ISendBox {
+    /**
+     * Target the textarea element in the send box
+     */
+    textarea?: {
+        /**
+         * Customer can increase minHeight as a work-around to avoid bug when some languages (like Arabic, Chinese,
+         * Hebrew, etc) will show a scrollbar in the textarea element when placeholder is visible
+         */
+        minHeight?: string;
+    };
+}

package/lib/types/components/webchatcontainerstateful/interfaces/IWebChatContainerStatefulProps.d.ts

@@ -6,10 +6,13 @@ import { IWebChatProps } from "./IWebChatProps";
 import { StyleOptions } from "botframework-webchat-api";
 import { IAdaptiveCardStyles } from "./IAdaptiveCardStyles";
 import { IBotAuthConfig } from "./IBotAuthConfig";
+import { ISendBox } from "../../livechatwidget/interfaces/ISendBox";
 export interface IWebChatContainerStatefulProps {
     containerStyles?: IStyle;
     disableNewLineMarkdownSupport?: boolean;
     disableMarkdownMessageFormatting?: boolean;
+    opensMarkdownLinksInSameTab?: boolean;
+    honorsTargetInHTMLLinks?: boolean;
     webChatStyles?: StyleOptions;
     webChatProps?: IWebChatProps;
     directLine?: any;
@@ -20,4 +23,6 @@ export interface IWebChatContainerStatefulProps {
     botAuthConfig?: IBotAuthConfig;
     hyperlinkTextOverride?: boolean;
     adaptiveCardStyles?: IAdaptiveCardStyles;
+    sendBoxTextBox?: ISendBox;
+    webChatHistoryMobileAccessibilityLabel?: string;
 }

package/lib/types/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/htmlTextMiddleware.d.ts

@@ -4,7 +4,7 @@
  * Ensures that links within messages are processed so that the caller website cannot be traced.
  ******/
 import { IWebChatAction } from "../../../interfaces/IWebChatAction";
-declare const htmlTextMiddleware: ({ dispatch }: {
+declare const htmlTextMiddleware: (honorsTargetInHTMLLinks?: boolean) => ({ dispatch }: {
     dispatch: any;
 }) => (next: any) => (action: IWebChatAction) => any;
 export default htmlTextMiddleware;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/omnichannel-chat-widget",
-  "version": "1.7.6-main.dca3f60",
+  "version": "1.7.7-main.37d9c4a",
   "description": "Microsoft Omnichannel Chat Widget",
   "main": "lib/cjs/index.js",
   "types": "lib/types/index.d.ts",
@@ -78,7 +78,7 @@
   "dependencies": {
     "@azure/core-tracing": "^1.2.0",
     "@microsoft/omnichannel-chat-components": "1.1.8",
-    "@microsoft/omnichannel-chat-sdk": "^1.10.11",
+    "@microsoft/omnichannel-chat-sdk": "^1.10.15",
     "@opentelemetry/api": "^1.9.0",
     "abort-controller-es5": "^2.0.1",
     "dompurify": "^3.2.4",