Skip to content

Fix reaction crash #4608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PorterNan merged 4 commits into from
May 15, 2024
Merged

Fix reaction crash #4608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c6311e
Fix crash bug for remote screen share
PorterNan May 15, 2024
2220c65
Change files
PorterNan May 15, 2024
307b8bd
Merge branch 'main' into jinan/fix-reaction-crash
PorterNan May 15, 2024
1c25cf0
Merge branch 'main' into jinan/fix-reaction-crash
PorterNan May 15, 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
9 changes: 9 additions & 0 deletions change-beta/@azure-communication-react-d6a2c723-a4e8-48db-9ce4-a26c89fa019b.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "",
"comment": "Fix crash bug for remote screen share",
"packageName": "@azure/communication-react",
"email": "jiangnanhello@live.com",
"dependentChangeType": "patch"
}
9 changes: 9 additions & 0 deletions change/@azure-communication-react-d6a2c723-a4e8-48db-9ce4-a26c89fa019b.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "",
"comment": "Fix crash bug for remote screen share",
"packageName": "@azure/communication-react",
"email": "jiangnanhello@live.com",
"dependentChangeType": "patch"
}
4 changes: 2 additions & 2 deletions packages/react-components/src/components/RemoteVideoTile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,11 +203,11 @@ export const _RemoteVideoTile = React.memo(
return remoteParticipant.displayName;
};

const reactionOverlay = (
const reactionOverlay = reactionResources && (
<MeetingReactionOverlay
overlayMode="grid-tiles"
reaction={remoteParticipant.reaction}
reactionResources={reactionResources!}
reactionResources={reactionResources}
/>
);

Expand Down
28 changes: 16 additions & 12 deletions packages/react-components/src/components/VideoGallery/RemoteScreenShare.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,14 @@ export const RemoteScreenShare = React.memo(
}
onRenderPlaceholder={() => <LoadingSpinner loadingMessage={loadingMessage} />}
overlay={
<MeetingReactionOverlay
reactionResources={reactionResources!}
localParticipant={localParticipant}
remoteParticipants={remoteParticipants}
overlayMode="screen-share"
/>
reactionResources && (
<MeetingReactionOverlay
reactionResources={reactionResources}
localParticipant={localParticipant}
remoteParticipants={remoteParticipants}
overlayMode="screen-share"
/>
)
}
/>
);
Expand All @@ -115,12 +117,14 @@ export const RemoteScreenShare = React.memo(
}
onRenderPlaceholder={() => <LoadingSpinner loadingMessage={loadingMessage} />}
overlay={
<MeetingReactionOverlay
reactionResources={reactionResources!}
localParticipant={localParticipant}
remoteParticipants={remoteParticipants}
overlayMode="screen-share"
/>
reactionResources && (
<MeetingReactionOverlay
reactionResources={reactionResources}
localParticipant={localParticipant}
remoteParticipants={remoteParticipants}
overlayMode="screen-share"
/>
)
}
/>
);
Expand Down
⚡