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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (29) hide show
  1. package/README.md +2 -0
  2. package/lib/cjs/common/telemetry/TelemetryConstants.js +4 -0
  3. package/lib/cjs/components/chatbuttonstateful/ChatButtonStateful.js +42 -25
  4. package/lib/cjs/components/livechatwidget/common/endChat.js +39 -0
  5. package/lib/cjs/components/livechatwidget/common/initWebChatComposer.js +33 -9
  6. package/lib/cjs/components/livechatwidget/common/startChat.js +107 -33
  7. package/lib/cjs/components/webchatcontainerstateful/WebChatContainerStateful.js +2 -2
  8. package/lib/cjs/components/webchatcontainerstateful/common/defaultProps/defaultMiddlewareLocalizedTexts.js +2 -1
  9. package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/attachmentForScreenReaderMiddleware.js +159 -0
  10. package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/attachments/AdaptiveCardAccessibilityWrapper.js +16 -2
  11. package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentSentAnnouncementMiddleware.js +68 -40
  12. package/lib/cjs/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentUploadValidatorMiddleware.js +0 -27
  13. package/lib/esm/common/telemetry/TelemetryConstants.js +4 -0
  14. package/lib/esm/components/chatbuttonstateful/ChatButtonStateful.js +42 -25
  15. package/lib/esm/components/livechatwidget/common/endChat.js +39 -0
  16. package/lib/esm/components/livechatwidget/common/initWebChatComposer.js +31 -9
  17. package/lib/esm/components/livechatwidget/common/startChat.js +104 -31
  18. package/lib/esm/components/webchatcontainerstateful/WebChatContainerStateful.js +2 -2
  19. package/lib/esm/components/webchatcontainerstateful/common/defaultProps/defaultMiddlewareLocalizedTexts.js +2 -1
  20. package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/attachmentForScreenReaderMiddleware.js +153 -0
  21. package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/attachments/AdaptiveCardAccessibilityWrapper.js +16 -2
  22. package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentSentAnnouncementMiddleware.js +65 -39
  23. package/lib/esm/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentUploadValidatorMiddleware.js +0 -27
  24. package/lib/types/common/telemetry/TelemetryConstants.d.ts +2 -0
  25. package/lib/types/components/livechatwidget/common/initWebChatComposer.d.ts +8 -0
  26. package/lib/types/components/webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/attachmentForScreenReaderMiddleware.d.ts +11 -0
  27. package/lib/types/components/webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentSentAnnouncementMiddleware.d.ts +11 -4
  28. package/lib/types/contexts/common/ILiveChatWidgetLocalizedTexts.d.ts +9 -2
  29. package/package.json +5 -6
