A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
refactor(app): flatten screen share picker status and summary
Hampus124f5bf69489
diff --git a/fluxer_app/src/features/voice/components/modals/ScreenSharePickerModal.tsx b/fluxer_app/src/features/voice/components/modals/ScreenSharePickerModal.tsxindex 0b5e25731..deedcf845 100644--- a/fluxer_app/src/features/voice/components/modals/ScreenSharePickerModal.tsx+++ b/fluxer_app/src/features/voice/components/modals/ScreenSharePickerModal.tsx@@ -86,7 +86,7 @@ import {supportsDeviceScreenShare,usesNativeDisplaySharePicker,} from '@app/features/voice/utils/ScreenShareEnvironment';-import {resolveScreenShareTarget} from '@app/features/voice/utils/ScreenShareOptions';+import {resolveScreenShareTarget, type ScreenShareContext} from '@app/features/voice/utils/ScreenShareOptions';import {startConfiguredDeviceScreenShare,startConfiguredDisplayScreenShare,@@ -426,6 +426,12 @@ function getScreenSharePreviewPrivacyBodyDescriptor(context: ScreenSharePreviewCreturn SCREEN_SHARE_PREVIEW_PRIVACY_BODY_GUILD_DESCRIPTOR;}+function getPickerShareContext(tab: ScreenSharePickerTab): ScreenShareContext {+ if (tab === 'devices') return 'device';+ if (tab === 'apps') return 'app';+ return 'display';+}+function clampScreenSharePickerTab(tab: ScreenSharePickerTab | undefined): ScreenSharePickerTab {if (tab === 'devices' && !supportsDeviceScreenShare()) return 'apps';return tab ?? 'apps';@@ -766,28 +772,84 @@ const ScreenSharePickerModalPreloader = observer(} = useScreenSharePickerTabState(initialTab);const [preload, setPreload] = useState<ScreenSharePickerPreload | null>(null);const [loadError, setLoadError] = useState<string | null>(null);- const mountedRef = useRef(true);- useEffect(- () => () => {- mountedRef.current = false;- },- [],- );const loadPreload = useCallback(async () => {setLoadError(null);try {const nextPreload = await preloadScreenSharePickerSources();- if (!mountedRef.current) return;setPreload(nextPreload);} catch (error) {logger.error('Failed to preload screen share picker sources', {error});- if (!mountedRef.current) return;setLoadError(i18n._(FAILED_TO_LOAD_SHAREABLE_SOURCES_DESCRIPTOR));}}, [i18n]);useEffect(() => {void loadPreload();}, [loadPreload]);+ let content: ReactNode;+ if (preload) {+ content = (+ <ScreenSharePickerModalLoadedContent+ activeTab={activeTab}+ devicePreviewsEnabled={devicePreviewsEnabled}+ devicePreviewPermissionStatus={devicePreviewPermissionStatus}+ displayShareEnvironment={preload.displayShareEnvironment}+ initialDesktopSources={preload.desktopSources}+ initialDesktopSourcesError={preload.desktopSourcesError}+ initialDesktopSourcesSkippedForPermission={preload.desktopSourcesSkippedForPermission}+ mode={mode}+ onRequestDevicePreviewPermission={requestDevicePreviewPermission}+ data-flx="voice.screen-share-picker-modal.screen-share-picker-modal-preloader.screen-share-picker-modal-loaded-content"+ />+ );+ } else {+ let loadState: ReactNode;+ if (loadError) {+ loadState = (+ <div className={styles.state} data-flx="voice.screen-share-picker-modal.preloader.state">+ <div className={styles.stateTitle} data-flx="voice.screen-share-picker-modal.preloader.state-title">+ {loadError}+ </div>+ <Button+ variant="secondary"+ onClick={() => void loadPreload()}+ data-flx="voice.screen-share-picker-modal.preloader.button.retry"+ >+ {i18n._(TRY_AGAIN_DESCRIPTOR)}+ </Button>+ </div>+ );+ } else {+ loadState = (+ <div className={styles.loadingState} data-flx="voice.screen-share-picker-modal.preloader.loading-state">+ <Spinner size="large" data-flx="voice.screen-share-picker-modal.preloader.spinner" />+ </div>+ );+ }+ content = (+ <>+ <Modal.Content+ padding="none"+ className={styles.content}+ showTrack={false}+ data-flx="voice.screen-share-picker-modal.preloader.content"+ >+ {loadState}+ </Modal.Content>+ <Modal.Footer className={styles.footer} data-flx="voice.screen-share-picker-modal.preloader.footer">+ <div className={styles.footerStart} data-flx="voice.screen-share-picker-modal.preloader.footer-start">+ <ScreenSharePreviewFooterNotice data-flx="voice.screen-share-picker-modal.screen-share-picker-modal-preloader.screen-share-preview-footer-notice" />+ </div>+ <Button+ variant="secondary"+ onClick={() => ModalCommands.pop()}+ data-flx="voice.screen-share-picker-modal.preloader.button.pop"+ >+ {i18n._(CANCEL_DESCRIPTOR)}+ </Button>+ </Modal.Footer>+ </>+ );+ }return (<ScreenSharePickerModalFrameactiveTab={activeTab}@@ -796,60 +858,7 @@ const ScreenSharePickerModalPreloader = observer(onActiveTabChange={handleExplicitActiveTabChange}data-flx="voice.screen-share-picker-modal.screen-share-picker-modal-preloader.screen-share-picker-modal-frame">- {preload ? (- <ScreenSharePickerModalLoadedContent- activeTab={activeTab}- devicePreviewsEnabled={devicePreviewsEnabled}- devicePreviewPermissionStatus={devicePreviewPermissionStatus}- displayShareEnvironment={preload.displayShareEnvironment}- initialDesktopSources={preload.desktopSources}- initialDesktopSourcesError={preload.desktopSourcesError}- initialDesktopSourcesSkippedForPermission={preload.desktopSourcesSkippedForPermission}- mode={mode}- onRequestDevicePreviewPermission={requestDevicePreviewPermission}- data-flx="voice.screen-share-picker-modal.screen-share-picker-modal-preloader.screen-share-picker-modal-loaded-content"- />- ) : (- <>- <Modal.Content- padding="none"- className={styles.content}- showTrack={false}- data-flx="voice.screen-share-picker-modal.preloader.content"- >- {loadError ? (- <div className={styles.state} data-flx="voice.screen-share-picker-modal.preloader.state">- <div className={styles.stateTitle} data-flx="voice.screen-share-picker-modal.preloader.state-title">- {loadError}- </div>- <Button- variant="secondary"- onClick={() => void loadPreload()}- data-flx="voice.screen-share-picker-modal.preloader.button.retry"- >- {i18n._(TRY_AGAIN_DESCRIPTOR)}- </Button>- </div>- ) : (- <div className={styles.loadingState} data-flx="voice.screen-share-picker-modal.preloader.loading-state">- <Spinner size="large" data-flx="voice.screen-share-picker-modal.preloader.spinner" />- </div>- )}- </Modal.Content>- <Modal.Footer className={styles.footer} data-flx="voice.screen-share-picker-modal.preloader.footer">- <div className={styles.footerStart} data-flx="voice.screen-share-picker-modal.preloader.footer-start">- <ScreenSharePreviewFooterNotice data-flx="voice.screen-share-picker-modal.screen-share-picker-modal-preloader.screen-share-preview-footer-notice" />- </div>- <Button- variant="secondary"- onClick={() => ModalCommands.pop()}- data-flx="voice.screen-share-picker-modal.preloader.button.pop"- >- {i18n._(CANCEL_DESCRIPTOR)}- </Button>- </Modal.Footer>- </>- )}+ {content}</ScreenSharePickerModalFrame>);},@@ -921,7 +930,14 @@ const ScreenSharePickerModalLoadedContent = observer(activeTab,displayShareEnvironment,});- const captureScopeForActiveTab = activeTab === 'apps' ? 'process' : activeTab === 'displays' ? 'system' : null;+ let captureScopeForActiveTab: 'process' | 'system' | null;+ if (activeTab === 'apps') {+ captureScopeForActiveTab = 'process';+ } else if (activeTab === 'displays') {+ captureScopeForActiveTab = 'system';+ } else {+ captureScopeForActiveTab = null;+ }const showPerWindowAudioUnsupportedNotice =captureScopeForActiveTab != null &&(platform === 'win32' || platform === 'darwin' || platform === 'linux') &&@@ -1173,8 +1189,12 @@ const ScreenSharePickerModalLoadedContent = observer(: await startConfiguredDeviceScreenShare(cardId);} else {const selectedDisplaySourceId = usesNativeDisplayPicker ? null : cardId;- const preferredDisplaySurface: 'window' | 'monitor' | undefined =- activeTab === 'apps' ? 'window' : activeTab === 'displays' ? 'monitor' : undefined;+ let preferredDisplaySurface: 'window' | 'monitor' | undefined;+ if (activeTab === 'apps') {+ preferredDisplaySurface = 'window';+ } else if (activeTab === 'displays') {+ preferredDisplaySurface = 'monitor';+ }const isOwnWindow = selectedSource?.isOwnWindow === true;let includeAudio: boolean | undefined;if (platform === 'win32' || platform === 'darwin' || platform === 'linux') {@@ -1246,7 +1266,7 @@ const ScreenSharePickerModalLoadedContent = observer(ContextMenuCommands.openAboveElementBottomRight(event, () => (<StreamSettingsMenuContentapplyToLiveStream={false}- shareContext={activeTab === 'devices' ? 'device' : activeTab === 'apps' ? 'app' : 'display'}+ shareContext={getPickerShareContext(activeTab)}displayShareEnvironment={displayShareEnvironment}data-flx="voice.screen-share-picker-modal.handle-settings-click.stream-settings-menu-content"/>@@ -1300,9 +1320,15 @@ const ScreenSharePickerModalLoadedContent = observer([activeTab, i18n.locale],);const emptyStateCopy = activeTab === 'devices' ? deviceEmptyStateCopy : desktopEmptyStateCopy;- const emptyStateIcon =- activeTab === 'apps' ? AppWindowIcon : activeTab === 'displays' ? MonitorIcon : VideoCameraIcon;- const shareContext = activeTab === 'devices' ? 'device' : activeTab === 'apps' ? 'app' : 'display';+ let emptyStateIcon: typeof AppWindowIcon;+ if (activeTab === 'apps') {+ emptyStateIcon = AppWindowIcon;+ } else if (activeTab === 'displays') {+ emptyStateIcon = MonitorIcon;+ } else {+ emptyStateIcon = VideoCameraIcon;+ }+ const shareContext = getPickerShareContext(activeTab);const streamSummary = resolveScreenShareTarget({mode: VoiceSettings.getStreamingMode(),storedResolution: VoiceSettings.getScreenshareResolution(),@@ -1313,24 +1339,30 @@ const ScreenSharePickerModalLoadedContent = observer(hintSetting: VoiceSettings.getScreenShareContentHint(),bitrate: VoiceSettings.getScreenShareBitrateBudget(),});- const streamSummaryTitle =- streamSummary.mode === 'gaming'- ? i18n._(GAMING_DESCRIPTOR)- : streamSummary.mode === 'screenshare'- ? i18n._(SCREENSHARE_DESCRIPTOR)- : i18n._(CUSTOM_DESCRIPTOR);- const streamSummaryDescription =- streamSummary.mode === 'gaming'- ? i18n._(SMOOTHER_VIDEO_DESCRIPTOR)- : streamSummary.mode === 'screenshare'- ? i18n._(CLEARER_TEXT_DESCRIPTOR)- : null;- const configuredCaptureAudioEnabled =- activeTab === 'devices'- ? VoiceSettings.getShareDeviceAudio()- : activeTab === 'apps'- ? VoiceSettings.getShareAppAudio()- : VoiceSettings.getShareDesktopAudio();+ let streamSummaryTitle: string;+ if (streamSummary.mode === 'gaming') {+ streamSummaryTitle = i18n._(GAMING_DESCRIPTOR);+ } else if (streamSummary.mode === 'screenshare') {+ streamSummaryTitle = i18n._(SCREENSHARE_DESCRIPTOR);+ } else {+ streamSummaryTitle = i18n._(CUSTOM_DESCRIPTOR);+ }+ let streamSummaryDescription: string | null;+ if (streamSummary.mode === 'gaming') {+ streamSummaryDescription = i18n._(SMOOTHER_VIDEO_DESCRIPTOR);+ } else if (streamSummary.mode === 'screenshare') {+ streamSummaryDescription = i18n._(CLEARER_TEXT_DESCRIPTOR);+ } else {+ streamSummaryDescription = null;+ }+ let configuredCaptureAudioEnabled: boolean;+ if (activeTab === 'devices') {+ configuredCaptureAudioEnabled = VoiceSettings.getShareDeviceAudio();+ } else if (activeTab === 'apps') {+ configuredCaptureAudioEnabled = VoiceSettings.getShareAppAudio();+ } else {+ configuredCaptureAudioEnabled = VoiceSettings.getShareDesktopAudio();+ }const audioSourceMode = VoiceSettings.getScreenShareAudioSourceMode();const audioIncludeSources = VoiceSettings.getScreenShareAudioIncludeSources();const routableAudioSourceCount = filterRoutableLinuxAudioSources(audioIncludeSources).length;@@ -1357,24 +1389,24 @@ const ScreenSharePickerModalLoadedContent = observer(const microphoneLabel = selectedAudioDevice? formatVoiceAudioDeviceLabel(i18n, selectedAudioDevice, i18n._(UNNAMED_INPUT_DESCRIPTOR)): i18n._(SYSTEM_DEFAULT_DESCRIPTOR);- const audioSummary = captureAudioEnabled- ? formatScreenShareAudioSummary(i18n, {- sourceMode: manualAudioSourcesGovernShare({platform, displayShareEnvironment}) ? audioSourceMode : 'system',- includeSources: audioIncludeSources,- shareContext,- microphoneLabel,- chosenAudioDeviceId: VoiceSettings.getScreenShareAudioDeviceId(),- deviceAudioPairing: resolveDeviceShareAudioPairing(- [...videoDevices, ...inputDevices],- selectedDeviceId ?? '',- ),- displayShareEnvironment,- windowAudioScope,- usesDeviceMicrophone: VoiceSettings.getScreenShareDeviceAudioUsesMicrophone(),- })- : activeTab === 'devices'- ? i18n._(DEVICE_AUDIO_MUTED_DESCRIPTOR)- : null;+ let audioSummary: string | null;+ if (captureAudioEnabled) {+ audioSummary = formatScreenShareAudioSummary(i18n, {+ sourceMode: manualAudioSourcesGovernShare({platform, displayShareEnvironment}) ? audioSourceMode : 'system',+ includeSources: audioIncludeSources,+ shareContext,+ microphoneLabel,+ chosenAudioDeviceId: VoiceSettings.getScreenShareAudioDeviceId(),+ deviceAudioPairing: resolveDeviceShareAudioPairing([...videoDevices, ...inputDevices], selectedDeviceId ?? ''),+ displayShareEnvironment,+ windowAudioScope,+ usesDeviceMicrophone: VoiceSettings.getScreenShareDeviceAudioUsesMicrophone(),+ });+ } else if (activeTab === 'devices') {+ audioSummary = i18n._(DEVICE_AUDIO_MUTED_DESCRIPTOR);+ } else {+ audioSummary = null;+ }const streamSummaryDetails = [activeTab === 'devices' ? deviceSelectionError : null,streamSummaryDescription,@@ -1382,6 +1414,74 @@ const ScreenSharePickerModalLoadedContent = observer(i18n._(FPS_DESCRIPTOR, {fps: i18n.number(streamSummary.frameRate)}),audioSummary,].filter((detail): detail is string => detail != null);+ let pickerContent: ReactNode;+ if (activeTab === 'devices' && devicePreviewPermissionStatus !== 'granted') {+ pickerContent = (+ <DevicePreviewPermissionState+ status={devicePreviewPermissionStatus}+ onRequestPermission={onRequestDevicePreviewPermission}+ data-flx="voice.screen-share-picker-modal.device-preview-permission"+ />+ );+ } else if (showDesktopSourceState && displayPermission.prompt !== 'none') {+ pickerContent = (+ <ScreenSharePickerDisplayPermissionPrompt+ prompt={displayPermission.prompt}+ onOpenSettings={displayPermission.openSettings}+ data-flx="voice.screen-share-picker-modal.screen-share-picker-modal-loaded-content.screen-share-picker-display-permission-prompt"+ />+ );+ } else if (showDesktopSourceState && !usesNativeDisplayPicker && loadError) {+ pickerContent = (+ <div className={styles.state} data-flx="voice.screen-share-picker-modal.state">+ <div className={styles.stateTitle} data-flx="voice.screen-share-picker-modal.state-title">+ {loadError}+ </div>+ <Button+ variant="secondary"+ onClick={() => void loadDesktopSources()}+ data-flx="voice.screen-share-picker-modal.button"+ >+ {i18n._(TRY_AGAIN_DESCRIPTOR)}+ </Button>+ </div>+ );+ } else if (showNativeDisplayPickerState && nativePickerCopy) {+ pickerContent = (+ <NativeDisplayPickerState+ copy={nativePickerCopy}+ pickerActionLabel={pickerActionLabel}+ onPickerAction={() => void handleStartSelection(NATIVE_DISPLAY_SELECTION_ID)}+ pickerActionPending={nativeDisplayPending}+ showDesktopDownloadCta={showDesktopDownloadCta}+ data-flx="voice.screen-share-picker-modal.screen-share-picker-modal-loaded-content.native-display-picker-state"+ />+ );+ } else if (showEmptyState && activeCards.length === 0) {+ pickerContent = (+ <PickerEmptyState+ title={emptyStateCopy.title}+ description={emptyStateCopy.description}+ icon={emptyStateIcon}+ data-flx="voice.screen-share-picker-modal.screen-share-picker-modal-loaded-content.picker-empty-state"+ />+ );+ } else {+ pickerContent = (+ <PickerGrid+ ref={pickerGridRef}+ cards={activeCards}+ activeTab={activeTab}+ activeShareLabel={activeShareLabel}+ pendingSelectionId={pendingSelectionId}+ selectedCardId={activeTab === 'devices' ? selectedDeviceId : null}+ devicePreviewsEnabled={devicePreviewsEnabled}+ onSelect={handleCardSelect}+ onPreviewImageError={handlePreviewImageError}+ data-flx="voice.screen-share-picker-modal.screen-share-picker-modal-loaded-content.picker-grid"+ />+ );+ }return (<><Modal.Content@@ -1398,61 +1498,7 @@ const ScreenSharePickerModalLoadedContent = observer(/>)}<SoftwareEncodeNotice data-flx="voice.screen-share-picker-modal.screen-share-picker-modal-loaded-content.software-encode-notice" />- {activeTab === 'devices' && devicePreviewPermissionStatus !== 'granted' ? (- <DevicePreviewPermissionState- status={devicePreviewPermissionStatus}- onRequestPermission={onRequestDevicePreviewPermission}- data-flx="voice.screen-share-picker-modal.device-preview-permission"- />- ) : showDesktopSourceState && displayPermission.prompt !== 'none' ? (- <ScreenSharePickerDisplayPermissionPrompt- prompt={displayPermission.prompt}- onOpenSettings={displayPermission.openSettings}- data-flx="voice.screen-share-picker-modal.screen-share-picker-modal-loaded-content.screen-share-picker-display-permission-prompt"- />- ) : showDesktopSourceState && !usesNativeDisplayPicker && loadError ? (- <div className={styles.state} data-flx="voice.screen-share-picker-modal.state">- <div className={styles.stateTitle} data-flx="voice.screen-share-picker-modal.state-title">- {loadError}- </div>- <Button- variant="secondary"- onClick={() => void loadDesktopSources()}- data-flx="voice.screen-share-picker-modal.button"- >- {i18n._(TRY_AGAIN_DESCRIPTOR)}- </Button>- </div>- ) : showNativeDisplayPickerState && nativePickerCopy ? (- <NativeDisplayPickerState- copy={nativePickerCopy}- pickerActionLabel={pickerActionLabel}- onPickerAction={() => void handleStartSelection(NATIVE_DISPLAY_SELECTION_ID)}- pickerActionPending={nativeDisplayPending}- showDesktopDownloadCta={showDesktopDownloadCta}- data-flx="voice.screen-share-picker-modal.screen-share-picker-modal-loaded-content.native-display-picker-state"- />- ) : showEmptyState && activeCards.length === 0 ? (- <PickerEmptyState- title={emptyStateCopy.title}- description={emptyStateCopy.description}- icon={emptyStateIcon}- data-flx="voice.screen-share-picker-modal.screen-share-picker-modal-loaded-content.picker-empty-state"- />- ) : (- <PickerGrid- ref={pickerGridRef}- cards={activeCards}- activeTab={activeTab}- activeShareLabel={activeShareLabel}- pendingSelectionId={pendingSelectionId}- selectedCardId={activeTab === 'devices' ? selectedDeviceId : null}- devicePreviewsEnabled={devicePreviewsEnabled}- onSelect={handleCardSelect}- onPreviewImageError={handlePreviewImageError}- data-flx="voice.screen-share-picker-modal.screen-share-picker-modal-loaded-content.picker-grid"- />- )}+ {pickerContent}</Modal.Content><Modal.Footer className={styles.footer} data-flx="voice.screen-share-picker-modal.footer"><div className={styles.footerStart} data-flx="voice.screen-share-picker-modal.footer-start">diff --git a/fluxer_app/src/features/voice/components/modals/screen_share_picker_modal/DesktopDownloadCta.tsx b/fluxer_app/src/features/voice/components/modals/screen_share_picker_modal/DesktopDownloadCta.tsxindex 0c9772828..b91a70dd6 100644--- a/fluxer_app/src/features/voice/components/modals/screen_share_picker_modal/DesktopDownloadCta.tsx+++ b/fluxer_app/src/features/voice/components/modals/screen_share_picker_modal/DesktopDownloadCta.tsx@@ -1,7 +1,6 @@// SPDX-License-Identifier: AGPL-3.0-or-laterimport {DESKTOP_DOWNLOAD_URL} from '@app/features/app/config/I18nDisplayConstants';-import RuntimeConfig from '@app/features/app/state/RuntimeConfig';import {Button} from '@app/features/ui/button/Button';import {openExternalUrl} from '@app/features/ui/utils/NativeUtils';import styles from '@app/features/voice/components/modals/ScreenSharePickerModal.module.css';@@ -15,8 +14,8 @@ const BEST_WITH_THE_DESKTOP_APP_DESCRIPTOR = msg({comment: 'CTA card title in the screen-share picker promoting the desktop app for richer screen sharing.',});const INSTALL_FOR_THE_FULL_SOURCE_PICKER_AND_SMOOTHER_DESCRIPTOR = msg({- message: 'Install {productName} for the full source picker and smoother screen-sharing controls.',- comment: 'CTA card body in the screen-share picker promoting the desktop app. {productName} is Fluxer.',+ message: 'Install the desktop app for the full source picker and smoother screen-sharing controls.',+ comment: 'CTA card body in the screen-share picker promoting the desktop app.',});const GET_THE_DESKTOP_APP_DESCRIPTOR = msg({message: 'Get the desktop app',@@ -31,7 +30,7 @@ export const DesktopDownloadCta: React.FC = () => {{i18n._(BEST_WITH_THE_DESKTOP_APP_DESCRIPTOR)}</div><div className={styles.downloadDescription} data-flx="voice.screen-share-picker-modal.download-description">- {i18n._(INSTALL_FOR_THE_FULL_SOURCE_PICKER_AND_SMOOTHER_DESCRIPTOR, {productName: RuntimeConfig.productName})}+ {i18n._(INSTALL_FOR_THE_FULL_SOURCE_PICKER_AND_SMOOTHER_DESCRIPTOR)}</div></div><div className={styles.downloadActions} data-flx="voice.screen-share-picker-modal.download-actions">