diff --git a/desktop/app/src/electron/initializeElectron.tsx b/desktop/app/src/electron/initializeElectron.tsx index 24e740b3a..8482bf5ae 100644 --- a/desktop/app/src/electron/initializeElectron.tsx +++ b/desktop/app/src/electron/initializeElectron.tsx @@ -63,7 +63,7 @@ export async function initializeElectron( processId: electronProcess.pid, isProduction, readTextFromClipboard() { - return clipboard.readText(); + return Promise.resolve(clipboard.readText()); }, writeTextToClipboard(text: string) { clipboard.writeText(text); diff --git a/desktop/flipper-frontend-core/src/RenderHost.tsx b/desktop/flipper-frontend-core/src/RenderHost.tsx index 168bdccb1..27a4a0577 100644 --- a/desktop/flipper-frontend-core/src/RenderHost.tsx +++ b/desktop/flipper-frontend-core/src/RenderHost.tsx @@ -95,7 +95,7 @@ type ChildProcessEvents = { * Utilities provided by the render host, e.g. Electron, the Browser, etc */ export interface RenderHost { - readTextFromClipboard(): string | undefined; + readTextFromClipboard(): Promise | undefined; writeTextToClipboard(text: string): void; /** * @deprecated diff --git a/desktop/flipper-server-companion/src/initializeRenderHost.tsx b/desktop/flipper-server-companion/src/initializeRenderHost.tsx index 0243004c0..a35192397 100644 --- a/desktop/flipper-server-companion/src/initializeRenderHost.tsx +++ b/desktop/flipper-server-companion/src/initializeRenderHost.tsx @@ -16,12 +16,9 @@ export function initializeRenderHost( ) { globalThis.FlipperRenderHostInstance = { readTextFromClipboard() { - // TODO: return undefined; }, - writeTextToClipboard(_text: string) { - // TODO: - }, + writeTextToClipboard(_text: string) {}, async importFile() { throw new Error('Not implemented'); }, @@ -46,9 +43,7 @@ export function initializeRenderHost( shouldUseDarkColors() { return false; }, - restartFlipper() { - // TODO: - }, + restartFlipper() {}, serverConfig: flipperServerConfig, GK(gatekeeper) { return flipperServerConfig.gatekeepers[gatekeeper] ?? false; diff --git a/desktop/flipper-ui-browser/src/initializeRenderHost.tsx b/desktop/flipper-ui-browser/src/initializeRenderHost.tsx index c5b917e24..eb8103993 100644 --- a/desktop/flipper-ui-browser/src/initializeRenderHost.tsx +++ b/desktop/flipper-ui-browser/src/initializeRenderHost.tsx @@ -35,12 +35,11 @@ export function initializeRenderHost( flipperServerConfig: FlipperServerConfig, ) { FlipperRenderHostInstance = { - readTextFromClipboard() { - // TODO: - return undefined; + async readTextFromClipboard() { + return await navigator.clipboard.readText(); }, - writeTextToClipboard(_text: string) { - // TODO: + writeTextToClipboard(text: string) { + return navigator.clipboard.writeText(text); }, async importFile() { throw new Error('Not implemented'); @@ -71,7 +70,7 @@ export function initializeRenderHost( ); }, restartFlipper() { - window.flipperShowError!( + window.flipperShowError?.( 'Flipper settings have changed, please restart flipper server for the changes to take effect', ); }, diff --git a/desktop/scripts/jest-setup-after.tsx b/desktop/scripts/jest-setup-after.tsx index cb97365f3..f2cc9e650 100644 --- a/desktop/scripts/jest-setup-after.tsx +++ b/desktop/scripts/jest-setup-after.tsx @@ -197,7 +197,7 @@ function createStubRenderHost(): RenderHost { return { readTextFromClipboard() { - return ''; + return Promise.resolve(''); }, writeTextToClipboard() {}, async importFile() {