@@ -0,0 +1,159 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.getAdaptiveCardSpeak = exports.createAttachmentForScreenReaderMiddleware = void 0;
7
+ var _react = _interopRequireWildcard(require("react"));
8
+ var _Constants = require("../../../../../common/Constants");
9
+ var _botframeworkWebchat = require("botframework-webchat");
10
+ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
11
+ function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
12
+ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
13
+ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
14
+ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
15
+ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
16
+ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; } /* eslint-disable @typescript-eslint/no-explicit-any */ /******
17
+ * AttachmentForScreenReaderMiddleware
18
+ *
19
+ * Web Chat reads an Adaptive Card to screen readers only from the card's `speak` property.
20
+ * A card without `speak` is announced as "A card" with no content.
21
+ * This middleware sets `speak` from the visible text of the card, then lets Web Chat render it as usual.
22
+ ******/
23
+ const useAdaptiveCardsPackage = _botframeworkWebchat.hooks.useAdaptiveCardsPackage,
24
+ useStyleOptions = _botframeworkWebchat.hooks.useStyleOptions;
25
+ const ADAPTIVE_CARD_CONTENT_TYPE = "application/vnd.microsoft.card.adaptive";
26
+ const HTML_BLOCK_END = /<\/(p|li|h[1-6]|div|tr|td|th|blockquote|pre)>|<br\s*\/?>/gi;
27
+ // The "opens in a new window" icon of each link is left out: it describes the link target, not the content of the message.
28
+ const htmlToText = html => {
29
+ const body = new DOMParser().parseFromString(html.replace(HTML_BLOCK_END, "$& "), "text/html").body;
30
+ body.querySelectorAll(`script, style, template, img.${_Constants.Constants.OpenLinkIconCssClass}`).forEach(element => element.remove());
31
+ body.querySelectorAll("img").forEach(image => image.replaceWith(` ${image.getAttribute("alt") ?? ""} `));
32
+ return (body.textContent ?? "").replace(/\s+/g, " ").trim();
33
+ };
34
+
35
+ // Renders the element as the visible card does: Adaptive Cards formats {{DATE()}} and {{TIME()}}, then the Markdown is rendered.
36
+ // Web Chat sets the static Markdown handler before each visible render, and this restores the previous handler after rendering.
37
+ const getRenderedText = (element, AdaptiveCard, renderMarkdownAsHTML) => {
38
+ const previousOnProcessMarkdown = AdaptiveCard.onProcessMarkdown;
39
+ try {
40
+ AdaptiveCard.onProcessMarkdown = (text, result) => {
41
+ result.outputHtml = renderMarkdownAsHTML(text);
42
+ result.didProcess = true;
43
+ };
44
+ const renderedElement = element.render();
45
+ return renderedElement ? htmlToText(renderedElement.outerHTML) : "";
46
+ } catch {
47
+ var _element$asString;
48
+ return ((_element$asString = element.asString) === null || _element$asString === void 0 ? void 0 : _element$asString.call(element)) ?? "";
49
+ } finally {
50
+ AdaptiveCard.onProcessMarkdown = previousOnProcessMarkdown;
51
+ }
52
+ };
53
+
54
+ // Collects the visible text of the card in document order, after the parser has applied element fallbacks.
55
+ // Inputs and actions are not collected because Web Chat already lists them after the card text.
56
+ const getAdaptiveCardSpeak = (content, adaptiveCardsPackage, renderMarkdownAsHTML, adaptiveCardsParserMaxVersion) => {
57
+ const AdaptiveCard = adaptiveCardsPackage.AdaptiveCard,
58
+ FactSet = adaptiveCardsPackage.FactSet,
59
+ Image = adaptiveCardsPackage.Image,
60
+ RichTextBlock = adaptiveCardsPackage.RichTextBlock,
61
+ SerializationContext = adaptiveCardsPackage.SerializationContext,
62
+ TextBlock = adaptiveCardsPackage.TextBlock,
63
+ Version = adaptiveCardsPackage.Version;
64
+ const maxVersion = adaptiveCardsParserMaxVersion ? Version.parse(adaptiveCardsParserMaxVersion, new SerializationContext()) : undefined;
65
+ const card = new AdaptiveCard();
66
+ const texts = [];
67
+ card.parse(content, new SerializationContext(maxVersion !== null && maxVersion !== void 0 && maxVersion.isValid ? maxVersion : undefined));
68
+ const getFactText = (factSet, text) => {
69
+ const textBlock = new TextBlock(text);
70
+ textBlock.setParent(factSet);
71
+ return getRenderedText(textBlock, AdaptiveCard, renderMarkdownAsHTML);
72
+ };
73
+ const walk = element => {
74
+ if (!(element !== null && element !== void 0 && element.isVisible)) {
75
+ return;
76
+ }
77
+ if (element instanceof TextBlock || element instanceof RichTextBlock) {
78
+ texts.push(getRenderedText(element, AdaptiveCard, renderMarkdownAsHTML));
79
+ } else if (element instanceof FactSet) {
80
+ element.facts.forEach(_ref => {
81
+ let name = _ref.name,
82
+ value = _ref.value;
83
+ texts.push([name, value].map(text => text ? getFactText(element, text) : "").filter(Boolean).join(": "));
84
+ });
85
+ } else if (element instanceof Image) {
86
+ texts.push(element.altText);
87
+ }
88
+ if (element.getItemAt && element.getItemCount) {
89
+ for (let index = 0, count = element.getItemCount(); index < count; index++) {
90
+ walk(element.getItemAt(index));
91
+ }
92
+ }
93
+ };
94
+ walk(card);
95
+ return texts.filter(text => typeof text === "string" && text).join(" ").replace(/\s+/g, " ").trim();
96
+ };
97
+ exports.getAdaptiveCardSpeak = getAdaptiveCardSpeak;
98
+ const AdaptiveCardForScreenReader = _ref2 => {
99
+ let args = _ref2.args,
100
+ next = _ref2.next,
101
+ renderMarkdownAsHTML = _ref2.renderMarkdownAsHTML;
102
+ const _useAdaptiveCardsPack = useAdaptiveCardsPackage(),
103
+ _useAdaptiveCardsPack2 = _slicedToArray(_useAdaptiveCardsPack, 1),
104
+ adaptiveCardsPackage = _useAdaptiveCardsPack2[0];
105
+ const _useStyleOptions = useStyleOptions(),
106
+ _useStyleOptions2 = _slicedToArray(_useStyleOptions, 1),
107
+ adaptiveCardsParserMaxVersion = _useStyleOptions2[0].adaptiveCardsParserMaxVersion;
108
+ const _args = _slicedToArray(args, 1),
109
+ options = _args[0];
110
+ const attachment = options.attachment;
111
+
112
+ // The widget creates a new Markdown renderer on each render with the same settings, so the text is computed once for each attachment.
113
+ const contentWithSpeak = (0, _react.useMemo)(() => {
114
+ try {
115
+ const content = typeof attachment.content === "string" ? JSON.parse(attachment.content) : attachment.content;
116
+ if (!content || typeof content !== "object" || content.speak) {
117
+ return undefined;
118
+ }
119
+ const speak = getAdaptiveCardSpeak(content, adaptiveCardsPackage, renderMarkdownAsHTML, adaptiveCardsParserMaxVersion);
120
+ return speak ? {
121
+ ...content,
122
+ speak
123
+ } : undefined;
124
+ } catch {
125
+ return undefined;
126
+ }
127
+ }, [adaptiveCardsPackage, adaptiveCardsParserMaxVersion, attachment]);
128
+ const render = contentWithSpeak ? next({
129
+ ...options,
130
+ attachment: {
131
+ ...attachment,
132
+ content: contentWithSpeak
133
+ }
134
+ }, ...args.slice(1)) : next(...args);
135
+ return typeof render === "function" ? render() : null;
136
+ };
137
+ const createAttachmentForScreenReaderMiddleware = renderMarkdownAsHTML => {
138
+ const attachmentForScreenReaderMiddleware = () => next => function () {
139
+ var _args$;
140
+ for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
141
+ args[_key] = arguments[_key];
142
+ }
143
+ const attachment = (_args$ = args[0]) === null || _args$ === void 0 ? void 0 : _args$.attachment;
144
+
145
+ // Web Chat renders nothing for a card without content, so it is left to Web Chat.
146
+ if ((attachment === null || attachment === void 0 ? void 0 : attachment.contentType) !== ADAPTIVE_CARD_CONTENT_TYPE || !attachment.content) {
147
+ return next(...args);
148
+ }
149
+
150
+ // eslint-disable-next-line react/display-name
151
+ return () => /*#__PURE__*/_react.default.createElement(AdaptiveCardForScreenReader, {
152
+ args: args,
153
+ next: next,
154
+ renderMarkdownAsHTML: renderMarkdownAsHTML
155
+ });
156
+ };
157
+ return attachmentForScreenReaderMiddleware;
158
+ };
159
+ exports.createAttachmentForScreenReaderMiddleware = createAttachmentForScreenReaderMiddleware;
@@ -94,6 +94,19 @@ const AdaptiveCardAccessibilityWrapper = _ref => {
94
94
  }
