mirror of
https://github.com/infinilabs/coco-app.git
synced 2025-12-19 12:59:24 +01:00
Compare commits
5 Commits
add-search
...
v0.10.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7a4364665e | ||
|
|
444ba968c4 | ||
|
|
206d8db4f4 | ||
|
|
7e40632c29 | ||
|
|
f483ce4887 |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -29,4 +29,4 @@ web.md
|
||||
*.sw?
|
||||
.env
|
||||
|
||||
.trae
|
||||
.trae
|
||||
|
||||
@@ -13,6 +13,7 @@ Information about release notes of Coco App is provided here.
|
||||
|
||||
### 🚀 Features
|
||||
|
||||
- feat: resizable extension UI #1009
|
||||
- feat: add open button to launch installed extension #1013
|
||||
|
||||
### 🐛 Bug fix
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "coco",
|
||||
"private": true,
|
||||
"version": "0.9.1",
|
||||
"version": "0.10.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
||||
14
src-tauri/Cargo.lock
generated
14
src-tauri/Cargo.lock
generated
@@ -1132,7 +1132,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "coco"
|
||||
version = "0.9.1"
|
||||
version = "0.10.0"
|
||||
dependencies = [
|
||||
"actix-files",
|
||||
"actix-web",
|
||||
@@ -1184,6 +1184,7 @@ dependencies = [
|
||||
"scraper",
|
||||
"semver",
|
||||
"serde",
|
||||
"serde-inline-default",
|
||||
"serde_json",
|
||||
"serde_plain",
|
||||
"snafu",
|
||||
@@ -6308,6 +6309,17 @@ dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde-inline-default"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "92d48532bc0781ac622a5fea0f16502d3b4f1af0fcebe56d618120969f35d315"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.111",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde-untagged"
|
||||
version = "0.1.9"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "coco"
|
||||
version = "0.9.1"
|
||||
version = "0.10.0"
|
||||
description = "Search, connect, collaborate – all in one place."
|
||||
authors = ["INFINI Labs"]
|
||||
edition = "2024"
|
||||
@@ -122,6 +122,7 @@ actix-web = "4.11.0"
|
||||
tauri-plugin-clipboard-manager = "2"
|
||||
tauri-plugin-zustand = "1"
|
||||
snafu = "0.8.9"
|
||||
serde-inline-default = "1.0.0"
|
||||
|
||||
[dev-dependencies]
|
||||
tempfile = "3.23.0"
|
||||
|
||||
@@ -31,6 +31,11 @@
|
||||
"core:window:deny-internal-toggle-maximize",
|
||||
"core:window:allow-set-shadow",
|
||||
"core:window:allow-set-position",
|
||||
"core:window:allow-set-theme",
|
||||
"core:window:allow-unminimize",
|
||||
"core:window:allow-set-fullscreen",
|
||||
"core:window:allow-set-resizable",
|
||||
"core:window:allow-maximize",
|
||||
"core:app:allow-set-app-theme",
|
||||
"shell:default",
|
||||
"http:default",
|
||||
@@ -65,12 +70,10 @@
|
||||
"fs-pro:default",
|
||||
"macos-permissions:default",
|
||||
"screenshots:default",
|
||||
"core:window:allow-set-theme",
|
||||
"process:default",
|
||||
"updater:default",
|
||||
"windows-version:default",
|
||||
"log:default",
|
||||
"opener:default",
|
||||
"core:window:allow-unminimize"
|
||||
"opener:default"
|
||||
]
|
||||
}
|
||||
|
||||
@@ -152,14 +152,31 @@ pub struct Extension {
|
||||
}
|
||||
|
||||
/// Settings that control the built-in UI Components
|
||||
#[serde_inline_default::serde_inline_default]
|
||||
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq)]
|
||||
pub(crate) struct ViewExtensionUISettings {
|
||||
/// Show the search bar
|
||||
#[serde_inline_default(true)]
|
||||
search_bar: bool,
|
||||
/// Show the filter bar
|
||||
#[serde_inline_default(true)]
|
||||
filter_bar: bool,
|
||||
/// Show the footer
|
||||
#[serde_inline_default(true)]
|
||||
footer: bool,
|
||||
/// The recommended width of the window for this extension
|
||||
width: Option<u32>,
|
||||
/// The recommended heigh of the window for this extension
|
||||
height: Option<u32>,
|
||||
/// Is the extension window's size adjustable?
|
||||
#[serde_inline_default(false)]
|
||||
resizable: bool,
|
||||
/// Detch the extension window from Coco's main window.
|
||||
///
|
||||
/// If true, user can click the detach button to open this
|
||||
/// extension in a seprate window.
|
||||
#[serde_inline_default(false)]
|
||||
detachable: bool,
|
||||
}
|
||||
|
||||
/// Bundle ID uniquely identifies an extension.
|
||||
|
||||
@@ -32,7 +32,7 @@ pub fn platform(
|
||||
let panel = main_window.to_panel::<NsPanel>().unwrap();
|
||||
|
||||
// set level
|
||||
panel.set_level(PanelLevel::Utility.value());
|
||||
panel.set_level(PanelLevel::Dock.value());
|
||||
|
||||
// Do not steal focus from other windows
|
||||
panel.set_style_mask(StyleMask::empty().nonactivating_panel().into());
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
"width": 680,
|
||||
"decorations": false,
|
||||
"minimizable": false,
|
||||
"maximizable": false,
|
||||
"maximizable": true,
|
||||
"skipTaskbar": true,
|
||||
"resizable": false,
|
||||
"acceptFirstMouse": true,
|
||||
|
||||
@@ -63,6 +63,7 @@ export function Connect({ setIsConnect, onAddServer }: ConnectServiceProps) {
|
||||
type="text"
|
||||
id="endpoint"
|
||||
value={endpointLink}
|
||||
autoCorrect="off"
|
||||
placeholder={t("cloud.connect.serverPlaceholder")}
|
||||
onChange={onChangeEndpoint}
|
||||
className="text-[#101010] dark:text-white flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent dark:bg-gray-800"
|
||||
|
||||
@@ -57,13 +57,13 @@ const ErrorNotification = ({
|
||||
>
|
||||
<div className="flex items-center">
|
||||
{visibleError.type === "error" && (
|
||||
<AlertCircle className="w-5 h-5 text-red-500 mr-2" />
|
||||
<AlertCircle className="size-5 shrink-0 text-red-500 mr-2" />
|
||||
)}
|
||||
{visibleError.type === "warning" && (
|
||||
<AlertTriangle className="w-5 h-5 text-yellow-500 mr-2" />
|
||||
<AlertTriangle className="size-5 shrink-0 text-yellow-500 mr-2" />
|
||||
)}
|
||||
{visibleError.type === "info" && (
|
||||
<Info className="w-5 h-5 text-blue-500 mr-2" />
|
||||
<Info className="size-5 shrink-0 text-blue-500 mr-2" />
|
||||
)}
|
||||
|
||||
<span className="text-sm text-gray-700 dark:text-gray-200">
|
||||
@@ -78,7 +78,7 @@ const ErrorNotification = ({
|
||||
</div>
|
||||
|
||||
<X
|
||||
className="w-5 h-5 ml-4 cursor-pointer text-gray-400 hover:text-gray-600"
|
||||
className="size-5 shrink-0 ml-4 cursor-pointer text-gray-400 hover:text-gray-600"
|
||||
onClick={() => removeError(visibleError.id)}
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { useCallback, useRef, useMemo, useState, useEffect } from "react";
|
||||
import { cloneDeep, isEmpty } from "lodash-es";
|
||||
import { useKeyPress } from "ahooks";
|
||||
|
||||
import { useSearchStore } from "@/stores/searchStore";
|
||||
import { useExtensionsStore } from "@/stores/extensionsStore";
|
||||
@@ -8,7 +9,6 @@ import { Get } from "@/api/axiosRequest";
|
||||
import type { Assistant } from "@/types/chat";
|
||||
import { useAppStore } from "@/stores/appStore";
|
||||
import { canNavigateBack, navigateBack } from "@/utils";
|
||||
import { useKeyPress } from "ahooks";
|
||||
import { useShortcutsStore } from "@/stores/shortcutsStore";
|
||||
|
||||
interface AssistantManagerProps {
|
||||
@@ -167,7 +167,7 @@ export function useAssistantManager({
|
||||
const { selectedSearchContent, visibleExtensionStore } =
|
||||
useSearchStore.getState();
|
||||
|
||||
console.log("selectedSearchContent", selectedSearchContent);
|
||||
// console.log("selectedSearchContent", selectedSearchContent);
|
||||
|
||||
const { id, type, category } = selectedSearchContent ?? {};
|
||||
|
||||
|
||||
@@ -118,7 +118,7 @@ const ExtensionDetail: FC<ExtensionDetailProps> = (props) => {
|
||||
</div>
|
||||
<div className="flex items-center gap-1">
|
||||
<FolderDown className="size-4" />
|
||||
<span>{selectedExtension.stats.installs}</span>
|
||||
<span>{selectedExtension.stats?.installs ?? 0}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -243,7 +243,7 @@ const ExtensionDetail: FC<ExtensionDetailProps> = (props) => {
|
||||
}}
|
||||
deleteButtonProps={{
|
||||
className:
|
||||
"!text-[#FF4949] bg-[#F8F9FA] dark:text-white dark:bg-[#202126] border-[#E6E6E6] dark:border-white/10",
|
||||
"text-white bg-[#FF4949] hover:bg-[#FF4949] border-[#E6E6E6] dark:border-white/10",
|
||||
}}
|
||||
setIsOpen={setIsOpen}
|
||||
onCancel={handleCancel}
|
||||
|
||||
@@ -348,7 +348,7 @@ const ExtensionStore = ({
|
||||
|
||||
<div className="flex items-center gap-1 text-[#999]">
|
||||
<FolderDown className="size-4" />
|
||||
<span>{stats.installs}</span>
|
||||
<span>{stats?.installs ?? 0}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -14,7 +14,7 @@ import { useShortcutsStore } from "@/stores/shortcutsStore";
|
||||
import { useAppStore } from "@/stores/appStore";
|
||||
import { useSearchStore } from "@/stores/searchStore";
|
||||
import { useExtensionsStore } from "@/stores/extensionsStore";
|
||||
import { parseSearchQuery, SearchQuery } from "@/utils";
|
||||
import { parseSearchQuery, SearchQuery, canNavigateBack } from "@/utils";
|
||||
import InputUpload from "./InputUpload";
|
||||
import Copyright from "../Common/Copyright";
|
||||
|
||||
@@ -283,7 +283,7 @@ const InputControls = ({
|
||||
</div>
|
||||
)}
|
||||
|
||||
{isChatPage || hasModules?.length !== 2 ? null : (
|
||||
{isChatPage || hasModules?.length !== 2 || canNavigateBack() ? null : (
|
||||
<div className="relative w-16 flex justify-end items-center">
|
||||
<div className="absolute right-[52px] -top-2 z-10">
|
||||
<VisibleKey
|
||||
|
||||
@@ -1,19 +1,47 @@
|
||||
import React from "react";
|
||||
import { useState, useEffect, useMemo } from "react";
|
||||
import { useState, useEffect, useMemo, useRef, useCallback } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Maximize2, Minimize2, Focus } from "lucide-react";
|
||||
|
||||
import { useSearchStore } from "@/stores/searchStore";
|
||||
import {
|
||||
ExtensionFileSystemPermission,
|
||||
FileSystemAccess,
|
||||
ViewExtensionUISettings,
|
||||
} from "../Settings/Extensions";
|
||||
import platformAdapter from "@/utils/platformAdapter";
|
||||
import { useShortcutsStore } from "@/stores/shortcutsStore";
|
||||
import { isMac } from "@/utils/platform";
|
||||
import { useAppStore } from "@/stores/appStore";
|
||||
|
||||
const ViewExtension: React.FC = () => {
|
||||
const { viewExtensionOpened } = useSearchStore();
|
||||
|
||||
const isTauri = useAppStore((state) => state.isTauri);
|
||||
|
||||
// Complete list of the backend APIs, grouped by their category.
|
||||
const [apis, setApis] = useState<Map<string, string[]> | null>(null);
|
||||
const { setModifierKeyPressed } = useShortcutsStore();
|
||||
const { t } = useTranslation();
|
||||
const [isFullscreen, setIsFullscreen] = useState(false);
|
||||
const prevWindowRef = useRef<{
|
||||
width: number;
|
||||
height: number;
|
||||
resizable: boolean;
|
||||
x: number;
|
||||
y: number;
|
||||
} | null>(null);
|
||||
const fullscreenPrevRef = useRef<{
|
||||
width: number;
|
||||
height: number;
|
||||
resizable: boolean;
|
||||
x: number;
|
||||
y: number;
|
||||
} | null>(null);
|
||||
const iframeRef = useRef<HTMLIFrameElement | null>(null);
|
||||
const DEFAULT_VIEW_WIDTH = 1200;
|
||||
const DEFAULT_VIEW_HEIGHT = 900;
|
||||
const [scale, setScale] = useState(1);
|
||||
|
||||
if (viewExtensionOpened == null) {
|
||||
// When this view gets loaded, this state should not be NULL.
|
||||
@@ -156,7 +184,6 @@ const ViewExtension: React.FC = () => {
|
||||
}
|
||||
};
|
||||
window.addEventListener("message", messageHandler);
|
||||
console.info("Coco extension API listener is up");
|
||||
|
||||
return () => {
|
||||
window.removeEventListener("message", messageHandler);
|
||||
@@ -164,15 +191,233 @@ const ViewExtension: React.FC = () => {
|
||||
}, [reversedApis, permission]); // Add apiPermissions as dependency
|
||||
|
||||
const fileUrl = viewExtensionOpened[2];
|
||||
const ui: ViewExtensionUISettings | undefined = useMemo(() => {
|
||||
return viewExtensionOpened[4] as ViewExtensionUISettings | undefined;
|
||||
}, [viewExtensionOpened]);
|
||||
const resizable = ui?.resizable;
|
||||
|
||||
const baseWidth = useMemo(() => {
|
||||
return ui && typeof ui?.width === "number" ? ui.width : DEFAULT_VIEW_WIDTH;
|
||||
}, [ui]);
|
||||
const baseHeight = useMemo(() => {
|
||||
return ui && typeof ui?.height === "number" ? ui.height : DEFAULT_VIEW_HEIGHT;
|
||||
}, [ui]);
|
||||
|
||||
const recomputeScale = useCallback(async () => {
|
||||
const size = await platformAdapter.getWindowSize();
|
||||
const nextScale = Math.min(size.width / baseWidth, size.height / baseHeight);
|
||||
setScale(Math.max(nextScale, 0.1));
|
||||
}, [baseWidth, baseHeight]);
|
||||
|
||||
const applyFullscreen = useCallback(
|
||||
async (next: boolean) => {
|
||||
if (next) {
|
||||
const size = await platformAdapter.getWindowSize();
|
||||
const resizable = await platformAdapter.isWindowResizable();
|
||||
const pos = await platformAdapter.getWindowPosition();
|
||||
fullscreenPrevRef.current = {
|
||||
width: size.width,
|
||||
height: size.height,
|
||||
resizable,
|
||||
x: pos.x,
|
||||
y: pos.y,
|
||||
};
|
||||
|
||||
if (isMac && isTauri) {
|
||||
const monitor = await platformAdapter.getMonitorFromCursor();
|
||||
|
||||
if (!monitor) return;
|
||||
const window = await platformAdapter.getCurrentWebviewWindow();
|
||||
const factor = await window.scaleFactor();
|
||||
|
||||
const { size, position } = monitor;
|
||||
|
||||
const { width, height } = size.toLogical(factor);
|
||||
const { x, y } = position.toLogical(factor);
|
||||
|
||||
await platformAdapter.setWindowSize(width, height);
|
||||
await platformAdapter.setWindowPosition(x, y);
|
||||
await platformAdapter.setWindowResizable(true);
|
||||
await recomputeScale();
|
||||
} else {
|
||||
await platformAdapter.setWindowFullscreen(true);
|
||||
await recomputeScale();
|
||||
}
|
||||
} else {
|
||||
if (!isMac) {
|
||||
await platformAdapter.setWindowFullscreen(false);
|
||||
}
|
||||
const nextWidth =
|
||||
ui && typeof ui.width === "number" ? ui.width : DEFAULT_VIEW_WIDTH;
|
||||
const nextHeight =
|
||||
ui && typeof ui.height === "number" ? ui.height : DEFAULT_VIEW_HEIGHT;
|
||||
const nextResizable =
|
||||
ui && typeof ui.resizable === "boolean" ? ui.resizable : true;
|
||||
await platformAdapter.setWindowSize(nextWidth, nextHeight);
|
||||
await platformAdapter.setWindowResizable(nextResizable);
|
||||
await platformAdapter.centerOnCurrentMonitor();
|
||||
await recomputeScale();
|
||||
setTimeout(() => {
|
||||
iframeRef.current?.focus();
|
||||
try {
|
||||
iframeRef.current?.contentWindow?.focus();
|
||||
} catch {}
|
||||
}, 0);
|
||||
}
|
||||
},
|
||||
[ui, recomputeScale]
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
const applyWindowSettings = async () => {
|
||||
if (viewExtensionOpened != null) {
|
||||
const size = await platformAdapter.getWindowSize();
|
||||
const resizable = await platformAdapter.isWindowResizable();
|
||||
const pos = await platformAdapter.getWindowPosition();
|
||||
prevWindowRef.current = {
|
||||
width: size.width,
|
||||
height: size.height,
|
||||
resizable,
|
||||
x: pos.x,
|
||||
y: pos.y,
|
||||
};
|
||||
|
||||
const nextWidth =
|
||||
ui && typeof ui.width === "number" ? ui.width : DEFAULT_VIEW_WIDTH;
|
||||
const nextHeight =
|
||||
ui && typeof ui.height === "number" ? ui.height : DEFAULT_VIEW_HEIGHT;
|
||||
const nextResizable =
|
||||
ui && typeof ui.resizable === "boolean" ? ui.resizable : true;
|
||||
|
||||
await platformAdapter.setWindowSize(nextWidth, nextHeight);
|
||||
await platformAdapter.setWindowResizable(nextResizable);
|
||||
await platformAdapter.centerOnCurrentMonitor();
|
||||
await recomputeScale();
|
||||
setTimeout(() => {
|
||||
iframeRef.current?.focus();
|
||||
try {
|
||||
iframeRef.current?.contentWindow?.focus();
|
||||
} catch {}
|
||||
}, 0);
|
||||
} else {
|
||||
if (prevWindowRef.current) {
|
||||
const prev = prevWindowRef.current;
|
||||
await platformAdapter.setWindowSize(prev.width, prev.height);
|
||||
await platformAdapter.setWindowResizable(prev.resizable);
|
||||
await platformAdapter.centerOnCurrentMonitor();
|
||||
prevWindowRef.current = null;
|
||||
await recomputeScale();
|
||||
setTimeout(() => {
|
||||
iframeRef.current?.focus();
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
applyWindowSettings();
|
||||
return () => {
|
||||
if (prevWindowRef.current) {
|
||||
const prev = prevWindowRef.current;
|
||||
platformAdapter.setWindowSize(prev.width, prev.height);
|
||||
platformAdapter.setWindowResizable(prev.resizable);
|
||||
platformAdapter.centerOnCurrentMonitor();
|
||||
prevWindowRef.current = null;
|
||||
}
|
||||
};
|
||||
}, [viewExtensionOpened]);
|
||||
useEffect(() => {
|
||||
const handleKeyDown = (e: KeyboardEvent) => {
|
||||
if (e.key === "Escape" && isFullscreen) {
|
||||
applyFullscreen(false);
|
||||
setIsFullscreen(false);
|
||||
}
|
||||
};
|
||||
window.addEventListener("keydown", handleKeyDown, { capture: true });
|
||||
return () => {
|
||||
window.removeEventListener("keydown", handleKeyDown, {
|
||||
capture: true,
|
||||
} as any);
|
||||
};
|
||||
}, [isFullscreen, applyFullscreen]);
|
||||
|
||||
return (
|
||||
<iframe
|
||||
src={fileUrl}
|
||||
className="w-full h-full border-0"
|
||||
onLoad={(event) => {
|
||||
event.currentTarget.focus();
|
||||
}}
|
||||
/>
|
||||
<div className="relative w-full h-full">
|
||||
{isFullscreen && <div className="absolute inset-0 pointer-events-none" />}
|
||||
{resizable && (
|
||||
<button
|
||||
aria-label={
|
||||
isFullscreen
|
||||
? t("viewExtension.fullscreen.exit")
|
||||
: t("viewExtension.fullscreen.enter")
|
||||
}
|
||||
className="absolute top-2 right-2 z-10 rounded-md bg-black/40 text-white p-2 hover:bg-black/60 focus:outline-none"
|
||||
onClick={async () => {
|
||||
const next = !isFullscreen;
|
||||
await applyFullscreen(next);
|
||||
setIsFullscreen(next);
|
||||
if (next) {
|
||||
iframeRef.current?.focus();
|
||||
try {
|
||||
iframeRef.current?.contentWindow?.focus();
|
||||
} catch {}
|
||||
}
|
||||
}}
|
||||
>
|
||||
{isFullscreen ? (
|
||||
<Minimize2 className="size-4" />
|
||||
) : (
|
||||
<Maximize2 className="size-4" />
|
||||
)}
|
||||
</button>
|
||||
)}
|
||||
{/* Focus helper button */}
|
||||
<button
|
||||
aria-label={t("viewExtension.focus")}
|
||||
className="absolute top-2 right-12 z-10 rounded-md bg-black/40 text-white p-2 hover:bg-black/60 focus:outline-none"
|
||||
onClick={() => {
|
||||
iframeRef.current?.focus();
|
||||
try {
|
||||
iframeRef.current?.contentWindow?.focus();
|
||||
} catch {}
|
||||
}}
|
||||
>
|
||||
<Focus className="size-4"/>
|
||||
</button>
|
||||
<div
|
||||
className="w-full h-full flex items-center justify-center"
|
||||
onMouseDownCapture={() => {
|
||||
iframeRef.current?.focus();
|
||||
}}
|
||||
onPointerDown={() => {
|
||||
iframeRef.current?.focus();
|
||||
}}
|
||||
onClickCapture={() => {
|
||||
iframeRef.current?.focus();
|
||||
}}
|
||||
>
|
||||
<iframe
|
||||
ref={iframeRef}
|
||||
src={fileUrl}
|
||||
className="border-0"
|
||||
style={{
|
||||
width: `${baseWidth}px`,
|
||||
height: `${baseHeight}px`,
|
||||
transform: `scale(${scale})`,
|
||||
transformOrigin: "center center",
|
||||
outline: "none",
|
||||
}}
|
||||
allow="fullscreen; pointer-lock; gamepad"
|
||||
allowFullScreen
|
||||
tabIndex={-1}
|
||||
onLoad={(event) => {
|
||||
event.currentTarget.focus();
|
||||
try {
|
||||
iframeRef.current?.contentWindow?.focus();
|
||||
} catch {}
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
@@ -110,9 +110,13 @@ function SearchChat({
|
||||
let collapseWindowTimer = useRef<ReturnType<typeof setTimeout>>();
|
||||
|
||||
const setWindowSize = useCallback(() => {
|
||||
const { viewExtensionOpened } = useSearchStore.getState();
|
||||
if (collapseWindowTimer.current) {
|
||||
clearTimeout(collapseWindowTimer.current);
|
||||
}
|
||||
if (viewExtensionOpened != null) {
|
||||
return;
|
||||
}
|
||||
|
||||
const width = 680;
|
||||
let height = WINDOW_CENTER_BASELINE_HEIGHT;
|
||||
@@ -177,6 +181,28 @@ function SearchChat({
|
||||
onFocus: debouncedSetWindowSize,
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
const unlisten = platformAdapter.listenEvent(
|
||||
"refresh-window-size",
|
||||
() => {
|
||||
debouncedSetWindowSize();
|
||||
}
|
||||
);
|
||||
return () => {
|
||||
unlisten
|
||||
.then((fn) => {
|
||||
try {
|
||||
typeof fn === "function" && fn();
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
// ignore
|
||||
});
|
||||
};
|
||||
}, [debouncedSetWindowSize]);
|
||||
|
||||
useEffect(() => {
|
||||
dispatch({
|
||||
type: "SET_SEARCH_ACTIVE",
|
||||
@@ -386,7 +412,7 @@ function SearchChat({
|
||||
<div
|
||||
data-tauri-drag-region={isTauri}
|
||||
className={clsx(
|
||||
"m-auto overflow-hidden relative bg-no-repeat flex flex-col",
|
||||
"m-auto overflow-hidden relative bg-no-repeat flex flex-col bg-cover",
|
||||
[
|
||||
isTransitioned
|
||||
? "bg-bottom bg-[url('/assets/chat_bg_light.png')] dark:bg-[url('/assets/chat_bg_dark.png')]"
|
||||
@@ -401,7 +427,6 @@ function SearchChat({
|
||||
}
|
||||
)}
|
||||
style={{
|
||||
backgroundSize: "auto 590px",
|
||||
opacity: blurred ? blurOpacity / 100 : normalOpacity / 100,
|
||||
}}
|
||||
>
|
||||
|
||||
@@ -21,8 +21,8 @@ import SettingsInput from "@/components//Settings/SettingsInput";
|
||||
import platformAdapter from "@/utils/platformAdapter";
|
||||
import UpdateSettings from "./components/UpdateSettings";
|
||||
import SettingsToggle from "../SettingsToggle";
|
||||
import SelectionSettings from "./components/Selection";
|
||||
import { isMac } from "@/utils/platform";
|
||||
// import SelectionSettings from "./components/Selection";
|
||||
// import { isMac } from "@/utils/platform";
|
||||
import {
|
||||
Select,
|
||||
SelectTrigger,
|
||||
@@ -196,7 +196,7 @@ const Advanced = () => {
|
||||
})}
|
||||
</div>
|
||||
|
||||
{isMac && <SelectionSettings />}
|
||||
{/* {isMac && <SelectionSettings />} */}
|
||||
|
||||
<Shortcuts />
|
||||
|
||||
|
||||
@@ -75,6 +75,10 @@ export interface ViewExtensionUISettings {
|
||||
search_bar: boolean;
|
||||
filter_bar: boolean;
|
||||
footer: boolean;
|
||||
width: number | null;
|
||||
height: number | null;
|
||||
resizable: boolean;
|
||||
detachable: boolean;
|
||||
}
|
||||
|
||||
export interface Extension {
|
||||
|
||||
@@ -11,6 +11,9 @@ const useEscape = () => {
|
||||
const setVisibleContextMenu = useSearchStore((state) => {
|
||||
return state.setVisibleContextMenu;
|
||||
});
|
||||
const viewExtensionOpened = useSearchStore((state) => {
|
||||
return state.viewExtensionOpened;
|
||||
});
|
||||
|
||||
useKeyPress("esc", (event) => {
|
||||
event.preventDefault();
|
||||
@@ -33,6 +36,9 @@ const useEscape = () => {
|
||||
return closeHistoryPanel();
|
||||
}
|
||||
|
||||
if (viewExtensionOpened != null) {
|
||||
return;
|
||||
}
|
||||
platformAdapter.hideWindow();
|
||||
});
|
||||
};
|
||||
|
||||
@@ -626,9 +626,16 @@
|
||||
},
|
||||
"deleteDialog": {
|
||||
"title": "Uninstall",
|
||||
"description": "This will remove all the data and commands associated with this extension."
|
||||
"description": "This will delete all data and commands related to the extension."
|
||||
}
|
||||
},
|
||||
"viewExtension": {
|
||||
"fullscreen": {
|
||||
"enter": "Enter Full Screen",
|
||||
"exit": "Exit Full Screen"
|
||||
},
|
||||
"focus": "Focus"
|
||||
},
|
||||
"deleteDialog": {
|
||||
"button": {
|
||||
"cancel": "Cancel",
|
||||
|
||||
@@ -628,6 +628,13 @@
|
||||
"description": "这将删除与该扩展相关的所有数据和命令。"
|
||||
}
|
||||
},
|
||||
"viewExtension": {
|
||||
"fullscreen": {
|
||||
"enter": "进入全屏",
|
||||
"exit": "退出全屏"
|
||||
},
|
||||
"focus": "聚焦"
|
||||
},
|
||||
"deleteDialog": {
|
||||
"button": {
|
||||
"cancel": "取消",
|
||||
|
||||
@@ -12,6 +12,7 @@ import { ViewExtensionOpened } from "@/stores/searchStore";
|
||||
export interface EventPayloads {
|
||||
"theme-changed": string;
|
||||
"tauri://focus": void;
|
||||
"refresh-window-size": void;
|
||||
"endpoint-changed": {
|
||||
endpoint: string;
|
||||
endpoint_http: string;
|
||||
|
||||
@@ -258,7 +258,9 @@ export const navigateBack = () => {
|
||||
}
|
||||
|
||||
if (viewExtensionOpened) {
|
||||
return setViewExtensionOpened(void 0);
|
||||
setViewExtensionOpened(void 0);
|
||||
platformAdapter.emitEvent("refresh-window-size");
|
||||
return;
|
||||
}
|
||||
|
||||
setSourceData(void 0);
|
||||
|
||||
@@ -16,8 +16,16 @@ import { useAppearanceStore } from "@/stores/appearanceStore";
|
||||
import { copyToClipboard, dispatchEvent, OpenURLWithBrowser } from ".";
|
||||
import { useAppStore } from "@/stores/appStore";
|
||||
import { unrequitable } from "@/utils";
|
||||
import { WebviewWindow } from "@tauri-apps/api/webviewWindow";
|
||||
import { Theme } from "@tauri-apps/api/window";
|
||||
import {
|
||||
getCurrentWebviewWindow,
|
||||
WebviewWindow,
|
||||
} from "@tauri-apps/api/webviewWindow";
|
||||
import {
|
||||
cursorPosition,
|
||||
Monitor,
|
||||
monitorFromPoint,
|
||||
Theme,
|
||||
} from "@tauri-apps/api/window";
|
||||
|
||||
export interface TauriPlatformAdapter extends BasePlatformAdapter {
|
||||
openFileDialog: (
|
||||
@@ -30,13 +38,65 @@ export interface TauriPlatformAdapter extends BasePlatformAdapter {
|
||||
getWindowTheme: () => Promise<Theme | null>;
|
||||
setWindowTheme: (theme: Theme | null) => Promise<void>;
|
||||
getAllWindows: () => Promise<WebviewWindow[]>;
|
||||
setWindowResizable: (resizable: boolean) => Promise<void>;
|
||||
isWindowResizable: () => Promise<boolean>;
|
||||
getWindowSize: () => Promise<{ width: number; height: number }>;
|
||||
setWindowFullscreen: (enable: boolean) => Promise<void>;
|
||||
isWindowMaximized: () => Promise<boolean>;
|
||||
setWindowMaximized: (enable: boolean) => Promise<void>;
|
||||
getWindowPosition: () => Promise<{ x: number; y: number }>;
|
||||
setWindowPosition: (x: number, y: number) => Promise<void>;
|
||||
centerWindow: () => Promise<void>;
|
||||
getMonitorFromCursor: () => Promise<Monitor | null>;
|
||||
centerOnCurrentMonitor: () => Promise<unknown>;
|
||||
}
|
||||
|
||||
// Create Tauri adapter functions
|
||||
export const createTauriAdapter = (): TauriPlatformAdapter => {
|
||||
return {
|
||||
async setWindowSize(width, height) {
|
||||
return windowWrapper.setSize(width, height);
|
||||
return windowWrapper.setLogicalSize(width, height);
|
||||
},
|
||||
async getWindowSize() {
|
||||
return windowWrapper.getLogicalSize();
|
||||
},
|
||||
async setWindowResizable(resizable) {
|
||||
return windowWrapper.setResizable(resizable);
|
||||
},
|
||||
async isWindowResizable() {
|
||||
return windowWrapper.isResizable();
|
||||
},
|
||||
async setWindowFullscreen(enable) {
|
||||
return windowWrapper.setFullscreen(enable);
|
||||
},
|
||||
async isWindowMaximized() {
|
||||
return windowWrapper.isMaximized();
|
||||
},
|
||||
async setWindowMaximized(enable) {
|
||||
return windowWrapper.setMaximized(enable);
|
||||
},
|
||||
async getWindowPosition() {
|
||||
return windowWrapper.getLogicalPosition();
|
||||
},
|
||||
async setWindowPosition(x, y) {
|
||||
return windowWrapper.setLogicalPosition(x, y);
|
||||
},
|
||||
async centerWindow() {
|
||||
return windowWrapper.center();
|
||||
},
|
||||
|
||||
async getMonitorFromCursor() {
|
||||
const appWindow = getCurrentWebviewWindow();
|
||||
const factor = await appWindow.scaleFactor();
|
||||
|
||||
const point = await cursorPosition();
|
||||
const { x, y } = point.toLogical(factor);
|
||||
|
||||
return monitorFromPoint(x, y);
|
||||
},
|
||||
|
||||
async centerOnCurrentMonitor() {
|
||||
return windowWrapper.centerOnMonitor();
|
||||
},
|
||||
|
||||
async hideWindow() {
|
||||
|
||||
@@ -12,6 +12,14 @@ export interface WebPlatformAdapter extends BasePlatformAdapter {
|
||||
getWindowTheme: () => Promise<string>;
|
||||
setWindowTheme: (theme: string | null) => Promise<void>;
|
||||
getAllWindows: () => Promise<any[]>;
|
||||
setWindowResizable: (resizable: boolean) => Promise<void>;
|
||||
isWindowResizable: () => Promise<boolean>;
|
||||
getWindowSize: () => Promise<{ width: number; height: number }>;
|
||||
setWindowFullscreen: (enable: boolean) => Promise<void>;
|
||||
getMonitorFromCursor: () => Promise<any>;
|
||||
centerOnCurrentMonitor: () => Promise<void>;
|
||||
getWindowPosition: () => Promise<{ x: number; y: number }>;
|
||||
setWindowPosition: (x: number, y: number) => Promise<void>;
|
||||
}
|
||||
|
||||
// Create Web adapter functions
|
||||
@@ -35,6 +43,46 @@ export const createWebAdapter = (): WebPlatformAdapter => {
|
||||
console.log(`Web mode simulated window resize: ${width}x${height}`);
|
||||
// No actual operation needed in web environment
|
||||
},
|
||||
async getWindowSize() {
|
||||
return { width: window.innerWidth, height: window.innerHeight };
|
||||
},
|
||||
async setWindowResizable(resizable) {
|
||||
console.log("Web mode simulated set window resizable:", resizable);
|
||||
},
|
||||
async isWindowResizable() {
|
||||
return true;
|
||||
},
|
||||
async setWindowFullscreen(enable) {
|
||||
console.log("Web mode simulated fullscreen:", enable);
|
||||
},
|
||||
async getMonitorFromCursor() {
|
||||
return {
|
||||
size: {
|
||||
toLogical: (factor: number) => ({
|
||||
width: window.innerWidth / factor,
|
||||
height: window.innerHeight / factor,
|
||||
}),
|
||||
},
|
||||
position: {
|
||||
toLogical: (factor: number) => ({
|
||||
x: window.screenX / factor,
|
||||
y: window.screenY / factor,
|
||||
}),
|
||||
},
|
||||
};
|
||||
},
|
||||
async centerOnCurrentMonitor() {
|
||||
// Not applicable in web mode
|
||||
return;
|
||||
},
|
||||
|
||||
async getWindowPosition() {
|
||||
return { x: window.screenX, y: window.screenY };
|
||||
},
|
||||
|
||||
async setWindowPosition(x, y) {
|
||||
console.log(`Web mode simulated set window position: ${x}, ${y}`);
|
||||
},
|
||||
|
||||
async hideWindow() {
|
||||
console.log("Web mode simulated window hide");
|
||||
@@ -277,4 +325,4 @@ export const createWebAdapter = (): WebPlatformAdapter => {
|
||||
return Promise.resolve();
|
||||
},
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import * as commands from "@/commands";
|
||||
import { WINDOW_CENTER_BASELINE_HEIGHT } from "@/constants";
|
||||
import platformAdapter from "../platformAdapter";
|
||||
|
||||
// Window operations
|
||||
export const windowWrapper = {
|
||||
@@ -10,7 +11,7 @@ export const windowWrapper = {
|
||||
return getCurrentWebviewWindow();
|
||||
},
|
||||
|
||||
async setSize(width: number, height: number) {
|
||||
async setLogicalSize(width: number, height: number) {
|
||||
const { LogicalSize } = await import("@tauri-apps/api/dpi");
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
if (window) {
|
||||
@@ -20,6 +21,95 @@ export const windowWrapper = {
|
||||
}
|
||||
}
|
||||
},
|
||||
async getLogicalSize() {
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
if (window) {
|
||||
const size = await window.innerSize();
|
||||
const scale = await window.scaleFactor();
|
||||
return {
|
||||
width: Math.round(size.width / scale),
|
||||
height: Math.round(size.height / scale),
|
||||
};
|
||||
}
|
||||
return { width: 0, height: 0 };
|
||||
},
|
||||
async setResizable(resizable: boolean) {
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
if (window) {
|
||||
return window.setResizable(resizable);
|
||||
}
|
||||
},
|
||||
async isResizable() {
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
if (window) {
|
||||
return window.isResizable();
|
||||
}
|
||||
return false;
|
||||
},
|
||||
async setFullscreen(enable: boolean) {
|
||||
const { getCurrentWindow } = await import("@tauri-apps/api/window");
|
||||
const win = getCurrentWindow();
|
||||
return win.setFullscreen(enable);
|
||||
},
|
||||
async center() {
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
if (window) {
|
||||
return window.center();
|
||||
}
|
||||
},
|
||||
|
||||
async setLogicalPosition(x: number, y: number) {
|
||||
const { LogicalPosition } = await import("@tauri-apps/api/dpi");
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
if (window) {
|
||||
return window.setPosition(new LogicalPosition(x, y));
|
||||
}
|
||||
},
|
||||
async getLogicalPosition() {
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
if (window) {
|
||||
const pos = await window.outerPosition();
|
||||
const scale = await window.scaleFactor();
|
||||
return { x: Math.round(pos.x / scale), y: Math.round(pos.y / scale) };
|
||||
}
|
||||
return { x: 0, y: 0 };
|
||||
},
|
||||
async centerOnMonitor() {
|
||||
const { PhysicalPosition } = await import("@tauri-apps/api/dpi");
|
||||
|
||||
const monitor = await platformAdapter.getMonitorFromCursor();
|
||||
|
||||
if (!monitor) return;
|
||||
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
|
||||
const { x: monitorX, y: monitorY } = monitor.position;
|
||||
const { width: monitorWidth, height: monitorHeight } = monitor.size;
|
||||
|
||||
const windowSize = await window.innerSize();
|
||||
|
||||
const x = monitorX + (monitorWidth - windowSize.width) / 2;
|
||||
const y = monitorY + (monitorHeight - windowSize.height) / 2;
|
||||
|
||||
return window.setPosition(new PhysicalPosition(x, y));
|
||||
},
|
||||
async isMaximized() {
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
if (window) {
|
||||
return window.isMaximized();
|
||||
}
|
||||
return false;
|
||||
},
|
||||
async setMaximized(enable: boolean) {
|
||||
const window = await this.getCurrentWebviewWindow();
|
||||
if (window) {
|
||||
if (enable) {
|
||||
return window.maximize();
|
||||
} else {
|
||||
return window.unmaximize();
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
// Event handling
|
||||
|
||||
Reference in New Issue
Block a user