From 6829f5e94b4bec96e6055a550cd5a95b1f588379 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Mon, 6 Dec 2021 20:52:02 +0800
Subject: ...

---
 FrontEnd/src/views/common/AppBar.tsx                    | 5 ++---
 FrontEnd/src/views/timeline-common/MarkdownPostEdit.tsx | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'FrontEnd/src')

diff --git a/FrontEnd/src/views/common/AppBar.tsx b/FrontEnd/src/views/common/AppBar.tsx
index 5d62a88d..208da3f7 100644
--- a/FrontEnd/src/views/common/AppBar.tsx
+++ b/FrontEnd/src/views/common/AppBar.tsx
@@ -1,7 +1,7 @@
 import React from "react";
+import classnames from "classnames";
 import { useTranslation } from "react-i18next";
 import { Link, NavLink } from "react-router-dom";
-import classnames from "classnames";
 import { useMediaQuery } from "react-responsive";
 
 import { useUser } from "@/services/user";
@@ -30,9 +30,8 @@ const AppBar: React.FC = (_) => {
   ): React.ReactNode => (
     <NavLink
       to={link}
-      activeClassName="active"
       onClick={collapse}
-      className={className}
+      className={({ isActive }) => classnames(className, isActive && "active")}
     >
       {label}
     </NavLink>
diff --git a/FrontEnd/src/views/timeline-common/MarkdownPostEdit.tsx b/FrontEnd/src/views/timeline-common/MarkdownPostEdit.tsx
index b6893852..0eb9f53d 100644
--- a/FrontEnd/src/views/timeline-common/MarkdownPostEdit.tsx
+++ b/FrontEnd/src/views/timeline-common/MarkdownPostEdit.tsx
@@ -2,7 +2,6 @@
 import React from "react";
 import classnames from "classnames";
 import { useTranslation } from "react-i18next";
-import { Prompt } from "react-router-dom";
 
 import { getHttpTimelineClient, HttpTimelinePostInfo } from "@/http/timeline";
 
@@ -99,7 +98,6 @@ const MarkdownPostEdit: React.FC<MarkdownPostEditProps> = ({
 
   return (
     <>
-      <Prompt when={!canLeave} message={t("timeline.confirmLeave")} />
       <TabPages
         className={className}
         style={style}
-- 
cgit v1.2.3