95
95
  });
96
96
 
97
+ // action-button-double-read: the adaptivecards renderer writes the action
98
+ // title to the button text, aria-label AND title. The title becomes the
99
+ // accessible description, so TalkBack reads the label twice ("Submit,
100
+ // button, Submit"). Drop the title only when it repeats the button name;
101
+ // a distinct title (an action tooltip) adds information and is kept.
102
+ container.querySelectorAll("button[title]").forEach(btn => {
103
+ const title = (btn.getAttribute("title") || "").trim();
104
+ const name = (btn.getAttribute("aria-label") ?? btn.textContent ?? "").trim();
105
+ if (title && title === name) {
106
+ btn.removeAttribute("title");
107
+ }
108
+ });
109
+
97
110
  // Find all radio inputs inside the adaptive card
98
111
  const radios = container.querySelectorAll("input[type='radio']");
99
112
  if (radios.length === 0) return;
@@ -175,7 +188,8 @@ const AdaptiveCardAccessibilityWrapper = _ref => {
175
188
 
176
189
  // Use MutationObserver to patch after WebChat finishes rendering the card.
177
190
  // Also watch attribute changes on aria-hidden so we can re-apply if React
178
- // reconciliation removes it from labels.
191
+ // reconciliation removes it from labels, and on title so a re-added
192
+ // duplicate button title is removed again.
179
193
  const observer = new MutationObserver(() => {
180
194
  patchRadioGroups();
181
195
  });
@@ -183,7 +197,7 @@ const AdaptiveCardAccessibilityWrapper = _ref => {
183
197
  childList: true,
184
198
  subtree: true,
185
199
  attributes: true,
186
- attributeFilter: ["aria-hidden"]
200
+ attributeFilter: ["aria-hidden", "title"]
187
201
  });
188
202
 
189
203
  // Also run immediately in case the card is already rendered
@@ -3,31 +3,41 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.default = void 0;
6
+ exports.getFileSentMessage = exports.default = exports.createAttachmentSentAnnouncementMiddleware = exports.ATTACHMENT_ANNOUNCEMENT_REGION_ID = void 0;
7
7
  var _IWebChatAction = require("../../../interfaces/IWebChatAction");
8
8
  var _WebChatActionType = require("../../enums/WebChatActionType");
9
9
  /******
10
10
  * AttachmentSentAnnouncementMiddleware
11
11
  *
12
12
  * When a file attachment is successfully sent, announces the result to
13
- * screen readers via an aria-live region so that assistive technology
14
- * users receive immediate feedback.
13
+ * screen readers so that assistive technology users receive immediate
14
+ * feedback ("File report.pdf sent").
15
+ *
16
+ * The announcement region lives inside the chat dialog. While the dialog is
17
+ * open it is aria-modal and its host siblings are aria-hidden, so screen
18
+ * readers (TalkBack, VoiceOver) ignore live regions outside it.
15
19
  ******/
