mirror of
https://github.com/infinilabs/coco-app.git
synced 2025-12-23 23:09:25 +01:00
Compare commits
5 Commits
v0.10.0
...
selection-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0de417c165 | ||
|
|
aee46caac8 | ||
|
|
fd710b0144 | ||
|
|
318ae938bb | ||
|
|
16a4dbd7b0 |
1
.vscode/settings.json
vendored
1
.vscode/settings.json
vendored
@@ -59,6 +59,7 @@
|
|||||||
"serde",
|
"serde",
|
||||||
"Shadcn",
|
"Shadcn",
|
||||||
"swatinem",
|
"swatinem",
|
||||||
|
"systempreferences",
|
||||||
"tailwindcss",
|
"tailwindcss",
|
||||||
"tauri",
|
"tauri",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
|
|||||||
@@ -2,12 +2,14 @@ mod assistant;
|
|||||||
mod autostart;
|
mod autostart;
|
||||||
mod common;
|
mod common;
|
||||||
mod extension;
|
mod extension;
|
||||||
|
mod macos;
|
||||||
mod search;
|
mod search;
|
||||||
mod selection_monitor;
|
mod selection_monitor;
|
||||||
mod server;
|
mod server;
|
||||||
mod settings;
|
mod settings;
|
||||||
mod setup;
|
mod setup;
|
||||||
mod shortcut;
|
mod shortcut;
|
||||||
|
|
||||||
// We need this in main.rs, so it has to be pub
|
// We need this in main.rs, so it has to be pub
|
||||||
pub mod util;
|
pub mod util;
|
||||||
|
|
||||||
@@ -206,6 +208,10 @@ pub fn run() {
|
|||||||
util::logging::app_log_dir,
|
util::logging::app_log_dir,
|
||||||
selection_monitor::set_selection_enabled,
|
selection_monitor::set_selection_enabled,
|
||||||
selection_monitor::get_selection_enabled,
|
selection_monitor::get_selection_enabled,
|
||||||
|
macos::permissions::check_accessibility_trusted,
|
||||||
|
macos::permissions::open_accessibility_settings,
|
||||||
|
macos::permissions::open_screen_recording_settings,
|
||||||
|
macos::permissions::open_microphone_settings,
|
||||||
])
|
])
|
||||||
.setup(|app| {
|
.setup(|app| {
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
|
|||||||
1
src-tauri/src/macos/mod.rs
Normal file
1
src-tauri/src/macos/mod.rs
Normal file
@@ -0,0 +1 @@
|
|||||||
|
pub mod permissions;
|
||||||
58
src-tauri/src/macos/permissions.rs
Normal file
58
src-tauri/src/macos/permissions.rs
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
#[tauri::command]
|
||||||
|
pub fn check_accessibility_trusted() -> bool {
|
||||||
|
cfg_if::cfg_if! {
|
||||||
|
if #[cfg(target_os = "macos")] {
|
||||||
|
let trusted = macos_accessibility_client::accessibility::application_is_trusted();
|
||||||
|
log::info!(target: "coco_lib::permissions", "check_accessibility_trusted invoked: {}", trusted);
|
||||||
|
trusted
|
||||||
|
} else {
|
||||||
|
log::info!(target: "coco_lib::permissions", "check_accessibility_trusted invoked on non-macOS: false");
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn open_accessibility_settings() {
|
||||||
|
cfg_if::cfg_if! {
|
||||||
|
if #[cfg(target_os = "macos")] {
|
||||||
|
use std::process::Command;
|
||||||
|
log::info!(target: "coco_lib::permissions", "open_accessibility_settings invoked");
|
||||||
|
let _ = Command::new("open")
|
||||||
|
.arg("x-apple.systempreferences:com.apple.preference.security?Privacy_Accessibility")
|
||||||
|
.status();
|
||||||
|
} else {
|
||||||
|
// no-op on non-macOS
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn open_screen_recording_settings() {
|
||||||
|
cfg_if::cfg_if! {
|
||||||
|
if #[cfg(target_os = "macos")] {
|
||||||
|
use std::process::Command;
|
||||||
|
log::info!(target: "coco_lib::permissions", "open_screen_recording_settings invoked");
|
||||||
|
let _ = Command::new("open")
|
||||||
|
.arg("x-apple.systempreferences:com.apple.preference.security?Privacy_ScreenRecording")
|
||||||
|
.status();
|
||||||
|
} else {
|
||||||
|
// no-op on non-macOS
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn open_microphone_settings() {
|
||||||
|
cfg_if::cfg_if! {
|
||||||
|
if #[cfg(target_os = "macos")] {
|
||||||
|
use std::process::Command;
|
||||||
|
log::info!(target: "coco_lib::permissions", "open_microphone_settings invoked");
|
||||||
|
let _ = Command::new("open")
|
||||||
|
.arg("x-apple.systempreferences:com.apple.preference.security?Privacy_Microphone")
|
||||||
|
.status();
|
||||||
|
} else {
|
||||||
|
// no-op on non-macOS
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
/// Coordinates use logical (Quartz) points with a top-left origin.
|
/// Coordinates use logical (Quartz) points with a top-left origin.
|
||||||
/// Note: `y` is flipped on the backend to match the frontend’s usage.
|
/// Note: `y` is flipped on the backend to match the frontend’s usage.
|
||||||
use tauri::Emitter;
|
use tauri::Emitter;
|
||||||
|
use tauri::Manager;
|
||||||
|
|
||||||
#[derive(serde::Serialize, Clone)]
|
#[derive(serde::Serialize, Clone)]
|
||||||
struct SelectionEventPayload {
|
struct SelectionEventPayload {
|
||||||
@@ -14,8 +15,8 @@ use once_cell::sync::Lazy;
|
|||||||
use std::sync::Mutex;
|
use std::sync::Mutex;
|
||||||
use std::sync::atomic::{AtomicBool, Ordering};
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
|
|
||||||
/// Global toggle: selection monitoring disabled for this release.
|
/// Global toggle: selection monitoring enabled for this release.
|
||||||
static SELECTION_ENABLED: AtomicBool = AtomicBool::new(false);
|
static SELECTION_ENABLED: AtomicBool = AtomicBool::new(true);
|
||||||
|
|
||||||
/// Ensure we only start the monitor thread once. Allows delayed start after
|
/// Ensure we only start the monitor thread once. Allows delayed start after
|
||||||
/// Accessibility permission is granted post-launch.
|
/// Accessibility permission is granted post-launch.
|
||||||
@@ -24,6 +25,9 @@ static MONITOR_THREAD_STARTED: AtomicBool = AtomicBool::new(false);
|
|||||||
/// Guard to avoid spawning multiple permission watcher threads.
|
/// Guard to avoid spawning multiple permission watcher threads.
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
static PERMISSION_WATCHER_STARTED: AtomicBool = AtomicBool::new(false);
|
static PERMISSION_WATCHER_STARTED: AtomicBool = AtomicBool::new(false);
|
||||||
|
/// Guard to avoid spawning multiple selection store watcher threads.
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
static SELECTION_STORE_WATCHER_STARTED: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
/// Session flags for controlling macOS Accessibility prompts.
|
/// Session flags for controlling macOS Accessibility prompts.
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
@@ -31,6 +35,8 @@ static SEEN_ACCESSIBILITY_TRUSTED_ONCE: AtomicBool = AtomicBool::new(false);
|
|||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
static LAST_ACCESSIBILITY_PROMPT: Lazy<Mutex<Option<std::time::Instant>>> =
|
static LAST_ACCESSIBILITY_PROMPT: Lazy<Mutex<Option<std::time::Instant>>> =
|
||||||
Lazy::new(|| Mutex::new(None));
|
Lazy::new(|| Mutex::new(None));
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
static LAST_READ_WARN: Lazy<Mutex<Option<std::time::Instant>>> = Lazy::new(|| Mutex::new(None));
|
||||||
|
|
||||||
#[derive(serde::Serialize, Clone)]
|
#[derive(serde::Serialize, Clone)]
|
||||||
struct SelectionEnabledPayload {
|
struct SelectionEnabledPayload {
|
||||||
@@ -95,7 +101,19 @@ pub fn start_selection_monitor(app_handle: tauri::AppHandle) {
|
|||||||
use tauri::Emitter;
|
use tauri::Emitter;
|
||||||
|
|
||||||
// Sync initial enabled state to the frontend on startup.
|
// Sync initial enabled state to the frontend on startup.
|
||||||
|
// Prefer disk-persisted Zustand store if present
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
ensure_selection_store_bootstrap(&app_handle);
|
||||||
|
if let Some(enabled) = read_selection_enabled_from_store(&app_handle) {
|
||||||
|
log::info!(target: "coco_lib::selection_monitor", "initial selection-enabled loaded from store: {}", enabled);
|
||||||
|
set_selection_enabled_internal(&app_handle, enabled);
|
||||||
|
} else {
|
||||||
|
log::warn!(target: "coco_lib::selection_monitor", "initial selection-enabled not found in store, falling back to in-memory flag");
|
||||||
set_selection_enabled_internal(&app_handle, is_selection_enabled());
|
set_selection_enabled_internal(&app_handle, is_selection_enabled());
|
||||||
|
}
|
||||||
|
// Start a light watcher to keep SELECTION_ENABLED in sync with disk
|
||||||
|
start_selection_store_watcher(app_handle.clone());
|
||||||
|
log::info!(target: "coco_lib::selection_monitor", "selection store watcher started");
|
||||||
|
|
||||||
// Accessibility permission is required to read selected text in the foreground app.
|
// Accessibility permission is required to read selected text in the foreground app.
|
||||||
// If not granted, prompt the user once; if still not granted, skip starting the watcher.
|
// If not granted, prompt the user once; if still not granted, skip starting the watcher.
|
||||||
@@ -287,6 +305,7 @@ pub fn start_selection_monitor(app_handle: tauri::AppHandle) {
|
|||||||
|
|
||||||
// If disabled: do not read AX / do not show popup; hide if currently visible.
|
// If disabled: do not read AX / do not show popup; hide if currently visible.
|
||||||
if !is_selection_enabled() {
|
if !is_selection_enabled() {
|
||||||
|
log::debug!(target: "coco_lib::selection_monitor", "monitor loop: selection disabled");
|
||||||
if popup_visible {
|
if popup_visible {
|
||||||
let _ = app_handle.emit("selection-detected", "");
|
let _ = app_handle.emit("selection-detected", "");
|
||||||
popup_visible = false;
|
popup_visible = false;
|
||||||
@@ -444,6 +463,118 @@ fn ensure_accessibility_permission(app_handle: &tauri::AppHandle) -> bool {
|
|||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Resolve the path to the zustand store file `selection-store.json`.
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
fn selection_store_path(app_handle: &tauri::AppHandle) -> std::path::PathBuf {
|
||||||
|
let mut dir = app_handle
|
||||||
|
.path()
|
||||||
|
.app_data_dir()
|
||||||
|
.expect("failed to find the local dir");
|
||||||
|
dir.push("zustand");
|
||||||
|
dir.push("selection-store.json");
|
||||||
|
log::debug!(target: "coco_lib::selection_monitor", "selection_store_path resolved: {}", dir.display());
|
||||||
|
dir
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
fn ensure_selection_store_bootstrap(app_handle: &tauri::AppHandle) {
|
||||||
|
use std::fs;
|
||||||
|
use std::io::Write;
|
||||||
|
let mut dir = app_handle
|
||||||
|
.path()
|
||||||
|
.app_data_dir()
|
||||||
|
.expect("failed to find the local dir");
|
||||||
|
dir.push("zustand");
|
||||||
|
let _ = fs::create_dir_all(&dir);
|
||||||
|
let file = dir.join("selection-store.json");
|
||||||
|
if !file.exists() {
|
||||||
|
let initial = serde_json::json!({
|
||||||
|
"selectionEnabled": true,
|
||||||
|
"iconsOnly": false,
|
||||||
|
"toolbarConfig": []
|
||||||
|
});
|
||||||
|
if let Ok(mut f) = fs::File::create(&file) {
|
||||||
|
let _ = f.write_all(
|
||||||
|
serde_json::to_string(&initial)
|
||||||
|
.unwrap_or_else(|_| "{}".to_string())
|
||||||
|
.as_bytes(),
|
||||||
|
);
|
||||||
|
log::info!(target: "coco_lib::selection_monitor", "bootstrap selection-store.json created: {}", file.display());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Read `selectionEnabled` from the persisted zustand store.
|
||||||
|
/// Returns Some(bool) if read succeeds; None otherwise.
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
fn read_selection_enabled_from_store(app_handle: &tauri::AppHandle) -> Option<bool> {
|
||||||
|
use std::fs;
|
||||||
|
let path = selection_store_path(app_handle);
|
||||||
|
match fs::read_to_string(&path) {
|
||||||
|
Ok(content) => match serde_json::from_str::<serde_json::Value>(&content) {
|
||||||
|
Ok(v) => {
|
||||||
|
let val = v.get("selectionEnabled").and_then(|b| b.as_bool());
|
||||||
|
log::info!(target: "coco_lib::selection_monitor", "read_selection_enabled_from_store: {} -> {:?}", path.display(), val);
|
||||||
|
val
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
log::warn!(target: "coco_lib::selection_monitor", "read_selection_enabled_from_store: JSON parse failed for {}: {}", path.display(), e);
|
||||||
|
None
|
||||||
|
}
|
||||||
|
},
|
||||||
|
Err(e) => {
|
||||||
|
use std::time::Duration;
|
||||||
|
use std::time::Instant;
|
||||||
|
let mut last = LAST_READ_WARN.lock().unwrap();
|
||||||
|
let now = Instant::now();
|
||||||
|
let allow = match *last {
|
||||||
|
Some(ts) => now.duration_since(ts) > Duration::from_secs(30),
|
||||||
|
None => true,
|
||||||
|
};
|
||||||
|
if allow {
|
||||||
|
log::warn!(target: "coco_lib::selection_monitor", "read_selection_enabled_from_store: read failed for {}: {}", path.display(), e);
|
||||||
|
*last = Some(now);
|
||||||
|
} else {
|
||||||
|
log::debug!(target: "coco_lib::selection_monitor", "read_selection_enabled_from_store: read failed suppressed for {}", path.display());
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Spawn a background watcher to sync `SELECTION_ENABLED` with disk every ~1s.
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
fn start_selection_store_watcher(app_handle: tauri::AppHandle) {
|
||||||
|
if SELECTION_STORE_WATCHER_STARTED.swap(true, Ordering::Relaxed) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
std::thread::Builder::new()
|
||||||
|
.name("selection-store-watcher".into())
|
||||||
|
.spawn(move || {
|
||||||
|
use std::time::{Duration, Instant};
|
||||||
|
let mut last_check = Instant::now();
|
||||||
|
let mut last_val: Option<bool> = None;
|
||||||
|
loop {
|
||||||
|
// Check approximately every second
|
||||||
|
if last_check.elapsed() >= Duration::from_secs(1) {
|
||||||
|
let current = read_selection_enabled_from_store(&app_handle);
|
||||||
|
if current.is_some() && current != last_val {
|
||||||
|
let enabled = current.unwrap();
|
||||||
|
set_selection_enabled_internal(&app_handle, enabled);
|
||||||
|
log::info!(target: "coco_lib::selection_monitor", "selection-store-watcher: detected change, enabled={}", enabled);
|
||||||
|
last_val = current;
|
||||||
|
}
|
||||||
|
last_check = Instant::now();
|
||||||
|
}
|
||||||
|
std::thread::sleep(Duration::from_millis(200));
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.unwrap_or_else(|e| {
|
||||||
|
SELECTION_STORE_WATCHER_STARTED.store(false, Ordering::Relaxed);
|
||||||
|
panic!("selection-store-watcher: failed to spawn: {}", e);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
fn collect_selection_permission_info() -> SelectionPermissionInfo {
|
fn collect_selection_permission_info() -> SelectionPermissionInfo {
|
||||||
let exe_path = std::env::current_exe()
|
let exe_path = std::env::current_exe()
|
||||||
|
|||||||
@@ -110,6 +110,7 @@ pub(crate) async fn backend_setup(tauri_app_handle: AppHandle, app_lang: String)
|
|||||||
// Start system-wide selection monitor (macOS-only currently)
|
// Start system-wide selection monitor (macOS-only currently)
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
{
|
{
|
||||||
|
log::info!("backend_setup: starting system-wide selection monitor");
|
||||||
crate::selection_monitor::start_selection_monitor(tauri_app_handle.clone());
|
crate::selection_monitor::start_selection_monitor(tauri_app_handle.clone());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,207 @@
|
|||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import { useMount } from "ahooks";
|
||||||
|
import { ShieldCheck, Monitor, Mic, RotateCcw } from "lucide-react";
|
||||||
|
import clsx from "clsx";
|
||||||
|
|
||||||
|
import platformAdapter from "@/utils/platformAdapter";
|
||||||
|
import SettingsItem from "@/components/Settings/SettingsItem";
|
||||||
|
|
||||||
|
const Permissions = () => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const [accessibilityAuthorized, setAccessibilityAuthorized] = useState<boolean | null>(null);
|
||||||
|
const [screenAuthorized, setScreenAuthorized] = useState<boolean | null>(null);
|
||||||
|
const [microphoneAuthorized, setMicrophoneAuthorized] = useState<boolean | null>(null);
|
||||||
|
|
||||||
|
const refresh = async () => {
|
||||||
|
const [ax, sr, mic] = await Promise.all([
|
||||||
|
platformAdapter.invokeBackend<boolean>("check_accessibility_trusted"),
|
||||||
|
platformAdapter.checkScreenRecordingPermission(),
|
||||||
|
platformAdapter.checkMicrophonePermission(),
|
||||||
|
]);
|
||||||
|
console.info("[permissions] refreshed", { accessibility: ax, screenRecording: sr, microphone: mic });
|
||||||
|
setAccessibilityAuthorized(ax);
|
||||||
|
setScreenAuthorized(sr);
|
||||||
|
setMicrophoneAuthorized(mic);
|
||||||
|
};
|
||||||
|
|
||||||
|
useMount(refresh);
|
||||||
|
|
||||||
|
const openAccessibilitySettings = async () => {
|
||||||
|
const window = await platformAdapter.getCurrentWebviewWindow();
|
||||||
|
await window.setAlwaysOnTop(false);
|
||||||
|
console.info("[permissions] open accessibility settings");
|
||||||
|
await platformAdapter.invokeBackend("open_accessibility_settings");
|
||||||
|
await refresh();
|
||||||
|
};
|
||||||
|
|
||||||
|
const requestScreenRecording = async () => {
|
||||||
|
const window = await platformAdapter.getCurrentWebviewWindow();
|
||||||
|
await window.setAlwaysOnTop(false);
|
||||||
|
console.info("[permissions] request screen recording");
|
||||||
|
await platformAdapter.requestScreenRecordingPermission();
|
||||||
|
await platformAdapter.invokeBackend("open_screen_recording_settings");
|
||||||
|
await refresh();
|
||||||
|
};
|
||||||
|
|
||||||
|
const requestMicrophone = async () => {
|
||||||
|
const window = await platformAdapter.getCurrentWebviewWindow();
|
||||||
|
await window.setAlwaysOnTop(false);
|
||||||
|
console.info("[permissions] request microphone");
|
||||||
|
await platformAdapter.requestMicrophonePermission();
|
||||||
|
await platformAdapter.invokeBackend("open_microphone_settings");
|
||||||
|
await refresh();
|
||||||
|
};
|
||||||
|
|
||||||
|
const [refreshing, setRefreshing] = useState(false);
|
||||||
|
const handleRefresh = async () => {
|
||||||
|
if (refreshing) return;
|
||||||
|
setRefreshing(true);
|
||||||
|
try {
|
||||||
|
await refresh();
|
||||||
|
} finally {
|
||||||
|
setRefreshing(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const unlisten1 = platformAdapter.listenEvent("selection-permission-required", async () => {
|
||||||
|
console.info("[permissions] selection-permission-required received");
|
||||||
|
await refresh();
|
||||||
|
});
|
||||||
|
const unlisten2 = platformAdapter.listenEvent("selection-permission-info", async (evt: any) => {
|
||||||
|
console.info("[permissions] selection-permission-info", evt?.payload);
|
||||||
|
await refresh();
|
||||||
|
});
|
||||||
|
return () => {
|
||||||
|
unlisten1.then((fn) => fn());
|
||||||
|
unlisten2.then((fn) => fn());
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<h2 className="text-lg font-semibold text-gray-900 dark:text-white mb-4">
|
||||||
|
{t("settings.advanced.permissions.title")}
|
||||||
|
</h2>
|
||||||
|
|
||||||
|
<div className="space-y-6">
|
||||||
|
<SettingsItem
|
||||||
|
icon={ShieldCheck}
|
||||||
|
title={t("settings.advanced.permissions.accessibility.title")}
|
||||||
|
description={t("settings.advanced.permissions.accessibility.description")}
|
||||||
|
>
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
{accessibilityAuthorized ? (
|
||||||
|
<span className="text-sm font-medium text-green-600 dark:text-green-500">
|
||||||
|
{t("settings.common.status.authorized")}
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
<span className="text-sm font-medium text-red-600 dark:text-red-500">
|
||||||
|
{t("settings.common.status.notAuthorized")}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
<button
|
||||||
|
className="px-3 py-1.5 bg-blue-600 hover:bg-blue-700 text-white rounded-lg text-sm"
|
||||||
|
onClick={openAccessibilitySettings}
|
||||||
|
>
|
||||||
|
{t("settings.common.actions.openNow")}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
className={clsx(
|
||||||
|
"flex items-center justify-center size-8 rounded-[6px] border border-black/5 dark:border-white/10 transition bg-gray-200 dark:bg-gray-800 text-gray-900 dark:text-gray-100",
|
||||||
|
{ "opacity-70 cursor-not-allowed": refreshing }
|
||||||
|
)}
|
||||||
|
onClick={handleRefresh}
|
||||||
|
title={t("settings.common.actions.refresh")}
|
||||||
|
>
|
||||||
|
<RotateCcw
|
||||||
|
className={clsx("size-4", {
|
||||||
|
"animate-spin": refreshing,
|
||||||
|
})}
|
||||||
|
/>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</SettingsItem>
|
||||||
|
|
||||||
|
<SettingsItem
|
||||||
|
icon={Monitor}
|
||||||
|
title={t("settings.advanced.permissions.screenRecording.title")}
|
||||||
|
description={t("settings.advanced.permissions.screenRecording.description")}
|
||||||
|
>
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
{screenAuthorized ? (
|
||||||
|
<span className="text-sm font-medium text-green-600 dark:text-green-500">
|
||||||
|
{t("settings.common.status.authorized")}
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
<span className="text-sm font-medium text-red-600 dark:text-red-500">
|
||||||
|
{t("settings.common.status.notAuthorized")}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
<button
|
||||||
|
className="px-3 py-1.5 bg-blue-600 hover:bg-blue-700 text-white rounded-lg text-sm"
|
||||||
|
onClick={requestScreenRecording}
|
||||||
|
>
|
||||||
|
{t("settings.common.actions.openNow")}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
className={clsx(
|
||||||
|
"flex items-center justify-center size-8 rounded-[6px] border border-black/5 dark:border-white/10 transition bg-gray-200 dark:bg-gray-800 text-gray-900 dark:text-gray-100",
|
||||||
|
{ "opacity-70 cursor-not-allowed": refreshing }
|
||||||
|
)}
|
||||||
|
onClick={handleRefresh}
|
||||||
|
title={t("settings.common.actions.refresh")}
|
||||||
|
>
|
||||||
|
<RotateCcw
|
||||||
|
className={clsx("size-4", {
|
||||||
|
"animate-spin": refreshing,
|
||||||
|
})}
|
||||||
|
/>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</SettingsItem>
|
||||||
|
|
||||||
|
<SettingsItem
|
||||||
|
icon={Mic}
|
||||||
|
title={t("settings.advanced.permissions.microphone.title")}
|
||||||
|
description={t("settings.advanced.permissions.microphone.description")}
|
||||||
|
>
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
{microphoneAuthorized ? (
|
||||||
|
<span className="text-sm font-medium text-green-600 dark:text-green-500">
|
||||||
|
{t("settings.common.status.authorized")}
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
<span className="text-sm font-medium text-red-600 dark:text-red-500">
|
||||||
|
{t("settings.common.status.notAuthorized")}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
<button
|
||||||
|
className="px-3 py-1.5 bg-blue-600 hover:bg-blue-700 text-white rounded-lg text-sm"
|
||||||
|
onClick={requestMicrophone}
|
||||||
|
>
|
||||||
|
{t("settings.common.actions.openNow")}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
className={clsx(
|
||||||
|
"flex items-center justify-center size-8 rounded-[6px] border border-black/5 dark:border-white/10 transition bg-gray-200 dark:bg-gray-800 text-gray-900 dark:text-gray-100",
|
||||||
|
{ "opacity-70 cursor-not-allowed": refreshing }
|
||||||
|
)}
|
||||||
|
onClick={handleRefresh}
|
||||||
|
title={t("settings.common.actions.refresh")}
|
||||||
|
>
|
||||||
|
<RotateCcw
|
||||||
|
className={clsx("size-4", {
|
||||||
|
"animate-spin": refreshing,
|
||||||
|
})}
|
||||||
|
/>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</SettingsItem>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Permissions;
|
||||||
@@ -11,6 +11,13 @@ import {
|
|||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
import { useMount } from "ahooks";
|
import { useMount } from "ahooks";
|
||||||
import { isNil } from "lodash-es";
|
import { isNil } from "lodash-es";
|
||||||
|
import {
|
||||||
|
Select,
|
||||||
|
SelectTrigger,
|
||||||
|
SelectContent,
|
||||||
|
SelectItem,
|
||||||
|
SelectValue,
|
||||||
|
} from "@/components/ui/select";
|
||||||
|
|
||||||
import Shortcuts from "./components/Shortcuts";
|
import Shortcuts from "./components/Shortcuts";
|
||||||
import SettingsItem from "../SettingsItem";
|
import SettingsItem from "../SettingsItem";
|
||||||
@@ -23,13 +30,8 @@ import UpdateSettings from "./components/UpdateSettings";
|
|||||||
import SettingsToggle from "../SettingsToggle";
|
import SettingsToggle from "../SettingsToggle";
|
||||||
import SelectionSettings from "./components/Selection";
|
import SelectionSettings from "./components/Selection";
|
||||||
import { isMac } from "@/utils/platform";
|
import { isMac } from "@/utils/platform";
|
||||||
import {
|
import Permissions from "./components/Permissions";
|
||||||
Select,
|
|
||||||
SelectTrigger,
|
|
||||||
SelectContent,
|
|
||||||
SelectItem,
|
|
||||||
SelectValue,
|
|
||||||
} from "@/components/ui/select";
|
|
||||||
|
|
||||||
const Advanced = () => {
|
const Advanced = () => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
@@ -196,6 +198,8 @@ const Advanced = () => {
|
|||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{isMac && <Permissions />}
|
||||||
|
|
||||||
{isMac && <SelectionSettings />}
|
{isMac && <SelectionSettings />}
|
||||||
|
|
||||||
<Shortcuts />
|
<Shortcuts />
|
||||||
|
|||||||
@@ -14,19 +14,19 @@ export default function SettingsItem({
|
|||||||
children,
|
children,
|
||||||
}: SettingsItemProps) {
|
}: SettingsItemProps) {
|
||||||
return (
|
return (
|
||||||
<div className="flex items-center justify-between gap-6">
|
<div className="flex items-center justify-between gap-6 min-w-0">
|
||||||
<div className="flex items-center space-x-3">
|
<div className="flex items-center space-x-3 min-w-0">
|
||||||
<Icon className="h-5 min-w-5 text-gray-400 dark:text-gray-500" />
|
<Icon className="h-5 min-w-5 text-gray-400 dark:text-gray-500" />
|
||||||
<div>
|
<div className="max-w-[680px] min-w-0">
|
||||||
<h3 className="text-sm font-medium text-gray-900 dark:text-gray-100">
|
<h3 className="text-sm font-medium text-gray-900 dark:text-gray-100">
|
||||||
{title}
|
{title}
|
||||||
</h3>
|
</h3>
|
||||||
<p className="text-sm text-gray-500 dark:text-gray-400">
|
<p className="text-sm text-gray-500 dark:text-gray-400 whitespace-normal break-words">
|
||||||
{description}
|
{description}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{children}
|
<div className="flex-shrink-0">{children}</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,26 +0,0 @@
|
|||||||
import { useMount } from "ahooks";
|
|
||||||
|
|
||||||
import platformAdapter from "@/utils/platformAdapter";
|
|
||||||
import { useSelectionStore } from "@/stores/selectionStore";
|
|
||||||
|
|
||||||
export default function useSelectionEnabled() {
|
|
||||||
useMount(async () => {
|
|
||||||
try {
|
|
||||||
const enabled = await platformAdapter.invokeBackend<boolean>("get_selection_enabled");
|
|
||||||
useSelectionStore.getState().setSelectionEnabled(!!enabled);
|
|
||||||
} catch (e) {
|
|
||||||
console.error("get_selection_enabled failed:", e);
|
|
||||||
}
|
|
||||||
|
|
||||||
const unlisten = await platformAdapter.listenEvent(
|
|
||||||
"selection-enabled",
|
|
||||||
({ payload }: any) => {
|
|
||||||
useSelectionStore.getState().setSelectionEnabled(!!payload?.enabled);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
unlisten && unlisten();
|
|
||||||
};
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -18,7 +18,7 @@ export const useTray = () => {
|
|||||||
const showCocoShortcuts = useAppStore((state) => state.showCocoShortcuts);
|
const showCocoShortcuts = useAppStore((state) => state.showCocoShortcuts);
|
||||||
|
|
||||||
const selectionEnabled = useSelectionStore((state) => state.selectionEnabled);
|
const selectionEnabled = useSelectionStore((state) => state.selectionEnabled);
|
||||||
// const setSelectionEnabled = useSelectionStore((state) => state.setSelectionEnabled);
|
const setSelectionEnabled = useSelectionStore((state) => state.setSelectionEnabled);
|
||||||
|
|
||||||
useUpdateEffect(() => {
|
useUpdateEffect(() => {
|
||||||
if (showCocoShortcuts.length === 0) return;
|
if (showCocoShortcuts.length === 0) return;
|
||||||
@@ -65,18 +65,18 @@ export const useTray = () => {
|
|||||||
|
|
||||||
itemPromises.push(PredefinedMenuItem.new({ item: "Separator" }));
|
itemPromises.push(PredefinedMenuItem.new({ item: "Separator" }));
|
||||||
|
|
||||||
// if (isMac) {
|
if (isMac) {
|
||||||
// itemPromises.push(
|
itemPromises.push(
|
||||||
// MenuItem.new({
|
MenuItem.new({
|
||||||
// text: selectionEnabled
|
text: selectionEnabled
|
||||||
// ? t("tray.selectionDisable")
|
? t("tray.selectionDisable")
|
||||||
// : t("tray.selectionEnable"),
|
: t("tray.selectionEnable"),
|
||||||
// action: async () => {
|
action: async () => {
|
||||||
// setSelectionEnabled(!selectionEnabled);
|
setSelectionEnabled(!selectionEnabled);
|
||||||
// },
|
},
|
||||||
// })
|
})
|
||||||
// );
|
);
|
||||||
// }
|
}
|
||||||
|
|
||||||
itemPromises.push(
|
itemPromises.push(
|
||||||
MenuItem.new({
|
MenuItem.new({
|
||||||
|
|||||||
@@ -187,6 +187,21 @@
|
|||||||
"description": "Get early access to new features. May be unstable."
|
"description": "Get early access to new features. May be unstable."
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"permissions": {
|
||||||
|
"title": "Permissions",
|
||||||
|
"accessibility": {
|
||||||
|
"title": "Accessibility",
|
||||||
|
"description": "Required to read selected text in the foreground app. Grant in System Settings → Privacy & Security → Accessibility."
|
||||||
|
},
|
||||||
|
"screenRecording": {
|
||||||
|
"title": "Screen Recording",
|
||||||
|
"description": "Required for window/screen screenshots and sharing. Grant in System Settings → Privacy & Security → Screen Recording."
|
||||||
|
},
|
||||||
|
"microphone": {
|
||||||
|
"title": "Microphone",
|
||||||
|
"description": "Required for voice input and recording. Grant in System Settings → Privacy & Security → Microphone."
|
||||||
|
}
|
||||||
|
},
|
||||||
"other": {
|
"other": {
|
||||||
"title": "Other Settings",
|
"title": "Other Settings",
|
||||||
"connectionTimeout": {
|
"connectionTimeout": {
|
||||||
@@ -229,6 +244,16 @@
|
|||||||
"extensionsContent": "Extensions settings content",
|
"extensionsContent": "Extensions settings content",
|
||||||
"advancedContent": "Advanced Settings content"
|
"advancedContent": "Advanced Settings content"
|
||||||
},
|
},
|
||||||
|
"common": {
|
||||||
|
"status": {
|
||||||
|
"authorized": "Authorized",
|
||||||
|
"notAuthorized": "Not Authorized"
|
||||||
|
},
|
||||||
|
"actions": {
|
||||||
|
"openNow": "Open Settings",
|
||||||
|
"refresh": "Refresh"
|
||||||
|
}
|
||||||
|
},
|
||||||
"extensions": {
|
"extensions": {
|
||||||
"title": "Extensions",
|
"title": "Extensions",
|
||||||
"list": {
|
"list": {
|
||||||
|
|||||||
@@ -187,6 +187,21 @@
|
|||||||
"description": "抢先体验新功能,可能不稳定。"
|
"description": "抢先体验新功能,可能不稳定。"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"permissions": {
|
||||||
|
"title": "权限设置",
|
||||||
|
"accessibility": {
|
||||||
|
"title": "辅助功能(Accessibility)",
|
||||||
|
"description": "用于读取前台应用的选中文本,需在「隐私与安全 → 辅助功能」中授权。"
|
||||||
|
},
|
||||||
|
"screenRecording": {
|
||||||
|
"title": "屏幕录制",
|
||||||
|
"description": "用于窗口/屏幕截图与共享,需要在「隐私与安全 → 屏幕录制」中授权。"
|
||||||
|
},
|
||||||
|
"microphone": {
|
||||||
|
"title": "麦克风",
|
||||||
|
"description": "用于语音输入与录音功能,需要在「隐私与安全 → 麦克风」中授权。"
|
||||||
|
}
|
||||||
|
},
|
||||||
"other": {
|
"other": {
|
||||||
"title": "其它设置",
|
"title": "其它设置",
|
||||||
"connectionTimeout": {
|
"connectionTimeout": {
|
||||||
@@ -229,6 +244,16 @@
|
|||||||
"extensionsContent": "扩展设置内容",
|
"extensionsContent": "扩展设置内容",
|
||||||
"advancedContent": "高级设置内容"
|
"advancedContent": "高级设置内容"
|
||||||
},
|
},
|
||||||
|
"common": {
|
||||||
|
"status": {
|
||||||
|
"authorized": "已授权",
|
||||||
|
"notAuthorized": "未授权"
|
||||||
|
},
|
||||||
|
"actions": {
|
||||||
|
"openNow": "去授权",
|
||||||
|
"refresh": "刷新状态"
|
||||||
|
}
|
||||||
|
},
|
||||||
"extensions": {
|
"extensions": {
|
||||||
"title": "扩展",
|
"title": "扩展",
|
||||||
"list": {
|
"list": {
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ import { useExtensionsStore } from "@/stores/extensionsStore";
|
|||||||
import { useSelectionStore, startSelectionStorePersistence } from "@/stores/selectionStore";
|
import { useSelectionStore, startSelectionStorePersistence } from "@/stores/selectionStore";
|
||||||
import { useServers } from "@/hooks/useServers";
|
import { useServers } from "@/hooks/useServers";
|
||||||
import { useDeepLinkManager } from "@/hooks/useDeepLinkManager";
|
import { useDeepLinkManager } from "@/hooks/useDeepLinkManager";
|
||||||
// import { useSelectionWindow } from "@/hooks/useSelectionWindow";
|
import { useSelectionWindow } from "@/hooks/useSelectionWindow";
|
||||||
|
|
||||||
export default function LayoutOutlet() {
|
export default function LayoutOutlet() {
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
@@ -128,7 +128,7 @@ export default function LayoutOutlet() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// --- Selection window ---
|
// --- Selection window ---
|
||||||
// useSelectionWindow();
|
useSelectionWindow();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ export const useSelectionStore = create<SelectionStore>((set) => ({
|
|||||||
setIconsOnly: (iconsOnly) => set({ iconsOnly }),
|
setIconsOnly: (iconsOnly) => set({ iconsOnly }),
|
||||||
toolbarConfig: [],
|
toolbarConfig: [],
|
||||||
setToolbarConfig: (toolbarConfig) => set({ toolbarConfig }),
|
setToolbarConfig: (toolbarConfig) => set({ toolbarConfig }),
|
||||||
selectionEnabled: false,
|
selectionEnabled: true,
|
||||||
setSelectionEnabled: (selectionEnabled) => set({ selectionEnabled }),
|
setSelectionEnabled: (selectionEnabled) => set({ selectionEnabled }),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|||||||
@@ -58,6 +58,14 @@ export interface EventPayloads {
|
|||||||
"selection-detected": string;
|
"selection-detected": string;
|
||||||
"selection-enabled": boolean;
|
"selection-enabled": boolean;
|
||||||
"change-selection-store": any;
|
"change-selection-store": any;
|
||||||
|
"selection-permission-required": boolean;
|
||||||
|
"selection-permission-info": {
|
||||||
|
bundle_id: string;
|
||||||
|
exe_path: string;
|
||||||
|
in_applications: boolean;
|
||||||
|
is_dmg: boolean;
|
||||||
|
is_dev_guess: boolean;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// Window operation interface
|
// Window operation interface
|
||||||
|
|||||||
Reference in New Issue
Block a user