aboutsummaryrefslogtreecommitdiff
path: root/FrontEnd/src
diff options
context:
space:
mode:
Diffstat (limited to 'FrontEnd/src')
-rw-r--r--FrontEnd/src/views/common/AppBar.tsx5
-rw-r--r--FrontEnd/src/views/timeline-common/MarkdownPostEdit.tsx2
2 files changed, 2 insertions, 5 deletions
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}