@azure/communication-react 1.13.1-alpha-202402280012 → 1.14.0-alpha-202402290012

package/dist/dist-cjs/communication-react/index.js

@@ -173,7 +173,7 @@ function getDefaultExportFromCjs (x) {
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 // GENERATED FILE. DO NOT EDIT MANUALLY.
-var telemetryVersion = '1.13.1-alpha-202402280012';
+var telemetryVersion = '1.14.0-alpha-202402290012';
 
 
 var telemetryVersion$1 = /*@__PURE__*/getDefaultExportFromCjs(telemetryVersion);
@@ -10976,7 +10976,7 @@ const calloutMenuProps = Object.assign(Object.assign({}, preventUnwantedDismissP
 const defaultOnMentionRender = (mention) => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const MsftMention = 'msft-mention';
-    return React.createElement(MsftMention, { id: mention.id }, mention.displayText);
+    return (React.createElement(MsftMention, { id: mention.id, key: Math.random().toString() }, mention.displayText));
 };
 
 // Copyright (c) Microsoft Corporation.
@@ -11077,13 +11077,16 @@ const processHtmlToReact = (props) => {
             if (domNode instanceof parse.Element && domNode.attribs) {
                 // Transform custom rendering of mentions
                 /* @conditional-compile-remove(mention) */
-                if (((_a = props.mentionDisplayOptions) === null || _a === void 0 ? void 0 : _a.onRenderMention) && domNode.name === 'msft-mention') {
+                if (domNode.name === 'msft-mention') {
                     const { id } = domNode.attribs;
                     const mention = {
                         id: id,
-                        displayText: (_b = domNode.children[0].nodeValue) !== null && _b !== void 0 ? _b : ''
+                        displayText: (_a = domNode.children[0].nodeValue) !== null && _a !== void 0 ? _a : ''
                     };
-                    return props.mentionDisplayOptions.onRenderMention(mention, defaultOnMentionRender);
+                    if ((_b = props.mentionDisplayOptions) === null || _b === void 0 ? void 0 : _b.onRenderMention) {
+                        return props.mentionDisplayOptions.onRenderMention(mention, defaultOnMentionRender);
+                    }
+                    return defaultOnMentionRender(mention);
                 }
                 // Transform inline images
                 /* @conditional-compile-remove(teams-inline-images-and-file-sharing) */
@@ -21718,12 +21721,14 @@ const extractAttachedFilesMetadata = (metadata) => {
 const extractTeamsAttachmentsMetadata = (attachments, resourceCache) => {
     /* @conditional-compile-remove(file-sharing) */
     const files = [];
+    /* @conditional-compile-remove(teams-inline-images-and-file-sharing) */
     const inlineImages = [];
     attachments.forEach((attachment) => {
         var _a, _b, _c;
         const attachmentType = mapAttachmentType(attachment.attachmentType);
         /* @conditional-compile-remove(file-sharing) */
         const contentType = extractAttachmentContentTypeFromName(attachment.name);
+        /* @conditional-compile-remove(teams-inline-images-and-file-sharing) */
         if (attachmentType === 'inlineImage') {
             inlineImages.push({
                 attachmentType: attachmentType,
@@ -21745,7 +21750,10 @@ const extractTeamsAttachmentsMetadata = (attachments, resourceCache) => {
             });
         }
     });
-    return { /* @conditional-compile-remove(file-sharing) */ files, inlineImages };
+    return {
+        /* @conditional-compile-remove(file-sharing) */ files,
+        /* @conditional-compile-remove(teams-inline-images-and-file-sharing) */ inlineImages
+    };
 };
 /* @conditional-compile-remove(data-loss-prevention) */
 const convertToUiBlockedMessage = (message, userId, isSeen, isLargeGroup) => {
@@ -21843,6 +21851,7 @@ const extractAttachmentsMetadata = (message) => {
     var _a, _b;
     /* @conditional-compile-remove(file-sharing) */
     let files = [];
+    /* @conditional-compile-remove(teams-inline-images-and-file-sharing) */
     let inlineImages = [];
     /* @conditional-compile-remove(file-sharing) */
     if (message.metadata) {
@@ -21853,9 +21862,13 @@ const extractAttachmentsMetadata = (message) => {
         const teamsAttachments = extractTeamsAttachmentsMetadata((_b = message.content) === null || _b === void 0 ? void 0 : _b.attachments, message.resourceCache);
         /* @conditional-compile-remove(file-sharing) */
         files = files.concat(teamsAttachments.files);
+        /* @conditional-compile-remove(teams-inline-images-and-file-sharing) */
         inlineImages = inlineImages.concat(teamsAttachments.inlineImages);
     }
-    return { /* @conditional-compile-remove(file-sharing) */ files, inlineImages };
+    return {
+        /* @conditional-compile-remove(file-sharing) */ files,
+        /* @conditional-compile-remove(teams-inline-images-and-file-sharing) */ inlineImages
+    };
 };
 const convertToUiChatMessage = (message, userId, isSeen, isLargeGroup) => {
     const messageSenderId = message.sender !== undefined ? toFlatCommunicationIdentifier(message.sender) : userId;
@@ -22330,28 +22343,21 @@ class ResourceDownloadQueue {
                     this.isActive = false;
                     continue;
                 }
-                try {
-                    if (options) {
-                        const singleUrl = options.singleUrl;
-                        message = yield this.downloadSingleUrl(message, singleUrl, operation);
-                    }
-                    else {
-                        message = yield this.downloadAllPreviewUrls(message, operation);
-                    }
-                    this._context.setChatMessage(threadId, message);
-                }
-                catch (error) {
-                    console.log('Downloading Resource error: ', error);
+                if (options) {
+                    const singleUrl = options.singleUrl;
+                    message = yield this.downloadSingleUrl(message, singleUrl, operation);
                 }
-                finally {
-                    this.isActive = false;
+                else {
+                    message = yield this.downloadAllPreviewUrls(message, operation);
                 }
+                this._context.setChatMessage(threadId, message);
+                this.isActive = false;
             }
         });
     }
     downloadSingleUrl(message, resourceUrl, operation) {
         return __awaiter$t(this, void 0, void 0, function* () {
-            const blobUrl = yield operation(resourceUrl, this._credential);
+            const blobUrl = yield this.downloadResource(operation, resourceUrl);
             message = Object.assign(Object.assign({}, message), { resourceCache: Object.assign(Object.assign({}, message.resourceCache), { [resourceUrl]: blobUrl }) });
             return message;
         });
@@ -22366,7 +22372,7 @@ class ResourceDownloadQueue {
                 }
                 for (const attachment of attachments) {
                     if (attachment.previewUrl && attachment.attachmentType === 'image') {
-                        const blobUrl = yield operation(attachment.previewUrl, this._credential);
+                        const blobUrl = yield this.downloadResource(operation, attachment.previewUrl);
                         message.resourceCache[attachment.previewUrl] = blobUrl;
                     }
                 }
@@ -22374,6 +22380,18 @@ class ResourceDownloadQueue {
             return message;
         });
     }
+    downloadResource(operation, url) {
+        return __awaiter$t(this, void 0, void 0, function* () {
+            let blobUrl = URL.createObjectURL(new Blob());
+            try {
+                blobUrl = yield operation(url, this._credential);
+            }
+            catch (error) {
+                console.log('Downloading Resource error: ', error);
+            }
+            return blobUrl;
+        });
+    }
 }
 /* @conditional-compile-remove(teams-inline-images-and-file-sharing) */
 /**
@@ -22385,13 +22403,24 @@ const fetchImageSource = (src, credential) => __awaiter$t(void 0, void 0, void 0
             const headers = new Headers();
             headers.append('Authorization', `Bearer ${token}`);
             try {
-                return yield fetch(url, { headers });
+                return yield fetchWithTimeout(url, { headers });
             }
             catch (err) {
                 throw new ChatError('ChatThreadClient.getMessage', err);
             }
         });
     }
+    function fetchWithTimeout(resource, options) {
+        return __awaiter$t(this, void 0, void 0, function* () {
+            // default timeout is 30 seconds
+            const { timeout = 30000 } = options;
+            const controller = new AbortController();
+            const id = setTimeout(() => controller.abort(), timeout);
+            const response = yield fetch(resource, Object.assign(Object.assign({}, options), { signal: controller.signal }));
+            clearTimeout(id);
+            return response;
+        });
+    }
     const accessToken = yield credential.getToken();
     const response = yield fetchWithAuthentication(src, accessToken.token);
     const blob = yield response.blob();