-
Notifications
You must be signed in to change notification settings - Fork 4.4k
fix(mobile): allow terminal paste from the device clipboard #7239
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.
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
Open
DavidIlie
wants to merge
2
commits into
pingdotgg:main
Choose a base branch
from
DavidIlie:fix/mobile-terminal-paste
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+146
−6
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
apps/mobile/src/features/terminal/terminalClipboard.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| import { beforeEach, describe, expect, it, vi } from "vite-plus/test"; | ||
|
|
||
| const mocks = vi.hoisted(() => ({ | ||
| hasStringAsync: vi.fn(), | ||
| getStringAsync: vi.fn(), | ||
| })); | ||
|
|
||
| vi.mock("expo-clipboard", () => ({ | ||
| hasStringAsync: mocks.hasStringAsync, | ||
| getStringAsync: mocks.getStringAsync, | ||
| })); | ||
|
|
||
| import { readTerminalClipboardText } from "./terminalClipboard"; | ||
|
|
||
| describe("terminal clipboard", () => { | ||
| beforeEach(() => { | ||
| mocks.hasStringAsync.mockReset(); | ||
| mocks.getStringAsync.mockReset(); | ||
| }); | ||
|
|
||
| it("returns clipboard text", async () => { | ||
| mocks.hasStringAsync.mockResolvedValue(true); | ||
| mocks.getStringAsync.mockResolvedValue("pnpm test\n"); | ||
|
|
||
| await expect(readTerminalClipboardText()).resolves.toEqual({ | ||
| _tag: "text", | ||
| text: "pnpm test\n", | ||
| }); | ||
| }); | ||
|
|
||
| it("does not read non-text clipboard content", async () => { | ||
| mocks.hasStringAsync.mockResolvedValue(false); | ||
|
|
||
| await expect(readTerminalClipboardText()).resolves.toEqual({ _tag: "empty" }); | ||
| expect(mocks.getStringAsync).not.toHaveBeenCalled(); | ||
| }); | ||
|
|
||
| it("reports clipboard failures without throwing from the terminal action", async () => { | ||
| const cause = new Error("clipboard unavailable"); | ||
| mocks.hasStringAsync.mockRejectedValue(cause); | ||
|
|
||
| await expect(readTerminalClipboardText()).resolves.toEqual({ | ||
| _tag: "unavailable", | ||
| cause, | ||
| }); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| import * as Clipboard from "expo-clipboard"; | ||
|
|
||
| export type TerminalClipboardReadResult = | ||
| | { readonly _tag: "text"; readonly text: string } | ||
| | { readonly _tag: "empty" } | ||
| | { readonly _tag: "unavailable"; readonly cause: unknown }; | ||
|
|
||
| /** | ||
| * Reads text only after an explicit terminal paste action. Keeping clipboard | ||
| * access behind the button avoids surprising iOS paste prompts while still | ||
| * giving both native terminal surfaces the same behavior. | ||
| */ | ||
| export async function readTerminalClipboardText(): Promise<TerminalClipboardReadResult> { | ||
| try { | ||
| if (!(await Clipboard.hasStringAsync())) { | ||
| return { _tag: "empty" }; | ||
| } | ||
|
|
||
| const text = await Clipboard.getStringAsync(); | ||
| return text.length === 0 ? { _tag: "empty" } : { _tag: "text", text }; | ||
| } catch (cause) { | ||
| return { _tag: "unavailable", cause }; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.