@azure/communication-react 1.20.0-alpha-202410050015 → 1.20.0-beta.1

package/dist/dist-esm/react-composites/src/composites/ChatComposite/ChatHeader.js

@@ -8,9 +8,9 @@ import { chatHeaderContainerStyle, topicNameLabelStyle } from './styles/Chat.sty
  * @private
  */
 export const ChatHeader = (props) => {
-    return (React.createElement(Stack, { className: chatHeaderContainerStyle, horizontal: true },
+    return React.createElement(Stack, { className: chatHeaderContainerStyle, horizontal: true },
         React.createElement(Stack.Item, { align: "center" },
-            React.createElement("div", { className: topicNameLabelStyle }, props.topic))));
+            React.createElement("div", { className: topicNameLabelStyle }, props.topic)));
 };
 const getTopicName = (state, props) => {
     var _a, _b;
@@ -20,6 +20,8 @@ const getTopicName = (state, props) => {
  * @private
  */
 export const getHeaderProps = reselect.createSelector([getTopicName], (topic) => {
-    return { topic: topic };
+    return {
+        topic: topic
+    };
 });
 //# sourceMappingURL=ChatHeader.js.map

package/dist/dist-esm/react-composites/src/composites/ChatComposite/ChatHeader.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChatHeader.js","sourceRoot":"","sources":["../../../../../../../react-composites/src/composites/ChatComposite/ChatHeader.tsx"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AAGrC,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AASrF;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAkB,EAAe,EAAE;IAC5D,OAAO,CACL,oBAAC,KAAK,IAAC,SAAS,EAAE,wBAAwB,EAAE,UAAU;QACpD,oBAAC,KAAK,CAAC,IAAI,IAAC,KAAK,EAAC,QAAQ;YACxB,6BAAK,SAAS,EAAE,mBAAmB,IAAG,KAAK,CAAC,KAAK,CAAO,CAC7C,CACP,CACT,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,KAAsB,EAAE,KAA4B,EAAU,EAAE;;IACpF,OAAO,CAAA,MAAA,MAAA,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,0CAAE,UAAU,0CAAE,KAAK,KAAI,EAAE,CAAC;AAChE,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAe,EAAE;IAC3F,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AAC1B,CAAC,CAAC,CAAC","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport { Stack } from '@fluentui/react';\nimport React from 'react';\nimport * as reselect from 'reselect';\nimport { ChatClientState } from '@internal/chat-stateful-client';\nimport { ChatBaseSelectorProps } from '@internal/chat-component-bindings';\nimport { chatHeaderContainerStyle, topicNameLabelStyle } from './styles/Chat.styles';\n\n/**\n * @private\n */\nexport type HeaderProps = {\n  topic: string;\n};\n\n/**\n * @private\n */\nexport const ChatHeader = (props: HeaderProps): JSX.Element => {\n  return (\n    <Stack className={chatHeaderContainerStyle} horizontal>\n      <Stack.Item align=\"center\">\n        <div className={topicNameLabelStyle}>{props.topic}</div>\n      </Stack.Item>\n    </Stack>\n  );\n};\n\nconst getTopicName = (state: ChatClientState, props: ChatBaseSelectorProps): string => {\n  return state.threads[props.threadId]?.properties?.topic || '';\n};\n\n/**\n * @private\n */\nexport const getHeaderProps = reselect.createSelector([getTopicName], (topic): HeaderProps => {\n  return { topic: topic };\n});\n"]}
+{"version":3,"file":"ChatHeader.js","sourceRoot":"","sources":["../../../../../../preprocess-dist/react-composites/src/composites/ChatComposite/ChatHeader.tsx"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AAGrC,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AASrF;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAkB,EAAe,EAAE;IAC5D,OAAO,oBAAC,KAAK,IAAC,SAAS,EAAE,wBAAwB,EAAE,UAAU;QACzD,oBAAC,KAAK,CAAC,IAAI,IAAC,KAAK,EAAC,QAAQ;YACxB,6BAAK,SAAS,EAAE,mBAAmB,IAAG,KAAK,CAAC,KAAK,CAAO,CAC7C,CACP,CAAC;AACb,CAAC,CAAC;AACF,MAAM,YAAY,GAAG,CAAC,KAAsB,EAAE,KAA4B,EAAU,EAAE;;IACpF,OAAO,CAAA,MAAA,MAAA,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,0CAAE,UAAU,0CAAE,KAAK,KAAI,EAAE,CAAC;AAChE,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAe,EAAE;IAC3F,OAAO;QACL,KAAK,EAAE,KAAK;KACb,CAAC;AACJ,CAAC,CAAC,CAAC","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT License.\n\nimport { Stack } from '@fluentui/react';\nimport React from 'react';\nimport * as reselect from 'reselect';\nimport { ChatClientState } from '@internal/chat-stateful-client';\nimport { ChatBaseSelectorProps } from '@internal/chat-component-bindings';\nimport { chatHeaderContainerStyle, topicNameLabelStyle } from './styles/Chat.styles';\n\n/**\n * @private\n */\nexport type HeaderProps = {\n  topic: string;\n};\n\n/**\n * @private\n */\nexport const ChatHeader = (props: HeaderProps): JSX.Element => {\n  return <Stack className={chatHeaderContainerStyle} horizontal>\n      <Stack.Item align=\"center\">\n        <div className={topicNameLabelStyle}>{props.topic}</div>\n      </Stack.Item>\n    </Stack>;\n};\nconst getTopicName = (state: ChatClientState, props: ChatBaseSelectorProps): string => {\n  return state.threads[props.threadId]?.properties?.topic || '';\n};\n\n/**\n * @private\n */\nexport const getHeaderProps = reselect.createSelector([getTopicName], (topic): HeaderProps => {\n  return {\n    topic: topic\n  };\n});"]}

package/dist/dist-esm/react-composites/src/composites/ChatComposite/ChatScreen.js

@@ -14,78 +14,64 @@ import { mergeStyles, Stack } from '@fluentui/react';
 import { PersonaSize } from '@fluentui/react';
 import { ErrorBar, MessageThread, TypingIndicator, useTheme } from "../../../../react-components/src";
 import React, { useCallback, useEffect, useMemo } from 'react';
-/* @conditional-compile-remove(file-sharing-acs) */
 import { useReducer } from 'react';
 import { useState } from 'react';
 import { AvatarPersona } from '../common/AvatarPersona';
 import { useAdapter } from './adapter/ChatAdapterProvider';
 import { ChatHeader, getHeaderProps } from './ChatHeader';
-/* @conditional-compile-remove(file-sharing-acs) */
 import { AttachmentUploadButtonWrapper as AttachmentUploadButton } from './file-sharing';
 import { useAdaptedSelector } from './hooks/useAdaptedSelector';
 import { usePropsFor } from './hooks/usePropsFor';
 import { chatArea, chatContainer, chatWrapper, messageThreadChatCompositeStyles, sendboxContainerStyles, typingIndicatorContainerStyles } from './styles/Chat.styles';
 import { participantListContainerPadding } from '../common/styles/ParticipantContainer.styles';
-/* @conditional-compile-remove(chat-composite-participant-pane) */
 import { ChatScreenPeoplePane } from './ChatScreenPeoplePane';
 import { toFlatCommunicationIdentifier } from "../../../../acs-ui-common/src";
-/* @conditional-compile-remove(rich-text-editor-image-upload) */
 import { removeImageTags } from "../../../../acs-ui-common/src";
-/* @conditional-compile-remove(file-sharing-acs) */
 import { AttachmentDownloadErrorBar } from './AttachmentDownloadErrorBar';
 import { _AttachmentDownloadCards } from "../../../../react-components/src";
 import { ImageOverlay } from "../../../../react-components/src";
-/* @conditional-compile-remove(file-sharing-acs) */
 import { nanoid } from 'nanoid';
-/* @conditional-compile-remove(file-sharing-acs) */
-/* @conditional-compile-remove(rich-text-editor-image-upload) */
 import { AttachmentUploadActionType, AttachmentUploadReducer } from './file-sharing/AttachmentUpload';
 import { SendBoxPicker } from '../common/SendBoxPicker';
-/* @conditional-compile-remove(rich-text-editor-composite-support) */
 import { loadRichTextSendBox } from '../common/SendBoxPicker';
-/* @conditional-compile-remove(rich-text-editor-image-upload) */
 import { cancelInlineImageUpload, getEditBoxMessagesInlineImages, getImageFileNameFromAttributes, getSendBoxInlineImages, onInsertInlineImageForEditBox, onInsertInlineImageForSendBox, updateContentStringWithUploadedInlineImages } from './ImageUpload/ImageUploadUtils';
-/* @conditional-compile-remove(rich-text-editor-image-upload) */
 import { isMicrosoftTeamsUserIdentifier } from '@azure/communication-common';
-/* @conditional-compile-remove(rich-text-editor-image-upload) */
 import { SEND_BOX_UPLOADS_KEY_VALUE } from '../common/constants';
-/* @conditional-compile-remove(rich-text-editor-image-upload) */
 import { ImageUploadReducer } from './ImageUpload/ImageUploadReducer';
-/* @conditional-compile-remove(rich-text-editor-image-upload) */
 import { useLocale } from '../localization';
-import { useSelector } from './hooks/useSelector';
-import { getChatMessages, getThreadId, getUserId } from './selectors/baseSelectors';
-/* @conditional-compile-remove(rich-text-editor-image-upload) */
-import { getCreatedBy, getTextOnlyChat } from './selectors/baseSelectors';
 /**
  * @private
  */
 export const ChatScreen = (props) => {
     var _a, _b, _c, _d, _e;
-    const { onFetchAvatarPersonaData, onRenderMessage, onRenderTypingIndicator, options, styles, 
-    /* @conditional-compile-remove(file-sharing-acs) */
-    attachmentOptions, formFactor } = props;
+    const { onFetchAvatarPersonaData, onRenderMessage, onRenderTypingIndicator, options, styles, attachmentOptions, formFactor } = props;
     const defaultNumberOfChatMessagesToReload = 5;
-    /* @conditional-compile-remove(file-sharing-acs) */
     const [downloadErrorMessage, setDownloadErrorMessage] = React.useState('');
     const [overlayImageItem, setOverlayImageItem] = useState();
     const [isImageOverlayOpen, setIsImageOverlayOpen] = useState(false);
-    /* @conditional-compile-remove(file-sharing-acs) */
     const [uploads, handleUploadAction] = useReducer(AttachmentUploadReducer, []);
     const adapter = useAdapter();
     const theme = useTheme();
-    /* @conditional-compile-remove(rich-text-editor-image-upload) */
     const localeStrings = useLocale().strings;
-    /* @conditional-compile-remove(rich-text-editor-image-upload) */
-    const textOnlyChat = !!useSelector(getTextOnlyChat);
-    /* @conditional-compile-remove(rich-text-editor-image-upload) */
-    const createdBy = useSelector(getCreatedBy);
-    /* @conditional-compile-remove(rich-text-editor-image-upload) */
-    const isACSChat = createdBy && !isMicrosoftTeamsUserIdentifier(createdBy);
-    /* @conditional-compile-remove(rich-text-editor-image-upload) */
+    const [textOnlyChat, setTextOnlyChat] = useState(false);
+    const [isACSChat, setIsACSChat] = useState(false);
     const [editBoxInlineImageUploads, handleEditBoxInlineImageUploadAction] = useReducer(ImageUploadReducer, undefined);
-    /* @conditional-compile-remove(rich-text-editor-image-upload) */
     const [sendBoxInlineImageUploads, handleSendBoxInlineImageUploadAction] = useReducer(ImageUploadReducer, undefined);
+    useEffect(() => {
+        const updateChatState = (newState) => {
+            var _a, _b, _c, _d;
+            setTextOnlyChat(((_b = (_a = newState.thread.properties) === null || _a === void 0 ? void 0 : _a.messagingPolicy) === null || _b === void 0 ? void 0 : _b.textOnlyChat) === true);
+            if ((_c = newState.thread.properties) === null || _c === void 0 ? void 0 : _c.createdBy) {
+                setIsACSChat(!isMicrosoftTeamsUserIdentifier((_d = newState.thread.properties) === null || _d === void 0 ? void 0 : _d.createdBy));
+            }
+        };
+        // set initial state for textOnlyChat and isACSChat
+        updateChatState(adapter.getState());
+        adapter.onStateChange(updateChatState);
+        return () => {
+            adapter.offStateChange(updateChatState);
+        };
+    }, [adapter]);
     useEffect(() => {
         // Initial data should be always fetched by the composite(or external caller) instead of the adapter
         const fetchData = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -96,7 +82,6 @@ export const ChatScreen = (props) => {
         });
         fetchData();
     }, [adapter]);
-    /* @conditional-compile-remove(rich-text-editor-composite-support) */
     useEffect(() => {
         // if rich text editor is enabled, the rich text editor component should be loaded early for good UX
         if (options === null || options === void 0 ? void 0 : options.richTextEditor) {
@@ -109,30 +94,25 @@ export const ChatScreen = (props) => {
     const typingIndicatorProps = usePropsFor(TypingIndicator);
     const headerProps = useAdaptedSelector(getHeaderProps);
     const errorBarProps = usePropsFor(ErrorBar);
-    const overlayImageItemRef = React.useRef(overlayImageItem);
-    overlayImageItemRef.current = overlayImageItem;
-    const adapterChatMessages = useSelector(getChatMessages);
     useEffect(() => {
-        if (overlayImageItemRef.current === undefined) {
+        if (overlayImageItem === undefined) {
             return;
         }
-        const message = adapterChatMessages[overlayImageItemRef.current.messageId];
+        const message = adapter.getState().thread.chatMessages[overlayImageItem.messageId];
         if (message === undefined) {
             return;
         }
         const resourceCache = message.resourceCache;
-        if (overlayImageItemRef.current.imageSrc === '' &&
-            resourceCache &&
-            resourceCache[overlayImageItemRef.current.imageUrl]) {
-            const fullSizeImageSrc = getResourceSourceUrl(resourceCache[overlayImageItemRef.current.imageUrl]);
-            if (fullSizeImageSrc === undefined ||
-                fullSizeImageSrc === '' ||
-                overlayImageItemRef.current.imageSrc === fullSizeImageSrc) {
+        if (overlayImageItem.imageSrc === '' && resourceCache && resourceCache[overlayImageItem.imageUrl]) {
+            const fullSizeImageSrc = getResourceSourceUrl(resourceCache[overlayImageItem.imageUrl]);
+            if (fullSizeImageSrc === undefined || fullSizeImageSrc === '' || overlayImageItem.imageSrc === fullSizeImageSrc) {
                 return;
             }
-            setOverlayImageItem(Object.assign(Object.assign({}, overlayImageItemRef.current), { imageSrc: fullSizeImageSrc }));
+            setOverlayImageItem(Object.assign(Object.assign({}, overlayImageItem), { imageSrc: fullSizeImageSrc }));
         }
-    }, [adapterChatMessages]);
+        // 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
+    }, [messageThreadProps.messages]);
     const getResourceSourceUrl = (result) => {
         let src = '';
         if (result.error || !result.sourceUrl) {
@@ -144,7 +124,7 @@ export const ChatScreen = (props) => {
         return src;
     };
     const onRenderAvatarCallback = useCallback((userId, defaultOptions) => {
-        return (React.createElement(AvatarPersona, Object.assign({ userId: userId, hidePersonaDetails: true }, defaultOptions, { dataProvider: onFetchAvatarPersonaData })));
+        return React.createElement(AvatarPersona, Object.assign({ userId: userId, hidePersonaDetails: true }, defaultOptions, { dataProvider: onFetchAvatarPersonaData }));
     }, [onFetchAvatarPersonaData]);
     const messageThreadStyles = useMemo(() => {
         return Object.assign({}, messageThreadChatCompositeStyles(theme.semanticColors.bodyBackground), styles === null || styles === void 0 ? void 0 : styles.messageThread);
@@ -155,15 +135,12 @@ export const ChatScreen = (props) => {
     const sendBoxStyles = useMemo(() => {
         return Object.assign({}, styles === null || styles === void 0 ? void 0 : styles.sendBox);
     }, [styles === null || styles === void 0 ? void 0 : styles.sendBox]);
-    const userIdObject = useSelector(getUserId);
-    const userId = toFlatCommunicationIdentifier(userIdObject);
-    /* @conditional-compile-remove(file-sharing-acs) */
+    const userId = toFlatCommunicationIdentifier(adapter.getState().userId);
     const setKeyboardFocusAfterFileSelection = useCallback(() => {
         var _a;
         // look up sendbox by ID for now, we will use `useRef`
         // once attachment button is moved inside of send box component
         // see ADO workitem #3764245
-        /* @conditional-compile-remove(rich-text-editor-composite-support) */
         if ((_a = props.options) === null || _a === void 0 ? void 0 : _a.richTextEditor) {
             const richTextSendBox = document === null || document === void 0 ? void 0 : document.querySelector(`[id="richTextSendBox"]`);
             richTextSendBox === null || richTextSendBox === void 0 ? void 0 : richTextSendBox.focus();
@@ -172,11 +149,7 @@ export const ChatScreen = (props) => {
         const sendBox = document === null || document === void 0 ? void 0 : document.querySelector(`[id="sendbox"]`);
         // set send box on focus after file selection per A11y requirement
         sendBox === null || sendBox === void 0 ? void 0 : sendBox.focus();
-    }, [
-        /* @conditional-compile-remove(rich-text-editor-composite-support) */
-        (_a = props.options) === null || _a === void 0 ? void 0 : _a.richTextEditor
-    ]);
-    /* @conditional-compile-remove(file-sharing-acs) */
+    }, [(_a = props.options) === null || _a === void 0 ? void 0 : _a.richTextEditor]);
     const attachmentUploadButtonOnChange = useCallback((files) => {
         var _a;
         setKeyboardFocusAfterFileSelection();
@@ -195,36 +168,53 @@ export const ChatScreen = (props) => {
                     progress: 0
                 },
                 notifyUploadProgressChanged: (value) => {
-                    handleUploadAction({ type: AttachmentUploadActionType.Progress, taskId, progress: value });
+                    handleUploadAction({
+                        type: AttachmentUploadActionType.Progress,
+                        taskId,
+                        progress: value
+                    });
                 },
                 notifyUploadCompleted: (id, url) => {
-                    handleUploadAction({ type: AttachmentUploadActionType.Completed, taskId, id, url });
+                    handleUploadAction({
+                        type: AttachmentUploadActionType.Completed,
+                        taskId,
+                        id,
+                        url
+                    });
                 },
                 notifyUploadFailed: (message) => {
-                    handleUploadAction({ type: AttachmentUploadActionType.Failed, taskId, message });
+                    handleUploadAction({
+                        type: AttachmentUploadActionType.Failed,
+                        taskId,
+                        message
+                    });
                     // remove the failed upload task when error banner is auto dismissed after 10 seconds
                     // so the banner won't be shown again on UI re-rendering.
                     setTimeout(() => {
-                        handleUploadAction({ type: AttachmentUploadActionType.Remove, id: taskId });
+                        handleUploadAction({
+                            type: AttachmentUploadActionType.Remove,
+                            id: taskId
+                        });
                     }, 10 * 1000);
                 }
             };
         });
-        handleUploadAction({ type: AttachmentUploadActionType.Set, newUploads });
+        handleUploadAction({
+            type: AttachmentUploadActionType.Set,
+            newUploads
+        });
         (_a = attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.uploadOptions) === null || _a === void 0 ? void 0 : _a.handleAttachmentSelection(newUploads);
     }, [attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.uploadOptions, setKeyboardFocusAfterFileSelection]);
-    /* @conditional-compile-remove(file-sharing-acs) */
     const onRenderAttachmentDownloads = useCallback((message) => {
         var _a, _b, _c;
-        return ((_b = (_a = message === null || message === void 0 ? void 0 : message.attachments) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0 > 0) ? (React.createElement(_AttachmentDownloadCards, { attachments: message.attachments, message: message, actionsForAttachment: (_c = attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.downloadOptions) === null || _c === void 0 ? void 0 : _c.actionsForAttachment, onActionHandlerFailed: (errorMessage) => {
+        return ((_b = (_a = message === null || message === void 0 ? void 0 : message.attachments) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0 > 0) ? React.createElement(_AttachmentDownloadCards, { attachments: message.attachments, message: message, actionsForAttachment: (_c = attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.downloadOptions) === null || _c === void 0 ? void 0 : _c.actionsForAttachment, onActionHandlerFailed: (errorMessage) => {
                 setDownloadErrorMessage(errorMessage);
-            } })) : (React.createElement(React.Fragment, null));
+            } }) : React.createElement(React.Fragment, null);
     }, [(_b = attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.downloadOptions) === null || _b === void 0 ? void 0 : _b.actionsForAttachment]);
-    const threadId = useSelector(getThreadId);
     const onInlineImageClicked = useCallback((attachmentId, messageId) => {
         var _a, _b;
-        const message = adapterChatMessages[messageId];
-        const inlinedImages = (_b = (_a = message.content) === null || _a === void 0 ? void 0 : _a.attachments) === null || _b === void 0 ? void 0 : _b.filter((attachment) => {
+        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) {
@@ -239,8 +229,8 @@ export const ChatScreen = (props) => {
             }
             else {
                 adapter.downloadResourceToCache({
-                    threadId,
-                    messageId,
+                    threadId: adapter.getState().thread.threadId,
+                    messageId: messageId,
                     resourceUrl: attachment.url
                 });
             }
@@ -263,30 +253,32 @@ export const ChatScreen = (props) => {
         };
         setIsImageOverlayOpen(true);
         setOverlayImageItem(overlayImage);
-    }, [adapter, adapterChatMessages, onRenderAvatarCallback, userId, threadId]);
+    }, [adapter, onRenderAvatarCallback, userId]);
     const onRenderInlineImage = useCallback((inlineImage, defaultOnRender) => {
         var _a, _b;
-        const message = adapterChatMessages[inlineImage.messageId];
-        const attachment = (_b = (_a = message === null || message === void 0 ? void 0 : message.content) === null || _a === void 0 ? void 0 : _a.attachments) === null || _b === void 0 ? void 0 : _b.find((attachment) => attachment.id === inlineImage.imageAttributes.id);
+        const message = adapter.getState().thread.chatMessages[inlineImage.messageId];
+        const attachment = (_b = (_a = message === null || message === void 0 ? void 0 : message.content) === null || _a === void 0 ? void 0 : _a.attachments) === null || _b === void 0 ? void 0 : _b.find(attachment => attachment.id === inlineImage.imageAttributes.id);
         if (attachment === undefined) {
             return defaultOnRender(inlineImage);
         }
         let pointerEvents = inlineImage.imageAttributes.src === '' ? 'none' : 'auto';
         const resourceCache = message.resourceCache;
-        if (resourceCache &&
-            attachment.previewUrl &&
-            resourceCache[attachment.previewUrl] &&
-            resourceCache[attachment.previewUrl].error) {
+        if (resourceCache && attachment.previewUrl && resourceCache[attachment.previewUrl] && resourceCache[attachment.previewUrl].error) {
             pointerEvents = 'none';
         }
-        return (React.createElement("span", { key: inlineImage.imageAttributes.id, onClick: () => onInlineImageClicked(inlineImage.imageAttributes.id || '', inlineImage.messageId), tabIndex: 0, role: "button", onKeyDown: (e) => {
+        return React.createElement("span", { key: inlineImage.imageAttributes.id, onClick: () => onInlineImageClicked(inlineImage.imageAttributes.id || '', inlineImage.messageId), tabIndex: 0, role: "button", onKeyDown: e => {
                 if (e.key === 'Enter') {
                     onInlineImageClicked(inlineImage.imageAttributes.id || '', inlineImage.messageId);
                 }
-            }, style: { cursor: 'pointer', pointerEvents } }, defaultOnRender(inlineImage)));
-    }, [adapterChatMessages, onInlineImageClicked]);
+            }, style: {
+                cursor: 'pointer',
+                pointerEvents
+            } }, defaultOnRender(inlineImage));
+    }, [adapter, onInlineImageClicked]);
     const inlineImageOptions = useMemo(() => {
-        return { onRenderInlineImage: onRenderInlineImage };
+        return {
+            onRenderInlineImage: onRenderInlineImage
+        };
     }, [onRenderInlineImage]);
     const onDownloadButtonClicked = useCallback((imageSrc) => {
         if (imageSrc === '') {
@@ -309,190 +301,111 @@ export const ChatScreen = (props) => {
             document.body.removeChild(a);
         }
     }, [overlayImageItem === null || overlayImageItem === void 0 ? void 0 : overlayImageItem.attachmentId]);
-    /* @conditional-compile-remove(file-sharing-acs) */
     const attachmentButton = useMemo(() => {
         var _a, _b, _c;
-        if (!((_a = attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.uploadOptions) === null || _a === void 0 ? void 0 : _a.handleAttachmentSelection) ||
-            /* @conditional-compile-remove(rich-text-editor-image-upload) */
-            textOnlyChat) {
+        if (!((_a = attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.uploadOptions) === null || _a === void 0 ? void 0 : _a.handleAttachmentSelection) || textOnlyChat) {
             return null;
         }
-        return (React.createElement(AttachmentUploadButton, { supportedMediaTypes: (_b = attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.uploadOptions) === null || _b === void 0 ? void 0 : _b.supportedMediaTypes, disableMultipleUploads: (_c = attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.uploadOptions) === null || _c === void 0 ? void 0 : _c.disableMultipleUploads, onChange: attachmentUploadButtonOnChange }));
+        return React.createElement(AttachmentUploadButton, { supportedMediaTypes: (_b = attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.uploadOptions) === null || _b === void 0 ? void 0 : _b.supportedMediaTypes, disableMultipleUploads: (_c = attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.uploadOptions) === null || _c === void 0 ? void 0 : _c.disableMultipleUploads, onChange: attachmentUploadButtonOnChange });
         return React.createElement(React.Fragment, null);
-    }, [
-        (_c = attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.uploadOptions) === null || _c === void 0 ? void 0 : _c.handleAttachmentSelection,
-        (_d = attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.uploadOptions) === null || _d === void 0 ? void 0 : _d.supportedMediaTypes,
-        (_e = attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.uploadOptions) === null || _e === void 0 ? void 0 : _e.disableMultipleUploads,
-        attachmentUploadButtonOnChange,
-        /* @conditional-compile-remove(rich-text-editor-image-upload) */
-        textOnlyChat
-    ]);
-    /* @conditional-compile-remove(file-sharing-acs) */
+    }, [(_c = attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.uploadOptions) === null || _c === void 0 ? void 0 : _c.handleAttachmentSelection, (_d = attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.uploadOptions) === null || _d === void 0 ? void 0 : _d.supportedMediaTypes, (_e = attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.uploadOptions) === null || _e === void 0 ? void 0 : _e.disableMultipleUploads, attachmentUploadButtonOnChange, textOnlyChat]);
     const attachments = useMemo(() => {
-        return uploads === null || uploads === void 0 ? void 0 : uploads.map((v) => v.metadata);
+        return uploads === null || uploads === void 0 ? void 0 : uploads.map(v => v.metadata);
     }, [uploads]);
-    const onSendMessageHandler = useCallback(function (content, 
-    /* @conditional-compile-remove(file-sharing-acs) */ /* @conditional-compile-remove(rich-text-editor-composite-support) */ options) {
+    const onSendMessageHandler = useCallback(function (content, options) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            /* @conditional-compile-remove(rich-text-editor-image-upload) */
             content = updateContentStringWithUploadedInlineImages(content, sendBoxInlineImageUploads);
-            /* @conditional-compile-remove(file-sharing-acs) */
             const attachments = (_a = options === null || options === void 0 ? void 0 : options.attachments) !== null && _a !== void 0 ? _a : [];
-            /* @conditional-compile-remove(file-sharing-acs) */
-            handleUploadAction({ type: AttachmentUploadActionType.Clear });
-            /* @conditional-compile-remove(rich-text-editor-image-upload) */
+            handleUploadAction({
+                type: AttachmentUploadActionType.Clear
+            });
             handleSendBoxInlineImageUploadAction({
                 type: AttachmentUploadActionType.Clear,
                 messageId: SEND_BOX_UPLOADS_KEY_VALUE
             });
-            /* @conditional-compile-remove(file-sharing-acs) */
             yield adapter.sendMessage(content, {
                 attachments: attachments,
-                /* @conditional-compile-remove(rich-text-editor-composite-support) */
                 type: options === null || options === void 0 ? void 0 : options.type
             });
-            /* @conditional-compile-remove(file-sharing-acs) */
             return;
             yield adapter.sendMessage(content, {
-                /* @conditional-compile-remove(rich-text-editor-composite-support) */
                 type: options === null || options === void 0 ? void 0 : options.type
             });
         });
-    }, [
-        adapter,
-        /* @conditional-compile-remove(rich-text-editor-image-upload) */ handleSendBoxInlineImageUploadAction,
-        /* @conditional-compile-remove(rich-text-editor-image-upload) */ sendBoxInlineImageUploads
-    ]);
-    const onUpdateMessageHandler = useCallback(function (messageId, content, 
-    /* @conditional-compile-remove(file-sharing-acs) */ options) {
+    }, [adapter, handleSendBoxInlineImageUploadAction, sendBoxInlineImageUploads]);
+    const onUpdateMessageHandler = useCallback(function (messageId, content, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            /* @conditional-compile-remove(rich-text-editor-image-upload) */
             content = updateContentStringWithUploadedInlineImages(content, editBoxInlineImageUploads, messageId);
-            yield messageThreadProps.onUpdateMessage(messageId, content, 
-            /* @conditional-compile-remove(file-sharing-acs) */ options);
-            /* @conditional-compile-remove(rich-text-editor-image-upload) */
-            handleEditBoxInlineImageUploadAction({ type: AttachmentUploadActionType.Clear, messageId });
+            yield messageThreadProps.onUpdateMessage(messageId, content, options);
+            handleEditBoxInlineImageUploadAction({
+                type: AttachmentUploadActionType.Clear,
+                messageId
+            });
         });
-    }, [
-        /* @conditional-compile-remove(rich-text-editor-image-upload) */ handleEditBoxInlineImageUploadAction,
-        /* @conditional-compile-remove(rich-text-editor-image-upload) */ editBoxInlineImageUploads,
-        messageThreadProps
-    ]);
-    /* @conditional-compile-remove(rich-text-editor-image-upload) */
+    }, [handleEditBoxInlineImageUploadAction, editBoxInlineImageUploads, messageThreadProps]);
     const onCancelEditMessageHandler = useCallback((messageId) => {
-        handleEditBoxInlineImageUploadAction({ type: AttachmentUploadActionType.Clear, messageId });
+        handleEditBoxInlineImageUploadAction({
+            type: AttachmentUploadActionType.Clear,
+            messageId
+        });
     }, [handleEditBoxInlineImageUploadAction]);
-    /* @conditional-compile-remove(file-sharing-acs) */
     const onCancelUploadHandler = useCallback((id) => {
         var _a, _b;
-        handleUploadAction({ type: AttachmentUploadActionType.Remove, id });
+        handleUploadAction({
+            type: AttachmentUploadActionType.Remove,
+            id
+        });
         (_b = (_a = attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.uploadOptions) === null || _a === void 0 ? void 0 : _a.handleAttachmentRemoval) === null || _b === void 0 ? void 0 : _b.call(_a, id);
     }, [attachmentOptions === null || attachmentOptions === void 0 ? void 0 : attachmentOptions.uploadOptions]);
-    /* @conditional-compile-remove(rich-text-editor-composite-support) */
     const richTextEditorOptions = useMemo(() => {
-        /* @conditional-compile-remove(rich-text-editor-image-upload) */
-        const onPasteCallback = !!isACSChat || textOnlyChat ? removeImageTags : undefined;
-        return (options === null || options === void 0 ? void 0 : options.richTextEditor)
-            ? {
-                /* @conditional-compile-remove(rich-text-editor-image-upload) */ onPaste: onPasteCallback
-            }
-            : undefined;
-    }, [
-        /* @conditional-compile-remove(rich-text-editor-image-upload) */
-        isACSChat,
-        /* @conditional-compile-remove(rich-text-editor-image-upload) */
-        textOnlyChat,
-        options === null || options === void 0 ? void 0 : options.richTextEditor
-    ]);
-    /* @conditional-compile-remove(rich-text-editor-composite-support) */
+        const onPasteCallback = isACSChat || textOnlyChat ? removeImageTags : undefined;
+        return (options === null || options === void 0 ? void 0 : options.richTextEditor) ? {
+            onPaste: onPasteCallback
+        } : undefined;
+    }, [isACSChat, textOnlyChat, options === null || options === void 0 ? void 0 : options.richTextEditor]);
     const richTextEditBoxOptions = useMemo(() => {
-        return (options === null || options === void 0 ? void 0 : options.richTextEditor)
-            ? Object.assign(Object.assign({}, richTextEditorOptions), { 
-                /* @conditional-compile-remove(rich-text-editor-image-upload) */
-                onInsertInlineImage: (imageAttributes, messageId) => {
-                    onInsertInlineImageForEditBox(imageAttributes, getImageFileNameFromAttributes(imageAttributes), messageId, adapter, handleEditBoxInlineImageUploadAction, localeStrings.chat);
-                }, 
-                /* @conditional-compile-remove(rich-text-editor-image-upload) */
-                messagesInlineImagesWithProgress: getEditBoxMessagesInlineImages(editBoxInlineImageUploads), 
-                /* @conditional-compile-remove(rich-text-editor-image-upload) */
-                onRemoveInlineImage: (imageAttributes, messageId) => {
-                    cancelInlineImageUpload(imageAttributes, editBoxInlineImageUploads, messageId, handleEditBoxInlineImageUploadAction, adapter);
-                } }) : undefined;
-    }, [
-        options === null || options === void 0 ? void 0 : options.richTextEditor,
-        /* @conditional-compile-remove(rich-text-editor-image-upload) */ richTextEditorOptions,
-        /* @conditional-compile-remove(rich-text-editor-image-upload) */ editBoxInlineImageUploads,
-        /* @conditional-compile-remove(rich-text-editor-image-upload) */ adapter,
-        /* @conditional-compile-remove(rich-text-editor-image-upload) */ localeStrings.chat
-    ]);
-    /* @conditional-compile-remove(rich-text-editor-composite-support) */
+        return (options === null || options === void 0 ? void 0 : options.richTextEditor) ? Object.assign(Object.assign({}, richTextEditorOptions), { onInsertInlineImage: (imageAttributes, messageId) => {
+                onInsertInlineImageForEditBox(imageAttributes, getImageFileNameFromAttributes(imageAttributes), messageId, adapter, handleEditBoxInlineImageUploadAction, localeStrings.chat);
+            }, messagesInlineImagesWithProgress: getEditBoxMessagesInlineImages(editBoxInlineImageUploads), onRemoveInlineImage: (imageAttributes, messageId) => {
+                cancelInlineImageUpload(imageAttributes, editBoxInlineImageUploads, messageId, handleEditBoxInlineImageUploadAction, adapter);
+            } }) : undefined;
+    }, [options === null || options === void 0 ? void 0 : options.richTextEditor, richTextEditorOptions, editBoxInlineImageUploads, adapter, localeStrings.chat]);
     const richTextSendBoxOptions = useMemo(() => {
-        return (options === null || options === void 0 ? void 0 : options.richTextEditor)
-            ? Object.assign(Object.assign({}, richTextEditorOptions), { 
-                /* @conditional-compile-remove(rich-text-editor-image-upload) */
-                onInsertInlineImage: (imageAttributes) => {
-                    onInsertInlineImageForSendBox(imageAttributes, getImageFileNameFromAttributes(imageAttributes), adapter, handleSendBoxInlineImageUploadAction, localeStrings.chat);
-                }, 
-                /* @conditional-compile-remove(rich-text-editor-image-upload) */
-                inlineImagesWithProgress: getSendBoxInlineImages(sendBoxInlineImageUploads), 
-                /* @conditional-compile-remove(rich-text-editor-image-upload) */
-                onRemoveInlineImage: (imageAttributes) => {
-                    cancelInlineImageUpload(imageAttributes, sendBoxInlineImageUploads, SEND_BOX_UPLOADS_KEY_VALUE, handleSendBoxInlineImageUploadAction, adapter);
-                } }) : undefined;
-    }, [
-        options === null || options === void 0 ? void 0 : options.richTextEditor,
-        /* @conditional-compile-remove(rich-text-editor-image-upload) */ richTextEditorOptions,
-        /* @conditional-compile-remove(rich-text-editor-image-upload) */ sendBoxInlineImageUploads,
-        /* @conditional-compile-remove(rich-text-editor-image-upload) */ localeStrings.chat,
-        adapter
-    ]);
-    return (React.createElement(Stack, { className: chatContainer, grow: true },
+        return (options === null || options === void 0 ? void 0 : options.richTextEditor) ? Object.assign(Object.assign({}, richTextEditorOptions), { onInsertInlineImage: (imageAttributes) => {
+                onInsertInlineImageForSendBox(imageAttributes, getImageFileNameFromAttributes(imageAttributes), adapter, handleSendBoxInlineImageUploadAction, localeStrings.chat);
+            }, inlineImagesWithProgress: getSendBoxInlineImages(sendBoxInlineImageUploads), onRemoveInlineImage: (imageAttributes) => {
+                cancelInlineImageUpload(imageAttributes, sendBoxInlineImageUploads, SEND_BOX_UPLOADS_KEY_VALUE, handleSendBoxInlineImageUploadAction, adapter);
+            } }) : undefined;
+    }, [options === null || options === void 0 ? void 0 : options.richTextEditor, richTextEditorOptions, sendBoxInlineImageUploads, localeStrings.chat, adapter]);
+    return React.createElement(Stack, { className: chatContainer, grow: true },
         (options === null || options === void 0 ? void 0 : options.topic) !== false && React.createElement(ChatHeader, Object.assign({}, headerProps)),
         React.createElement(Stack, { className: chatArea, tokens: participantListContainerPadding, horizontal: true, grow: true },
             React.createElement(Stack, { className: chatWrapper, grow: true },
                 (options === null || options === void 0 ? void 0 : options.errorBar) !== false && React.createElement(ErrorBar, Object.assign({}, errorBarProps)),
-                /* @conditional-compile-remove(file-sharing-acs) */
                 React.createElement(AttachmentDownloadErrorBar, { onDismissDownloadErrorMessage: useCallback(() => {
                         setDownloadErrorMessage('');
                     }, []), attachmentDownloadErrorMessage: downloadErrorMessage || '' }),
-                React.createElement(MessageThread, Object.assign({}, messageThreadProps, { onUpdateMessage: onUpdateMessageHandler, 
-                    /* @conditional-compile-remove(rich-text-editor-image-upload) */
-                    onCancelEditMessage: onCancelEditMessageHandler, onRenderAvatar: onRenderAvatarCallback, onRenderMessage: onRenderMessage, 
-                    /* @conditional-compile-remove(file-sharing-acs) */
-                    onRenderAttachmentDownloads: onRenderAttachmentDownloads, inlineImageOptions: inlineImageOptions, numberOfChatMessagesToReload: defaultNumberOfChatMessagesToReload, styles: messageThreadStyles, 
-                    /* @conditional-compile-remove(rich-text-editor-composite-support) */
-                    richTextEditorOptions: richTextEditBoxOptions })),
+                React.createElement(MessageThread, Object.assign({}, messageThreadProps, { onUpdateMessage: onUpdateMessageHandler, onCancelEditMessage: onCancelEditMessageHandler, onRenderAvatar: onRenderAvatarCallback, onRenderMessage: onRenderMessage, onRenderAttachmentDownloads: onRenderAttachmentDownloads, inlineImageOptions: inlineImageOptions, numberOfChatMessagesToReload: defaultNumberOfChatMessagesToReload, styles: messageThreadStyles, richTextEditorOptions: richTextEditBoxOptions })),
                 React.createElement(Stack, { className: mergeStyles(sendboxContainerStyles) },
-                    React.createElement("div", { className: mergeStyles(typingIndicatorContainerStyles) }, onRenderTypingIndicator ? (onRenderTypingIndicator(typingIndicatorProps.typingUsers)) : (React.createElement(TypingIndicator, Object.assign({}, typingIndicatorProps, { styles: typingIndicatorStyles })))),
+                    React.createElement("div", { className: mergeStyles(typingIndicatorContainerStyles) }, onRenderTypingIndicator ? onRenderTypingIndicator(typingIndicatorProps.typingUsers) : React.createElement(TypingIndicator, Object.assign({}, typingIndicatorProps, { styles: typingIndicatorStyles }))),
                     React.createElement(Stack, { horizontal: formFactor === 'mobile' },
-                        formFactor === 'mobile' && (
-                        /* @conditional-compile-remove(file-sharing-acs) */
-                        React.createElement(Stack, { verticalAlign: "center" }, attachmentButton)),
+                        formFactor === 'mobile' && (React.createElement(Stack, { verticalAlign: "center" }, attachmentButton)),
                         React.createElement(Stack, { grow: true },
-                            React.createElement(SendBoxPicker, { styles: sendBoxStyles, autoFocus: options === null || options === void 0 ? void 0 : options.autoFocus, 
-                                /* @conditional-compile-remove(rich-text-editor-composite-support) */
-                                richTextEditorOptions: richTextSendBoxOptions, 
-                                /* @conditional-compile-remove(file-sharing-acs) */
-                                attachments: attachments, 
-                                /* @conditional-compile-remove(file-sharing-acs) */
-                                onCancelAttachmentUpload: onCancelUploadHandler, 
+                            React.createElement(SendBoxPicker, { styles: sendBoxStyles, autoFocus: options === null || options === void 0 ? void 0 : options.autoFocus, richTextEditorOptions: richTextSendBoxOptions, attachments: attachments, onCancelAttachmentUpload: onCancelUploadHandler, 
                                 // we need to overwrite onSendMessage for SendBox because we need to clear attachment state
                                 // when submit button is clicked
                                 onSendMessage: onSendMessageHandler })),
-                        formFactor !== 'mobile' &&
-                            /* @conditional-compile-remove(file-sharing-acs) */
-                            attachmentButton))),
-            /* @conditional-compile-remove(chat-composite-participant-pane) */
-            (options === null || options === void 0 ? void 0 : options.participantPane) === true && (React.createElement(ChatScreenPeoplePane, { onFetchAvatarPersonaData: onFetchAvatarPersonaData, onFetchParticipantMenuItems: props.onFetchParticipantMenuItems, isMobile: formFactor === 'mobile' }))),
-        overlayImageItem && (React.createElement(ImageOverlay, Object.assign({}, overlayImageItem, { isOpen: isImageOverlayOpen, onDismiss: () => {
+                        formFactor !== 'mobile' && attachmentButton))),
+            (options === null || options === void 0 ? void 0 : options.participantPane) === true && React.createElement(ChatScreenPeoplePane, { onFetchAvatarPersonaData: onFetchAvatarPersonaData, onFetchParticipantMenuItems: props.onFetchParticipantMenuItems, isMobile: formFactor === 'mobile' })),
+        overlayImageItem && React.createElement(ImageOverlay, Object.assign({}, overlayImageItem, { isOpen: isImageOverlayOpen, onDismiss: () => {
                 setOverlayImageItem(undefined);
                 setIsImageOverlayOpen(false);
                 adapter.removeResourceFromCache({
-                    threadId,
+                    threadId: adapter.getState().thread.threadId,
                     messageId: overlayImageItem.messageId,
                     resourceUrl: overlayImageItem.imageUrl
                 });
-            }, onDownloadButtonClicked: onDownloadButtonClicked })))));
+            }, onDownloadButtonClicked: onDownloadButtonClicked })));
 };
 //# sourceMappingURL=ChatScreen.js.map