Skip to content

Commit b00b127

Browse files
committed
fix(preview): open client tabs when the server browser is off and skip remote paste shortcut
1 parent 20d88c7 commit b00b127

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

‎apps/mobile/src/features/browser/preview-stream.browser.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,8 @@ export function start(configuration: PreviewStreamConfiguration) {
548548
return;
549549
}
550550
const shortcut = event.ctrlKey || event.metaKey;
551+
// Paste arrives as input text from this device's clipboard.
552+
if (shortcut && event.key.toLowerCase() === "v") return;
551553
// Enter carries "\r" like Puppeteer's key table, so forms submit and textareas break lines.
552554
const text = shortcut
553555
? undefined

‎apps/server/src/ws.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ import { attachmentRelativePath, createDeterministicAttachmentId } from "./attac
185185
import { parseBase64DataUrl } from "./imageMime.ts";
186186
import { deletePendingAttachment, issueAttachmentUploadUrl } from "./assets/AttachmentUpload.ts";
187187
import * as PortScanner from "./preview/PortScanner.ts";
188+
import { isServerBrowserEnabled } from "./preview/serverBrowserEnabled.ts";
188189
import * as WorkspaceEntries from "./workspace/WorkspaceEntries.ts";
189190
import * as WorkspaceFileSystem from "./workspace/WorkspaceFileSystem.ts";
190191
import { readWorkflowScript } from "./orchestration-v2/workflowScriptQuery.ts";
@@ -3442,10 +3443,14 @@ const makeWsRpcLayer = (
34423443
),
34433444
{ "rpc.aggregate": "terminal" },
34443445
),
3445-
[WS_METHODS.previewOpen]: (input) =>
3446-
observeRpcEffect(WS_METHODS.previewOpen, previewManager.open(input), {
3446+
[WS_METHODS.previewOpen]: (input) => {
3447+
// Without a server browser nothing renders server tabs, so the client renders it.
3448+
const { runtime, ...rest } = input;
3449+
const open = runtime === "server" && !isServerBrowserEnabled(config.mode) ? rest : input;
3450+
return observeRpcEffect(WS_METHODS.previewOpen, previewManager.open(open), {
34473451
"rpc.aggregate": "preview",
3448-
}),
3452+
});
3453+
},
34493454
[WS_METHODS.previewNavigate]: (input) =>
34503455
observeRpcEffect(WS_METHODS.previewNavigate, previewManager.navigate(input), {
34513456
"rpc.aggregate": "preview",

0 commit comments

Comments
 (0)