fix: 修复跳转逻辑

Author: XYShaoKang

src/content/pages/problem-list/index.tsx

@@ -1,30 +1,24 @@
 import { render, unmountComponentAtNode } from 'react-dom'
 
-import {
-  autoMount,
-  awaitFn,
-  findElementByXPath,
-  pageIsLoad,
-  sleep,
-} from '@/utils'
+import { autoMount, findElementByXPath, sleep } from '@/utils'
 
 import App from './App'
 import { fixRandom, removeFixRandom } from './fixRandom'
 import RankApp from '../problemset/App'
 
 let _root: HTMLDivElement | null = null,
   rankTitle: HTMLDivElement | null = null
-
+const xpath =
+  '//*[@id="__next"]/div/div[2]/div/div[2]/div/*//span[text()="精选题单"]/../..'
 function getListEl() {
-  return findElementByXPath(
-    '//*[@id="__next"]/*//span[text()="精选题单"]/../..'
-  )
+  return findElementByXPath(xpath)
 }
 
 const [mountProblemList, unmountProblemList] = autoMount(
-  '//*[@id="__next"]/*//span[text()="精选题单"]/../..',
+  xpath,
   async () => {
     const el = await getListEl()
+    if (!isProblemList()) return
     if (_root) {
       if (_root?.nextElementSibling === el) return
       // 可能因为加载比较慢之类的原因，导致自定义题单的侧边栏已经加载而其他的一些元素还没加载，
@@ -97,10 +91,10 @@ window.addEventListener('urlchange', async function () {
     await getListEl()
     await Promise.race([
       sleep(500),
-      findElementByXPath('//span[text()="分享"]'),
+      findElementByXPath(
+        '//*[@id="__next"]/div/div[2]/div/div[2]/div/*//span[text()="分享"]'
+      ),
     ])
-    // 等待跳转到题单页，通过判断「导航栏的题单按钮是否取消高亮」
-    await awaitFn(async () => !(await pageIsLoad('题库')))
     mount()
     fixRandom()
   } else {

src/content/pages/problemset/index.tsx

@@ -1,11 +1,5 @@
 import { render, unmountComponentAtNode } from 'react-dom'
-import {
-  autoMount,
-  awaitFn,
-  findElementByXPath,
-  pageIsLoad,
-  sleep,
-} from '@/utils'
+import { autoMount, awaitFn, findElementByXPath, pageIsLoad } from '@/utils'
 import ProblemListApp from '../problem-list/App'
 import App from './App'
 import './intercept'
@@ -16,6 +10,7 @@ const [mountProblemList, unmountProblemList] = autoMount(
   problemListXPath,
   async () => {
     const el = await findElementByXPath(problemListXPath)
+    if (!isProblemset()) return
     if (_root) {
       if (_root?.nextElementSibling === el) return
       // 可能因为加载比较慢之类的原因，导致自定义题单的侧边栏已经加载而其他的一些元素还没加载，
@@ -104,7 +99,6 @@ void (async function main() {
 
 window.addEventListener('urlchange', async function () {
   if (isProblemset()) {
-    await sleep(500)
     await awaitFn(() => pageIsLoad('题库'))
     mount()
   } else {

src/content/utils/utils.ts

@@ -143,7 +143,7 @@ export async function findElementByXPath<T = HTMLElement | HTMLElement[]>(
   } else {
     xpath = evaluateParam.xpath
     nodeType = evaluateParam.nodeType
-    fn = el => !!(Array.isArray(el) && el.length)
+    if (!fn) fn = el => !!(Array.isArray(el) && el.length)
   }
   const element = await findBase<T>(
     () => {
@@ -334,6 +334,7 @@ export function autoMount(
 
       const mountFn = debounce(async () => {
         await unmount?.()
+        if (!_observer) return
         mount()
       }, 100)
       mountFn()
@@ -344,6 +345,7 @@ export function autoMount(
     },
     () => {
       _observer?.disconnect()
+      _observer = null
       unmount?.()
     },
   ]