16
20
 
17
- const ARIA_LIVE_REGION_ID = "oc-lcw-attachment-announcement";
21
+ const ATTACHMENT_ANNOUNCEMENT_REGION_ID = exports.ATTACHMENT_ANNOUNCEMENT_REGION_ID = "oc-lcw-attachment-announcement";
22
+ const DEFAULT_FILE_SENT_TEXT = "File {2} sent";
23
+ const DEFAULT_FILES_SENT_TEXT = "{0} files sent";
24
+
25
+ // Let the send-box focus shift settle before speaking, then keep the node
26
+ // long enough for the screen reader to read it.
27
+ const ANNOUNCE_DELAY_MS = 100;
28
+ const ANNOUNCEMENT_LIFETIME_MS = 5000;
18
29
 
19
30
  /**
20
- * Ensures a visually-hidden aria-live region exists in the DOM for
21
- * announcing attachment upload results to screen readers.
31
+ * Ensures a visually-hidden aria-live region exists inside the chat dialog
32
+ * for announcing attachment upload results to screen readers.
22
33
  */
23
- const ensureAriaLiveRegion = () => {
24
- let region = document.getElementById(ARIA_LIVE_REGION_ID);
34
+ const ensureAriaLiveRegion = widgetElementId => {
35
+ const host = document.getElementById(widgetElementId) || document.body;
36
+ let region = document.getElementById(ATTACHMENT_ANNOUNCEMENT_REGION_ID);
25
37
  if (!region) {
26
38
  region = document.createElement("div");
27
- region.id = ARIA_LIVE_REGION_ID;
39
+ region.id = ATTACHMENT_ANNOUNCEMENT_REGION_ID;
28
40
  region.setAttribute("aria-live", "polite");
29
- region.setAttribute("role", "status");
30
- region.setAttribute("aria-atomic", "true");
31
41
  // Visually hidden but available to screen readers
32
42
  Object.assign(region.style, {
33
43
  position: "absolute",
@@ -40,44 +50,62 @@ const ensureAriaLiveRegion = () => {
40
50
  whiteSpace: "nowrap",
41
51
  border: "0"
42
52
  });
43
- const container = document.getElementById("oc-lcw-container");
44
- (container || document.body).appendChild(region);
53
+ }
54
+ if (region.parentElement !== host) {
55
+ host.appendChild(region);
45
56
  }
46
57
  return region;
47
58
  };
48
59
 
49
60
  /**
50
- * Announces a message to screen readers by updating the aria-live region.
51
- * Clears it briefly first so repeated identical messages are still announced.
61
+ * Announces a message by appending a fresh node to the live region.
62
+ * TalkBack reliably speaks newly added nodes but often misses text changes
63
+ * on an existing node, so each announcement gets its own element.
52
64
  */
53
- const announce = message => {
54
- const region = ensureAriaLiveRegion();
55
- region.textContent = "";
56
- // Small delay so the screen reader detects the content change
65
+ const announce = (message, widgetElementId) => {
66
+ const region = ensureAriaLiveRegion(widgetElementId);
57
67
  setTimeout(() => {
58
- region.textContent = message;
59
- }, 100);
68
+ const node = document.createElement("div");
69
+ node.textContent = message;
70
+ region.appendChild(node);
71
+ setTimeout(() => node.remove(), ANNOUNCEMENT_LIFETIME_MS);
72
+ }, ANNOUNCE_DELAY_MS);
60
73
  };
61
74
 
62
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
63
- const attachmentSentAnnouncementMiddleware = _ref => {
64
- let dispatch = _ref.dispatch;
65
- return next => action => {
66
- if (!(0, _IWebChatAction.isWebChatAction)(action)) {
67
- return next(action);
68
- }
75
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
76
+ const getFileSentMessage = (attachments, localizedTexts) => {
77
+ var _attachments$;
78
+ if (attachments.length > 1) {
79
+ // Replacer callbacks insert values literally; a string would treat "$&" or "$$" as patterns.
80
+ return ((localizedTexts === null || localizedTexts === void 0 ? void 0 : localizedTexts.MIDDLEWARE_BANNER_FILES_SENT) || DEFAULT_FILES_SENT_TEXT).replace("{0}", () => String(attachments.length));
81
+ }
82
+ const name = typeof ((_attachments$ = attachments[0]) === null || _attachments$ === void 0 ? void 0 : _attachments$.name) === "string" ? attachments[0].name.trim() : "";
83
+ 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();
84
+ };
85
+ exports.getFileSentMessage = getFileSentMessage;
86
+ const createAttachmentSentAnnouncementMiddleware = function (localizedTexts) {
87
+ let widgetElementId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "oc-lcw";
88
+ return (
89
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
90
+ _ref => {
91
+ let dispatch = _ref.dispatch;
92
+ return next => action => {
93
+ if (!(0, _IWebChatAction.isWebChatAction)(action)) {
94
+ return next(action);
95
+ }
69
96
 
70
- // Intercept successfully posted activities that contain attachments
71
- if (action.type === _WebChatActionType.WebChatActionType.DIRECT_LINE_POST_ACTIVITY_FULFILLED) {
72
- var _action$payload;
73
- 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;
74
- if (attachments && attachments.length > 0) {
75
- const count = attachments.length;
76
- const message = count === 1 ? "File sent" : `${count} files sent`;
77
- announce(message);
78
- }
97
+ // Intercept successfully posted activities that contain attachments
98
+ if (action.type === _WebChatActionType.WebChatActionType.DIRECT_LINE_POST_ACTIVITY_FULFILLED) {
99
+ var _action$payload;
100
+ 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;
101
+ if (attachments && attachments.length > 0) {
102
+ announce(getFileSentMessage(attachments, localizedTexts), widgetElementId);
103
+ }
104
+ }
105
+ return next(action);
106
+ };
79
107
  }
80
- return next(action);
81
- };
108
+ );
82
109
  };
83
- var _default = exports.default = attachmentSentAnnouncementMiddleware;
110
+ exports.createAttachmentSentAnnouncementMiddleware = createAttachmentSentAnnouncementMiddleware;
111
+ var _default = exports.default = createAttachmentSentAnnouncementMiddleware;
@@ -18,27 +18,6 @@ var _WebChatActionType = require("../../enums/WebChatActionType");
18
18
  ******/
19
19
 
20
20
  const MBtoBRatio = 1000000;
21
- const announceFileSent = message => {
22
- // TalkBack on Android WebView reliably announces newly *appended*
23
- // role="alert" nodes but often misses text-content updates on existing
24
- // nodes. Wait 500ms for the send-box focus shift to settle, then inject
25
- // a fresh alert element appended to document.body and remove it after 3s.
26
- setTimeout(() => {
27
- const el = document.createElement("div");
28
- el.setAttribute("role", "alert");
29
- el.setAttribute("aria-live", "assertive");
30
- el.setAttribute("aria-atomic", "true");
31
- el.style.cssText = "position:absolute;left:-9999px;top:auto;width:1px;height:1px;overflow:hidden;";
32
- el.textContent = message;
33
- document.body.appendChild(el);
34
- // Remove after TalkBack has had time to read it
35
- setTimeout(() => {
36
- if (el.parentNode) {
37
- el.parentNode.removeChild(el);
38
- }
39
- }, 3000);
40
- }, 500);
41
- };
42
21
 
43
22
  /*
44
23
  * If an attachment is invalid, delete this attachment from the attachments list
@@ -227,13 +206,7 @@ const createAttachmentUploadValidatorMiddleware = (allowedFileExtensions, maxFil
227
206
  var _payload$activity, _payload$activity2;
228
207
  const payload = action.payload;
229
208
  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)) {
230
- var _validatedAction$payl;
231
209
  const validatedAction = validateAttachment(action, allowedFileExtensions, maxFileSizeSupportedByDynamics, localizedTexts);
232
-
233
- // Announce to screen readers that the file was sent when validation passes
234
- 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) {
235
- announceFileSent(localizedTexts.MIDDLEWARE_BANNER_FILE_SENT ?? "File sent successfully.");
236
- }
237
210
  return next(validatedAction);
238
211
  }
239
212
  }
@@ -141,6 +141,8 @@ export let TelemetryEvent = /*#__PURE__*/function (TelemetryEvent) {
141
141
  TelemetryEvent["PrechatSubmitted"] = "PrechatSubmitted";
142
142
  TelemetryEvent["StartChatSDKCall"] = "StartChatCall";
143
143
  TelemetryEvent["StartChatEventReceived"] = "StartChatEventReceived";
144
+ TelemetryEvent["ConcurrentStartChatRejected"] = "ConcurrentStartChatRejected";
145
+ TelemetryEvent["ChatSDKStateCleanUpDisconnectFailed"] = "ChatSDKStateCleanUpDisconnectFailed";
144
146
  TelemetryEvent["EndChatSDKCall"] = "EndChatSDKCall";
145
147
  TelemetryEvent["PrepareEndChat"] = "PrepareEndChat";
146
148
  TelemetryEvent["EndChatEventReceived"] = "EndChatEventReceived";
@@ -413,6 +415,8 @@ export let TelemetryConstants = /*#__PURE__*/function () {
413
415
  case TelemetryEvent.SecureEventBusDispatchError:
414
416
  case TelemetryEvent.AgentJoinedConversation:
415
417
  case TelemetryEvent.BrowserTabHidden:
418
+ case TelemetryEvent.ConcurrentStartChatRejected:
419
+ case TelemetryEvent.ChatSDKStateCleanUpDisconnectFailed:
416
420
  case TelemetryEvent.RecoveryEligibilityEvaluated:
417
421
  return ScenarioType.ACTIONS;
418
422
  case TelemetryEvent.StartChatSDKCall:
@@ -50,37 +50,54 @@ export const ChatButtonStateful = props => {
50
50
  const ref = useRef(() => {
51
51
  return;
52
52
  });
53
+ // Optimistic guard against rapid double-clicks. `conversationState` only flips to
54
+ // `Loading` after React re-renders, so the button stays visible and clickable for the
55
+ // whole duration of the first click's async work. Without this ref two concurrent
56
+ // startChat() calls can create two conversations on the backend.
57
+ const startChatInProgressRef = useRef(false);
53
58
  ref.current = async () => {
54
- TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
55
- Event: TelemetryEvent.LCWChatButtonClicked,
56
- Description: "Chat button click action started",
57
- CustomProperties: {
58
- ConversationStage: ConversationStage.Initialization
59
- }
60
- });
61
- if (state.appStates.isMinimized) {
62
- dispatch({
63
- type: LiveChatWidgetActionType.SET_MINIMIZED,
64
- payload: false
59
+ if (startChatInProgressRef.current) {
60
+ TelemetryHelper.logActionEvent(LogLevel.WARN, {
61
+ Event: TelemetryEvent.ConcurrentStartChatRejected,
62
+ Description: "Chat button click ignored, a start chat operation is already in progress."
65
63
  });
66
- dispatch({
67
- type: LiveChatWidgetActionType.SET_UNREAD_MESSAGE_COUNT,
68
- payload: 0
64
+ return;
65
+ }
66
+ startChatInProgressRef.current = true;
67
+ try {
68
+ TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
69
+ Event: TelemetryEvent.LCWChatButtonClicked,
70
+ Description: "Chat button click action started",
71
+ CustomProperties: {
72
+ ConversationStage: ConversationStage.Initialization
73
+ }
69
74
  });
70
- // If chat is minimized and then unminimized, start a chat if convesation state is closed.
71
- if (state.appStates.conversationState === ConversationState.Closed) {
75
+ if (state.appStates.isMinimized) {
76
+ dispatch({
77
+ type: LiveChatWidgetActionType.SET_MINIMIZED,
78
+ payload: false
79
+ });
80
+ dispatch({
81
+ type: LiveChatWidgetActionType.SET_UNREAD_MESSAGE_COUNT,
82
+ payload: 0
83
+ });
84
+ // If chat is minimized and then unminimized, start a chat if convesation state is closed.
85
+ if (state.appStates.conversationState === ConversationState.Closed) {
86
+ await startChat();
87
+ }
88
+ } else {
72
89
  await startChat();
73
90
  }
74
- } else {
75
- await startChat();
91
+ TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
92
+ Event: TelemetryEvent.LCWChatButtonActionCompleted,
93
+ Description: "Chat button action completed",
94
+ CustomProperties: {
95
+ ConversationStage: ConversationStage.Initialization
96
+ }
97
+ });
98
+ } finally {
99
+ startChatInProgressRef.current = false;
76
100
  }
77
- TelemetryHelper.logActionEventToAllTelemetry(LogLevel.INFO, {
78
- Event: TelemetryEvent.LCWChatButtonActionCompleted,
79
- Description: "Chat button action completed",
80
- CustomProperties: {
81
- ConversationStage: ConversationStage.Initialization
82
- }
83
- });
84
101
  };
85
102
  const outOfOfficeStyleProps = Object.assign({}, defaultOutOfOfficeChatButtonStyleProps, outOfOfficeButtonProps === null || outOfOfficeButtonProps === void 0 ? void 0 : outOfOfficeButtonProps.styleProps);
86
103
  const controlProps = {
@@ -349,14 +349,53 @@ export const closeChatStateCleanUp = dispatch => {
349
349
  });
350
350
  };
351
351
 
352
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
353
+ const logCleanUpDisconnectFailure = error => {
354
+ TelemetryHelper.logActionEvent(LogLevel.WARN, {
355
+ Event: TelemetryEvent.ChatSDKStateCleanUpDisconnectFailed,
356
+ Description: "Failed to disconnect the previous conversation during chat SDK state clean up.",
357
+ ExceptionDetails: {
358
+ exception: (error === null || error === void 0 ? void 0 : error.message) ?? error
359
+ }
360
+ });
361
+ };
362
+
363
+ // Releases the previous session's conversation. Mirrors the cleanup OmnichannelChatSDK.endChat()
364
+ // runs in its finally block (disconnect, then drop the reference). Without it, a conversation
365
+ // left over from a failed or orphaned start chat, or from a chat ended in another tab (which
366
+ // skips the SDK endChat), keeps its messaging session open and leaks into the next chat.
367
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
368
+ const disconnectConversation = chatSDK => {
369
+ const conversation = chatSDK.conversation;
370
+ if (!conversation || typeof conversation.disconnect !== "function") {
371
+ return;
372
+ }
373
+ try {
374
+ // ACS conversations disconnect asynchronously; legacy IC3 conversations may not return a promise.
375
+ const result = conversation.disconnect();
376
+ if (result && typeof result.catch === "function") {
377
+ result.catch(logCleanUpDisconnectFailure);
378
+ }
379
+ } catch (error) {
380
+ logCleanUpDisconnectFailure(error);
381
+ }
382
+ };
383
+
352
384
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
353
385
  export const chatSDKStateCleanUp = chatSDK => {
386
+ if (!chatSDK) {
387
+ return;
388
+ }
389
+
354
390
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
355
391
  chatSDK.requestId = uuidv4();
356
392
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
357
393
  chatSDK.chatToken = {};
358
394
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
359
395
  chatSDK.reconnectId = null;
396
+ disconnectConversation(chatSDK);
397
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
398
+ chatSDK.conversation = null;
360
399
  };
361
400
 
362
401
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -11,10 +11,11 @@ import { LiveChatWidgetActionType } from "../../../contexts/common/LiveChatWidge
11
11
  import { TelemetryHelper } from "../../../common/telemetry/TelemetryHelper";
12
12
  import { WebChatStoreLoader } from "../../webchatcontainerstateful/webchatcontroller/WebChatStoreLoader";
13
13
  import attachmentProcessingMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentProcessingMiddleware";
14
- import attachmentSentAnnouncementMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentSentAnnouncementMiddleware";
14
+ import createAttachmentSentAnnouncementMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentSentAnnouncementMiddleware";
15
15
  import channelDataMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/channelDataMiddleware";
16
16
  import { createActivityMiddleware } from "../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityMiddleware";
17
17
  import { createActivityStatusMiddleware } from "../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/activityStatusMiddleware";
18
+ import { createAttachmentForScreenReaderMiddleware } from "../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/attachmentForScreenReaderMiddleware";
18
19
  import { createAttachmentMiddleware } from "../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/attachmentMiddleware";
19
20
  import createAttachmentUploadValidatorMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/attachmentUploadValidatorMiddleware";
20
21
  import { createAvatarMiddleware } from "../../webchatcontainerstateful/webchatcontroller/middlewares/renderingmiddlewares/avatarMiddleware";
@@ -42,6 +43,31 @@ import htmlPlayerMiddleware from "../../webchatcontainerstateful/webchatcontroll
42
43
  import htmlTextMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/htmlTextMiddleware";
43
44
  import preProcessingMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/preProcessingMiddleware";
44
45
  import sanitizationMiddleware from "../../webchatcontainerstateful/webchatcontroller/middlewares/storemiddlewares/sanitizationMiddleware";
46
+ const markdownSanitizeConfig = {
47
+ FORBID_TAGS: ["form", "button", "script", "div", "input"],
48
+ FORBID_ATTR: ["action"],
49
+ ADD_ATTR: ["target"]
50
+ };
51
+
52
+ /**
53
+ * Renders Markdown for the screen reader text of Adaptive Cards, from the same pieces as the visible card:
54
+ * the host renderMarkdown when set, the hyperlink text override, and the same sanitization.
55
+ * Markdown is always formatted, also when the widget shows Markdown unformatted, so that screen readers do not read the syntax.
56
+ * Styles are removed with their content because the card does not show them.
57
+ */
58
+ export const createScreenReaderMarkdownRenderer = webChatContainerProps => {
59
+ var _webChatContainerProp;
60
+ const hostRenderMarkdown = webChatContainerProps === null || webChatContainerProps === void 0 || (_webChatContainerProp = webChatContainerProps.webChatProps) === null || _webChatContainerProp === void 0 ? void 0 : _webChatContainerProp.renderMarkdown;
61
+ const markdown = createMarkdown(false, (webChatContainerProps === null || webChatContainerProps === void 0 ? void 0 : webChatContainerProps.disableNewLineMarkdownSupport) ?? defaultWebChatContainerStatefulProps.disableNewLineMarkdownSupport, webChatContainerProps === null || webChatContainerProps === void 0 ? void 0 : webChatContainerProps.opensMarkdownLinksInSameTab);
62
+ const hyperlinkTextOverrideRenderer = new HyperlinkTextOverrideRenderer((webChatContainerProps === null || webChatContainerProps === void 0 ? void 0 : webChatContainerProps.hyperlinkTextOverride) ?? defaultWebChatContainerStatefulProps.hyperlinkTextOverride);
63
+ return text => {
64
+ const html = hostRenderMarkdown ? hostRenderMarkdown(text) : markdown.render(text);
65
+ return DOMPurify.sanitize(hyperlinkTextOverrideRenderer.render(html), {
66
+ ...markdownSanitizeConfig,
67
+ FORBID_TAGS: [...markdownSanitizeConfig.FORBID_TAGS, "style"]
68
+ });
69
+ };
70
+ };
45
71
 
46
72
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
47
73
  export const initWebChatComposer = (props, state, dispatch, facadeChatSDK, endChat) => {
@@ -62,7 +88,7 @@ export const initWebChatComposer = (props, state, dispatch, facadeChatSDK, endCh
62
88
  // Initialize Web Chat's redux store
63
89
  let webChatStore = WebChatStoreLoader.store;
64
90
  if (!webChatStore) {
65
- var _state$domainStates$l, _state$domainStates$l2, _state$domainStates$l3, _props$webChatContain7;
91
+ var _state$domainStates$l, _state$domainStates$l2, _props$controlProps, _state$domainStates$l3, _props$webChatContain7;
66
92
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
67
93
  const addConversationalSurveyTagsCallback = action => {
68
94
  var _inMemoryState$appSta;
@@ -121,7 +147,7 @@ export const initWebChatComposer = (props, state, dispatch, facadeChatSDK, endCh
121
147
  };
122
148
  webChatStore = createStore({},
123
149
  //initial state
124
- 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(),
150
+ 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(),
125
151
  // Pass a callback so middleware can push initials into React context for reactivity
126
152
  localizedStringsBotInitialsMiddleware(initials => {
127
153
  dispatch({
@@ -149,12 +175,7 @@ export const initWebChatComposer = (props, state, dispatch, facadeChatSDK, endCh
149
175
  });
150
176
 
151
177
  // EXISTING sanitization (continues to work as before)
152
- const config = {
153
- FORBID_TAGS: ["form", "button", "script", "div", "input"],
154
- FORBID_ATTR: ["action"],
155
- ADD_ATTR: ["target"]
156
- };
157
- text = DOMPurify.sanitize(text, config);
178
+ text = DOMPurify.sanitize(text, markdownSanitizeConfig);
158
179
 
159
180
  // MONITOR-ONLY: Test what the stricter allowlist would remove (Phase 1)
160
181
  // This does NOT modify the text, only logs telemetry
@@ -358,6 +379,7 @@ export const initWebChatComposer = (props, state, dispatch, facadeChatSDK, endCh
358
379
  store: webChatStore,
359
380
  activityMiddleware: (_props$webChatContain0 = props.webChatContainerProps) !== null && _props$webChatContain0 !== void 0 && (_props$webChatContain0 = _props$webChatContain0.renderingMiddlewareProps) !== null && _props$webChatContain0 !== void 0 && _props$webChatContain0.disableActivityMiddleware ? undefined : createActivityMiddleware(renderMarkdown, (_state$domainStates$r = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r === void 0 ? void 0 : _state$domainStates$r.systemMessageStyleProps, (_state$domainStates$r2 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r2 === void 0 ? void 0 : _state$domainStates$r2.userMessageStyleProps, localizedTexts),
360
381
  attachmentMiddleware: (_props$webChatContain1 = props.webChatContainerProps) !== null && _props$webChatContain1 !== void 0 && (_props$webChatContain1 = _props$webChatContain1.renderingMiddlewareProps) !== null && _props$webChatContain1 !== void 0 && _props$webChatContain1.disableAttachmentMiddleware ? undefined : createAttachmentMiddleware(((_state$domainStates$r3 = state.domainStates.renderingMiddlewareProps) === null || _state$domainStates$r3 === void 0 || (_state$domainStates$r3 = _state$domainStates$r3.attachmentProps) === null || _state$domainStates$r3 === void 0 ? void 0 : _state$domainStates$r3.enableInlinePlaying) ?? defaultAttachmentProps.enableInlinePlaying),
382
+ attachmentForScreenReaderMiddleware: createAttachmentForScreenReaderMiddleware(createScreenReaderMarkdownRenderer(props.webChatContainerProps)),
361
383
  activityStatusMiddleware: (_props$webChatContain10 = props.webChatContainerProps) !== null && _props$webChatContain10 !== void 0 && (_props$webChatContain10 = _props$webChatContain10.renderingMiddlewareProps) !== null && _props$webChatContain10 !== void 0 && _props$webChatContain10.disableActivityStatusMiddleware ? undefined : createActivityStatusMiddleware(getLocaleStringFromId((_state$domainStates$l5 = state.domainStates.liveChatConfig) === null || _state$domainStates$l5 === void 0 || (_state$domainStates$l5 = _state$domainStates$l5.ChatWidgetLanguage) === null || _state$domainStates$l5 === void 0 ? void 0 : _state$domainStates$l5.msdyn_localeid)),
362
384
  toastMiddleware: (_props$webChatContain11 = props.webChatContainerProps) !== null && _props$webChatContain11 !== void 0 && (_props$webChatContain11 = _props$webChatContain11.renderingMiddlewareProps) !== null && _props$webChatContain11 !== void 0 && _props$webChatContain11.disableToastMiddleware ? undefined : createToastMiddleware(props.notificationPaneProps, endChat),
363
385
  renderMarkdown,