fix(app): browser pane keyboard tweaks
- Refresh icon: use single-arrow RotateCw instead of two-arrow RefreshCw - URL bar selects all text on focus - Cmd+R now reloads the active browser pane (tracked via IPC) when the URL bar has focus, instead of reloading the Electron window - Forward Paseo shortcut keys (b, e, w, t, k, /, \, comma, digits, enter, arrows) from the embedded webview to the main window so sidebar/tab/etc. shortcuts still fire when focus is inside the loaded page
This commit is contained in:
@@ -8,7 +8,7 @@ import {
|
||||
createElement,
|
||||
} from "react";
|
||||
import { Pressable, Text, TextInput, View } from "react-native";
|
||||
import { ArrowLeft, ArrowRight, MousePointer2, RefreshCw } from "lucide-react-native";
|
||||
import { ArrowLeft, ArrowRight, MousePointer2, RotateCw } from "lucide-react-native";
|
||||
import { StyleSheet, useUnistyles } from "react-native-unistyles";
|
||||
import {
|
||||
buildWorkspaceAttachmentScopeKey,
|
||||
@@ -336,13 +336,27 @@ export function BrowserPane({
|
||||
const updateBrowserRef = useRef(updateBrowser);
|
||||
updateBrowserRef.current = updateBrowser;
|
||||
|
||||
const focusUrlBar = useCallback(() => {
|
||||
urlInputRef.current?.focus();
|
||||
const selectUrlBar = useCallback(() => {
|
||||
window.setTimeout(() => {
|
||||
getTextInputNativeElement(urlInputRef.current)?.select();
|
||||
}, 0);
|
||||
}, []);
|
||||
|
||||
const markActivePane = useCallback(() => {
|
||||
if (!isElectronRuntime()) return;
|
||||
void getDesktopHost()?.browser?.setActivePane?.(browserIdRef.current);
|
||||
}, []);
|
||||
|
||||
const handleUrlBarFocus = useCallback(() => {
|
||||
markActivePane();
|
||||
selectUrlBar();
|
||||
}, [markActivePane, selectUrlBar]);
|
||||
|
||||
const focusUrlBar = useCallback(() => {
|
||||
urlInputRef.current?.focus();
|
||||
selectUrlBar();
|
||||
}, [selectUrlBar]);
|
||||
|
||||
const syncNavigationState = useCallback((input?: { syncUrl?: boolean }) => {
|
||||
const webview = webviewRef.current;
|
||||
if (!webview || !domReadyRef.current) {
|
||||
@@ -466,6 +480,7 @@ export function BrowserPane({
|
||||
};
|
||||
const handleWebviewFocus = () => {
|
||||
onFocusPane?.();
|
||||
markActivePane();
|
||||
};
|
||||
|
||||
webview.addEventListener("did-start-loading", handleStartLoading);
|
||||
@@ -937,7 +952,7 @@ export function BrowserPane({
|
||||
onPress={handleRefresh}
|
||||
style={baseIconButtonStyle}
|
||||
>
|
||||
<RefreshCw size={16} color={theme.colors.foregroundMuted} />
|
||||
<RotateCw size={16} color={theme.colors.foregroundMuted} />
|
||||
</Pressable>
|
||||
</View>
|
||||
<View style={styles.urlBarWrap}>
|
||||
@@ -946,6 +961,7 @@ export function BrowserPane({
|
||||
autoCapitalize="none"
|
||||
autoCorrect={false}
|
||||
onChangeText={setDraftUrl}
|
||||
onFocus={handleUrlBarFocus}
|
||||
onSubmitEditing={handleNavigateDraftUrl}
|
||||
placeholder="Enter URL"
|
||||
placeholderTextColor={theme.colors.foregroundMuted}
|
||||
|
||||
@@ -74,6 +74,10 @@ export interface DesktopBrowserShortcutEvent {
|
||||
action: "focus-url";
|
||||
}
|
||||
|
||||
export interface DesktopBrowserBridge {
|
||||
setActivePane?: (browserId: string | null) => Promise<void>;
|
||||
}
|
||||
|
||||
export interface DesktopInvokeBridge {
|
||||
invoke?: (command: string, args?: Record<string, unknown>) => Promise<unknown>;
|
||||
}
|
||||
@@ -88,6 +92,7 @@ export interface DesktopHostBridge {
|
||||
notification?: DesktopNotificationBridge;
|
||||
opener?: DesktopOpenerBridge;
|
||||
menu?: DesktopMenuBridge;
|
||||
browser?: DesktopBrowserBridge;
|
||||
}
|
||||
|
||||
declare global {
|
||||
|
||||
@@ -24,6 +24,7 @@ import { getShortcutOs } from "@/utils/shortcut-platform";
|
||||
import { useOpenProjectPicker } from "@/hooks/use-open-project-picker";
|
||||
import { useKeyboardShortcutOverrides } from "@/hooks/use-keyboard-shortcut-overrides";
|
||||
import { isNative } from "@/constants/platform";
|
||||
import { getDesktopHost, isElectronRuntime } from "@/desktop/host";
|
||||
import { isImeComposingKeyboardEvent } from "@/utils/keyboard-ime";
|
||||
import { getRelativeSidebarShortcutTarget } from "@/utils/sidebar-shortcuts";
|
||||
import { useActiveServerId } from "@/hooks/use-active-server-id";
|
||||
@@ -418,6 +419,26 @@ export function useKeyboardShortcuts({
|
||||
window.addEventListener("keyup", handleKeyUp, true);
|
||||
window.addEventListener("blur", handleBlurOrHide);
|
||||
document.addEventListener("visibilitychange", handleBlurOrHide);
|
||||
|
||||
const forwardedKeySubscription = isElectronRuntime()
|
||||
? getDesktopHost()?.events?.on?.("browser-forwarded-key", (payload) => {
|
||||
if (!payload || typeof payload !== "object") return;
|
||||
const p = payload as Record<string, unknown>;
|
||||
if (typeof p.key !== "string") return;
|
||||
window.dispatchEvent(
|
||||
new KeyboardEvent("keydown", {
|
||||
key: p.key,
|
||||
code: typeof p.code === "string" ? p.code : "",
|
||||
metaKey: p.meta === true,
|
||||
ctrlKey: p.control === true,
|
||||
shiftKey: p.shift === true,
|
||||
altKey: p.alt === true,
|
||||
bubbles: true,
|
||||
}),
|
||||
);
|
||||
})
|
||||
: null;
|
||||
|
||||
return () => {
|
||||
if (chordStateRef.current.timeoutId !== null) {
|
||||
clearTimeout(chordStateRef.current.timeoutId);
|
||||
@@ -431,6 +452,11 @@ export function useKeyboardShortcuts({
|
||||
window.removeEventListener("keyup", handleKeyUp, true);
|
||||
window.removeEventListener("blur", handleBlurOrHide);
|
||||
document.removeEventListener("visibilitychange", handleBlurOrHide);
|
||||
if (typeof forwardedKeySubscription === "function") {
|
||||
forwardedKeySubscription();
|
||||
} else {
|
||||
void forwardedKeySubscription?.then((dispose) => dispose());
|
||||
}
|
||||
};
|
||||
}, [
|
||||
bindings,
|
||||
|
||||
Reference in New Issue
Block a user