去死吧

client/ui/chat-fragment/ChatFragment.tsx

@@ -12,9 +12,10 @@ import SwitchPreference from "../preference/SwitchPreference"
 import TextFieldPreference from "../preference/TextFieldPreference"
 import * as React from 'react'
 import ChatMessageContainer from "./ChatMessageContainer"
+import gotoChatInfo from "../routers/gotoChatInfo"
 
-function gotoChatInfo(nav: NavigateFunction, id: string) {
-    nav('/chat/info?id=' + id)
+function gotoChatInfo2(nav: NavigateFunction, id: string, useWithRouterChatFragment?: boolean) {
+    useWithRouterChatFragment ? nav('/chat/info?id=' + id) : gotoChatInfo(nav, id)
 }
 
 interface MduiTabFitSizeArgs extends React.HTMLAttributes<HTMLElement & Tab> {
@@ -106,7 +107,7 @@ export default function ChatFragment({
                     marginLeft: '5px',
                     marginRight: '5px',
                 }}></mdui-button-icon>
-                <mdui-button-icon icon="info" onClick={() => gotoChatInfo(nav, chatInfo.getId())} style={{
+                <mdui-button-icon icon="info" onClick={() => gotoChatInfo2(nav, chatInfo.getId(), openedWithRouter)} style={{
                     alignSelf: 'center',
                     marginLeft: '5px',
                     marginRight: '5px',

client/ui/routers/RouterDialogsContext.ts

@@ -1,5 +1,6 @@
+import { Dialog } from 'mdui'
 import * as React from 'react'
 
-const RouterDialogsContext = React.createContext(() => {})
+const RouterDialogsContext = React.createContext((ref: React.MutableRefObject<Dialog>) => {})
 
 export default RouterDialogsContext

client/ui/routers/RouterDialogsContextWrapper.tsx

@@ -4,7 +4,7 @@ import RouterDialogsContext from './RouterDialogsContext'
 import { BlockerFunction, useBlocker, useNavigate } from "react-router"
 import sleep from "../../utils/sleep"
 
-const routerDialogsList = []
+const routerDialogsList: React.MutableRefObject<Dialog>[] = []
 
 export default function RouterDialogsContextWrapper({ children }: React.HTMLAttributes<HTMLElement>) {
     const proceedRef = React.useRef<() => void>()
@@ -41,6 +41,9 @@ export default function RouterDialogsContextWrapper({ children }: React.HTMLAttr
             // 这个让姐姐来就好啦
             routerDialogsList.length != 0 && (routerDialogsList[routerDialogsList.length - 1].current!.open = false)
         }
+        return () => {
+            blocker.reset?.()
+        }
     }, [blocker.state])
 
     // 注册