Skip to content

Commit ece9597

Browse files
committed
Merge branch 'develop'
2 parents ebd4e99 + 5255a8b commit ece9597

File tree

8 files changed

+231
-207
lines changed

8 files changed

+231
-207
lines changed

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"homepage": "https://github.com/molvqingtai/WebChat",
4646
"dependencies": {
4747
"@hookform/resolvers": "^3.9.1",
48-
"@number-flow/react": "^0.3.2",
48+
"@number-flow/react": "^0.3.4",
4949
"@perfsee/jsonr": "^1.13.0",
5050
"@radix-ui/react-avatar": "^1.1.1",
5151
"@radix-ui/react-checkbox": "^1.1.2",
@@ -73,7 +73,7 @@
7373
"date-fns": "^4.1.0",
7474
"framer-motion": "^11.11.17",
7575
"idb-keyval": "^6.2.1",
76-
"lucide-react": "^0.456.0",
76+
"lucide-react": "^0.460.0",
7777
"nanoid": "^5.0.8",
7878
"react": "^18.3.1",
7979
"react-dom": "^18.3.1",
@@ -89,15 +89,15 @@
8989
"rxjs": "^7.8.1",
9090
"sonner": "^1.7.0",
9191
"tailwind-merge": "^2.5.4",
92-
"type-fest": "^4.26.1",
92+
"type-fest": "^4.27.0",
9393
"unstorage": "^1.13.1",
9494
"valibot": "1.0.0-beta.0"
9595
},
9696
"devDependencies": {
9797
"@commitlint/cli": "^19.5.0",
9898
"@commitlint/config-conventional": "^19.5.0",
9999
"@eslint-react/eslint-plugin": "^1.16.1",
100-
"@eslint/js": "^9.14.0",
100+
"@eslint/js": "^9.15.0",
101101
"@semantic-release/changelog": "^6.0.3",
102102
"@semantic-release/exec": "^6.0.3",
103103
"@semantic-release/git": "^10.0.1",
@@ -111,7 +111,7 @@
111111
"@vitejs/plugin-react": "^4.3.3",
112112
"autoprefixer": "^10.4.20",
113113
"cross-env": "^7.0.3",
114-
"eslint": "^9.14.0",
114+
"eslint": "^9.15.0",
115115
"eslint-config-prettier": "^9.1.0",
116116
"eslint-plugin-prettier": "^5.2.1",
117117
"eslint-plugin-tailwindcss": "^3.17.5",
@@ -131,7 +131,7 @@
131131
"typescript-eslint": "^8.14.0",
132132
"vite-plugin-svgr": "^4.3.0",
133133
"webext-bridge": "^6.0.1",
134-
"wxt": "^0.19.15"
134+
"wxt": "^0.19.16"
135135
},
136136
"lint-staged": {
137137
"*.{js,jsx,ts,tsx}": "eslint --fix --flag unstable_ts_config"

pnpm-lock.yaml

Lines changed: 203 additions & 191 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/app/background/index.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ import { defineBackground } from 'wxt/sandbox'
66
export default defineBackground({
77
type: 'module',
88
main() {
9+
browser.action.onClicked.addListener(() => {
10+
browser.runtime.openOptionsPage()
11+
})
12+
913
const historyNotificationTabs = new Map<string, Tabs.Tab>()
1014
messenger.onMessage(EVENT.OPTIONS_PAGE_OPEN, () => {
1115
browser.runtime.openOptionsPage()
@@ -18,6 +22,8 @@ export default defineBackground({
1822
return new URL(tab.url!).origin === new URL(sender.tab!.url!).origin
1923
})
2024

25+
console.log('sender', sender)
26+
2127
if (hasActiveSomeSiteTab) return
2228

2329
browser.notifications.create(message.id, {
@@ -38,7 +44,8 @@ export default defineBackground({
3844
if (fromTab?.id) {
3945
try {
4046
const tab = await browser.tabs.get(fromTab.id)
41-
browser.tabs.update(tab.id, { active: true })
47+
browser.tabs.update(tab.id, { active: true, highlighted: true })
48+
browser.windows.update(tab.windowId!, { focused: true })
4249
} catch {
4350
browser.tabs.create({ url: fromTab.url })
4451
}

src/app/content/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { createElement } from '@/utils'
2222

2323
export default defineContentScript({
2424
cssInjectionMode: 'ui',
25-
runAt: 'document_end',
25+
runAt: 'document_idle',
2626
matches: ['https://*/*'],
2727
excludeMatches: ['*://localhost/*', '*://127.0.0.1/*', '*://*.csdn.net/*', '*://*.csdn.com/*'],
2828
async main(ctx) {

src/app/content/views/Header/index.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,11 @@ const Header: FC = () => {
7676
</Avatar>
7777
<div className="grid items-center">
7878
<div className="flex items-center gap-x-1 overflow-hidden">
79-
<h4 className="flex-1 truncate text-sm font-semibold">{site.hostname.replace(/^www\./i, '')}</h4>
79+
<h4 className="flex-1 truncate text-sm font-semibold text-slate-600 dark:text-slate-50">
80+
{site.hostname.replace(/^www\./i, '')}
81+
</h4>
8082
<div className="shrink-0 text-sm">
81-
<div className="flex items-center gap-x-1 text-nowrap text-xs text-slate-500">
83+
<div className="flex items-center gap-x-1 text-nowrap text-xs text-slate-500 dark:text-slate-100">
8284
<div className="flex items-center gap-x-1 pt-px">
8385
<span className="relative flex size-2">
8486
<span
@@ -94,7 +96,7 @@ const Header: FC = () => {
9496
)}
9597
></span>
9698
</span>
97-
<span className="flex items-center leading-none dark:text-slate-50">
99+
<span className="flex items-center leading-none ">
98100
<span className="py-[0.25em]">ONLINE</span>
99101
</span>
100102
</div>
@@ -117,7 +119,7 @@ const Header: FC = () => {
117119
<HoverCard>
118120
<HoverCardTrigger asChild>
119121
<Button className=" rounded-md p-0 hover:no-underline" variant="link">
120-
<div className="relative flex items-center gap-x-1 text-nowrap text-xs text-slate-500 hover:after:absolute hover:after:bottom-0 hover:after:left-0 hover:after:h-px hover:after:w-full hover:after:bg-black">
122+
<div className="relative flex items-center gap-x-1 text-nowrap text-xs text-slate-500 hover:after:absolute hover:after:bottom-0 hover:after:left-0 hover:after:h-px hover:after:w-full hover:after:bg-black dark:text-slate-100 dark:hover:after:bg-white">
121123
<div className="flex items-center gap-x-1 pt-px">
122124
<span className="relative flex size-2">
123125
<span
@@ -133,7 +135,7 @@ const Header: FC = () => {
133135
)}
134136
></span>
135137
</span>
136-
<span className="flex items-center leading-none dark:text-slate-50">
138+
<span className="flex items-center leading-none">
137139
<span className="py-[0.25em]">ONLINE</span>
138140
</span>
139141
</div>

src/app/content/views/Setup/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ const Setup: FC = () => {
8888
useEffect(() => {
8989
const timer = new Timer(
9090
async () => {
91-
await createMessage(await refreshUserInfo())
91+
if (timer.status !== 'stopped') {
92+
await createMessage(await refreshUserInfo())
93+
}
9294
},
9395
{ delay: 2000, immediate: true, limit: mockTextList.length }
9496
)

src/app/options/components/ProfileForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const defaultUserInfo: UserInfo = {
2727
themeMode: 'system',
2828
danmakuEnabled: true,
2929
notificationEnabled: true,
30-
notificationType: 'all'
30+
notificationType: 'at'
3131
}
3232

3333
const formSchema = v.object({

wxt.config.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ export default defineConfig({
2121
'32': 'logo.png',
2222
'48': 'logo.png',
2323
'128': 'logo.png'
24-
}
24+
},
25+
action: {}
2526
}
2627
return {
2728
chrome: {

0 commit comments

Comments
 (0)