Compare commits

...

34 Commits

Author SHA1 Message Date
Gabe Yuan
c80ead6116 v1.7.13 2023-11-22 15:24:54 +08:00
Gabe Yuan
67e76e4009 update readme 2023-11-22 15:08:26 +08:00
Gabe Yuan
b213218a30 update readme 2023-11-22 15:04:52 +08:00
Gabe Yuan
c629a1252c GM registerMenuCommand: open transbox, translate selected 2023-11-22 14:45:01 +08:00
Gabe Yuan
64d2481e93 update rules 2023-11-22 13:38:49 +08:00
Gabe Yuan
e7d6a6add8 update readme 2023-11-22 12:27:38 +08:00
Gabe Yuan
edc25f7da4 add touch option: four finger tap 2023-11-22 11:27:41 +08:00
Gabe Yuan
5bff84ace1 add context menus: open tranbox 2023-11-22 11:02:48 +08:00
Gabe Yuan
f8bfcba317 fix html fontsize 2023-11-22 10:23:14 +08:00
Gabe Yuan
013a05201b add context menus 2023-11-21 11:36:46 +08:00
Gabe Yuan
433e811821 add context menus 2023-11-21 11:20:05 +08:00
Gabe Yuan
df4cfc0fbc update readme 2023-11-17 11:38:42 +08:00
Gabe Yuan
1bfb465fd6 v1.7.12 2023-11-14 22:30:53 +08:00
Gabe Yuan
d5d5ec3fef fix text 2023-11-14 16:55:44 +08:00
Gabe Yuan
0a32f94d32 update webfix 2023-11-14 15:15:19 +08:00
Gabe Yuan
8067f34ce6 update readme 2023-11-14 10:50:48 +08:00
Gabe Yuan
214c189a7c fix text 2023-11-14 10:41:44 +08:00
Gabe Yuan
1f67afc8d8 fix error: addNode.querySelectorAll 2023-11-14 10:26:07 +08:00
Gabe Yuan
7d4af27919 user webfix rules 2023-11-14 10:19:23 +08:00
Gabe Yuan
2d651abfdd user webfix rules... 2023-11-13 18:03:38 +08:00
Gabe Yuan
6e06fe79cd bug fix: repace mouseover to mouseenter 2023-11-13 11:02:25 +08:00
Gabe Yuan
6093577591 sleep mouseup 2023-11-11 17:22:43 +08:00
Gabe Yuan
4b23ee733f touch operation 2023-11-11 16:59:38 +08:00
Gabe Yuan
46428b7c7f touch operation... 2023-11-10 18:00:34 +08:00
Gabe Yuan
6805340a9a remove wrangler script 2023-11-10 10:56:17 +08:00
Gabe Yuan
df36ca8d8b fix bug 2023-11-07 17:57:17 +08:00
Gabe Yuan
fe13de7c30 trans api return early 2023-11-07 17:52:33 +08:00
Gabe Yuan
b00f636b72 fix bug 2023-11-07 17:47:42 +08:00
Gabe Yuan
8d074e63e1 throw fetch error 2023-11-06 15:42:21 +08:00
Gabe Yuan
37989b0089 fix text 2023-11-06 12:06:10 +08:00
Gabe Yuan
477361eb40 replace getElementsByTagName to querySelectorAll 2023-11-05 16:20:44 +08:00
Gabe Yuan
94288b5dc3 show detail error to api test 2023-11-02 23:35:36 +08:00
Gabe Yuan
84de1e0f12 replace getElementsByName to getElementsByTagName 2023-11-02 10:59:26 +08:00
Gabe Yuan
06f93c1c10 repace querySelectorAll to getElementsByName 2023-11-02 10:56:46 +08:00
36 changed files with 855 additions and 271 deletions

2
.env
View File

@@ -2,7 +2,7 @@ GENERATE_SOURCEMAP=false
REACT_APP_NAME=KISS Translator REACT_APP_NAME=KISS Translator
REACT_APP_NAME_CN=简约翻译 REACT_APP_NAME_CN=简约翻译
REACT_APP_VERSION=1.7.11 REACT_APP_VERSION=1.7.13
REACT_APP_HOMEPAGE=https://github.com/fishjar/kiss-translator REACT_APP_HOMEPAGE=https://github.com/fishjar/kiss-translator

View File

