@microsoft/omnichannel-chat-widget 2.0.1-main.a2ef2a3 → 2.0.1-main.eaef039

package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentUploadValidatorMiddleware.js

@@ -18,27 +18,6 @@ var _WebChatActionType = require("../../enums/WebChatActionType");
  ******/
 
 const MBtoBRatio = 1000000;
-const announceFileSent = message => {
-  // TalkBack on Android WebView reliably announces newly *appended*
-  // role="alert" nodes but often misses text-content updates on existing
-  // nodes. Wait 500ms for the send-box focus shift to settle, then inject
-  // a fresh alert element appended to document.body and remove it after 3s.
-  setTimeout(() => {
-    const el = document.createElement("div");
-    el.setAttribute("role", "alert");
-    el.setAttribute("aria-live", "assertive");
-    el.setAttribute("aria-atomic", "true");
-    el.style.cssText = "position:absolute;left:-9999px;top:auto;width:1px;height:1px;overflow:hidden;";
-    el.textContent = message;
-    document.body.appendChild(el);
-    // Remove after TalkBack has had time to read it
-    setTimeout(() => {
-      if (el.parentNode) {
-        el.parentNode.removeChild(el);
-      }
-    }, 3000);
-  }, 500);
-};
 
 /*
 * If an attachment is invalid, delete this attachment from the attachments list
@@ -227,13 +206,7 @@ const createAttachmentUploadValidatorMiddleware = (allowedFileExtensions, maxFil
       var _payload$activity, _payload$activity2;
       const payload = action.payload;
       if (payload !== null && payload !== void 0 && payload.activity.attachments && payload.activity.attachments.length > 0 && (payload === null || payload === void 0 || (_payload$activity = payload.activity) === null || _payload$activity === void 0 || (_payload$activity = _payload$activity.attachments) === null || _payload$activity === void 0 ? void 0 : _payload$activity.length) === (payload === null || payload === void 0 || (_payload$activity2 = payload.activity) === null || _payload$activity2 === void 0 || (_payload$activity2 = _payload$activity2.channelData) === null || _payload$activity2 === void 0 || (_payload$activity2 = _payload$activity2.attachmentSizes) === null || _payload$activity2 === void 0 ? void 0 : _payload$activity2.length)) {
-        var _validatedAction$payl;
         const validatedAction = validateAttachment(action, allowedFileExtensions, maxFileSizeSupportedByDynamics, localizedTexts);
-
-        // Announce to screen readers that the file was sent when validation passes
-        if (((_validatedAction$payl = validatedAction.payload) === null || _validatedAction$payl === void 0 || (_validatedAction$payl = _validatedAction$payl.activity) === null || _validatedAction$payl === void 0 || (_validatedAction$payl = _validatedAction$payl.attachments) === null || _validatedAction$payl === void 0 ? void 0 : _validatedAction$payl.length) > 0) {
-          announceFileSent(localizedTexts.MIDDLEWARE_BANNER_FILE_SENT ?? "File sent successfully.");
-        }
         return next(validatedAction);
       }
     }

package/lib/esm/common/telemetry/TelemetryConstants.js

@@ -141,6 +141,8 @@ export let TelemetryEvent = /*#__PURE__*/function (TelemetryEvent) {
   TelemetryEvent["PrechatSubmitted"] = "PrechatSubmitted";
   TelemetryEvent["StartChatSDKCall"] = "StartChatCall";
   TelemetryEvent["StartChatEventReceived"] = "StartChatEventReceived";
+  TelemetryEvent["ConcurrentStartChatRejected"] = "ConcurrentStartChatRejected";
+  TelemetryEvent["ChatSDKStateCleanUpDisconnectFailed"] = "ChatSDKStateCleanUpDisconnectFailed";
   TelemetryEvent["EndChatSDKCall"] = "EndChatSDKCall";
   TelemetryEvent["PrepareEndChat"] = "PrepareEndChat";
   TelemetryEvent["EndChatEventReceived"] = "EndChatEventReceived";
@@ -413,6 +415,8 @@ export let TelemetryConstants = /*#__PURE__*/function () {
         case TelemetryEvent.SecureEventBusDispatchError:
         case TelemetryEvent.AgentJoinedConversation:
         case TelemetryEvent.BrowserTabHidden:
+        case TelemetryEvent.ConcurrentStartChatRejected:
+        case TelemetryEvent.ChatSDKStateCleanUpDisconnectFailed:
         case TelemetryEvent.RecoveryEligibilityEvaluated:
           return ScenarioType.ACTIONS;
         case TelemetryEvent.StartChatSDKCall:

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

@@ -50,37 +50,54 @@ export const ChatButtonStateful = props => {
   const ref = useRef(() => {
     return;
   });
+  // Optimistic guard against rapid double-clicks. `conversationState` only flips to
+  // `Loading` after React re-renders, so the button stays visible and clickable for the
+  // whole duration of the first click's async work. Without this ref two concurrent
+  // startChat() calls can create two conversations on the backend.
+  const startChatInProgressRef = useRef(false);
   ref.current = async () => {
-    TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
-      Event: TelemetryEvent.LCWChatButtonClicked,
-      Description: "Chat button click action started",
-      CustomProperties: {
-        ConversationStage: ConversationStage.Initialization
-      }
-    });
-    if (state.appStates.isMinimized) {
-      dispatch({
-        type: LiveChatWidgetActionType.SET_MINIMIZED,
-        payload: false
+    if (startChatInProgressRef.current) {
+      TelemetryHelper.logActionEvent(LogLevel.WARN, {
+        Event: TelemetryEvent.ConcurrentStartChatRejected,
+        Description: "Chat button click ignored, a start chat operation is already in progress."
       });
-      dispatch({
-        type: LiveChatWidgetActionType.SET_UNREAD_MESSAGE_COUNT,
-        payload: 0
+      return;
+    }
+    startChatInProgressRef.current = true;
+    try {
+      TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
+        Event: TelemetryEvent.LCWChatButtonClicked,
+        Description: "Chat button click action started",
+        CustomProperties: {
+          ConversationStage: ConversationStage.Initialization
+        }
       });
-      // If chat is minimized and then unminimized, start a chat if convesation state is closed.
-      if (state.appStates.conversationState === ConversationState.Closed) {
+      if (state.appStates.isMinimized) {
+        dispatch({
+          type: LiveChatWidgetActionType.SET_MINIMIZED,
+          payload: false
+        });
+        dispatch({
+          type: LiveChatWidgetActionType.SET_UNREAD_MESSAGE_COUNT,
+          payload: 0
+        });
+        // If chat is minimized and then unminimized, start a chat if convesation state is closed.
+        if (state.appStates.conversationState === ConversationState.Closed) {
+          await startChat();
+        }
+      } else {
         await startChat();
       }
-    } else {
-      await startChat();
+      TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
+        Event: TelemetryEvent.LCWChatButtonActionCompleted,
+        Description: "Chat button action completed",
+        CustomProperties: {
+          ConversationStage: ConversationStage.Initialization
+        }
+      });
+    } finally {
+      startChatInProgressRef.current = false;
     }
-    TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
-      Event: TelemetryEvent.LCWChatButtonActionCompleted,
-      Description: "Chat button action completed",
-      CustomProperties: {
-        ConversationStage: ConversationStage.Initialization
-      }
-    });
   };
   const outOfOfficeStyleProps = Object.assign({}, defaultOutOfOfficeChatButtonStyleProps, outOfOfficeButtonProps === null || outOfOfficeButtonProps === void 0 ? void 0 : outOfOfficeButtonProps.styleProps);
   const controlProps = {

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

@@ -349,14 +349,53 @@ export const closeChatStateCleanUp = dispatch => {
   });
 };
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const logCleanUpDisconnectFailure = error => {
+  TelemetryHelper.logActionEvent(LogLevel.WARN, {
+    Event: TelemetryEvent.ChatSDKStateCleanUpDisconnectFailed,
+    Description: "Failed to disconnect the previous conversation during chat SDK state clean up.",
+    ExceptionDetails: {
+      exception: (error === null || error === void 0 ? void 0 : error.message) ?? error
+    }
+  });
+};
+
+// Releases the previous session's conversation. Mirrors the cleanup OmnichannelChatSDK.endChat()
+// runs in its finally block (disconnect, then drop the reference). Without it, a conversation
+// left over from a failed or orphaned start chat, or from a chat ended in another tab (which
+// skips the SDK endChat), keeps its messaging session open and leaks into the next chat.
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const disconnectConversation = chatSDK => {
+  const conversation = chatSDK.conversation;
+  if (!conversation || typeof conversation.disconnect !== "function") {
+    return;
+  }
+  try {
+    // ACS conversations disconnect asynchronously; legacy IC3 conversations may not return a promise.
+    const result = conversation.disconnect();
+    if (result && typeof result.catch === "function") {
+      result.catch(logCleanUpDisconnectFailure);
+    }
+  } catch (error) {
+    logCleanUpDisconnectFailure(error);
+  }
+};
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const chatSDKStateCleanUp = chatSDK => {
+  if (!chatSDK) {
+    return;
+  }
+
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   chatSDK.requestId = uuidv4();
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   chatSDK.chatToken = {};
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   chatSDK.reconnectId = null;
+  disconnectConversation(chatSDK);
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  chatSDK.conversation = null;
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

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

@@ -11,7 +11,7 @@ import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidge
 import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
 import { WebChatStoreLoader } from "../../webchatcontainerstateful/webchatcontroller/WebChatStoreLoader";
 import attachmentProcessingMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentProcessingMiddleware";
-import attachmentSentAnnouncementMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentSentAnnouncementMiddleware";
+import createAttachmentSentAnnouncementMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentSentAnnouncementMiddleware";
 import channelDataMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/channelDataMiddleware";
 import { createActivityMiddleware } from "../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityMiddleware";
 import { createActivityStatusMiddleware } from "../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityStatusMiddleware";
@@ -62,7 +62,7 @@ export const initWebChatComposer = (props, state, dispatch, facadeChatSDK, endCh
   // Initialize Web Chat's redux store
   let webChatStore = WebChatStoreLoader.store;
   if (!webChatStore) {
-    var _state$domainStates$l, _state$domainStates$l2, _state$domainStates$l3, _props$webChatContain7;
+    var _state$domainStates$l, _state$domainStates$l2, _props$controlProps, _state$domainStates$l3, _props$webChatContain7;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const addConversationalSurveyTagsCallback = action => {
       var _inMemoryState$appSta;
@@ -121,7 +121,7 @@ export const initWebChatComposer = (props, state, dispatch, facadeChatSDK, endCh
     };
     webChatStore = createStore({},
     //initial state
-    preProcessingMiddleware, attachmentProcessingMiddleware, createAttachmentUploadValidatorMiddleware((_state$domainStates$l = state.domainStates.liveChatConfig) === null || _state$domainStates$l === void 0 ? void 0 : _state$domainStates$l.allowedFileExtensions, (_state$domainStates$l2 = state.domainStates.liveChatConfig) === null || _state$domainStates$l2 === void 0 ? void 0 : _state$domainStates$l2.maxUploadFileSize, localizedTexts), attachmentSentAnnouncementMiddleware, createCustomEventMiddleware(BroadcastService), createQueueOverflowMiddleware(state, dispatch), channelDataMiddleware(addConversationalSurveyTagsCallback), createConversationEndMiddleware(conversationEndCallback, startConversationalSurveyCallback, endConversationalSurveyCallback), createDataMaskingMiddleware((_state$domainStates$l3 = state.domainStates.liveChatConfig) === null || _state$domainStates$l3 === void 0 ? void 0 : _state$domainStates$l3.DataMaskingInfo), createMessageTimeStampMiddleware, createMessageSequenceIdOverrideMiddleware, createCitationsMiddleware(state, dispatch), gifUploadMiddleware, htmlPlayerMiddleware, htmlTextMiddleware(honorsTargetInHTMLLinks), createMaxMessageSizeValidator(localizedTexts), sanitizationMiddleware, createCallActionMiddleware(),
+    preProcessingMiddleware, attachmentProcessingMiddleware, createAttachmentUploadValidatorMiddleware((_state$domainStates$l = state.domainStates.liveChatConfig) === null || _state$domainStates$l === void 0 ? void 0 : _state$domainStates$l.allowedFileExtensions, (_state$domainStates$l2 = state.domainStates.liveChatConfig) === null || _state$domainStates$l2 === void 0 ? void 0 : _state$domainStates$l2.maxUploadFileSize, localizedTexts), createAttachmentSentAnnouncementMiddleware(localizedTexts, ((_props$controlProps = props.controlProps) === null || _props$controlProps === void 0 ? void 0 : _props$controlProps.id) || "oc-lcw"), createCustomEventMiddleware(BroadcastService), createQueueOverflowMiddleware(state, dispatch), channelDataMiddleware(addConversationalSurveyTagsCallback), createConversationEndMiddleware(conversationEndCallback, startConversationalSurveyCallback, endConversationalSurveyCallback), createDataMaskingMiddleware((_state$domainStates$l3 = state.domainStates.liveChatConfig) === null || _state$domainStates$l3 === void 0 ? void 0 : _state$domainStates$l3.DataMaskingInfo), createMessageTimeStampMiddleware, createMessageSequenceIdOverrideMiddleware, createCitationsMiddleware(state, dispatch), gifUploadMiddleware, htmlPlayerMiddleware, htmlTextMiddleware(honorsTargetInHTMLLinks), createMaxMessageSizeValidator(localizedTexts), sanitizationMiddleware, createCallActionMiddleware(),
     // Pass a callback so middleware can push initials into React context for reactivity
     localizedStringsBotInitialsMiddleware(initials => {
       dispatch({

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

@@ -18,19 +18,86 @@ import { isMidAuthEnabled } from "./authHelper";
 import { setPostChatContextAndLoadSurvey } from "./setPostChatContextAndLoadSurvey";
 import { shouldSetPreChatIfPersistentChat } from "./persistentChatHelper";
 import { updateTelemetryData } from "./updateSessionDataForTelemetry";
+/**
+ * Per widget instance mutexes for the two chat creation entry points.
+ *
+ * Every guard in the prepareStartChat -> setPreChatAndInitiateChat -> initStartChat chain
+ * checks `conversationState === Closed`, but React state is updated asynchronously. A second
+ * invocation fired within the same render cycle (for example a rapid double click on the chat
+ * button, or a chat button click racing a BroadcastEvent.StartChat) therefore still observes
+ * the stale `Closed` state, reaches `facadeChatSDK.startChat()` and creates a second
+ * conversation on the backend which is then orphaned and never ended.
+ *
+ * The locks are keyed by FacadeChatSDK instance rather than being module wide, because a host
+ * page can mount several independent widgets, each with its own widgetInstanceId and its own
+ * FacadeChatSDK (created once per widget in LiveChatWidget.tsx). A module wide lock would make
+ * widget A's start chat silently drop widget B's legitimate simultaneous start chat.
+ *
+ * The two maps are separate because prepareStartChat calls initStartChat; sharing a single lock
+ * would make the nested call see its own parent as in flight and drop it. prepareStartChat is
+ * additionally blocked by an in flight initStartChat (pre-chat submit, reconnect, or the
+ * hideStartChatButton bootstrap call initStartChat directly). Otherwise a later prepareStartChat
+ * would dispatch Loading and maximize the widget, and only then have its nested initStartChat
+ * dropped.
+ */
+const prepareStartChatGuards = new WeakMap();
+const initStartChatGuards = new WeakMap();
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let optionalParams = {};
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let widgetInstanceId;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let popoutWidgetInstanceId;
+// Fallback owner used only when no FacadeChatSDK instance is available to key on, so the guard
+// degrades to the module wide behaviour instead of disappearing altogether.
+const unkeyedGuardOwner = {};
+const getGuard = (guards, facadeChatSDK) => {
+  const owner = facadeChatSDK ?? unkeyedGuardOwner;
+  let guard = guards.get(owner);
+  if (!guard) {
+    guard = {
+      inFlight: false
+    };
+    guards.set(owner, guard);
+  }
+  return guard;
+};
+
+/**
+ * Runs `operation` only if no other invocation for the same widget instance is already in
+ * flight. Concurrent invocations are dropped (and reported through telemetry) rather than
+ * awaiting the in-flight promise, so a future re-entrant call can never deadlock on itself.
+ * No caller acts on the resolved value, so dropping is safe.
+ *
+ * `blockedBy` lets an operation also yield to a different, already running operation for the
+ * same widget instance without claiming that operation's lock.
+ */
+const runExclusively = async (guards, facadeChatSDK, description, operation, props, blockedBy) => {
+  const guard = getGuard(guards, facadeChatSDK);
+  const blockingGuard = blockedBy ? getGuard(blockedBy, facadeChatSDK) : undefined;
+  if (guard.inFlight || blockingGuard !== null && blockingGuard !== void 0 && blockingGuard.inFlight) {
+    TelemetryHelper.logActionEvent(LogLevel.WARN, {
+      Event: TelemetryEvent.ConcurrentStartChatRejected,
+      Description: description,
+      CustomProperties: {
+        WidgetCacheId: props ? getWidgetCacheIdfromProps(props) : undefined
+      }
+    });
+    return;
+  }
+
+  // Claim the lock before invoking the operation, so a re-entrant call made from the
+  // operation's synchronous preamble (before its first await) cannot slip past the check above.
+  guard.inFlight = true;
+  try {
+    await operation();
+  } finally {
+    guard.inFlight = false;
+  }
+};
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const prepareStartChat = async (props, facadeChatSDK, state, dispatch, setAdapter) => {
-  optionalParams = {}; //Resetting to ensure no stale values
-  widgetInstanceId = getWidgetCacheIdfromProps(props);
+  return runExclusively(prepareStartChatGuards, facadeChatSDK, "Concurrent prepareStartChat call ignored, a start chat operation is already in progress for this widget instance.", () => prepareStartChatInternal(props, facadeChatSDK, state, dispatch, setAdapter), props, initStartChatGuards);
+};
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const prepareStartChatInternal = async (props, facadeChatSDK, state, dispatch, setAdapter) => {
   // reconnect > chat from cache
   if (isReconnectEnabled(props.chatConfig) === true && !isPersistentEnabled(props.chatConfig)) {
     const shouldStartChatNormally = await handleChatReconnect(facadeChatSDK, props, dispatch, setAdapter, initStartChat, state);
@@ -156,6 +223,11 @@ const setPreChatAndInitiateChat = async (facadeChatSDK, dispatch, setAdapter, is
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const initStartChat = async (facadeChatSDK, dispatch, setAdapter, state, props, params, persistedState) => {
+  return runExclusively(initStartChatGuards, facadeChatSDK, "Concurrent initStartChat call ignored, a start chat operation is already in progress for this widget instance.", () => initStartChatInternal(facadeChatSDK, dispatch, setAdapter, state, props, params, persistedState), props);
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const initStartChatInternal = async (facadeChatSDK, dispatch, setAdapter, state, props, params, persistedState) => {
   var _state$domainStates7;
   let isStartChatSuccessful = false;
   const persistentChatEnabled = isPersistentChatEnabled(state === null || state === void 0 || (_state$domainStates7 = state.domainStates) === null || _state$domainStates7 === void 0 || (_state$domainStates7 = _state$domainStates7.liveChatConfig) === null || _state$domainStates7 === void 0 || (_state$domainStates7 = _state$domainStates7.LiveWSAndLiveChatEngJoin) === null || _state$domainStates7 === void 0 ? void 0 : _state$domainStates7.msdyn_conversationmode);
@@ -194,14 +266,15 @@ const initStartChat = async (facadeChatSDK, dispatch, setAdapter, state, props,
     }
     try {
       var _window$Microsoft, _state$domainStates8;
-      // Set custom context params
-      await setCustomContextParams(state, props);
+      // Set custom context params. Returned (not stored module-side) so that concurrent
+      // widget instances cannot overwrite each other's custom context.
+      const customContextParams = await setCustomContextParams(state, props);
       const defaultOptionalParams = {
         sendDefaultInitContext: true,
         isProactiveChat: !!(params !== null && params !== void 0 && params.isProactiveChat),
         portalContactId: (_window$Microsoft = window.Microsoft) === null || _window$Microsoft === void 0 || (_window$Microsoft = _window$Microsoft.Dynamic365) === null || _window$Microsoft === void 0 || (_window$Microsoft = _window$Microsoft.Portal) === null || _window$Microsoft === void 0 || (_window$Microsoft = _window$Microsoft.User) === null || _window$Microsoft === void 0 ? void 0 : _window$Microsoft.contactId
       };
-      const startChatOptionalParams = Object.assign({}, params, optionalParams, defaultOptionalParams);
+      const startChatOptionalParams = Object.assign({}, params, customContextParams, defaultOptionalParams);
 
       // MID-AUTH: Add wasAuthenticated flag for reconnect scenarios
       // Tells FacadeChatSDK whether the previous session was authenticated
@@ -284,9 +357,6 @@ const initStartChat = async (facadeChatSDK, dispatch, setAdapter, state, props,
     await updateTelemetryData(facadeChatSDK, dispatch);
   } catch (ex) {
     handleStartChatError(dispatch, facadeChatSDK, props, ex, isStartChatSuccessful);
-  } finally {
-    optionalParams = {};
-    widgetInstanceId = "";
   }
 };
 
@@ -330,19 +400,22 @@ const canConnectToExistingChat = async (props, facadeChatSDK, state, dispatch, s
   return false;
 };
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+/**
+ * Resolves the custom context to start the chat with.
+ *
+ * Returns the resolved params instead of mutating module-level state: a page can host several
+ * independent widgets, and once per-instance start-chat guards allow them to run concurrently,
+ * shared mutable state would let one widget overwrite another widget's custom context.
+ */
 const setCustomContextParams = async (state, props) => {
   var _state$domainStates9, _persistedState$domai5;
   if (state !== null && state !== void 0 && (_state$domainStates9 = state.domainStates) !== null && _state$domainStates9 !== void 0 && _state$domainStates9.customContext) {
     var _state$domainStates0;
-    optionalParams = Object.assign({}, optionalParams, {
+    return {
       customContext: JSON.parse(JSON.stringify(state === null || state === void 0 || (_state$domainStates0 = state.domainStates) === null || _state$domainStates0 === void 0 ? void 0 : _state$domainStates0.customContext))
-    });
-    return;
-  }
-  if (isNullOrEmptyString(widgetInstanceId)) {
-    widgetInstanceId = getWidgetCacheIdfromProps(props);
+    };
   }
+  const widgetInstanceId = props ? getWidgetCacheIdfromProps(props) : "";
   // Add custom context only for unauthenticated chat
   const persistedState = getStateFromCache(widgetInstanceId);
   const customContextLocal = (persistedState === null || persistedState === void 0 || (_persistedState$domai5 = persistedState.domainStates) === null || _persistedState$domai5 === void 0 ? void 0 : _persistedState$domai5.customContext) ?? (props === null || props === void 0 ? void 0 : props.initialCustomContext);
@@ -351,23 +424,23 @@ const setCustomContextParams = async (state, props) => {
       Event: TelemetryEvent.SettingCustomContext,
       Description: "Setting custom context for unauthenticated chat"
     });
-    optionalParams = Object.assign({}, optionalParams, {
+    return {
       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: JSON.parse(JSON.stringify(customContextFromParent.contextVariables))
-      });
-    }
+    };
+  }
+  const customContextFromParent = await getInitContextParamsForPopout();
+  if (!isUndefinedOrEmpty(customContextFromParent === null || customContextFromParent === void 0 ? void 0 : customContextFromParent.contextVariables)) {
+    return {
+      customContext: JSON.parse(JSON.stringify(customContextFromParent.contextVariables))
+    };
   }
+  return {};
 };
 const canStartPopoutChat = async props => {
   if (props.allowSdkChatSupport === false) {
     return false;
   }
-  popoutWidgetInstanceId = getWidgetCacheIdfromProps(props, true);
+  const popoutWidgetInstanceId = getWidgetCacheIdfromProps(props, true);
   if (!isNullOrEmptyString(popoutWidgetInstanceId)) {
     var _persistedState$domai6, _persistedState$appSt3;
     const persistedState = getStateFromCache(popoutWidgetInstanceId);

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

@@ -529,9 +529,9 @@ export const WebChatContainerStateful = props => {
 
         /* Suggested actions carousel previous/next navigation focus */
         .webchat__suggested-actions .webchat__suggested-actions__carousel .react-film__flipper:focus-visible .react-film__flipper__body {
-            outline: ${(webChatContainerProps === null || webChatContainerProps === void 0 || (_webChatContainerProp20 = webChatContainerProps.webChatStyles) === null || _webChatContainerProp20 === void 0 ? void 0 : _webChatContainerProp20.suggestedActionKeyboardFocusIndicatorBorderStyle) ?? "dashed"} ${(webChatContainerProps === null || webChatContainerProps === void 0 || (_webChatContainerProp21 = webChatContainerProps.webChatStyles) === null || _webChatContainerProp21 === void 0 ? void 0 : _webChatContainerProp21.suggestedActionKeyboardFocusIndicatorBorderWidth) ?? "1px"} ${(webChatContainerProps === null || webChatContainerProps === void 0 || (_webChatContainerProp22 = webChatContainerProps.webChatStyles) === null || _webChatContainerProp22 === void 0 ? void 0 : _webChatContainerProp22.suggestedActionKeyboardFocusIndicatorBorderColor) ?? "#605E5C"} !important;
+            outline: ${(webChatContainerProps === null || webChatContainerProps === void 0 || (_webChatContainerProp20 = webChatContainerProps.webChatStyles) === null || _webChatContainerProp20 === void 0 ? void 0 : _webChatContainerProp20.suggestedActionKeyboardFocusIndicatorBorderStyle) ?? "solid"} ${(webChatContainerProps === null || webChatContainerProps === void 0 || (_webChatContainerProp21 = webChatContainerProps.webChatStyles) === null || _webChatContainerProp21 === void 0 ? void 0 : _webChatContainerProp21.suggestedActionKeyboardFocusIndicatorBorderWidth) ?? "2px"} ${(webChatContainerProps === null || webChatContainerProps === void 0 || (_webChatContainerProp22 = webChatContainerProps.webChatStyles) === null || _webChatContainerProp22 === void 0 ? void 0 : _webChatContainerProp22.suggestedActionKeyboardFocusIndicatorBorderColor) ?? "#605E5C"} !important;
             outline-offset: ${(webChatContainerProps === null || webChatContainerProps === void 0 || (_webChatContainerProp23 = webChatContainerProps.webChatStyles) === null || _webChatContainerProp23 === void 0 ? void 0 : _webChatContainerProp23.suggestedActionKeyboardFocusIndicatorInset) ?? "2px"} !important;
-
+        }
         `), /*#__PURE__*/React.createElement(Stack, {
     styles: containerStyles,
     className: "webchat__stacked-layout_container"

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

@@ -27,7 +27,8 @@ export const defaultMiddlewareLocalizedTexts = {
   MIDDLEWARE_BANNER_CHAT_DISCONNECT: "Your conversation has been disconnected. For additional assistance, please start a new chat.",
   THIRD_PARTY_COOKIES_BLOCKED_ALERT_MESSAGE: "Allow sites to save/read cookies in browser settings. Reloading page starts a new chat.",
   MIDDLEWARE_BANNER_FILE_IS_MALICIOUS: "{0} has been blocked because the file may contain a malware.",
-  MIDDLEWARE_BANNER_FILE_SENT: "File sent successfully.",
+  MIDDLEWARE_BANNER_FILE_SENT: "File {2} sent",
+  MIDDLEWARE_BANNER_FILES_SENT: "{0} files sent",
   MIDDLEWARE_BANNER_FILE_EMAIL_ADDRESS_RECORDED_SUCCESS: "Email will be sent after chat ends!",
   MIDDLEWARE_BANNER_FILE_EMAIL_ADDRESS_RECORDED_ERROR: "Email {0} could not be saved, try again later.",
   MIDDLEWARE_SR_PREFIX_SUCCESS: "Success. ",

package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/attachments/AdaptiveCardAccessibilityWrapper.js

@@ -88,6 +88,19 @@ const AdaptiveCardAccessibilityWrapper = _ref => {
         }
       });
 
+      // action-button-double-read: the adaptivecards renderer writes the action
+      // title to the button text, aria-label AND title. The title becomes the
+      // accessible description, so TalkBack reads the label twice ("Submit,
+      // button, Submit"). Drop the title only when it repeats the button name;
+      // a distinct title (an action tooltip) adds information and is kept.
+      container.querySelectorAll("button[title]").forEach(btn => {
+        const title = (btn.getAttribute("title") || "").trim();
+        const name = (btn.getAttribute("aria-label") ?? btn.textContent ?? "").trim();
+        if (title && title === name) {
+          btn.removeAttribute("title");
+        }
+      });
+
       // Find all radio inputs inside the adaptive card
       const radios = container.querySelectorAll("input[type='radio']");
       if (radios.length === 0) return;
@@ -169,7 +182,8 @@ const AdaptiveCardAccessibilityWrapper = _ref => {
 
     // Use MutationObserver to patch after WebChat finishes rendering the card.
     // Also watch attribute changes on aria-hidden so we can re-apply if React
-    // reconciliation removes it from labels.
+    // reconciliation removes it from labels, and on title so a re-added
+    // duplicate button title is removed again.
     const observer = new MutationObserver(() => {
       patchRadioGroups();
     });
@@ -177,7 +191,7 @@ const AdaptiveCardAccessibilityWrapper = _ref => {
       childList: true,
       subtree: true,
       attributes: true,
-      attributeFilter: ["aria-hidden"]
+      attributeFilter: ["aria-hidden", "title"]
     });
 
     // Also run immediately in case the card is already rendered

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

@@ -2,26 +2,36 @@
  * AttachmentSentAnnouncementMiddleware
  *
  * When a file attachment is successfully sent, announces the result to
- * screen readers via an aria-live region so that assistive technology
- * users receive immediate feedback.
+ * screen readers so that assistive technology users receive immediate
+ * feedback ("File report.pdf sent").
+ *
+ * The announcement region lives inside the chat dialog. While the dialog is
+ * open it is aria-modal and its host siblings are aria-hidden, so screen
+ * readers (TalkBack, VoiceOver) ignore live regions outside it.
  ******/
 
 import { isWebChatAction } from "../../../interfaces/IWebChatAction";
 import { WebChatActionType } from "../../enums/WebChatActionType";
-const ARIA_LIVE_REGION_ID = "oc-lcw-attachment-announcement";
+export const ATTACHMENT_ANNOUNCEMENT_REGION_ID = "oc-lcw-attachment-announcement";
+const DEFAULT_FILE_SENT_TEXT = "File {2} sent";
+const DEFAULT_FILES_SENT_TEXT = "{0} files sent";
+
+// Let the send-box focus shift settle before speaking, then keep the node
+// long enough for the screen reader to read it.
+const ANNOUNCE_DELAY_MS = 100;
+const ANNOUNCEMENT_LIFETIME_MS = 5000;
 
 /**
- * Ensures a visually-hidden aria-live region exists in the DOM for
- * announcing attachment upload results to screen readers.
+ * Ensures a visually-hidden aria-live region exists inside the chat dialog
+ * for announcing attachment upload results to screen readers.
  */
-const ensureAriaLiveRegion = () => {
-  let region = document.getElementById(ARIA_LIVE_REGION_ID);
+const ensureAriaLiveRegion = widgetElementId => {
+  const host = document.getElementById(widgetElementId) || document.body;
+  let region = document.getElementById(ATTACHMENT_ANNOUNCEMENT_REGION_ID);
   if (!region) {
     region = document.createElement("div");
-    region.id = ARIA_LIVE_REGION_ID;
+    region.id = ATTACHMENT_ANNOUNCEMENT_REGION_ID;
     region.setAttribute("aria-live", "polite");
-    region.setAttribute("role", "status");
-    region.setAttribute("aria-atomic", "true");
     // Visually hidden but available to screen readers
     Object.assign(region.style, {
       position: "absolute",
@@ -34,44 +44,60 @@ const ensureAriaLiveRegion = () => {
       whiteSpace: "nowrap",
       border: "0"
     });
-    const container = document.getElementById("oc-lcw-container");
-    (container || document.body).appendChild(region);
+  }
+  if (region.parentElement !== host) {
+    host.appendChild(region);
   }
   return region;
 };
 
 /**
- * Announces a message to screen readers by updating the aria-live region.
- * Clears it briefly first so repeated identical messages are still announced.
+ * Announces a message by appending a fresh node to the live region.
+ * TalkBack reliably speaks newly added nodes but often misses text changes
+ * on an existing node, so each announcement gets its own element.
  */
-const announce = message => {
-  const region = ensureAriaLiveRegion();
-  region.textContent = "";
-  // Small delay so the screen reader detects the content change
+const announce = (message, widgetElementId) => {
+  const region = ensureAriaLiveRegion(widgetElementId);
   setTimeout(() => {
-    region.textContent = message;
-  }, 100);
+    const node = document.createElement("div");
+    node.textContent = message;
+    region.appendChild(node);
+    setTimeout(() => node.remove(), ANNOUNCEMENT_LIFETIME_MS);
+  }, ANNOUNCE_DELAY_MS);
 };
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const attachmentSentAnnouncementMiddleware = _ref => {
-  let dispatch = _ref.dispatch;
-  return next => action => {
-    if (!isWebChatAction(action)) {
-      return next(action);
-    }
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const getFileSentMessage = (attachments, localizedTexts) => {
+  var _attachments$;
+  if (attachments.length > 1) {
+    // Replacer callbacks insert values literally; a string would treat "$&" or "$$" as patterns.
+    return ((localizedTexts === null || localizedTexts === void 0 ? void 0 : localizedTexts.MIDDLEWARE_BANNER_FILES_SENT) || DEFAULT_FILES_SENT_TEXT).replace("{0}", () => String(attachments.length));
+  }
+  const name = typeof ((_attachments$ = attachments[0]) === null || _attachments$ === void 0 ? void 0 : _attachments$.name) === "string" ? attachments[0].name.trim() : "";
+  return ((localizedTexts === null || localizedTexts === void 0 ? void 0 : localizedTexts.MIDDLEWARE_BANNER_FILE_SENT) || DEFAULT_FILE_SENT_TEXT).replace("{2}", () => name).replace(/\s{2,}/g, " ").trim();
+};
+export const createAttachmentSentAnnouncementMiddleware = function (localizedTexts) {
+  let widgetElementId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "oc-lcw";
+  return (
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _ref => {
+      let dispatch = _ref.dispatch;
+      return next => action => {
+        if (!isWebChatAction(action)) {
+          return next(action);
+        }
 
-    // Intercept successfully posted activities that contain attachments
-    if (action.type === WebChatActionType.DIRECT_LINE_POST_ACTIVITY_FULFILLED) {
-      var _action$payload;
-      const attachments = (_action$payload = action.payload) === null || _action$payload === void 0 || (_action$payload = _action$payload.activity) === null || _action$payload === void 0 ? void 0 : _action$payload.attachments;
-      if (attachments && attachments.length > 0) {
-        const count = attachments.length;
-        const message = count === 1 ? "File sent" : `${count} files sent`;
-        announce(message);
-      }
+        // Intercept successfully posted activities that contain attachments
+        if (action.type === WebChatActionType.DIRECT_LINE_POST_ACTIVITY_FULFILLED) {
+          var _action$payload;
+          const attachments = (_action$payload = action.payload) === null || _action$payload === void 0 || (_action$payload = _action$payload.activity) === null || _action$payload === void 0 ? void 0 : _action$payload.attachments;
+          if (attachments && attachments.length > 0) {
+            announce(getFileSentMessage(attachments, localizedTexts), widgetElementId);
+          }
+        }
+        return next(action);
+      };
     }
-    return next(action);
-  };
+  );
 };
-export default attachmentSentAnnouncementMiddleware;
+export default createAttachmentSentAnnouncementMiddleware;