@azure/communication-react 1.14.0-alpha-202403030013 → 1.14.0-alpha-202403050012

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

@@ -174,7 +174,7 @@ function getDefaultExportFromCjs (x) {
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 // GENERATED FILE. DO NOT EDIT MANUALLY.
-var telemetryVersion = '1.14.0-alpha-202403030013';
+var telemetryVersion = '1.14.0-alpha-202403050012';
 
 
 var telemetryVersion$1 = /*@__PURE__*/getDefaultExportFromCjs(telemetryVersion);
@@ -19318,16 +19318,12 @@ const _TagsSurvey = (props) => {
         else {
             if (issue) {
                 setSelectedTags((prevState) => {
-                    var _a;
-                    if ((_a = prevState[issueCategory]) === null || _a === void 0 ? void 0 : _a.issues) {
-                        prevState[issueCategory].issues = prevState[issueCategory].issues.filter(function (value) {
-                            return value !== issue;
-                        });
-                        if (prevState[issueCategory].issues.length === 0) {
-                            delete prevState[issueCategory];
-                        }
-                    }
-                    return prevState;
+                    var _a, _b;
+                    // 'prevState[issueCategory]?.issues as ...' typing is required here to avoid a typescript limitation
+                    // "This expression is not callable" caused by filter().
+                    // More information can be found here: https://github.com/microsoft/TypeScript/issues/44373
+                    const categoryIssues = (_b = (_a = prevState[issueCategory]) === null || _a === void 0 ? void 0 : _a.issues) === null || _b === void 0 ? void 0 : _b.filter((value) => value !== issue);
+                    return Object.assign(Object.assign({}, prevState), { [issueCategory]: Object.assign(Object.assign({}, (prevState[issueCategory] || {})), { issues: categoryIssues }) });
                 });
             }
             else {
@@ -24139,7 +24135,7 @@ class AzureCommunicationChatAdapter {
         return __awaiter$n(this, void 0, void 0, function* () {
             return yield this.asyncTeeErrorToEventEmitter(() => __awaiter$n(this, void 0, void 0, function* () {
                 /* @conditional-compile-remove(file-sharing) */
-                const updatedOptions = options ? { attachmentMetadata: options.attachmentMetadata, metadata: metadata } : {};
+                const updatedOptions = { attachmentMetadata: options === null || options === void 0 ? void 0 : options.attachmentMetadata, metadata: metadata };
                 /* @conditional-compile-remove(file-sharing) */
                 return yield this.handlers.onUpdateMessage(messageId, content, updatedOptions);
             }));
@@ -25153,28 +25149,17 @@ const ChatScreen = (props) => {
     const errorBarProps = usePropsFor$2(ErrorBar);
     /* @conditional-compile-remove(image-overlay) */
     React.useEffect(() => {
-        var _a;
         if (overlayImageItem === undefined) {
             return;
         }
-        const messages = messageThreadProps.messages.filter((message) => {
-            return message.messageId === (overlayImageItem === null || overlayImageItem === void 0 ? void 0 : overlayImageItem.messageId);
-        });
-        if (messages.length <= 0 || messages[0].messageType !== 'chat') {
-            return;
-        }
-        const message = messages[0];
-        if (overlayImageItem.imageSrc === '' && message.inlineImages && ((_a = message.inlineImages) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-            const inlineImages = message.inlineImages.filter((attachment) => {
-                return attachment.id === (overlayImageItem === null || overlayImageItem === void 0 ? void 0 : overlayImageItem.attachmentId);
-            });
-            if (inlineImages.length <= 0 ||
-                inlineImages[0].fullSizeImageSrc === undefined ||
-                inlineImages[0].fullSizeImageSrc === '' ||
-                overlayImageItem.imageSrc === inlineImages[0].fullSizeImageSrc) {
+        const message = adapter.getState().thread.chatMessages[overlayImageItem === null || overlayImageItem === void 0 ? void 0 : overlayImageItem.messageId];
+        const resourceCache = message.resourceCache;
+        if (overlayImageItem.imageSrc === '' && resourceCache) {
+            const fullSizeImageSrc = resourceCache[overlayImageItem.imageUrl];
+            if (fullSizeImageSrc === undefined || fullSizeImageSrc === '' || overlayImageItem.imageSrc === fullSizeImageSrc) {
                 return;
             }
-            setOverlayImageItem(Object.assign(Object.assign({}, overlayImageItem), { imageSrc: inlineImages[0].fullSizeImageSrc }));
+            setOverlayImageItem(Object.assign(Object.assign({}, overlayImageItem), { imageSrc: fullSizeImageSrc }));
         }
         // Disable eslint because we are using the overlayImageItem in this effect but don't want to have it as a dependency, as it will cause an infinite loop.
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -25208,44 +25193,47 @@ const ChatScreen = (props) => {
     /* @conditional-compile-remove(image-overlay) */
     const onInlineImageClicked = React.useCallback((attachmentId, messageId) => __awaiter$l(void 0, void 0, void 0, function* () {
         var _a, _b;
-        const messages = (_a = messageThreadProps.messages) === null || _a === void 0 ? void 0 : _a.filter((message) => {
-            return message.messageId === messageId;
-        });
-        if (!messages || messages.length <= 0) {
-            return;
-        }
-        const chatMessage = messages[0];
-        const inlinedImages = (_b = chatMessage.inlineImages) === null || _b === void 0 ? void 0 : _b.filter((attachment) => {
-            return attachment.id === attachmentId;
+        const message = adapter.getState().thread.chatMessages[messageId];
+        const inlinedImages = (_b = (_a = message.content) === null || _a === void 0 ? void 0 : _a.attachments) === null || _b === void 0 ? void 0 : _b.filter((attachment) => {
+            return attachment.attachmentType === 'image' && attachment.id === attachmentId;
         });
         if (!inlinedImages || inlinedImages.length <= 0) {
             return;
         }
         const attachment = inlinedImages[0];
+        const resourceCache = message.resourceCache;
+        let imageSrc = '';
+        if (attachment.url) {
+            if (resourceCache && resourceCache[attachment.url]) {
+                imageSrc = resourceCache[attachment.url];
+            }
+            else {
+                adapter.downloadResourceToCache({
+                    threadId: adapter.getState().thread.threadId,
+                    messageId: messageId,
+                    resourceUrl: attachment.url
+                });
+            }
+        }
         const titleIconRenderOptions = {
-            text: chatMessage.senderDisplayName,
+            text: message.senderDisplayName,
             size: react.PersonaSize.size32,
             showOverflowTooltip: false,
-            imageAlt: chatMessage.senderDisplayName
+            imageAlt: message.senderDisplayName
         };
-        const titleIcon = onRenderAvatarCallback && onRenderAvatarCallback(chatMessage.senderId, titleIconRenderOptions);
+        const messageSenderId = message.sender !== undefined ? toFlatCommunicationIdentifier(message.sender) : userId;
+        const titleIcon = onRenderAvatarCallback && onRenderAvatarCallback(messageSenderId, titleIconRenderOptions);
         const overlayImage = {
-            title: chatMessage.senderDisplayName || '',
+            title: message.senderDisplayName || '',
             titleIcon: titleIcon,
             attachmentId: attachment.id,
-            imageSrc: attachment.fullSizeImageSrc || '',
-            messageId: messageId
+            imageSrc: imageSrc,
+            messageId: messageId,
+            imageUrl: attachment.url || ''
         };
         setIsImageOverlayOpen(true);
         setOverlayImageItem(overlayImage);
-        if (attachment.attachmentType === 'inlineImage' && attachment.url) {
-            adapter.downloadResourceToCache({
-                threadId: adapter.getState().thread.threadId,
-                messageId: messageId,
-                resourceUrl: attachment.url
-            });
-        }
-    }), [adapter, messageThreadProps, onRenderAvatarCallback]);
+    }), [adapter, onRenderAvatarCallback, userId]);
     /* @conditional-compile-remove(image-overlay) */
     const inlineImageOptions = {
         onRenderInlineImage: (inlineImage, defaultOnRender) => {
@@ -25316,6 +25304,11 @@ const ChatScreen = (props) => {
         overlayImageItem && (React.createElement(ImageOverlay, Object.assign({}, overlayImageItem, { isOpen: isImageOverlayOpen, onDismiss: () => {
                 setOverlayImageItem(undefined);
                 setIsImageOverlayOpen(false);
+                adapter.removeResourceFromCache({
+                    threadId: adapter.getState().thread.threadId,
+                    messageId: overlayImageItem.messageId,
+                    resourceUrl: overlayImageItem.imageUrl
+                });
             }, onDownloadButtonClicked: onDownloadButtonClicked })))));
 };