An audit of the destroy→hide change across four lenses raised 17 findings; 14 survived adversarial verification. Two of them were regressions that change introduced, and both had the same shape: code that only worked because the pet window used to not exist. show_pet_context_menu picked the pet window and fell back to main. While the pet rendered inside the app its window had been destroyed at startup, so the fallback happened to select the visible main window. Now that the window merely hides, the menu was being anchored to a hidden HWND, which Win32 cannot bring to the foreground. The visibility test is explicit now rather than incidental. DesktopPetView read the connection state in a mount effect and nothing emitted connection events, so destroy-and-rebuild was what re-read it. Without a remount the floating pet showed whatever was true at startup for the rest of the session. reveal_pet_window now emits pet-window-revealed and the view re-reads on it. The rest were already there. Every pet setting was decorative: the preferences were applied and then dropped, so reveal_pet_window had to invent an answer and hard-coded the first monitor, the safe edge and always-on-top — reverting the user's choices on every show. The pet view re-sent a fully hard-coded payload whenever game mode toggled, and the settings page initialised its controls from literals, so returning to the page and changing one thing pushed three stale defaults back onto the window. There is a session-scoped store now, a command to read it, and both frontends read before they write. Persisting it across restarts is F-75. Always-on-top is off by default, which is what the Q6 acceptance criterion asked for (F-35), and the window no longer takes focus when shown — it was activating on show and swallowing keystrokes meant for the main window. focusable is left alone on purpose: clearing it adds WS_EX_NOACTIVATE, which would re-break the context menu now anchored to that window. That is F-79. The pet also painted a solid dark rectangle before its assets arrived. The transparency rule is gated on a class that an effect inside the 5.2 MB lazy chunk added, so until that chunk ran the app's opaque background won. This is why the earlier hunt for "the rule that beats !important" found nothing: the class was not applied yet, so specificity was never the question. The pet now has its own entry document carrying the class statically. An inline script would not do — tauri-utils only nonces script[src^='http'], so it would pass in dev and be blocked by script-src 'self' in a release build. Rust tests 92 → 97, frontend 30 → 35. All 11 mutations of the new assertions were confirmed to fail. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
745 行
23 KiB
TypeScript
745 行
23 KiB
TypeScript
import { invoke } from "@tauri-apps/api/core";
|
||
import { listen } from "@tauri-apps/api/event";
|
||
import { getCurrentWindow } from "@tauri-apps/api/window";
|
||
import {
|
||
lazy,
|
||
Suspense,
|
||
useCallback,
|
||
useEffect,
|
||
useRef,
|
||
useState,
|
||
} from "react";
|
||
|
||
import { errorMessage } from "./lib/errorMessage";
|
||
import {
|
||
petPositionModeSchema,
|
||
petWindowPreferencesSchema,
|
||
type PetPositionMode,
|
||
} from "./features/pet/types";
|
||
import { ChatPanel } from "./features/chat/ChatPanel";
|
||
import { StatusBubble } from "./features/chat/StatusBubble";
|
||
const ProfileManager = lazy(() =>
|
||
import("./features/profiles/ProfileManager").then(({ ProfileManager }) => ({
|
||
default: ProfileManager,
|
||
})),
|
||
);
|
||
const PetPackImporter = lazy(() =>
|
||
import("./features/pet/PetPackImporter").then(({ PetPackImporter }) => ({
|
||
default: PetPackImporter,
|
||
})),
|
||
);
|
||
const DesktopBehaviorPage = lazy(() =>
|
||
import("./pages/SettingsPages").then(({ DesktopBehaviorPage }) => ({
|
||
default: DesktopBehaviorPage,
|
||
})),
|
||
);
|
||
const DesktopPetView = lazy(() =>
|
||
import("./features/pet/DesktopPetView").then(({ DesktopPetView }) => ({
|
||
default: DesktopPetView,
|
||
})),
|
||
);
|
||
const DiagnosticsPage = lazy(() =>
|
||
import("./pages/SettingsPages").then(({ DiagnosticsPage }) => ({
|
||
default: DiagnosticsPage,
|
||
})),
|
||
);
|
||
import { bootstrapStatusSchema, type BootstrapStatus } from "./types/bootstrap";
|
||
|
||
/// Shared with `ChatPanel`, which portals its slot tabs into this element.
|
||
export const WINDOW_CHROME_MOUNT_ID = "window-chrome-mount";
|
||
|
||
type PageKey = "chat" | "connections" | "desktop" | "pet" | "diagnostics";
|
||
type ChatSlot = "companion" | "operations";
|
||
type PetDisplayMode = "app-ui" | "desktop-floating";
|
||
type ThemeMode = "dark" | "light";
|
||
|
||
const initialStatus: BootstrapStatus = {
|
||
appVersion: "unknown",
|
||
platform: "unknown",
|
||
rustCore: "pending",
|
||
protocolVersion: "desktop-v1alpha1",
|
||
databaseSchemaVersion: 4,
|
||
};
|
||
|
||
const navigation: Array<{ key: PageKey; label: string; description: string }> =
|
||
[
|
||
{ key: "chat", label: "聊天", description: "陪伴与运维对话" },
|
||
{ key: "connections", label: "连接", description: "实例与槽位管理" },
|
||
{ key: "desktop", label: "桌面行为", description: "快速聊天与状态气泡" },
|
||
{ key: "pet", label: "桌宠", description: "形象与活动范围" },
|
||
{
|
||
key: "diagnostics",
|
||
label: "诊断与设置",
|
||
description: "运行状态与安全边界",
|
||
},
|
||
];
|
||
|
||
export function App() {
|
||
const params = new URLSearchParams(window.location.search);
|
||
const view = params.get("view");
|
||
const isQuickView = view === "quick";
|
||
const isBubbleView = view === "bubble";
|
||
const isPetView =
|
||
view === "pet" ||
|
||
window.location.hash === "#pet" ||
|
||
document.documentElement.dataset.astrbotPet === "true";
|
||
const quickSlot = params.get("slot");
|
||
const [page, setPage] = useState<PageKey>("chat");
|
||
const [theme, setTheme] = useState<ThemeMode>(() =>
|
||
localStorage.getItem("astrbot.theme") === "light" ? "light" : "dark",
|
||
);
|
||
const [status, setStatus] = useState(initialStatus);
|
||
const [error, setError] = useState<string | null>(null);
|
||
const [quickTarget, setQuickTarget] = useState<ChatSlot>(() =>
|
||
localStorage.getItem("astrbot.quickTarget") === "operations"
|
||
? "operations"
|
||
: "companion",
|
||
);
|
||
const [bubbleTarget, setBubbleTarget] = useState<"main" | "quick">(() =>
|
||
localStorage.getItem("astrbot.bubbleTarget") === "quick" ? "quick" : "main",
|
||
);
|
||
const [petDisplayMode, setPetDisplayMode] = useState<PetDisplayMode>(() =>
|
||
localStorage.getItem("astrbot.petDisplayMode") === "desktop-floating"
|
||
? "desktop-floating"
|
||
: "app-ui",
|
||
);
|
||
|
||
const refreshStatus = useCallback(async () => {
|
||
try {
|
||
const result = await invoke<unknown>("bootstrap_status");
|
||
setStatus(bootstrapStatusSchema.parse(result));
|
||
setError(null);
|
||
} catch (reason) {
|
||
setError(errorMessage(reason));
|
||
}
|
||
}, []);
|
||
|
||
useEffect(() => {
|
||
document.documentElement.dataset.theme = theme;
|
||
localStorage.setItem("astrbot.theme", theme);
|
||
}, [theme]);
|
||
|
||
useEffect(() => {
|
||
void refreshStatus();
|
||
}, [refreshStatus]);
|
||
|
||
useEffect(() => {
|
||
if (isBubbleView || isPetView || isQuickView) return;
|
||
const command =
|
||
petDisplayMode === "desktop-floating"
|
||
? "open_pet_window"
|
||
: "close_pet_window";
|
||
void invoke(command).catch((reason) => {
|
||
setError(errorMessage(reason));
|
||
});
|
||
}, [isBubbleView, isPetView, isQuickView, petDisplayMode]);
|
||
|
||
if (isBubbleView) return <StatusBubble />;
|
||
// `DesktopPetView` is lazy and this branch returns before the shell's own
|
||
// boundary, so it had none. React 19 turned out to tolerate that — removing
|
||
// this wrapper still rendered the pet — so it is not the reason the floating
|
||
// pet does not appear. Kept because relying on that tolerance is not a
|
||
// contract, and the bubble and quick views already have their own.
|
||
if (isPetView) {
|
||
return (
|
||
<Suspense fallback={null}>
|
||
<DesktopPetView />
|
||
</Suspense>
|
||
);
|
||
}
|
||
if (isQuickView) {
|
||
return (
|
||
<main className="quick-app-shell">
|
||
<ChatPanel
|
||
fixedSlot={
|
||
quickSlot === "operations"
|
||
? "operations"
|
||
: quickSlot === "companion"
|
||
? "companion"
|
||
: undefined
|
||
}
|
||
/>
|
||
</main>
|
||
);
|
||
}
|
||
|
||
return (
|
||
<main className="app-shell">
|
||
<WindowChrome
|
||
theme={theme}
|
||
onToggleTheme={() =>
|
||
setTheme((current) => (current === "dark" ? "light" : "dark"))
|
||
}
|
||
onError={setError}
|
||
/>
|
||
<div className="app-shell-body">
|
||
<aside className="app-sidebar">
|
||
<div className="brand-lockup">
|
||
<div className="brand-mark">A</div>
|
||
<div>
|
||
<strong>AstrBot Desktop</strong>
|
||
<span>Companion workspace</span>
|
||
</div>
|
||
</div>
|
||
<nav className="primary-nav" aria-label="主导航">
|
||
{navigation.map((item) => (
|
||
<button
|
||
key={item.key}
|
||
type="button"
|
||
className={page === item.key ? "nav-item active" : "nav-item"}
|
||
onClick={() => setPage(item.key)}
|
||
>
|
||
<span className="nav-item-icon">{navIcon(item.key)}</span>
|
||
<span>
|
||
<strong>{item.label}</strong>
|
||
<small>{item.description}</small>
|
||
</span>
|
||
</button>
|
||
))}
|
||
</nav>
|
||
<div className="sidebar-footer">
|
||
<span className="connection-dot" />
|
||
<span>本地客户端已启动</span>
|
||
</div>
|
||
</aside>
|
||
|
||
<section
|
||
className={
|
||
page === "chat" ? "app-content app-content-chat" : "app-content"
|
||
}
|
||
>
|
||
{page === "chat" ? null : <PageHeader page={page} />}
|
||
{error ? (
|
||
<p className="error-banner" role="alert">
|
||
IPC 暂不可用:{error}
|
||
</p>
|
||
) : null}
|
||
<Suspense fallback={<PageLoading />}>
|
||
{page === "chat" ? <ChatPage /> : null}
|
||
{page === "connections" ? <ProfileManager /> : null}
|
||
{page === "desktop" ? (
|
||
<DesktopBehaviorPage
|
||
bubbleTarget={bubbleTarget}
|
||
quickTarget={quickTarget}
|
||
onBubbleTargetChange={(value) => {
|
||
setBubbleTarget(value);
|
||
localStorage.setItem("astrbot.bubbleTarget", value);
|
||
}}
|
||
onQuickTargetChange={(value) => {
|
||
setQuickTarget(value);
|
||
localStorage.setItem("astrbot.quickTarget", value);
|
||
}}
|
||
onOpenQuickChat={() =>
|
||
void invoke("open_quick_chat_window", { slot: quickTarget })
|
||
}
|
||
/>
|
||
) : null}
|
||
{page === "pet" ? (
|
||
<PetPage
|
||
displayMode={petDisplayMode}
|
||
onDisplayModeChange={(value) => {
|
||
setPetDisplayMode(value);
|
||
localStorage.setItem("astrbot.petDisplayMode", value);
|
||
}}
|
||
/>
|
||
) : null}
|
||
{page === "diagnostics" ? (
|
||
<DiagnosticsPage
|
||
status={status}
|
||
onRefresh={() => void refreshStatus()}
|
||
/>
|
||
) : null}
|
||
</Suspense>
|
||
</section>
|
||
</div>
|
||
{petDisplayMode === "app-ui" ? (
|
||
<Suspense fallback={null}>
|
||
<InAppPetOverlay />
|
||
</Suspense>
|
||
) : null}
|
||
</main>
|
||
);
|
||
}
|
||
|
||
function WindowChrome({
|
||
theme,
|
||
onToggleTheme,
|
||
onError,
|
||
}: {
|
||
theme: ThemeMode;
|
||
onToggleTheme: () => void;
|
||
onError: (message: string) => void;
|
||
}) {
|
||
const [currentWindow, setCurrentWindow] = useState<ReturnType<
|
||
typeof getCurrentWindow
|
||
> | null>(null);
|
||
const [maximized, setMaximized] = useState(false);
|
||
|
||
useEffect(() => {
|
||
try {
|
||
const windowHandle = getCurrentWindow();
|
||
setCurrentWindow(windowHandle);
|
||
void windowHandle.isMaximized().then(setMaximized);
|
||
} catch {
|
||
return;
|
||
}
|
||
}, []);
|
||
|
||
/// Every one of these is an ACL-gated IPC call. They used to be bare
|
||
/// `void ...()` expressions, so when the capability set was missing the
|
||
/// window permissions the rejection was swallowed and the buttons simply did
|
||
/// nothing, with no way to tell that from an unwired handler.
|
||
const runWindowAction = async (action: () => Promise<void>) => {
|
||
if (!currentWindow) return;
|
||
try {
|
||
await action();
|
||
} catch (reason) {
|
||
onError(errorMessage(reason));
|
||
}
|
||
};
|
||
|
||
const toggleMaximize = () =>
|
||
runWindowAction(async () => {
|
||
await currentWindow!.toggleMaximize();
|
||
setMaximized(await currentWindow!.isMaximized());
|
||
});
|
||
|
||
return (
|
||
<header
|
||
className="window-chrome"
|
||
data-tauri-drag-region
|
||
onDoubleClick={() => void toggleMaximize()}
|
||
onMouseDown={(event) => {
|
||
if (
|
||
event.button === 0 &&
|
||
!(event.target as HTMLElement).closest(
|
||
'[data-tauri-drag-region="false"]',
|
||
)
|
||
) {
|
||
void runWindowAction(() => currentWindow!.startDragging());
|
||
}
|
||
}}
|
||
>
|
||
<span className="window-chrome-title">AstrBot Desktop</span>
|
||
{/* Mount point for controls that belong to the active page but should sit
|
||
in the title bar. ChatPanel portals its slot tabs here, which keeps the
|
||
slot state and its status polling where they already live instead of
|
||
lifting both into the shell. */}
|
||
<div
|
||
className="window-chrome-mount"
|
||
id={WINDOW_CHROME_MOUNT_ID}
|
||
data-tauri-drag-region="false"
|
||
/>
|
||
<div className="window-chrome-actions" data-tauri-drag-region="false">
|
||
<button
|
||
aria-label={
|
||
theme === "dark" ? "Switch to light theme" : "Switch to dark theme"
|
||
}
|
||
className="window-theme-toggle"
|
||
onClick={onToggleTheme}
|
||
onMouseDown={(event) => event.stopPropagation()}
|
||
type="button"
|
||
>
|
||
{theme === "dark" ? "Light" : "Dark"}
|
||
</button>
|
||
<div className="window-controls" data-tauri-drag-region="false">
|
||
<button
|
||
aria-label="Minimize window"
|
||
className="window-control"
|
||
onClick={() =>
|
||
void runWindowAction(() => currentWindow!.minimize())
|
||
}
|
||
onMouseDown={(event) => event.stopPropagation()}
|
||
type="button"
|
||
>
|
||
<span
|
||
className="window-glyph window-glyph-minimize"
|
||
aria-hidden="true"
|
||
/>
|
||
</button>
|
||
<button
|
||
aria-label={maximized ? "Restore window" : "Maximize window"}
|
||
className="window-control"
|
||
onClick={() => void toggleMaximize()}
|
||
onMouseDown={(event) => event.stopPropagation()}
|
||
type="button"
|
||
>
|
||
<span
|
||
className={`window-glyph window-glyph-maximize${maximized ? " is-restored" : ""}`}
|
||
aria-hidden="true"
|
||
/>
|
||
</button>
|
||
<button
|
||
aria-label="Close window"
|
||
className="window-control window-control-close"
|
||
onClick={() => void runWindowAction(() => currentWindow!.close())}
|
||
onMouseDown={(event) => event.stopPropagation()}
|
||
type="button"
|
||
>
|
||
<span
|
||
className="window-glyph window-glyph-close"
|
||
aria-hidden="true"
|
||
/>
|
||
</button>
|
||
</div>
|
||
</div>
|
||
</header>
|
||
);
|
||
}
|
||
|
||
function InAppPetOverlay() {
|
||
const [visible, setVisible] = useState(true);
|
||
const [position, setPosition] = useState(() => {
|
||
try {
|
||
const saved = JSON.parse(
|
||
localStorage.getItem("astrbot.petPosition") ?? "null",
|
||
);
|
||
return saved && typeof saved.x === "number" && typeof saved.y === "number"
|
||
? saved
|
||
: { x: window.innerWidth >= 720 ? 280 : 24, y: 96 };
|
||
} catch {
|
||
return { x: window.innerWidth >= 720 ? 280 : 24, y: 96 };
|
||
}
|
||
});
|
||
const dragRef = useRef<{
|
||
pointerId: number;
|
||
offsetX: number;
|
||
offsetY: number;
|
||
} | null>(null);
|
||
|
||
const clampPosition = useCallback((x: number, y: number) => {
|
||
const safeLeft = window.innerWidth >= 720 ? 248 : 0;
|
||
const maxX = Math.max(safeLeft, window.innerWidth - 188);
|
||
return {
|
||
x: Math.max(safeLeft, Math.min(x, maxX)),
|
||
y: Math.max(0, Math.min(y, window.innerHeight - 226)),
|
||
};
|
||
}, []);
|
||
|
||
const savePosition = (x: number, y: number) => {
|
||
const next = clampPosition(x, y);
|
||
setPosition(next);
|
||
localStorage.setItem("astrbot.petPosition", JSON.stringify(next));
|
||
};
|
||
|
||
useEffect(() => {
|
||
const normalizePosition = () => {
|
||
const next = clampPosition(position.x, position.y);
|
||
if (next.x === position.x && next.y === position.y) return;
|
||
setPosition(next);
|
||
localStorage.setItem("astrbot.petPosition", JSON.stringify(next));
|
||
};
|
||
|
||
normalizePosition();
|
||
window.addEventListener("resize", normalizePosition);
|
||
return () => window.removeEventListener("resize", normalizePosition);
|
||
}, [clampPosition, position.x, position.y]);
|
||
|
||
useEffect(() => {
|
||
let active = true;
|
||
let unlisten: (() => void) | undefined;
|
||
void listen("pet-hide-requested", () => setVisible(false))
|
||
.then((cleanup) => {
|
||
if (active) {
|
||
unlisten = cleanup;
|
||
} else {
|
||
cleanup();
|
||
}
|
||
})
|
||
.catch(() => undefined);
|
||
return () => {
|
||
active = false;
|
||
unlisten?.();
|
||
unlisten = undefined;
|
||
};
|
||
}, []);
|
||
|
||
return visible ? (
|
||
<div
|
||
className="app-pet-overlay"
|
||
style={{ left: position.x, top: position.y }}
|
||
onContextMenu={(event) => {
|
||
event.preventDefault();
|
||
void invoke("show_pet_context_menu");
|
||
}}
|
||
onPointerDown={(event) => {
|
||
if (event.button !== 0) return;
|
||
event.currentTarget.setPointerCapture(event.pointerId);
|
||
dragRef.current = {
|
||
pointerId: event.pointerId,
|
||
offsetX: event.clientX - position.x,
|
||
offsetY: event.clientY - position.y,
|
||
};
|
||
}}
|
||
onPointerMove={(event) => {
|
||
if (dragRef.current?.pointerId !== event.pointerId) return;
|
||
savePosition(
|
||
event.clientX - dragRef.current.offsetX,
|
||
event.clientY - dragRef.current.offsetY,
|
||
);
|
||
}}
|
||
onPointerUp={(event) => {
|
||
if (dragRef.current?.pointerId === event.pointerId)
|
||
dragRef.current = null;
|
||
}}
|
||
onPointerCancel={() => {
|
||
dragRef.current = null;
|
||
}}
|
||
>
|
||
<DesktopPetView embedded />
|
||
</div>
|
||
) : null;
|
||
}
|
||
|
||
function navIcon(page: PageKey) {
|
||
return {
|
||
chat: "⌁",
|
||
connections: "◎",
|
||
desktop: "◈",
|
||
pet: "✦",
|
||
diagnostics: "⚙",
|
||
}[page];
|
||
}
|
||
|
||
function PageLoading() {
|
||
return (
|
||
<p className="loading-state" role="status" aria-live="polite">
|
||
加载中…
|
||
</p>
|
||
);
|
||
}
|
||
|
||
function PageHeader({ page }: { page: PageKey }) {
|
||
const current = navigation.find((item) => item.key === page) ?? navigation[0];
|
||
return (
|
||
<header className="page-header">
|
||
<div>
|
||
<p className="eyebrow">AstrBot Desktop</p>
|
||
<h1>{current.label}</h1>
|
||
<p className="subtitle">
|
||
{current.description},所有本机能力都经过客户端权限边界。
|
||
</p>
|
||
</div>
|
||
<div className="header-status-pill">
|
||
<span className="connection-dot" />
|
||
双槽位架构
|
||
</div>
|
||
</header>
|
||
);
|
||
}
|
||
|
||
function ChatPage() {
|
||
return (
|
||
<div className="chat-page">
|
||
<ChatPanel />
|
||
</div>
|
||
);
|
||
}
|
||
|
||
function PetPage({
|
||
displayMode,
|
||
onDisplayModeChange,
|
||
}: {
|
||
displayMode: PetDisplayMode;
|
||
onDisplayModeChange: (value: PetDisplayMode) => void;
|
||
}) {
|
||
const [monitors, setMonitors] = useState<
|
||
Array<{
|
||
name?: string;
|
||
width: number;
|
||
height: number;
|
||
scaleFactor: number;
|
||
isPrimary: boolean;
|
||
}>
|
||
>([]);
|
||
const [monitorIndex, setMonitorIndex] = useState(0);
|
||
const [positionMode, setPositionMode] = useState<PetPositionMode>("edge");
|
||
const [alwaysOnTop, setAlwaysOnTop] = useState(false);
|
||
const [gameMode, setGameMode] = useState(false);
|
||
|
||
useEffect(() => {
|
||
void invoke<unknown>("list_monitor_geometries")
|
||
.then((value) => setMonitors(value as typeof monitors))
|
||
.catch(() => setMonitors([]));
|
||
}, []);
|
||
|
||
// Adopt what the window is actually doing. These controls used to start from
|
||
// literals, so leaving the page and coming back showed monitor 1 / safe edge
|
||
// / always-on-top regardless of the truth — and because every edit re-sends
|
||
// the whole payload, the next single change pushed those wrong values back
|
||
// onto the window as if the user had chosen them.
|
||
useEffect(() => {
|
||
let cancelled = false;
|
||
void invoke<unknown>("pet_window_preferences")
|
||
.then((value) => {
|
||
if (cancelled) return;
|
||
const preferences = petWindowPreferencesSchema.parse(value);
|
||
setMonitorIndex(preferences.monitorIndex ?? 0);
|
||
setPositionMode(preferences.positionMode);
|
||
setAlwaysOnTop(preferences.alwaysOnTop);
|
||
setGameMode(preferences.gameMode);
|
||
})
|
||
.catch(() => undefined);
|
||
return () => {
|
||
cancelled = true;
|
||
};
|
||
}, []);
|
||
|
||
const applyPetPreferences = (
|
||
next: Partial<{
|
||
positionMode: PetPositionMode;
|
||
monitorIndex: number;
|
||
alwaysOnTop: boolean;
|
||
gameMode: boolean;
|
||
}> = {},
|
||
) => {
|
||
const preferences = {
|
||
positionMode: next.positionMode ?? positionMode,
|
||
monitorIndex: next.monitorIndex ?? monitorIndex,
|
||
alwaysOnTop: next.alwaysOnTop ?? alwaysOnTop,
|
||
gameMode: next.gameMode ?? gameMode,
|
||
};
|
||
void invoke("set_pet_window_preferences", { preferences }).catch(
|
||
() => undefined,
|
||
);
|
||
};
|
||
|
||
return (
|
||
<div className="page-stack">
|
||
<PetPackImporter />
|
||
{displayMode === "app-ui" ? (
|
||
<section className="pet-inline-preview" aria-label="应用内桌宠预览">
|
||
<div>
|
||
<span className="section-kicker">App UI</span>
|
||
<h2>应用内活动桌宠</h2>
|
||
<p>桌宠已叠加在主界面上,可直接拖动;关闭后可重新打开应用。</p>
|
||
</div>
|
||
</section>
|
||
) : null}
|
||
<section className="settings-grid">
|
||
<SettingCard
|
||
title="显示范围"
|
||
description="应用内活动桌宠不创建桌面浮窗,避免透明窗口白框。"
|
||
>
|
||
<select
|
||
value={displayMode}
|
||
onChange={(event) =>
|
||
onDisplayModeChange(event.target.value as PetDisplayMode)
|
||
}
|
||
>
|
||
<option value="app-ui">仅应用 UI 内</option>
|
||
<option value="desktop-floating">桌面浮动</option>
|
||
</select>
|
||
</SettingCard>
|
||
<SettingCard
|
||
title="活动策略"
|
||
description="为后续游戏模式和多显示器行为预留配置入口。"
|
||
>
|
||
<select defaultValue="smart">
|
||
<option value="smart">智能选择显示器</option>
|
||
<option value="primary">固定主屏</option>
|
||
<option value="secondary">优先副屏</option>
|
||
</select>
|
||
</SettingCard>
|
||
<SettingCard
|
||
title="运行桌宠"
|
||
description="应用内桌宠可在主界面中自由移动,不再创建白色桌面浮窗。"
|
||
>
|
||
{displayMode === "desktop-floating" ? (
|
||
<button type="button" onClick={() => onDisplayModeChange("app-ui")}>
|
||
改用应用内活动桌宠
|
||
</button>
|
||
) : (
|
||
<span className="form-note">应用内活动桌宠已显示,可直接拖动</span>
|
||
)}
|
||
</SettingCard>
|
||
<SettingCard
|
||
title="显示器与位置"
|
||
description="桌面版只会把桌宠放在屏幕安全边缘,不会覆盖游戏中心区域。"
|
||
>
|
||
<select
|
||
value={monitorIndex}
|
||
onChange={(event) => {
|
||
const next = Number(event.target.value);
|
||
setMonitorIndex(next);
|
||
applyPetPreferences({ monitorIndex: next });
|
||
}}
|
||
disabled={monitors.length === 0}
|
||
>
|
||
{monitors.map((monitor, index) => (
|
||
<option
|
||
value={index}
|
||
key={`${monitor.name ?? "monitor"}-${index}`}
|
||
>
|
||
{monitor.name ?? `显示器 ${index + 1}`}{" "}
|
||
{monitor.isPrimary ? "(主屏)" : ""}
|
||
</option>
|
||
))}
|
||
</select>
|
||
<select
|
||
value={positionMode}
|
||
onChange={(event) => {
|
||
const next = petPositionModeSchema.parse(event.target.value);
|
||
setPositionMode(next);
|
||
applyPetPreferences({ positionMode: next });
|
||
}}
|
||
>
|
||
<option value="free">自由位置</option>
|
||
<option value="edge">安全边缘</option>
|
||
<option value="monitor">指定显示器</option>
|
||
</select>
|
||
</SettingCard>
|
||
<SettingCard
|
||
title="桌面行为"
|
||
description="置顶和游戏模式都可以随时关闭;权限或显示器不可用时自动回退。"
|
||
>
|
||
<label className="toggle-row">
|
||
<input
|
||
type="checkbox"
|
||
checked={alwaysOnTop}
|
||
onChange={(event) => {
|
||
const next = event.target.checked;
|
||
setAlwaysOnTop(next);
|
||
applyPetPreferences({ alwaysOnTop: next });
|
||
}}
|
||
/>
|
||
始终置顶
|
||
</label>
|
||
<label className="toggle-row">
|
||
<input
|
||
type="checkbox"
|
||
checked={gameMode}
|
||
onChange={(event) => {
|
||
const next = event.target.checked;
|
||
setGameMode(next);
|
||
applyPetPreferences({ gameMode: next });
|
||
}}
|
||
/>
|
||
游戏模式(安全边缘)
|
||
</label>
|
||
</SettingCard>
|
||
</section>
|
||
</div>
|
||
);
|
||
}
|
||
|
||
function SettingCard({
|
||
title,
|
||
description,
|
||
children,
|
||
}: {
|
||
title: string;
|
||
description: string;
|
||
children: React.ReactNode;
|
||
}) {
|
||
return (
|
||
<section className="setting-card">
|
||
<div>
|
||
<span className="section-kicker">Settings</span>
|
||
<h2>{title}</h2>
|
||
<p>{description}</p>
|
||
</div>
|
||
<div className="setting-card-controls">{children}</div>
|
||
</section>
|
||
);
|
||
}
|