Skip to content

fix: VideoConfPopup not receiving focus properly #36738

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
kodiakhq merged 4 commits into from
Aug 19, 2025
+11 −6
Merged

fix: VideoConfPopup not receiving focus properly #36738

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
d91e566
chore: change `FocusScope` order
dougfabris Aug 18, 2025
5140508
chore: changeset
dougfabris Aug 18, 2025
723470b
Merge branch 'develop' into test/videoconf-popup-focus
kodiakhq[bot] Aug 18, 2025
f63d7f9
Merge branch 'develop' into test/videoconf-popup-focus
kodiakhq[bot] Aug 19, 2025
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
5 changes: 5 additions & 0 deletions .changeset/dull-beers-ring.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Addresses an issue where video conference popups don't receive proper focus because FocusScope is mispositioned
12 changes: 6 additions & 6 deletions ...eteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopups.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ const VideoConfPopups = ({ children }: { children?: VideoConfPopupPayload }): Re
<>
{(children || popups?.length > 0) && (
<VideoConfPopupPortal>
<FocusScope autoFocus contain restoreFocus>
<VideoConfPopupBackdrop>
{(children ? [children, ...popups] : popups).map(({ id, rid, isReceiving }, index = 1) => (
<VideoConfPopup key={id} id={id} rid={rid} isReceiving={isReceiving} isCalling={isCalling} position={index * 10} />
))}
{(children ? [children, ...popups] : popups).map(({ id, rid, isReceiving }, index = 1) => (
<VideoConfPopupBackdrop key={id}>
<FocusScope autoFocus contain restoreFocus>
<VideoConfPopup id={id} rid={rid} isReceiving={isReceiving} isCalling={isCalling} position={index * 10} />
</FocusScope>
</VideoConfPopupBackdrop>
</FocusScope>
))}
</VideoConfPopupPortal>
)}
</>
Expand Down
Loading