Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
09468e6
Use resourceCache from adapter state for fullsize image src
Leah-Xia-Microsoft Mar 2, 2024
da03ff4
Clean full size cache when ImageOverlay is closed
Leah-Xia-Microsoft Mar 2, 2024
dc9fbf8
Change files
Leah-Xia-Microsoft Mar 2, 2024
dbb2efb
Duplicate change files for beta release
Leah-Xia-Microsoft Mar 2, 2024
676b7d6
Update ChatScreen.tsx
Leah-Xia-Microsoft Mar 2, 2024
6922e00
Remove cc for stable
Leah-Xia-Microsoft Mar 2, 2024
1dd3191
Merge branch 'main' into leahxia/useAdapterStateForFullsizeCache
Leah-Xia-Microsoft Mar 2, 2024
0f25341
Merge branch 'main' of https://github.com/Azure/communication-ui-libr…
JoshuaLai Mar 4, 2024
f11bfcb
Remove the InlineImageMetadata type
JoshuaLai Mar 4, 2024
d3bc3d3
Change files
JoshuaLai Mar 4, 2024
dca8589
Duplicate change files for beta release
JoshuaLai Mar 4, 2024
45d9ac2
Update storybook removing reference to inline image
JoshuaLai Mar 4, 2024
c5c9550
Merge branch 'main' into feature/removeInlineImageMetadata
JoshuaLai Mar 4, 2024
d147ff7
Handle non ACS images in Chat Composite
Leah-Xia-Microsoft Mar 4, 2024
2d21d6d
Change files
Leah-Xia-Microsoft Mar 4, 2024
cdd54eb
Duplicate change files for beta release
Leah-Xia-Microsoft Mar 4, 2024
63f24f3
Removing and cleaning up Storybook
JoshuaLai Mar 4, 2024
1830c0b
Merge branch 'feature/removeInlineImageMetadata' of https://github.co…
JoshuaLai Mar 4, 2024
832ed06
Merge branch 'leahxia/removeAttachmentMetadata' into leahxia/non-acs-…
Leah-Xia-Microsoft Mar 4, 2024
9d6b7cc
Merge branch 'main' into leahxia/non-acs-images
emlynmac Mar 5, 2024
aca8ccb
Merge branch 'main' into leahxia/non-acs-images
JoshuaLai Mar 5, 2024
b3aec7f
Merge branch 'main' into leahxia/non-acs-images
Leah-Xia-Microsoft Mar 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "minor",
"area": "improvement",
"workstream": "InlineImage",
"comment": "In the chat composite, if the message contains image that's not an ACS image, we will render the image but it will not be clickable to view and download in the ImageOverlay",
"packageName": "@azure/communication-react",
"email": "107075081+Leah-Xia-Microsoft@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "minor",
"area": "improvement",
"workstream": "InlineImage",
"comment": "In the chat composite, if the message contains image that's not an ACS image, we will render the image but it will not be clickable to view and download in the ImageOverlay",
"packageName": "@azure/communication-react",
"email": "107075081+Leah-Xia-Microsoft@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,15 @@ export const ChatScreen = (props: ChatScreenProps): JSX.Element => {
inlineImage: InlineImage,
defaultOnRender: (inlineImage: InlineImage) => JSX.Element
): JSX.Element => {
const message = adapter.getState().thread.chatMessages[inlineImage.messageId];
const attachments = message?.content?.attachments?.find(
(attachment) => attachment.id === inlineImage.imgAttrs.id
);

if (attachments === undefined) {
return defaultOnRender(inlineImage);
}

return (
<span
key={inlineImage.imgAttrs.id}
Expand Down