From 1a22b7d0ddecd7be0319c6495eda1c46bc751f88 Mon Sep 17 00:00:00 2001 From: Christoph Settgast Date: Thu, 13 Apr 2023 21:53:10 +0200 Subject: [PATCH] fix(desktop-picker): Populate list of desktop app windows to share Fix bug introduced via #12994 where id was changed and "-tab" was appended. Due to this the selected tab was not anymore working and empty object was returned here: https://github.com/dudumanbogdan/jitsi-meet/blob/05da37b56de391e3f67d5919a751a81a4e803d73/react/features/desktop-picker/components/DesktopPicker.tsx#L270 Originally part of #13096 by @dudumanbogdan, but pulled ahead to fix application window sharing via Electron desktop app. Fixes: jitsi/jitsi-meet-electron#857 --- react/features/desktop-picker/components/DesktopPicker.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/react/features/desktop-picker/components/DesktopPicker.tsx b/react/features/desktop-picker/components/DesktopPicker.tsx index 3c122ec5ea..f582b09bd3 100644 --- a/react/features/desktop-picker/components/DesktopPicker.tsx +++ b/react/features/desktop-picker/components/DesktopPicker.tsx @@ -358,7 +358,7 @@ class DesktopPicker extends PureComponent { type => { return { accessibilityLabel: t(TAB_LABELS[type as keyof typeof TAB_LABELS]), - id: `${type}-tab`, + id: `${type}`, controlsId: `${type}-panel`, label: t(TAB_LABELS[type as keyof typeof TAB_LABELS]) }; @@ -369,7 +369,7 @@ class DesktopPicker extends PureComponent { accessibilityLabel = { t('dialog.sharingTabs') } className = 'desktop-picker-tabs-container' onChange = { this._onTabSelected } - selected = { `${this.state.selectedTab}-tab` } + selected = { `${this.state.selectedTab}` } tabs = { tabs } />); }