Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(remote-desktop): 桌面控制端防窥开启后不再常驻提示条 (#5480)

Dash84ba26719b8e
diff --git a/apps/desktop/src/renderer/features/remote-desktop/RemoteDesktopViewerWindow.tsx b/apps/desktop/src/renderer/features/remote-desktop/RemoteDesktopViewerWindow.tsx
index 9c235ec9ea..0215f7a950 100644
--- a/apps/desktop/src/renderer/features/remote-desktop/RemoteDesktopViewerWindow.tsx
+++ b/apps/desktop/src/renderer/features/remote-desktop/RemoteDesktopViewerWindow.tsx
@@ -680,15 +680,13 @@ export function RemoteDesktopViewerWindow() {
</div>
)}
{isFullscreen && network && <div className="remote-viewer-network-overlay">{network}</div>}
- {(notice || state?.safety.notice || state?.safety.privacyActive) && (
+ {/* Announce the privacy screen to assistive tech without covering the remote picture. */}
+ <span className="sr-only" role="status">
+ {state?.safety.privacyActive ? t('remoteDesktop.privacyActive') : ''}
+ </span>
+ {(notice || state?.safety.notice) && (
<div className="remote-viewer-feedback" role="status">
- {state?.safety.privacyActive && <Shield size={14} aria-hidden="true" />}
- <span>
- {notice ??
- (state?.safety.notice
- ? t(`remoteDesktop.${state.safety.notice}`)
- : t('remoteDesktop.privacyActive'))}
- </span>
+ <span>{notice ?? t(`remoteDesktop.${state?.safety.notice}`)}</span>
{state?.safety.notice && (
<Button
variant="secondary"
diff --git a/apps/desktop/src/renderer/features/remote-desktop/__tests__/viewerWindow.test.tsx b/apps/desktop/src/renderer/features/remote-desktop/__tests__/viewerWindow.test.tsx
index 0072ac693c..2d17d05d64 100644
--- a/apps/desktop/src/renderer/features/remote-desktop/__tests__/viewerWindow.test.tsx
+++ b/apps/desktop/src/renderer/features/remote-desktop/__tests__/viewerWindow.test.tsx
@@ -334,6 +334,58 @@ it.each([
expect(toolbar.getByText(label)).toBeDefined();
});
+it('marks an active privacy screen in the toolbar and for screen readers without a persistent banner', async () => {
+ await i18n.changeLanguage('zh-CN');
+ Object.assign(window, {
+ electronAPI: {
+ remoteDesktopViewer: {
+ onActive: () => () => {},
+ onLocale: () => () => {},
+ onCloseRequested: () => () => {},
+ state: async () => ({ generation: 1 }),
+ rendererReady: async () => {},
+ presentationReady: async () => {},
+ },
+ },
+ });
+ render(<RemoteDesktopViewerWindow />);
+ await act(async () =>
+ lifecycle.update?.({
+ preferences: {
+ audio: true,
+ privacyScreen: true,
+ hostMute: false,
+ clipboardSync: false,
+ lockOnExit: false,
+ },
+ safety: { privacyActive: true, notice: null, clipboardProgress: null },
+ receiveRate: null,
+ closing: false,
+ credential: null,
+ credentialBusy: false,
+ credentialNotice: null,
+ target: null,
+ ready: true,
+ controlling: true,
+ controlPending: false,
+ status: 'live',
+ error: null,
+ caps: null,
+ displayId: 'one',
+ transport: 'direct',
+ latency: null,
+ settings: { fps: 30, quality: 'auto', audio: false },
+ }),
+ );
+ expect(document.querySelector('.remote-viewer-feedback')).toBeNull();
+ const announcement = screen.getByText(i18n.t('remoteDesktop.privacyActive'));
+ expect(announcement.getAttribute('role')).toBe('status');
+ expect(announcement.classList.contains('sr-only')).toBe(true);
+ expect(
+ screen.getByRole('button', { name: '安全' }).querySelector('.remote-viewer-active-dot'),
+ ).not.toBeNull();
+});
+
it('updates translated controls without ending or recreating the viewer connection', async () => {
await i18n.changeLanguage('en');
const listeners = new Set<(locale: string) => void>();