@@ -1,6 +1,6 @@
# KISS Translator # KISS Translator
A simple [bilingual translation extension & Greasemonkey script](https://github.com/fishjar/kiss-translator). A simple, open source [bilingual translation extension & Greasemonkey script](https://github.com/fishjar/kiss-translator).
[kiss-translator.webm](https://github.com/fishjar/kiss-translator/assets/1157624/f7ba8a5c-e4a8-4d5a-823a-5c5c67a0a47f) [kiss-translator.webm](https://github.com/fishjar/kiss-translator/assets/1157624/f7ba8a5c-e4a8-4d5a-823a-5c5c67a0a47f)
@@ -34,13 +34,14 @@ A simple [bilingual translation extension & Greasemonkey script](https://github.
- `Alt+B` Open Translate Popup - `Alt+B` Open Translate Popup
- `Alt+O` Open Options Page - `Alt+O` Open Options Page
- `Alt+I` Input Box Translation - `Alt+I` Input Box Translation
- `Alt+S` Translate Selected Text
## Install ## Install
> Note: For the following reasons, it is recommended to use browser extensions first > Note: For the following reasons, it is recommended to use browser extensions first
> >
> - Browser extension can use local language recognition > - Browser extensions have more complete functions (local language recognition, context menu, etc.)
> - Grease Monkey script will encounter more usage problems > - Grease Monkey script will encounter more usage problems (cross domain issues, script conflicts, etc.)
- [x] Browser extension - [x] Browser extension
- [x] Chrome [Installation address](https://chrome.google.com/webstore/detail/kiss-translator/bdiifdefkgmcblbcghdlonllpjhhjgof?hl=zh-CN) - [x] Chrome [Installation address](https://chrome.google.com/webstore/detail/kiss-translator/bdiifdefkgmcblbcghdlonllpjhhjgof?hl=zh-CN)
@@ -48,9 +49,9 @@ A simple [bilingual translation extension & Greasemonkey script](https://github.
- [x] Firefox [Installation address](https://addons.mozilla.org/zh-CN/firefox/addon/kiss-translator/) - [x] Firefox [Installation address](https://addons.mozilla.org/zh-CN/firefox/addon/kiss-translator/)
- [ ] Safari - [ ] Safari
- [x] GreaseMonkey Script - [x] GreaseMonkey Script
- [x] Chrome/Edge/Firefox ([Tampermonkey](https://www.tampermonkey.net/)/[Violentmonkey](https://violentmonkey.github.io/)) [Installation link 1](https://fishjar.github.io/kiss-translator/kiss-translator.user.js)、 [Installation link 2](https://kiss-translator.rayjar.com/kiss-translator.user.js) - [x] Chrome/Edge/Firefox ([Tampermonkey](https://www.tampermonkey.net/)/[Violentmonkey](https://violentmonkey.github.io/)) [Installation link](https://fishjar.github.io/kiss-translator/kiss-translator.user.js)
- Greasy Fork [Installation address](https://greasyfork.org/zh-CN/scripts/472840-kiss-translator) - Greasy Fork [Installation address](https://greasyfork.org/zh-CN/scripts/472840-kiss-translator)
- [x] iOS Safari ([Userscripts Safari](https://github.com/quoid/userscripts)) [Installation link 1](https://fishjar.github.io/kiss-translator/kiss-translator-ios-safari.user.js)、 [Installation link 2](https://kiss-translator.rayjar.com/kiss-translator.user-ios-safari.js) - [x] iOS Safari ([Userscripts Safari](https://github.com/quoid/userscripts)) [Installation link](https://fishjar.github.io/kiss-translator/kiss-translator-ios-safari.user.js)
## Associated Projects ## Associated Projects

View File

@@ -1,6 +1,6 @@
# 简约翻译 # 简约翻译
一个简约的 [双语对照翻译扩展 & 油猴脚本](https://github.com/fishjar/kiss-translator)。 一个简约、开源的 [双语对照翻译扩展 & 油猴脚本](https://github.com/fishjar/kiss-translator)。
[kiss-translator.webm](https://github.com/fishjar/kiss-translator/assets/1157624/f7ba8a5c-e4a8-4d5a-823a-5c5c67a0a47f) [kiss-translator.webm](https://github.com/fishjar/kiss-translator/assets/1157624/f7ba8a5c-e4a8-4d5a-823a-5c5c67a0a47f)
@@ -34,13 +34,14 @@
- `Alt+B` 打开翻译弹窗 - `Alt+B` 打开翻译弹窗
- `Alt+O` 打开设置页面 - `Alt+O` 打开设置页面
- `Alt+I` 输入框翻译 - `Alt+I` 输入框翻译
- `Alt+S` 翻译选中文字
## 安装 ## 安装
> 注:基于以下原因,建议优先使用浏览器扩展 > 注:基于以下原因,建议优先使用浏览器扩展
> >
> - 浏览器扩展可以使用本地语言识别 > - 浏览器扩展的功能更完整(本地语言识别、右键菜单等)
> - 油猴脚本会遇到更多使用上的问题 > - 油猴脚本会遇到更多使用上的问题(跨域问题、脚本冲突等)
- [x] 浏览器扩展 - [x] 浏览器扩展
- [x] Chrome [安装地址](https://chrome.google.com/webstore/detail/kiss-translator/bdiifdefkgmcblbcghdlonllpjhhjgof?hl=zh-CN) - [x] Chrome [安装地址](https://chrome.google.com/webstore/detail/kiss-translator/bdiifdefkgmcblbcghdlonllpjhhjgof?hl=zh-CN)
@@ -48,9 +49,9 @@
- [x] Firefox [安装地址](https://addons.mozilla.org/zh-CN/firefox/addon/kiss-translator/) - [x] Firefox [安装地址](https://addons.mozilla.org/zh-CN/firefox/addon/kiss-translator/)
- [ ] Safari - [ ] Safari
- [x] 油猴脚本 - [x] 油猴脚本
- [x] Chrome/Edge/Firefox ([Tampermonkey](https://www.tampermonkey.net/)/[Violentmonkey](https://violentmonkey.github.io/)) [安装链接 1](https://fishjar.github.io/kiss-translator/kiss-translator.user.js)、 [安装链接 2](https://kiss-translator.rayjar.com/kiss-translator.user.js) - [x] Chrome/Edge/Firefox ([Tampermonkey](https://www.tampermonkey.net/)/[Violentmonkey](https://violentmonkey.github.io/)) [安装链接](https://fishjar.github.io/kiss-translator/kiss-translator.user.js)
- Greasy Fork [安装地址](https://greasyfork.org/zh-CN/scripts/472840-kiss-translator) - Greasy Fork [安装地址](https://greasyfork.org/zh-CN/scripts/472840-kiss-translator)
- [x] iOS Safari ([Userscripts Safari](https://github.com/quoid/userscripts)) [安装链接 1](https://fishjar.github.io/kiss-translator/kiss-translator-ios-safari.user.js)、 [安装链接 2](https://kiss-translator.rayjar.com/kiss-translator.user-ios-safari.js) - [x] iOS Safari ([Userscripts Safari](https://github.com/quoid/userscripts)) [安装链接](https://fishjar.github.io/kiss-translator/kiss-translator-ios-safari.user.js)
## 关联项目 ## 关联项目
@@ -65,7 +66,7 @@
- 针对一些特殊网站的修正脚本。 - 针对一些特殊网站的修正脚本。
- 以便翻译软件得到更好的展示效果。 - 以便翻译软件得到更好的展示效果。
- 翻译接口代理: [https://github.com/fishjar/kiss-proxy](https://github.com/fishjar/kiss-proxy) - 翻译接口代理: [https://github.com/fishjar/kiss-proxy](https://github.com/fishjar/kiss-proxy)
- 如果访问某个翻译接口遇到网络问题,这个代理服务也许可以帮到你。 - 如果访问某个翻译接口遇到网络问题,这个代理服务也许可以帮到你。
- 自己部署,自己管理。 - 自己部署,自己管理。
- 简约词典插件: [https://github.com/fishjar/kiss-dictionary](https://github.com/fishjar/kiss-dictionary) - 简约词典插件: [https://github.com/fishjar/kiss-dictionary](https://github.com/fishjar/kiss-dictionary)
- 搭配本项目一起使用的划词翻译插件。 - 搭配本项目一起使用的划词翻译插件。

View File

@@ -1,7 +1,7 @@
{ {
"name": "kiss-translator", "name": "kiss-translator",
"description": "A minimalist bilingual translation Extension & Greasemonkey Script", "description": "A minimalist bilingual translation Extension & Greasemonkey Script",
"version": "1.7.11", "version": "1.7.13",
"author": "Gabe<yugang2002@gmail.com>", "author": "Gabe<yugang2002@gmail.com>",
"private": true, "private": true,
"dependencies": { "dependencies": {
@@ -30,7 +30,6 @@
"build:userscript": "rm -rf build/userscript && mkdir build/userscript && cp build/web/*.user.js build/userscript/", "build:userscript": "rm -rf build/userscript && mkdir build/userscript && cp build/web/*.user.js build/userscript/",
"build:rules": "babel-node src/rules.js", "build:rules": "babel-node src/rules.js",
"build": "pnpm build:chrome && pnpm build:edge && pnpm build:firefox && pnpm build:web && pnpm build:userscript-ios && pnpm build:userscript && pnpm build:rules", "build": "pnpm build:chrome && pnpm build:edge && pnpm build:firefox && pnpm build:web && pnpm build:userscript-ios && pnpm build:userscript && pnpm build:rules",
"deploy:web": "wrangler pages deploy ./build/web --project-name kiss-translator",
"test": "react-app-rewired test", "test": "react-app-rewired test",
"eject": "react-scripts eject" "eject": "react-scripts eject"
}, },

View File

@@ -6,12 +6,18 @@
"message": "A simple bilingual translation extension & Greasemonkey script" "message": "A simple bilingual translation extension & Greasemonkey script"
}, },
"toggle_translate": { "toggle_translate": {
"message": "Toggle Translate" "message": "Toggle Translate (Alt+Q)"
}, },
"toggle_style": { "toggle_style": {
"message": "Toggle Style" "message": "Toggle Style (Alt+C)"
}, },
"open_options": { "open_options": {
"message": "Open Options" "message": "Open Options (Alt+O)"
},
"open_tranbox": {
"message": "Open Translate Popup (Alt+B)"
},
"translate_selected": {
"message": "Translate Selected Text (Alt+S)"
} }
} }

View File

@@ -6,12 +6,18 @@
"message": "一个简约的双语对照翻译扩展 & 油猴脚本" "message": "一个简约的双语对照翻译扩展 & 油猴脚本"
}, },
"toggle_translate": { "toggle_translate": {
"message": "开启翻译" "message": "开启翻译 (Alt+Q)"
}, },
"toggle_style": { "toggle_style": {
"message": "切换样式" "message": "切换样式 (Alt+C)"
}, },
"open_options": { "open_options": {
"message": "打开设置" "message": "打开设置 (Alt+O)"
},
"open_tranbox": {
"message": "打开翻译弹窗 (Alt+B)"
},
"translate_selected": {
"message": "翻译选中文字 (Alt+S)"
} }
} }

View File

@@ -2,7 +2,7 @@
"manifest_version": 2, "manifest_version": 2,
"name": "__MSG_app_name__", "name": "__MSG_app_name__",
"description": "__MSG_app_description__", "description": "__MSG_app_description__",
"version": "1.7.11", "version": "1.7.13",
"default_locale": "en", "default_locale": "en",
"author": "Gabe<yugang2002@gmail.com>", "author": "Gabe<yugang2002@gmail.com>",
"homepage_url": "https://github.com/fishjar/kiss-translator", "homepage_url": "https://github.com/fishjar/kiss-translator",
@@ -41,7 +41,7 @@
"description": "__MSG_open_options__" "description": "__MSG_open_options__"
} }
}, },
"permissions": ["<all_urls>", "storage"], "permissions": ["<all_urls>", "storage", "contextMenus"],
"icons": { "icons": {
"16": "images/logo16.png", "16": "images/logo16.png",
"32": "images/logo32.png", "32": "images/logo32.png",

View File

@@ -2,7 +2,7 @@
"manifest_version": 3, "manifest_version": 3,
"name": "__MSG_app_name__", "name": "__MSG_app_name__",
"description": "__MSG_app_description__", "description": "__MSG_app_description__",
"version": "1.7.11", "version": "1.7.13",
"default_locale": "en", "default_locale": "en",
"author": "Gabe<yugang2002@gmail.com>", "author": "Gabe<yugang2002@gmail.com>",
"homepage_url": "https://github.com/fishjar/kiss-translator", "homepage_url": "https://github.com/fishjar/kiss-translator",
@@ -42,7 +42,7 @@
"description": "__MSG_open_options__" "description": "__MSG_open_options__"
} }
}, },
"permissions": ["storage"], "permissions": ["storage", "contextMenus"],
"host_permissions": ["<all_urls>"], "host_permissions": ["<all_urls>"],
"icons": { "icons": {
"16": "images/logo16.png", "16": "images/logo16.png",

View File

@@ -111,11 +111,15 @@ export const apiTranslate = async ({
let trText = ""; let trText = "";
let isSame = false; let isSame = false;
if (!text) {
return [trText, true];
}
const from = const from =
OPT_LANGS_SPECIAL[translator].get(fromLang) ?? OPT_LANGS_SPECIAL[translator].get(fromLang) ??
OPT_LANGS_SPECIAL[translator].get("auto"); OPT_LANGS_SPECIAL[translator].get("auto");
const to = OPT_LANGS_SPECIAL[translator].get(toLang); const to = OPT_LANGS_SPECIAL[translator].get(toLang);
if (!text || !to) { if (!to) {
console.log(`[trans] target lang: ${toLang} not support`); console.log(`[trans] target lang: ${toLang} not support`);
return [trText, isSame]; return [trText, isSame];
} }

View File

@@ -7,9 +7,13 @@ import {
MSG_OPEN_OPTIONS, MSG_OPEN_OPTIONS,
MSG_SAVE_RULE, MSG_SAVE_RULE,
MSG_TRANS_TOGGLE_STYLE, MSG_TRANS_TOGGLE_STYLE,
MSG_TRANSLATE_SELECTED,
MSG_OPEN_TRANBOX,
CMD_TOGGLE_TRANSLATE, CMD_TOGGLE_TRANSLATE,
CMD_TOGGLE_STYLE, CMD_TOGGLE_STYLE,
CMD_OPEN_OPTIONS, CMD_OPEN_OPTIONS,
CMD_OPEN_TRANBOX,
CMD_TRANSLATE_SELECTED,
} from "./config"; } from "./config";
import { getSettingWithDefault, tryInitDefaultData } from "./libs/storage"; import { getSettingWithDefault, tryInitDefaultData } from "./libs/storage";
import { trySyncSettingAndRules } from "./libs/sync"; import { trySyncSettingAndRules } from "./libs/sync";
@@ -26,14 +30,49 @@ globalThis.ContextType = "BACKGROUND";
*/ */
browser.runtime.onInstalled.addListener(() => { browser.runtime.onInstalled.addListener(() => {
tryInitDefaultData(); tryInitDefaultData();
// 右键菜单
browser.contextMenus.create({
id: CMD_TRANSLATE_SELECTED,
title: browser.i18n.getMessage("translate_selected"),
contexts: ["selection"],
});
browser.contextMenus.create({
id: "selection_separator",
type: "separator",
contexts: ["selection"],
});
browser.contextMenus.create({
id: CMD_TOGGLE_TRANSLATE,
title: browser.i18n.getMessage("toggle_translate"),
contexts: ["all"],
});
browser.contextMenus.create({
id: CMD_TOGGLE_STYLE,
title: browser.i18n.getMessage("toggle_style"),
contexts: ["all"],
});
browser.contextMenus.create({
id: "options_separator",
type: "separator",
contexts: ["all"],
});
browser.contextMenus.create({
id: CMD_OPEN_TRANBOX,
title: browser.i18n.getMessage("open_tranbox"),
contexts: ["all"],
});
browser.contextMenus.create({
id: CMD_OPEN_OPTIONS,
title: browser.i18n.getMessage("open_options"),
contexts: ["all"],
});
}); });
/** /**
* 浏览器启动 * 浏览器启动
*/ */
browser.runtime.onStartup.addListener(async () => { browser.runtime.onStartup.addListener(async () => {
console.log("browser onStartup");
// 同步数据 // 同步数据
await trySyncSettingAndRules(); await trySyncSettingAndRules();
@@ -60,7 +99,7 @@ browser.runtime.onMessage.addListener(
sendResponse({ data }); sendResponse({ data });
}) })
.catch((error) => { .catch((error) => {
sendResponse({ error: error.message }); sendResponse({ error: error.message, cause: error.cause });
}); });
break; break;
case MSG_FETCH_LIMIT: case MSG_FETCH_LIMIT:
@@ -103,3 +142,24 @@ browser.commands.onCommand.addListener((command) => {
default: default:
} }
}); });
browser.contextMenus.onClicked.addListener(({ menuItemId }) => {
switch (menuItemId) {
case CMD_TOGGLE_TRANSLATE:
sendTabMsg(MSG_TRANS_TOGGLE);
break;
case CMD_TOGGLE_STYLE:
sendTabMsg(MSG_TRANS_TOGGLE_STYLE);
break;
case CMD_TRANSLATE_SELECTED:
sendTabMsg(MSG_TRANSLATE_SELECTED);
break;
case CMD_OPEN_TRANBOX:
sendTabMsg(MSG_OPEN_TRANBOX);
break;
case CMD_OPEN_OPTIONS:
browser.runtime.openOptionsPage();
break;
default:
}
});

View File

@@ -16,6 +16,8 @@ import { Translator } from "./libs/translator";
import { sendIframeMsg, sendParentMsg } from "./libs/iframe"; import { sendIframeMsg, sendParentMsg } from "./libs/iframe";
import { matchRule } from "./libs/rules"; import { matchRule } from "./libs/rules";
import Slection from "./views/Selection"; import Slection from "./views/Selection";
import { touchTapListener } from "./libs/touch";
import { debounce } from "./libs/utils";
export async function runTranslator(setting) { export async function runTranslator(setting) {
const href = document.location.href; const href = document.location.href;
@@ -120,10 +122,22 @@ export function windowListener(rule) {
}); });
} }
export function showErr(err) { export function showErr(message) {
console.error("[KISS-Translator]", err);
const $err = document.createElement("div"); const $err = document.createElement("div");
$err.innerText = `KISS-Translator: ${err.message}`; $err.innerText = `KISS-Translator: ${message}`;
$err.style.cssText = "background:red; color:#fff;"; $err.style.cssText = "background:red; color:#fff;";
document.body.prepend($err); document.body.prepend($err);
} }
export function touchOperation(translator) {
const { touchTranslate = 2 } = translator.setting;
if (touchTranslate === 0) {
return;
}
const handleTap = debounce(() => {
translator.toggle();
sendIframeMsg(MSG_TRANS_TOGGLE);
});
touchTapListener(handleTap, touchTranslate);
}

View File

@@ -375,6 +375,14 @@ export const I18N = {
zh: `选择器`, zh: `选择器`,
en: `Selector`, en: `Selector`,
}, },
root_selector: {
zh: `根选择器`,
en: `Root Selector`,
},
fixer_function: {
zh: `修复函数`,
en: `Fixer Function`,
},
import: { import: {
zh: `导入`, zh: `导入`,
en: `Import`, en: `Import`,
@@ -539,6 +547,10 @@ export const I18N = {
zh: `隐藏悬浮按钮`, zh: `隐藏悬浮按钮`,
en: `Hide Fab Button`, en: `Hide Fab Button`,
}, },
hide_tran_button: {
zh: `隐藏翻译按钮`,
en: `Hide Translate Button`,
},
show: { show: {
zh: `显示`, zh: `显示`,
en: `Show`, en: `Show`,
@@ -623,6 +635,10 @@ export const I18N = {
zh: `显示翻译框快捷键`, zh: `显示翻译框快捷键`,
en: `Toggle Translate Box Shortcut`, en: `Toggle Translate Box Shortcut`,
}, },
trigger_transel_shortcut: {
zh: `翻译选中文字快捷键`,
en: `Translate Selected Shortcut`,
},
tranbtn_offset_x: { tranbtn_offset_x: {
zh: `翻译按钮偏移X0-100`, zh: `翻译按钮偏移X0-100`,
en: `Translate Button Offset X (0-100)`, en: `Translate Button Offset X (0-100)`,
@@ -643,4 +659,28 @@ export const I18N = {
zh: `收藏词汇`, zh: `收藏词汇`,
en: `Favorite Words`, en: `Favorite Words`,
}, },
touch_setting: {
zh: `触屏设置`,
en: `Touch Setting`,
},
touch_translate_shortcut: {
zh: `触屏翻译快捷方式`,
en: `Touch Translate Shortcut`,
},
touch_tap_0: {
zh: `禁用`,
en: `Disable`,
},
touch_tap_2: {
zh: `双指轻触`,
en: `Two finger tap`,
},
touch_tap_3: {
zh: `三指轻触`,
en: `Three finger tap`,
},
touch_tap_4: {
zh: `四指轻触`,
en: `Four finger tap`,
},
}; };

View File

@@ -23,6 +23,7 @@ export const STOKEY_MSAUTH = `${APP_NAME}_msauth`;
export const STOKEY_BDAUTH = `${APP_NAME}_bdauth`; export const STOKEY_BDAUTH = `${APP_NAME}_bdauth`;
export const STOKEY_SETTING = `${APP_NAME}_setting`; export const STOKEY_SETTING = `${APP_NAME}_setting`;
export const STOKEY_RULES = `${APP_NAME}_rules`; export const STOKEY_RULES = `${APP_NAME}_rules`;
export const STOKEY_WFRULES = `${APP_NAME}_webfix_rules`;
export const STOKEY_WORDS = `${APP_NAME}_words`; export const STOKEY_WORDS = `${APP_NAME}_words`;
export const STOKEY_SYNC = `${APP_NAME}_sync`; export const STOKEY_SYNC = `${APP_NAME}_sync`;
export const STOKEY_FAB = `${APP_NAME}_fab`; export const STOKEY_FAB = `${APP_NAME}_fab`;
@@ -32,6 +33,8 @@ export const STOKEY_WEBFIXCACHE_PREFIX = `${APP_NAME}_webfixcache_`;
export const CMD_TOGGLE_TRANSLATE = "toggleTranslate"; export const CMD_TOGGLE_TRANSLATE = "toggleTranslate";
export const CMD_TOGGLE_STYLE = "toggleStyle"; export const CMD_TOGGLE_STYLE = "toggleStyle";
export const CMD_OPEN_OPTIONS = "openOptions"; export const CMD_OPEN_OPTIONS = "openOptions";
export const CMD_OPEN_TRANBOX = "openTranbox";
export const CMD_TRANSLATE_SELECTED = "translateSelected";
export const CLIENT_WEB = "web"; export const CLIENT_WEB = "web";
export const CLIENT_CHROME = "chrome"; export const CLIENT_CHROME = "chrome";
@@ -41,6 +44,7 @@ export const CLIENT_USERSCRIPT = "userscript";
export const CLIENT_EXTS = [CLIENT_CHROME, CLIENT_EDGE, CLIENT_FIREFOX]; export const CLIENT_EXTS = [CLIENT_CHROME, CLIENT_EDGE, CLIENT_FIREFOX];
export const KV_RULES_KEY = "kiss-rules.json"; export const KV_RULES_KEY = "kiss-rules.json";
export const KV_WFRULES_KEY = "kiss-webfix.json";
export const KV_WORDS_KEY = "kiss-words.json"; export const KV_WORDS_KEY = "kiss-words.json";
export const KV_RULES_SHARE_KEY = "kiss-rules-share.json"; export const KV_RULES_SHARE_KEY = "kiss-rules-share.json";
export const KV_SETTING_KEY = "kiss-setting.json"; export const KV_SETTING_KEY = "kiss-setting.json";
@@ -56,6 +60,8 @@ export const MSG_OPEN_OPTIONS = "open_options";
export const MSG_SAVE_RULE = "save_rule"; export const MSG_SAVE_RULE = "save_rule";
export const MSG_TRANS_TOGGLE = "trans_toggle"; export const MSG_TRANS_TOGGLE = "trans_toggle";
export const MSG_TRANS_TOGGLE_STYLE = "trans_toggle_style"; export const MSG_TRANS_TOGGLE_STYLE = "trans_toggle_style";
export const MSG_TRANSLATE_SELECTED = "translate_selected";
export const MSG_OPEN_TRANBOX = "open_tranbox";
export const MSG_TRANS_GETRULE = "trans_getrule"; export const MSG_TRANS_GETRULE = "trans_getrule";
export const MSG_TRANS_PUTRULE = "trans_putrule"; export const MSG_TRANS_PUTRULE = "trans_putrule";
export const MSG_TRANS_CURRULE = "trans_currule"; export const MSG_TRANS_CURRULE = "trans_currule";
@@ -332,14 +338,17 @@ export const DEFAULT_INPUT_RULE = {
// 划词翻译 // 划词翻译
export const DEFAULT_TRANBOX_SHORTCUT = ["AltLeft", "KeyB"]; export const DEFAULT_TRANBOX_SHORTCUT = ["AltLeft", "KeyB"];
export const DEFAULT_TRANSEL_SHORTCUT = ["AltLeft", "KeyS"];
export const DEFAULT_TRANBOX_SETTING = { export const DEFAULT_TRANBOX_SETTING = {
transOpen: true, transOpen: true,
translator: OPT_TRANS_MICROSOFT, translator: OPT_TRANS_MICROSOFT,
fromLang: "auto", fromLang: "auto",
toLang: "zh-CN", toLang: "zh-CN",
tranboxShortcut: DEFAULT_TRANBOX_SHORTCUT, tranboxShortcut: DEFAULT_TRANBOX_SHORTCUT,
transelShortcut: DEFAULT_TRANSEL_SHORTCUT,
btnOffsetX: 10, btnOffsetX: 10,
btnOffsetY: 10, btnOffsetY: 10,
hideTranBtn: false,
}; };
// 订阅列表 // 订阅列表
@@ -423,6 +432,7 @@ export const DEFAULT_SETTING = {
shortcuts: DEFAULT_SHORTCUTS, // 快捷键 shortcuts: DEFAULT_SHORTCUTS, // 快捷键
inputRule: DEFAULT_INPUT_RULE, // 输入框设置 inputRule: DEFAULT_INPUT_RULE, // 输入框设置
tranboxSetting: DEFAULT_TRANBOX_SETTING, // 划词翻译设置 tranboxSetting: DEFAULT_TRANBOX_SETTING, // 划词翻译设置
touchTranslate: 2, // 触屏翻译
}; };
export const DEFAULT_RULES = [GLOBLA_RULE]; export const DEFAULT_RULES = [GLOBLA_RULE];

View File

@@ -1,6 +1,4 @@
const els = `li, p, h1, h2, h3, h4, h5, h6, dd, blockquote`; export const DEFAULT_SELECTOR = `:is(li, p, h1, h2, h3, h4, h5, h6, dd, blockquote)`;
export const DEFAULT_SELECTOR = `:is(${els})`;
export const GLOBAL_KEY = "*"; export const GLOBAL_KEY = "*";
export const REMAIN_KEY = "-"; export const REMAIN_KEY = "-";
@@ -42,145 +40,66 @@ export const DEFAULT_OW_RULE = {
textDiyStyle: DEFAULT_DIY_STYLE, textDiyStyle: DEFAULT_DIY_STYLE,
}; };
const RULES = [ const RULES_MAP = {
{ "www.google.com/search": `h3, .IsZvec, .VwiC3b`,
pattern: `www.google.com/search`, "news.google.com": `[role="link"], .DY5T1d, .ifw3f, ${DEFAULT_SELECTOR}`,
selector: `h3, .IsZvec, .VwiC3b`, "www.foxnews.com": `h1, h2, .title, .sidebar [data-type="Title"], .article-content ${DEFAULT_SELECTOR}; [data-spotim-module="conversation"]>div >>> [data-spot-im-class="message-text"] p, [data-spot-im-class="message-text"]`,
}, "bearblog.dev, www.theverge.com, www.tampermonkey.net/documentation.php": `${DEFAULT_SELECTOR}`,
{ "themessenger.com": `.leading-tight, .leading-tighter, .my-2 p, .font-body p, article ${DEFAULT_SELECTOR}`,
pattern: `news.google.com`, "www.telegraph.co.uk, go.dev/doc/": `article ${DEFAULT_SELECTOR}`,
selector: `h4`, "www.theguardian.com": `.show-underline, .dcr-hup5wm div, .dcr-7vl6y8 div, .dcr-12evv1c, figcaption, article ${DEFAULT_SELECTOR}, [data-cy="mostviewed-footer"] h4`,
}, "www.semafor.com": `${DEFAULT_SELECTOR}, .styles_intro__IYj__, [class*="styles_description"]`,
{ "www.noemamag.com": `.splash__title, .single-card__title, .single-card__type, .single-card__topic, .highlighted-content__title, .single-card__author, article ${DEFAULT_SELECTOR}, .quote__text, .wp-caption-text div`,
pattern: `www.foxnews.com`, "restofworld.org": `${DEFAULT_SELECTOR}, .recirc-story__headline, .recirc-story__dek`,
selector: `h1, h2, .title, .sidebar [data-type="Title"], .article-content ${DEFAULT_SELECTOR}; [data-spotim-module="conversation"]>div >>> [data-spot-im-class="message-text"] p, [data-spot-im-class="message-text"]`, "www.axios.com": `.h7, ${DEFAULT_SELECTOR}`,
}, "www.newyorker.com": `.summary-item__hed, .summary-item__dek, .summary-collection-grid__dek, .dqtvfu, .rubric__link, .caption, article ${DEFAULT_SELECTOR}, .HEhan ${DEFAULT_SELECTOR}, .ContributorBioBio-fBolsO`,
{ "time.com": `h1, h3, .summary, .video-title, #article-body ${DEFAULT_SELECTOR}, .image-wrap-container .credit.body-caption, .media-heading`,
pattern: `bearblog.dev, www.theverge.com, www.tampermonkey.net/documentation.php`, "www.dw.com": `.ts-teaser-title a, .news-title a, .title a, .teaser-description a, .hbudab h3, .hbudab p, figcaption ,article ${DEFAULT_SELECTOR}`,
selector: DEFAULT_SELECTOR, "www.bbc.com": `h1, h2, .media__link, .media__summary, article ${DEFAULT_SELECTOR}, .ssrcss-y7krbn-Stack, .ssrcss-17zglt8-PromoHeadline, .ssrcss-18cjaf3-Headline, .gs-c-promo-heading__title, .gs-c-promo-summary, .media__content h3, .article__intro`,
}, "www.chinadaily.com.cn": `h1, .tMain [shape="rect"], .cMain [shape="rect"], .photo_art [shape="rect"], .mai_r [shape="rect"], .lisBox li, #Content ${DEFAULT_SELECTOR}`,
{ "www.facebook.com": `[role="main"] [dir="auto"]`,
pattern: `themessenger.com`, "www.reddit.com": `[slot="title"], [slot="text-body"] ${DEFAULT_SELECTOR}, #-post-rtjson-content p`,
selector: `.leading-tight, .leading-tighter, .my-2 p, .font-body p, article ${DEFAULT_SELECTOR}`, "www.quora.com": `.qu-wordBreak--break-word`,
}, "edition.cnn.com": `.container__title, .container__headline, .headline__text, .image__caption, [data-type="Title"], .article__content ${DEFAULT_SELECTOR}`,
{ "www.reuters.com": `#main-content [data-testid="Heading"], #main-content [data-testid="Body"], .article-body__content__17Yit ${DEFAULT_SELECTOR}`,
pattern: `www.telegraph.co.uk`, "www.bloomberg.com": `[data-component="headline"], [data-component="related-item-headline"], [data-component="title"], article ${DEFAULT_SELECTOR}`,
selector: `article ${DEFAULT_SELECTOR}`, "deno.land, docs.github.com": `main ${DEFAULT_SELECTOR}`,
}, "doc.rust-lang.org": `.content ${DEFAULT_SELECTOR}`,
{ "www.indiehackers.com": `h1, h3, .content ${DEFAULT_SELECTOR}, .feed-item__title-link`,
pattern: `www.theguardian.com`, "platform.openai.com/docs": `.docs-body ${DEFAULT_SELECTOR}`,
selector: `.show-underline, .dcr-hup5wm div, .dcr-7vl6y8 div, .dcr-12evv1c, figcaption, article ${DEFAULT_SELECTOR}, [data-cy="mostviewed-footer"] h4`, "en.wikipedia.org": `h1, .mw-parser-output ${DEFAULT_SELECTOR}`,
}, "stackoverflow.com": `h1, .s-prose p, .comment-body .comment-copy`,
{ "www.npmjs.com/package, developer.chrome.com/docs, medium.com, developers.cloudflare.com, react.dev, create-react-app.dev, pytorch.org": `article ${DEFAULT_SELECTOR}`,
pattern: `www.semafor.com`, "news.ycombinator.com": `.title, .commtext`,
selector: `${DEFAULT_SELECTOR}, .styles_intro__IYj__, [class*="styles_description"]`, "github.com": `.markdown-body ${DEFAULT_SELECTOR}, .repo-description p, .Layout-sidebar .f4, .container-lg .py-4 .f5, .container-lg .my-4 .f5, .Box-row .pr-4, .Box-row article .mt-1, [itemprop="description"], .markdown-title, bdi, .ws-pre-wrap, .status-meta, span.status-meta, .col-10.color-fg-muted, .TimelineItem-body, .pinned-item-list-item-content .color-fg-muted, .markdown-body td, .markdown-body th`,
}, "twitter.com": `[data-testid="tweetText"]`,
{ "m.youtube.com": `.slim-video-information-title .yt-core-attributed-string, .media-item-headline .yt-core-attributed-string, .comment-text .yt-core-attributed-string, .typography-body-2b .yt-core-attributed-string, #ytp-caption-window-container .ytp-caption-segment`,
pattern: `www.noemamag.com`, "www.youtube.com": `h1, #video-title, #content-text, #title, yt-attributed-string>span>span, #ytp-caption-window-container .ytp-caption-segment`,
selector: `.splash__title, .single-card__title, .single-card__type, .single-card__topic, .highlighted-content__title, .single-card__author, article ${DEFAULT_SELECTOR}, .quote__text, .wp-caption-text div`, "bard.google.com": `.query-content ${DEFAULT_SELECTOR}, message-content ${DEFAULT_SELECTOR}`,
}, "www.bing.com": `.b_algoSlug, .rwrl_padref; .cib-serp-main >>> .ac-textBlock ${DEFAULT_SELECTOR}, .text-message-content div`,
{ "www.phoronix.com": `article ${DEFAULT_SELECTOR}`,
pattern: `restofworld.org`, "wx2.qq.com": `.js_message_plain`,
selector: `${DEFAULT_SELECTOR}, .recirc-story__headline, .recirc-story__dek`, "app.slack.com/client/": `.p-rich_text_section, .c-message_attachment__text, .p-rich_text_list li`,
}, "discord.com/channels/": `div[id^=message-content]`,
{ "t.me/s/": `.js-message_text ${DEFAULT_SELECTOR}`,
pattern: `www.axios.com`, "web.telegram.org/k/": `.message, .bot-commands-list-element-description, .reply-markup-button-text`,
selector: `.h7, ${DEFAULT_SELECTOR}`, "web.telegram.org/a/": `.message, .text-content, .bot-commands-list-element-description, .reply-markup-button-text`,
}, "chromereleases.googleblog.com": `.title, .publishdate, p, i, .header-desc, .header-title, .text`,
{ "www.instagram.com/": `h1, article span[dir=auto] > span[dir=auto], ._ab1y`,
pattern: `www.newyorker.com`, "www.instagram.com/p/,www.instagram.com/reels/": `h1, div[class='x9f619 xjbqb8w x78zum5 x168nmei x13lgxp2 x5pf9jr xo71vjh x1uhb9sk x1plvlek xryxfnj x1c4vz4f x2lah0s xdt5ytf xqjyukv x1cy8zhl x1oa3qoh x1nhvcw1'] > span[class='x1lliihq x1plvlek xryxfnj x1n2onr6 x193iq5w xeuugli x1fj9vlw x13faqbe x1vvkbs x1s928wv xhkezso x1gmr53x x1cpjm7i x1fgarty x1943h6x x1i0vuye xvs91rp xo1l8bm x5n08af x10wh9bi x1wdrske x8viiok x18hxmgj'], span[class='x193iq5w xeuugli x1fj9vlw x13faqbe x1vvkbs xt0psk2 x1i0vuye xvs91rp xo1l8bm x5n08af x10wh9bi x1wdrske x8viiok x18hxmgj']`,
selector: `.summary-item__hed, .summary-item__dek, .summary-collection-grid__dek, .dqtvfu, .rubric__link, .caption, article ${DEFAULT_SELECTOR}, .HEhan ${DEFAULT_SELECTOR}, .ContributorBioBio-fBolsO`, "mail.google.com": `${DEFAULT_SELECTOR}, h2[data-thread-perm-id], span[data-thread-id], div[data-message-id] div[class=''], .messageBody, #views`,
}, "web.whatsapp.com": `.copyable-text > span`,
{ "chat.openai.com": `div[data-message-author-role] > div ${DEFAULT_SELECTOR}`,
pattern: `https://time.com/`, "forum.ru-board.com": `.tit, .dats, span.post ${DEFAULT_SELECTOR}`,
selector: `h1, h3, .summary, .video-title, #article-body ${DEFAULT_SELECTOR}, .image-wrap-container .credit.body-caption, .media-heading`, "education.github.com": `${DEFAULT_SELECTOR}, a, summary, span.Button-content`,
}, "blogs.windows.com": `${DEFAULT_SELECTOR}, .c-uhf-nav-link, figcaption`,
{ "developer.apple.com/documentation/": `#main ${DEFAULT_SELECTOR}, #main .abstract .content, #main .abstract.content, #main .link span`,
pattern: `www.dw.com`, };
selector: `.ts-teaser-title a, .news-title a, .title a, .teaser-description a, .hbudab h3, .hbudab p, figcaption ,article ${DEFAULT_SELECTOR}`,
},
{
pattern: `www.bbc.com`,
selector: `h1, h2, .media__link, .media__summary, article ${DEFAULT_SELECTOR}, .ssrcss-y7krbn-Stack, .ssrcss-1mrs5ns-PromoLink, .ssrcss-18cjaf3-Headline, .gs-c-promo-heading__title, .gs-c-promo-summary, .media__content h3, .article__intro`,
},
{
pattern: `www.chinadaily.com.cn`,
selector: `h1, .tMain [shape="rect"], .cMain [shape="rect"], .photo_art [shape="rect"], .mai_r [shape="rect"], .lisBox li, #Content ${DEFAULT_SELECTOR}`,
},
{
pattern: `www.facebook.com`,
selector: `[role="main"] [dir="auto"]`,
},
{
pattern: `www.reddit.com`,
selector: `[slot="title"], [slot="text-body"] ${DEFAULT_SELECTOR}, #-post-rtjson-content p`,
},
{
pattern: `www.quora.com`,
selector: `.qu-wordBreak--break-word`,
},
{
pattern: `edition.cnn.com`,
selector: `.container__title, .container__headline, .headline__text, .image__caption, [data-type="Title"], .article__content ${DEFAULT_SELECTOR}`,
},
{
pattern: `www.reuters.com`,
selector: `#main-content [data-testid="Heading"], #main-content [data-testid="Body"], .article-body__content__17Yit ${DEFAULT_SELECTOR}`,
},
{
pattern: `www.bloomberg.com`,
selector: `[data-component="headline"], [data-component="related-item-headline"], [data-component="title"], article ${DEFAULT_SELECTOR}`,
},
{
pattern: `deno.land, docs.github.com`,
selector: `main ${DEFAULT_SELECTOR}`,
},
{
pattern: `doc.rust-lang.org`,
selector: `#content ${DEFAULT_SELECTOR}`,
},
{
pattern: `www.indiehackers.com`,
selector: `h1, h3, .content ${DEFAULT_SELECTOR}, .feed-item__title-link`,
},
{
pattern: `platform.openai.com/docs`,
selector: `.docs-body ${DEFAULT_SELECTOR}`,
},
{
pattern: `en.wikipedia.org`,
selector: `h1, .mw-parser-output ${DEFAULT_SELECTOR}`,
},
{
pattern: `stackoverflow.com`,
selector: `h1, .s-prose p, .comment-body .comment-copy`,
},
{
pattern: `www.npmjs.com/package/, developer.chrome.com/docs, medium.com, developers.cloudflare.com, react.dev, create-react-app.dev, pytorch.org/`,
selector: `article ${DEFAULT_SELECTOR}`,
},
{
pattern: `news.ycombinator.com`,
selector: `.title, .commtext`,
},
{
pattern: `https://github.com/`,
selector: `.markdown-body ${DEFAULT_SELECTOR}, .repo-description p, .Layout-sidebar .f4, .container-lg .py-4 .f5, .container-lg .my-4 .f5, .Box-row .pr-4, .Box-row article .mt-1, [itemprop='description'], .markdown-title, bdi`,
},
{
pattern: `twitter.com`,
selector: `[data-testid='tweetText']`,
},
{
pattern: `youtube.com`,
selector: `h1, #video-title, #content-text, #title, yt-attributed-string>span>span`,
},
];
export const BUILTIN_RULES = RULES.sort((a, b) => export const BUILTIN_RULES = Object.entries(RULES_MAP)
a.pattern.localeCompare(b.pattern) .sort((a, b) => a[0].localeCompare(b[0]))
).map((item) => ({ .map(([pattern, selector]) => ({
...DEFAULT_RULE, ...DEFAULT_RULE,
...item, pattern,
transOpen: "true", selector,
})); }));

View File

@@ -2,6 +2,8 @@ import { browser } from "./libs/browser";
import { import {
MSG_TRANS_TOGGLE, MSG_TRANS_TOGGLE,
MSG_TRANS_TOGGLE_STYLE, MSG_TRANS_TOGGLE_STYLE,
MSG_TRANSLATE_SELECTED,
MSG_OPEN_TRANBOX,
MSG_TRANS_GETRULE, MSG_TRANS_GETRULE,
MSG_TRANS_PUTRULE, MSG_TRANS_PUTRULE,
} from "./config"; } from "./config";
@@ -15,6 +17,7 @@ import {
showTransbox, showTransbox,
windowListener, windowListener,
showErr, showErr,
touchOperation,
} from "./common"; } from "./common";
function runtimeListener(translator) { function runtimeListener(translator) {
@@ -34,6 +37,12 @@ function runtimeListener(translator) {
translator.updateRule(args); translator.updateRule(args);
sendIframeMsg(MSG_TRANS_PUTRULE, args); sendIframeMsg(MSG_TRANS_PUTRULE, args);
break; break;
case MSG_TRANSLATE_SELECTED:
window.dispatchEvent(new CustomEvent(MSG_TRANSLATE_SELECTED));
break;
case MSG_OPEN_TRANBOX:
window.dispatchEvent(new CustomEvent(MSG_OPEN_TRANBOX));
break;
default: default:
return { error: `message action is unavailable: ${action}` }; return { error: `message action is unavailable: ${action}` };
} }
@@ -70,7 +79,11 @@ function runtimeListener(translator) {
// 浮球按钮 // 浮球按钮
await showFab(translator); await showFab(translator);
// 触屏操作
touchOperation(translator);
} catch (err) { } catch (err) {
showErr(err); console.error("[KISS-Translator]", err);
showErr(err.message);
} }
})(); })();

View File

@@ -1,6 +1,12 @@
import { useCallback, useEffect, useState } from "react"; import { useCallback, useEffect, useState } from "react";
import { storage } from "../libs/storage"; import { storage } from "../libs/storage";
/**
*
* @param {*} key
* @param {*} defaultVal 需为调用hook外的常量
* @returns
*/
export function useStorage(key, defaultVal) { export function useStorage(key, defaultVal) {
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [data, setData] = useState(null); const [data, setData] = useState(null);

View File

@@ -12,10 +12,24 @@ import { THEME_DARK, THEME_LIGHT } from "../config";
export default function Theme({ children, options }) { export default function Theme({ children, options }) {
const { darkMode } = useDarkMode(); const { darkMode } = useDarkMode();
const theme = useMemo(() => { const theme = useMemo(() => {
let htmlFontSize = 16;
try {
const s = window.getComputedStyle(document.body.parentNode).fontSize;
const fontSize = parseInt(s.replace("px", ""));
if (fontSize > 0 && fontSize < 1000) {
htmlFontSize = fontSize;
}
} catch (err) {
//
}
return createTheme({ return createTheme({
palette: { palette: {
mode: darkMode ? THEME_DARK : THEME_LIGHT, mode: darkMode ? THEME_DARK : THEME_LIGHT,
}, },
typography: {
htmlFontSize,
},
...options, ...options,
}); });
}, [darkMode, options]); }, [darkMode, options]);

58
src/hooks/WebfixRules.js Normal file
View File

@@ -0,0 +1,58 @@
import { STOKEY_WFRULES, KV_WFRULES_KEY } from "../config";
import { useStorage } from "./Storage";
import { trySyncWebfixRules } from "../libs/sync";
import { useCallback } from "react";
import { useSyncMeta } from "./Sync";
const DEFAULT_WFRULES = [];
/**
* 修复规则 hook
* @returns
*/
export function useWebfixRules() {
const { data: list, save } = useStorage(STOKEY_WFRULES, DEFAULT_WFRULES);
const { updateSyncMeta } = useSyncMeta();
const updateRules = useCallback(
async (rules) => {
await save(rules);
await updateSyncMeta(KV_WFRULES_KEY);
trySyncWebfixRules();
},
[save, updateSyncMeta]
);
const add = useCallback(
async (rule) => {
const rules = [...list];
if (rules.map((item) => item.pattern).includes(rule.pattern)) {
return;
}
rules.unshift(rule);
await updateRules(rules);
},
[list, updateRules]
);
const del = useCallback(
async (pattern) => {
let rules = [...list];
rules = rules.filter((item) => item.pattern !== pattern);
await updateRules(rules);
},
[list, updateRules]
);
const put = useCallback(
async (pattern, obj) => {
const rules = [...list];
const rule = rules.find((r) => r.pattern === pattern);
rule && Object.assign(rule, obj);
await updateRules(rules);
},
[list, updateRules]
);
return { list, add, del, put };
}

View File

@@ -55,6 +55,10 @@ export const fetchApi = async ({ input, init, transOpts, apiSetting }) => {
[input, init] = await newTransReq(transOpts, apiSetting); [input, init] = await newTransReq(transOpts, apiSetting);
} }
if (!input) {
throw new Error("url is empty");
}
if (isGm) { if (isGm) {
let info; let info;
if (window.KISS_GM) { if (window.KISS_GM) {
@@ -127,7 +131,13 @@ export const fetchData = async (
} }
if (!res?.ok) { if (!res?.ok) {
throw new Error(`response: ${res.statusText}`); const cause = {
status: res.status,
};
if (res.headers.get("Content-Type")?.includes("json")) {
cause.body = await res.json();
}
throw new Error(`response: [${res.status}] ${res.statusText}`, { cause });
} }
// 插入缓存 // 插入缓存
@@ -163,7 +173,7 @@ export const fetchPolyfill = async (input, opts) => {
if (isExt && !isBg()) { if (isExt && !isBg()) {
const res = await sendBgMsg(MSG_FETCH, { input, opts }); const res = await sendBgMsg(MSG_FETCH, { input, opts });
if (res.error) { if (res.error) {
throw new Error(res.error); throw new Error(res.error, { cause: res.cause });
} }
return res.data; return res.data;
} }

View File

@@ -1,6 +1,7 @@
import { import {
STOKEY_SETTING, STOKEY_SETTING,
STOKEY_RULES, STOKEY_RULES,
STOKEY_WFRULES,
STOKEY_WORDS, STOKEY_WORDS,
STOKEY_FAB, STOKEY_FAB,
STOKEY_SYNC, STOKEY_SYNC,
@@ -98,6 +99,14 @@ export const getRulesWithDefault = async () =>
(await getRules()) || DEFAULT_RULES; (await getRules()) || DEFAULT_RULES;
export const setRules = (val) => setObj(STOKEY_RULES, val); export const setRules = (val) => setObj(STOKEY_RULES, val);
/**
* 修复规则列表
*/
export const getWebfixRules = () => getObj(STOKEY_WFRULES);
export const getWebfixRulesWithDefault = async () =>
(await getWebfixRules()) || [];
export const setWebfixRules = (val) => setObj(STOKEY_WFRULES, val);
/** /**
* 词汇列表 * 词汇列表
*/ */

View File

@@ -2,6 +2,7 @@ import {
APP_LCNAME, APP_LCNAME,
KV_SETTING_KEY, KV_SETTING_KEY,
KV_RULES_KEY, KV_RULES_KEY,
KV_WFRULES_KEY,
KV_WORDS_KEY, KV_WORDS_KEY,
KV_RULES_SHARE_KEY, KV_RULES_SHARE_KEY,
KV_SALT_SHARE, KV_SALT_SHARE,
@@ -13,8 +14,10 @@ import {
getSettingWithDefault, getSettingWithDefault,
getRulesWithDefault, getRulesWithDefault,
getWordsWithDefault, getWordsWithDefault,
getWebfixRulesWithDefault,
setSetting, setSetting,
setRules, setRules,
setWebfixRules,
setWords, setWords,
} from "./storage"; } from "./storage";
import { apiSyncData } from "../apis"; import { apiSyncData } from "../apis";
@@ -138,6 +141,25 @@ export const trySyncRules = async () => {
} }
}; };
/**
* 同步修复规则
* @returns
*/
const syncWebfixRules = async () => {
const res = await syncData(KV_WFRULES_KEY, getWebfixRulesWithDefault);
if (res?.isNew) {
await setWebfixRules(res.value);
}
};
export const trySyncWebfixRules = async () => {
try {
await syncWebfixRules();
} catch (err) {
console.log("[sync user webfix rules]", err);
}
};
/** /**
* 同步词汇 * 同步词汇
* @returns * @returns
@@ -185,11 +207,13 @@ export const syncShareRules = async ({ rules, syncUrl, syncKey }) => {
export const syncSettingAndRules = async () => { export const syncSettingAndRules = async () => {
await syncSetting(); await syncSetting();
await syncRules(); await syncRules();
await syncWebfixRules();
await syncWords(); await syncWords();
}; };
export const trySyncSettingAndRules = async () => { export const trySyncSettingAndRules = async () => {
await trySyncSetting(); await trySyncSetting();
await trySyncRules(); await trySyncRules();
await trySyncWebfixRules();
await trySyncWords(); await trySyncWords();
}; };

12
src/libs/touch.js Normal file
View File

@@ -0,0 +1,12 @@
export function touchTapListener(fn, touchsLength) {
const handleTouchend = (e) => {
if (e.touches.length === touchsLength) {
fn();
}
};
document.addEventListener("touchstart", handleTouchend);
return () => {
document.removeEventListener("touchstart", handleTouchend);
};
}

View File

@@ -349,8 +349,8 @@ export class Translator {
// 监听鼠标悬停 // 监听鼠标悬停
window.addEventListener("keydown", this._handleKeydown); window.addEventListener("keydown", this._handleKeydown);
this._tranNodes.forEach((_, node) => { this._tranNodes.forEach((_, node) => {
node.addEventListener("mouseover", this._handleMouseover); node.addEventListener("mouseenter", this._handleMouseover);
node.addEventListener("mouseout", this._handleMouseout); node.addEventListener("mouseleave", this._handleMouseout);
}); });
} }
}; };
@@ -475,15 +475,15 @@ export class Translator {
}; };
_handleMouseover = (e) => { _handleMouseover = (e) => {
// console.log("mouseover", e); // console.log("mouseenter", e);
if (!this._tranNodes.has(e.target)) { if (!this._tranNodes.has(e.target)) {
return; return;
} }
const key = this._setting.mouseKey.slice(3); const key = this._setting.mouseKey.slice(3);
if (this._setting.mouseKey === OPT_MOUSEKEY_MOUSEOVER || e[key]) { if (this._setting.mouseKey === OPT_MOUSEKEY_MOUSEOVER || e[key]) {
e.target.removeEventListener("mouseover", this._handleMouseover); e.target.removeEventListener("mouseenter", this._handleMouseover);
e.target.removeEventListener("mouseout", this._handleMouseout); e.target.removeEventListener("mouseleave", this._handleMouseout);
this._render(e.target); this._render(e.target);
} else { } else {
this._mouseoverNode = e.target; this._mouseoverNode = e.target;
@@ -491,7 +491,7 @@ export class Translator {
}; };
_handleMouseout = (e) => { _handleMouseout = (e) => {
// console.log("mouseout", e); // console.log("mouseleave", e);
if (!this._tranNodes.has(e.target)) { if (!this._tranNodes.has(e.target)) {
return; return;
} }
@@ -504,10 +504,13 @@ export class Translator {
const key = this._setting.mouseKey.slice(3); const key = this._setting.mouseKey.slice(3);
if (e[key] && this._mouseoverNode) { if (e[key] && this._mouseoverNode) {
this._mouseoverNode.removeEventListener( this._mouseoverNode.removeEventListener(
"mouseover", "mouseenter",
this._handleMouseover this._handleMouseover
); );
this._mouseoverNode.removeEventListener("mouseout", this._handleMouseout); this._mouseoverNode.removeEventListener(
"mouseleave",
this._handleMouseout
);
const node = this._mouseoverNode; const node = this._mouseoverNode;
this._render(node); this._render(node);
@@ -536,8 +539,9 @@ export class Translator {
// 移除鼠标悬停监听 // 移除鼠标悬停监听
window.removeEventListener("keydown", this._handleKeydown); window.removeEventListener("keydown", this._handleKeydown);
this._tranNodes.forEach((_, node) => { this._tranNodes.forEach((_, node) => {
node.removeEventListener("mouseover", this._handleMouseover); // node.style.pointerEvents = "none";
node.removeEventListener("mouseout", this._handleMouseout); node.removeEventListener("mouseenter", this._handleMouseover);
node.removeEventListener("mouseleave", this._handleMouseout);
// 移除已插入元素 // 移除已插入元素
node.querySelector(APP_LCNAME)?.remove(); node.querySelector(APP_LCNAME)?.remove();
}); });

View File

@@ -1,5 +1,5 @@
import { isMatch } from "./utils"; import { isMatch } from "./utils";
import { getWebfix, setWebfix } from "./storage"; import { getWebfix, setWebfix, getWebfixRulesWithDefault } from "./storage";
import { apiFetch } from "../apis"; import { apiFetch } from "../apis";
/** /**
@@ -7,7 +7,16 @@ import { apiFetch } from "../apis";
*/ */
const FIXER_BR = "br"; const FIXER_BR = "br";
const FIXER_BN = "bn"; const FIXER_BN = "bn";
const FIXER_BR_DIV = "brToDiv";
const FIXER_BN_DIV = "bnToDiv";
const FIXER_FONTSIZE = "fontSize"; const FIXER_FONTSIZE = "fontSize";
export const FIXER_ALL = [
FIXER_BR,
FIXER_BN,
FIXER_BR_DIV,
FIXER_BN_DIV,
// FIXER_FONTSIZE,
];
/** /**
* 需要修复的站点列表 * 需要修复的站点列表
@@ -54,7 +63,7 @@ const fixedSign = "kissfixed";
* @param {*} node * @param {*} node
* @returns * @returns
*/ */
function brFixer(node) { function brFixer(node, tag = "p") {
if (node.hasAttribute(fixedSign)) { if (node.hasAttribute(fixedSign)) {
return; return;
} }
@@ -81,13 +90,13 @@ function brFixer(node) {
var html = ""; var html = "";
node.childNodes.forEach(function (child, index) { node.childNodes.forEach(function (child, index) {
if (index === 0) { if (index === 0) {
html += "<p>"; html += `<${tag} class="kiss-p">`;
} }
if (gapTags.indexOf(child.nodeName) !== -1) { if (gapTags.indexOf(child.nodeName) !== -1) {
html += "</p><p>"; html += `</${tag}><${tag} class="kiss-p">`;
} else if (newlineTags.indexOf(child.nodeName) !== -1) { } else if (newlineTags.indexOf(child.nodeName) !== -1) {
html += "</p>" + child.outerHTML + "<p>"; html += `</${tag}>${child.outerHTML}<${tag} class="kiss-p">`;
} else if (child.outerHTML) { } else if (child.outerHTML) {
html += child.outerHTML; html += child.outerHTML;
} else if (child.nodeValue) { } else if (child.nodeValue) {
@@ -95,30 +104,34 @@ function brFixer(node) {
} }
if (index === node.childNodes.length - 1) { if (index === node.childNodes.length - 1) {
html += "</p>"; html += `</${tag}>`;
} }
}); });
node.innerHTML = html; node.innerHTML = html;
} }
function brDivFixer(node) {
return brFixer(node, "div");
}
/** /**
* 目标是将 `\n` 替换成 `p` * 目标是将 `\n` 替换成 `p`
* @param {*} node * @param {*} node
* @returns * @returns
*/ */
function bnFixer(node) { function bnFixer(node, tag = "p") {
if (node.hasAttribute(fixedSign)) { if (node.hasAttribute(fixedSign)) {
return; return;
} }
node.setAttribute(fixedSign, "true"); node.setAttribute(fixedSign, "true");
node.innerHTML = node.innerHTML
.split("\n")
.map((item) => `<${tag} class="kiss-p">${item || "&nbsp;"}</${tag}>`)
.join("");
}
const childs = node.childNodes; function bnDivFixer(node) {
if (childs.length === 1 && childs[0].nodeName === "#text") { return bnFixer(node, "div");
node.innerHTML = node.innerHTML
.split("\n")
.map((item) => `<p>${item || "&nbsp;"}</p>`)
.join("");
}
} }
/** /**
@@ -135,6 +148,8 @@ function fontSizeFixer(node) {
const fixerMap = { const fixerMap = {
[FIXER_BR]: brFixer, [FIXER_BR]: brFixer,
[FIXER_BN]: bnFixer, [FIXER_BN]: bnFixer,
[FIXER_BR_DIV]: brDivFixer,
[FIXER_BN_DIV]: bnDivFixer,
[FIXER_FONTSIZE]: fontSizeFixer, [FIXER_FONTSIZE]: fontSizeFixer,
}; };
@@ -148,7 +163,11 @@ function run(selector, fixer, rootSelector) {
var mutaObserver = new MutationObserver(function (mutations) { var mutaObserver = new MutationObserver(function (mutations) {
mutations.forEach(function (mutation) { mutations.forEach(function (mutation) {
mutation.addedNodes.forEach(function (addNode) { mutation.addedNodes.forEach(function (addNode) {
addNode.querySelectorAll(selector).forEach(fixer); if (addNode && addNode.querySelectorAll) {
addNode.querySelectorAll(selector).forEach(function (node) {
fixer(node);
});
}
}); });
}); });
}); });
@@ -159,7 +178,9 @@ function run(selector, fixer, rootSelector) {
} }
rootNodes.forEach(function (rootNode) { rootNodes.forEach(function (rootNode) {
rootNode.querySelectorAll(selector).forEach(fixer); rootNode.querySelectorAll(selector).forEach(function (node) {
fixer(node);
});
mutaObserver.observe(rootNode, { mutaObserver.observe(rootNode, {
childList: true, childList: true,
subtree: true, subtree: true,
@@ -206,7 +227,9 @@ export async function runWebfix({ injectWebfix }) {
} }
const href = document.location.href; const href = document.location.href;
const sites = await loadOrFetchWebfix(process.env.REACT_APP_WEBFIXURL); const userSites = await getWebfixRulesWithDefault();
const subSites = await loadOrFetchWebfix(process.env.REACT_APP_WEBFIXURL);
const sites = [...userSites, ...subSites];
for (var i = 0; i < sites.length; i++) { for (var i = 0; i < sites.length; i++) {
var site = sites[i]; var site = sites[i];
if (isMatch(href, site.pattern)) { if (isMatch(href, site.pattern)) {

View File

@@ -11,6 +11,7 @@ import {
showTransbox, showTransbox,
windowListener, windowListener,
showErr, showErr,
touchOperation,
} from "./common"; } from "./common";
function runSettingPage() { function runSettingPage() {
@@ -69,9 +70,13 @@ function runSettingPage() {
// 浮球按钮 // 浮球按钮
await showFab(translator); await showFab(translator);
// 触屏操作
touchOperation(translator);
// 同步订阅规则 // 同步订阅规则
await trySyncAllSubRules(setting); await trySyncAllSubRules(setting);
} catch (err) { } catch (err) {
showErr(err); console.error("[KISS-Translator]", err);
showErr(err.message);
} }
})(); })();

View File

@@ -46,7 +46,20 @@ function TestButton({ translator, api }) {
} }
alert.success(i18n("test_success")); alert.success(i18n("test_success"));
} catch (err) { } catch (err) {
alert.error(`${i18n("test_failed")}: ${err.message}`); // alert.error(`${i18n("test_failed")}: ${err.message}`);
alert.error(
<>
<div>{`${i18n("test_failed")}: ${err.message}`}</div>
<pre
style={{
maxWidth: 400,
overflow: "auto",
}}
>
{JSON.stringify(err.cause || {}, null, 2)}
</pre>
</>
);
} finally { } finally {
setLoading(false); setLoading(false);
} }

View File

@@ -6,6 +6,7 @@ import Box from "@mui/material/Box";
import Link from "@mui/material/Link"; import Link from "@mui/material/Link";
import { useI18n } from "../../hooks/I18n"; import { useI18n } from "../../hooks/I18n";
import DarkModeButton from "./DarkModeButton"; import DarkModeButton from "./DarkModeButton";
import Typography from "@mui/material/Typography";
function Header(props) { function Header(props) {
const i18n = useI18n(); const i18n = useI18n();
@@ -30,14 +31,14 @@ function Header(props) {
<MenuIcon /> <MenuIcon />
</IconButton> </IconButton>
</Box> </Box>
<Box sx={{ flexGrow: 1 }}> <Typography component="div" sx={{ flexGrow: 1, fontWeight: "bold" }}>
<Link <Link
underline="none" underline="none"
color="inherit" color="inherit"
href={process.env.REACT_APP_HOMEPAGE} href={process.env.REACT_APP_HOMEPAGE}
target="_blank" target="_blank"
>{`${i18n("app_name")} v${process.env.REACT_APP_VERSION}`}</Link> >{`${i18n("app_name")} v${process.env.REACT_APP_VERSION}`}</Link>
</Box> </Typography>
<DarkModeButton /> <DarkModeButton />
</Toolbar> </Toolbar>
</AppBar> </AppBar>

View File

@@ -13,8 +13,8 @@ import SyncIcon from "@mui/icons-material/Sync";
import ApiIcon from "@mui/icons-material/Api"; import ApiIcon from "@mui/icons-material/Api";
import SendTimeExtensionIcon from "@mui/icons-material/SendTimeExtension"; import SendTimeExtensionIcon from "@mui/icons-material/SendTimeExtension";
import InputIcon from "@mui/icons-material/Input"; import InputIcon from "@mui/icons-material/Input";
import SelectAllIcon from '@mui/icons-material/SelectAll'; import SelectAllIcon from "@mui/icons-material/SelectAll";
import EventNoteIcon from '@mui/icons-material/EventNote'; import EventNoteIcon from "@mui/icons-material/EventNote";
function LinkItem({ label, url, icon }) { function LinkItem({ label, url, icon }) {
const match = useMatch(url); const match = useMatch(url);

View File

@@ -60,6 +60,9 @@ export default function Settings() {
case "newlineLength": case "newlineLength":
value = limitNumber(value, 1, 1000); value = limitNumber(value, 1, 1000);
break; break;
case "touchTranslate":
value = limitNumber(value, 0, 3);
break;
default: default:
} }
updateSetting({ updateSetting({
@@ -86,6 +89,7 @@ export default function Settings() {
newlineLength = TRANS_NEWLINE_LENGTH, newlineLength = TRANS_NEWLINE_LENGTH,
mouseKey = OPT_MOUSEKEY_DISABLE, mouseKey = OPT_MOUSEKEY_DISABLE,
detectRemote = false, detectRemote = false,
touchTranslate = 2,
} = setting; } = setting;
const { isHide = false } = fab || {}; const { isHide = false } = fab || {};
@@ -169,6 +173,22 @@ export default function Settings() {
</Select> </Select>
</FormControl> </FormControl>
<FormControl size="small">
<InputLabel>{i18n("touch_translate_shortcut")}</InputLabel>
<Select
name="touchTranslate"
value={touchTranslate}
label={i18n("touch_translate_shortcut")}
onChange={handleChange}
>
{[0, 2, 3, 4].map((item) => (
<MenuItem key={item} value={item}>
{i18n(`touch_tap_${item}`)}
</MenuItem>
))}
</Select>
</FormControl>
<FormControl size="small"> <FormControl size="small">
<InputLabel>{i18n("hide_fab_button")}</InputLabel> <InputLabel>{i18n("hide_fab_button")}</InputLabel>
<Select <Select

View File

@@ -3,7 +3,12 @@ import Stack from "@mui/material/Stack";
import TextField from "@mui/material/TextField"; import TextField from "@mui/material/TextField";
import MenuItem from "@mui/material/MenuItem"; import MenuItem from "@mui/material/MenuItem";
import { useI18n } from "../../hooks/I18n"; import { useI18n } from "../../hooks/I18n";
import { OPT_TRANS_ALL, OPT_LANGS_FROM, OPT_LANGS_TO } from "../../config"; import {
OPT_TRANS_ALL,
OPT_LANGS_FROM,
OPT_LANGS_TO,
DEFAULT_TRANSEL_SHORTCUT,
} from "../../config";
import ShortcutInput from "./ShortcutInput"; import ShortcutInput from "./ShortcutInput";
import FormControlLabel from "@mui/material/FormControlLabel"; import FormControlLabel from "@mui/material/FormControlLabel";
import Switch from "@mui/material/Switch"; import Switch from "@mui/material/Switch";
@@ -39,14 +44,23 @@ export default function Tranbox() {
[updateTranbox] [updateTranbox]
); );
const handleShortcutTransel = useCallback(
(val) => {
updateTranbox({ transelShortcut: val });
},
[updateTranbox]
);
const { const {
transOpen, transOpen,
translator, translator,
fromLang, fromLang,
toLang, toLang,
tranboxShortcut, tranboxShortcut,
transelShortcut = DEFAULT_TRANSEL_SHORTCUT,
btnOffsetX, btnOffsetX,
btnOffsetY, btnOffsetY,
hideTranBtn = false,
} = tranboxSetting; } = tranboxSetting;
return ( return (
@@ -129,11 +143,29 @@ export default function Tranbox() {
onChange={handleChange} onChange={handleChange}
/> />
<TextField
select
size="small"
name="hideTranBtn"
value={hideTranBtn}
label={i18n("hide_tran_button")}
onChange={handleChange}
>
<MenuItem value={false}>{i18n("show")}</MenuItem>
<MenuItem value={true}>{i18n("hide")}</MenuItem>
</TextField>
<ShortcutInput <ShortcutInput
value={tranboxShortcut} value={tranboxShortcut}
onChange={handleShortcutInput} onChange={handleShortcutInput}
label={i18n("trigger_tranbox_shortcut")} label={i18n("trigger_tranbox_shortcut")}
/> />
<ShortcutInput
value={transelShortcut}
onChange={handleShortcutTransel}
label={i18n("trigger_transel_shortcut")}
/>
</Stack> </Stack>
</Box> </Box>
); );

View File

@@ -13,43 +13,204 @@ import FormControlLabel from "@mui/material/FormControlLabel";
import Switch from "@mui/material/Switch"; import Switch from "@mui/material/Switch";
import { useSetting } from "../../hooks/Setting"; import { useSetting } from "../../hooks/Setting";
import CircularProgress from "@mui/material/CircularProgress"; import CircularProgress from "@mui/material/CircularProgress";
import { syncWebfix, loadOrFetchWebfix } from "../../libs/webfix"; import { syncWebfix, loadOrFetchWebfix, FIXER_ALL } from "../../libs/webfix";
import Button from "@mui/material/Button"; import Button from "@mui/material/Button";
import SyncIcon from "@mui/icons-material/Sync"; import SyncIcon from "@mui/icons-material/Sync";
import { useAlert } from "../../hooks/Alert"; import { useAlert } from "../../hooks/Alert";
import HelpButton from "./HelpButton"; import HelpButton from "./HelpButton";
import { URL_KISS_RULES_NEW_ISSUE } from "../../config"; import { URL_KISS_RULES_NEW_ISSUE } from "../../config";
import MenuItem from "@mui/material/MenuItem";
import { useWebfixRules } from "../../hooks/WebfixRules";
function WebfixFields({ rule, webfix, setShow }) {
const editMode = !!rule;
const initFormValues = rule || {
pattern: "",
selector: "",
rootSelector: "",
fixer: FIXER_ALL[0],
};
const i18n = useI18n();
const [disabled, setDisabled] = useState(editMode);
const [errors, setErrors] = useState({});
const [formValues, setFormValues] = useState(initFormValues);
const { pattern, selector, rootSelector, fixer } = formValues;
const hasSamePattern = (str) => {
for (const item of webfix.list || []) {
if (item.pattern === str && rule?.pattern !== str) {
return true;
}
}
return false;
};
const handleFocus = (e) => {
e.preventDefault();
const { name } = e.target;
setErrors((pre) => ({ ...pre, [name]: "" }));
};
const handleChange = (e) => {
e.preventDefault();
const { name, value } = e.target;
setFormValues((pre) => ({ ...pre, [name]: value }));
};
const handleCancel = (e) => {
e.preventDefault();
if (editMode) {
setDisabled(true);
} else {
setShow(false);
}
setFormValues(initFormValues);
};
const handleSubmit = (e) => {
e.preventDefault();
const errors = {};
if (!pattern.trim()) {
errors.pattern = i18n("error_cant_be_blank");
}
if (hasSamePattern(pattern)) {
errors.pattern = i18n("error_duplicate_values");
}
if (!selector.trim()) {
errors.selector = i18n("error_cant_be_blank");
}
if (Object.keys(errors).length > 0) {
setErrors(errors);
return;
}
if (editMode) {
// 编辑
setDisabled(true);
webfix.put(rule.pattern, formValues);
} else {
// 添加
webfix.add(formValues);
setShow(false);
setFormValues(initFormValues);
}
};
function ApiFields({ site }) {
const { selector, rootSelector, fixer } = site;
return ( return (
<Stack spacing={3}> <form onSubmit={handleSubmit}>
<TextField <Stack spacing={3}>
size="small" <TextField
label={"rootSelector"} size="small"
name="rootSelector" label={i18n("pattern")}
value={rootSelector || "document"} error={!!errors.pattern}
disabled helperText={errors.pattern}
/> name="pattern"
<TextField value={pattern}
size="small" disabled={disabled}
label={"selector"} onChange={handleChange}
name="selector" onFocus={handleFocus}
value={selector} multiline
disabled />
/> <TextField
<TextField size="small"
size="small" label={i18n("root_selector")}
label={"fixer"} error={!!errors.rootSelector}
name="fixer" helperText={errors.rootSelector}
value={fixer} name="rootSelector"
disabled value={rootSelector}
/> disabled={disabled}
</Stack> onChange={handleChange}
onFocus={handleFocus}
multiline
/>
<TextField
size="small"
label={i18n("selector")}
error={!!errors.selector}
helperText={errors.selector}
name="selector"
value={selector}
disabled={disabled}
onChange={handleChange}
onFocus={handleFocus}
multiline
/>
<TextField
select
size="small"
name="fixer"
value={fixer}
label={i18n("fixer_function")}
disabled={disabled}
onChange={handleChange}
>
{FIXER_ALL.map((item) => (
<MenuItem key={item} value={item}>
{item}
</MenuItem>
))}
</TextField>
{webfix &&
(editMode ? (
// 编辑
<Stack direction="row" spacing={2}>
{disabled ? (
<>
<Button
size="small"
variant="contained"
onClick={(e) => {
e.preventDefault();
setDisabled(false);
}}
>
{i18n("edit")}
</Button>
<Button
size="small"
variant="outlined"
onClick={(e) => {
e.preventDefault();
webfix.del(rule.pattern);
}}
>
{i18n("delete")}
</Button>
</>
) : (
<>
<Button size="small" variant="contained" type="submit">
{i18n("save")}
</Button>
<Button
size="small"
variant="outlined"
onClick={handleCancel}
>
{i18n("cancel")}
</Button>
</>
)}
</Stack>
) : (
// 添加
<Stack direction="row" spacing={2}>
<Button size="small" variant="contained" type="submit">
{i18n("save")}
</Button>
<Button size="small" variant="outlined" onClick={handleCancel}>
{i18n("cancel")}
</Button>
</Stack>
))}
</Stack>
</form>
); );
} }
function ApiAccordion({ site }) { function WebfixAccordion({ rule, webfix }) {
const [expanded, setExpanded] = useState(false); const [expanded, setExpanded] = useState(false);
const handleChange = (e) => { const handleChange = (e) => {
@@ -59,10 +220,17 @@ function ApiAccordion({ site }) {
return ( return (
<Accordion expanded={expanded} onChange={handleChange}> <Accordion expanded={expanded} onChange={handleChange}>
<AccordionSummary expandIcon={<ExpandMoreIcon />}> <AccordionSummary expandIcon={<ExpandMoreIcon />}>
<Typography>{site.pattern}</Typography> <Typography
sx={{
opacity: webfix ? 1 : 0.5,
overflowWrap: "anywhere",
}}
>
{rule.pattern}
</Typography>
</AccordionSummary> </AccordionSummary>
<AccordionDetails> <AccordionDetails>
{expanded && <ApiFields site={site} />} {expanded && <WebfixFields rule={rule} webfix={webfix} />}
</AccordionDetails> </AccordionDetails>
</Accordion> </Accordion>
); );
@@ -74,6 +242,8 @@ export default function Webfix() {
const i18n = useI18n(); const i18n = useI18n();
const alert = useAlert(); const alert = useAlert();
const { setting, updateSetting } = useSetting(); const { setting, updateSetting } = useSetting();
const [showAdd, setShowAdd] = useState(false);
const webfix = useWebfixRules();
const loadSites = useCallback(async () => { const loadSites = useCallback(async () => {
const sites = await loadOrFetchWebfix(process.env.REACT_APP_WEBFIXURL); const sites = await loadOrFetchWebfix(process.env.REACT_APP_WEBFIXURL);
@@ -120,6 +290,18 @@ export default function Webfix() {
useFlexGap useFlexGap
flexWrap="wrap" flexWrap="wrap"
> >
<Button
size="small"
variant="contained"
disabled={showAdd}
onClick={(e) => {
e.preventDefault();
setShowAdd(true);
}}
>
{i18n("add")}
</Button>
<Button <Button
size="small" size="small"
variant="outlined" variant="outlined"
@@ -146,6 +328,16 @@ export default function Webfix() {
/> />
</Stack> </Stack>
{showAdd && <WebfixFields webfix={webfix} setShow={setShowAdd} />}
{webfix.list?.length > 0 && (
<Box>
{webfix.list.map((rule) => (
<WebfixAccordion key={rule.pattern} rule={rule} webfix={webfix} />
))}
</Box>
)}
{setting.injectWebfix && ( {setting.injectWebfix && (
<Box> <Box>
{loading ? ( {loading ? (
@@ -153,8 +345,8 @@ export default function Webfix() {
<CircularProgress size={16} /> <CircularProgress size={16} />
</center> </center>
) : ( ) : (
sites.map((site) => ( sites.map((rule) => (
<ApiAccordion key={site.pattern} site={site} /> <WebfixAccordion key={rule.pattern} rule={rule} />
)) ))
)} )}
</Box> </Box>

View File

@@ -1,9 +1,9 @@
import Box from "@mui/material/Box";
import IconButton from "@mui/material/IconButton"; import IconButton from "@mui/material/IconButton";
import CloseIcon from "@mui/icons-material/Close"; import CloseIcon from "@mui/icons-material/Close";
import HomeIcon from "@mui/icons-material/Home"; import HomeIcon from "@mui/icons-material/Home";
import Stack from "@mui/material/Stack"; import Stack from "@mui/material/Stack";
import DarkModeButton from "../Options/DarkModeButton"; import DarkModeButton from "../Options/DarkModeButton";
import Typography from "@mui/material/Typography";
export default function Header({ setShowPopup }) { export default function Header({ setShowPopup }) {
const handleHomepage = () => { const handleHomepage = () => {
@@ -21,14 +21,16 @@ export default function Header({ setShowPopup }) {
<IconButton onClick={handleHomepage}> <IconButton onClick={handleHomepage}>
<HomeIcon /> <HomeIcon />
</IconButton> </IconButton>
<Box <Typography
component="div"
sx={{ sx={{
userSelect: "none", userSelect: "none",
WebkitUserSelect: "none", WebkitUserSelect: "none",
fontWeight: "bold",
}} }}
> >
{`${process.env.REACT_APP_NAME} v${process.env.REACT_APP_VERSION}`} {`${process.env.REACT_APP_NAME} v${process.env.REACT_APP_VERSION}`}
</Box> </Typography>
</Stack> </Stack>
{setShowPopup ? ( {setShowPopup ? (

View File

@@ -2,6 +2,7 @@ import Box from "@mui/material/Box";
import Chip from "@mui/material/Chip"; import Chip from "@mui/material/Chip";
import Stack from "@mui/material/Stack"; import Stack from "@mui/material/Stack";
import FavBtn from "./FavBtn"; import FavBtn from "./FavBtn";
import Typography from "@mui/material/Typography";
const exchangeMap = { const exchangeMap = {
word_third: "第三人称单数", word_third: "第三人称单数",
@@ -9,7 +10,7 @@ const exchangeMap = {
word_done: "过去式", word_done: "过去式",
word_past: "过去分词", word_past: "过去分词",
word_pl: "复数", word_pl: "复数",
word_proto: "词", word_proto: "词",
}; };
export default function DictCont({ dictResult }) { export default function DictCont({ dictResult }) {
@@ -24,16 +25,16 @@ export default function DictCont({ dictResult }) {
justifyContent="space-between" justifyContent="space-between"
alignItems="flex-start" alignItems="flex-start"
> >
<div style={{ fontWeight: "bold" }}> <Typography variant="subtitle1" style={{ fontWeight: "bold" }}>
{dictResult.simple_means?.word_name} {dictResult.simple_means?.word_name}
</div> </Typography>
<FavBtn word={dictResult.simple_means?.word_name} /> <FavBtn word={dictResult.simple_means?.word_name} />
</Stack> </Stack>
{dictResult.simple_means?.symbols?.map(({ ph_en, ph_am, parts }, idx) => ( {dictResult.simple_means?.symbols?.map(({ ph_en, ph_am, parts }, idx) => (
<div key={idx}> <Typography key={idx} component="div">
{(ph_en || ph_am) && ( {(ph_en || ph_am) && (
<div>{`英/${ph_en || ""}/ 美/${ph_am || ""}/`}</div> <Typography>{` /${ph_en || ""}/ 美 /${ph_am || ""}/`}</Typography>
)} )}
<ul style={{ margin: "0.5em 0" }}> <ul style={{ margin: "0.5em 0" }}>
{parts.map(({ part, means }, idx) => ( {parts.map(({ part, means }, idx) => (
@@ -42,14 +43,14 @@ export default function DictCont({ dictResult }) {
</li> </li>
))} ))}
</ul> </ul>
</div> </Typography>
))} ))}
<div> <Typography>
{Object.entries(dictResult.simple_means?.exchange || {}) {Object.entries(dictResult.simple_means?.exchange || {})
.map(([key, val]) => `${exchangeMap[key] || key}: ${val.join(", ")}`) .map(([key, val]) => `${exchangeMap[key] || key}: ${val.join(", ")}`)
.join("; ")} .join("; ")}
</div> </Typography>
<Stack direction="row" spacing={1} flexWrap="wrap" useFlexGap> <Stack direction="row" spacing={1} flexWrap="wrap" useFlexGap>
{Object.values(dictResult.simple_means?.tags || {}) {Object.values(dictResult.simple_means?.tags || {})

View File

@@ -95,6 +95,7 @@ function TranForm({ text, setText, tranboxSetting, transApis }) {
<Box> <Box>
<TextField <TextField
size="small"
label={i18n("original_text")} label={i18n("original_text")}
inputRef={inputRef} inputRef={inputRef}
fullWidth fullWidth

View File

@@ -69,6 +69,7 @@ export default function TranCont({
<> <>
<Box> <Box>
<TextField <TextField
size="small"
label={i18n("translated_text")} label={i18n("translated_text")}
// disabled // disabled
fullWidth fullWidth

View File

@@ -1,7 +1,14 @@
import { useState, useEffect } from "react"; import { useState, useEffect, useCallback } from "react";
import TranBtn from "./TranBtn"; import TranBtn from "./TranBtn";
import TranBox from "./TranBox"; import TranBox from "./TranBox";
import { shortcutRegister } from "../../libs/shortcut"; import { shortcutRegister } from "../../libs/shortcut";
import { sleep } from "../../libs/utils";
import { isGm } from "../../libs/client";
import {
MSG_TRANSLATE_SELECTED,
MSG_OPEN_TRANBOX,
DEFAULT_TRANSEL_SHORTCUT,
} from "../../config";
export default function Slection({ tranboxSetting, transApis }) { export default function Slection({ tranboxSetting, transApis }) {
const [showBox, setShowBox] = useState(false); const [showBox, setShowBox] = useState(false);
@@ -15,34 +22,47 @@ export default function Slection({ tranboxSetting, transApis }) {
y: (window.innerHeight - 400) / 2, y: (window.innerHeight - 400) / 2,
}); });
function handleMouseup(e) { const handleClick = (e) => {
e.stopPropagation();
setShowBtn(false);
setText(selectedText);
setShowBox(true);
};
const handleTranSelected = useCallback(() => {
setShowBtn(false);
const selectedText = window.getSelection()?.toString()?.trim() || ""; const selectedText = window.getSelection()?.toString()?.trim() || "";
if (!selectedText) { if (!selectedText) {
setShowBtn(false);
return; return;
} }
setSelText(selectedText); setSelText(selectedText);
setShowBtn(true);
setPosition({ x: e.clientX, y: e.clientY });
}
const handleClick = (e) => {
e.stopPropagation();
setShowBtn(false);
setText(selectedText); setText(selectedText);
if (!showBox) { setShowBox(true);
setShowBox(true); }, []);
}
};
useEffect(() => { useEffect(() => {
async function handleMouseup(e) {
await sleep(10);
const selectedText = window.getSelection()?.toString()?.trim() || "";
setSelText(selectedText);
if (!selectedText) {
setShowBtn(false);
return;
}
!tranboxSetting.hideTranBtn && setShowBtn(true);
setPosition({ x: e.clientX, y: e.clientY });
}
window.addEventListener("mouseup", handleMouseup); window.addEventListener("mouseup", handleMouseup);
return () => { return () => {
window.removeEventListener("mouseup", handleMouseup); window.removeEventListener("mouseup", handleMouseup);
}; };
}, []); }, [tranboxSetting.hideTranBtn]);
useEffect(() => { useEffect(() => {
const clearShortcut = shortcutRegister( const clearShortcut = shortcutRegister(
@@ -55,7 +75,70 @@ export default function Slection({ tranboxSetting, transApis }) {
return () => { return () => {
clearShortcut(); clearShortcut();
}; };
}, [tranboxSetting.tranboxShortcut, setShowBox]); }, [tranboxSetting.tranboxShortcut]);
useEffect(() => {
const clearShortcut = shortcutRegister(
tranboxSetting.transelShortcut || DEFAULT_TRANSEL_SHORTCUT,
handleTranSelected
);
return () => {
clearShortcut();
};
}, [tranboxSetting.transelShortcut, handleTranSelected]);
useEffect(() => {
window.addEventListener(MSG_TRANSLATE_SELECTED, handleTranSelected);
return () => {
window.removeEventListener(MSG_TRANSLATE_SELECTED, handleTranSelected);
};
}, [handleTranSelected]);
useEffect(() => {
const handleOpenTranbox = () => {
setShowBox((pre) => !pre);
};
window.addEventListener(MSG_OPEN_TRANBOX, handleOpenTranbox);
return () => {
window.removeEventListener(MSG_OPEN_TRANBOX, handleOpenTranbox);
};
}, []);
useEffect(() => {
if (!isGm) {
return;
}
// 注册菜单
try {
const menuCommandIds = [];
menuCommandIds.push(
GM.registerMenuCommand(
"Translate Selected Text (Alt+S)",
(event) => {
handleTranSelected();
},
"S"
),
GM.registerMenuCommand(
"Open Translate Popup (Alt+B)",
(event) => {
setShowBox((pre) => !pre);
},
"B"
)
);
return () => {
menuCommandIds.forEach((id) => {
GM.unregisterMenuCommand(id);
});
};
} catch (err) {
console.log("[registerMenuCommand]", err);
}
}, [handleTranSelected]);
return ( return (
<> <>