mirror of
https://github.com/usual2970/certimate.git
synced 2025-06-09 22:19:51 +00:00
fix(ui): useEffect deps
This commit is contained in:
parent
67a32a98a9
commit
b2417ad902
@ -1,4 +1,4 @@
|
|||||||
import { memo, useCallback, useEffect, useState } from "react";
|
import { memo, useEffect, useState } from "react";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { Link, Navigate, Outlet, useLocation, useNavigate } from "react-router-dom";
|
import { Link, Navigate, Outlet, useLocation, useNavigate } from "react-router-dom";
|
||||||
import {
|
import {
|
||||||
@ -135,12 +135,12 @@ const SiderMenu = memo(({ onSelect }: { onSelect?: (key: string) => void }) => {
|
|||||||
});
|
});
|
||||||
const [menuSelectedKey, setMenuSelectedKey] = useState<string>();
|
const [menuSelectedKey, setMenuSelectedKey] = useState<string>();
|
||||||
|
|
||||||
const getActiveMenuItem = useCallback(() => {
|
const getActiveMenuItem = () => {
|
||||||
const item =
|
const item =
|
||||||
menuItems.find((item) => item!.key === location.pathname) ??
|
menuItems.find((item) => item!.key === location.pathname) ??
|
||||||
menuItems.find((item) => item!.key !== MENU_KEY_HOME && location.pathname.startsWith(item!.key as string));
|
menuItems.find((item) => item!.key !== MENU_KEY_HOME && location.pathname.startsWith(item!.key as string));
|
||||||
return item;
|
return item;
|
||||||
}, [location.pathname, menuItems]);
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const item = getActiveMenuItem();
|
const item = getActiveMenuItem();
|
||||||
@ -149,13 +149,13 @@ const SiderMenu = memo(({ onSelect }: { onSelect?: (key: string) => void }) => {
|
|||||||
} else {
|
} else {
|
||||||
setMenuSelectedKey(undefined);
|
setMenuSelectedKey(undefined);
|
||||||
}
|
}
|
||||||
}, [location.pathname, getActiveMenuItem]);
|
}, [location.pathname]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (menuSelectedKey && menuSelectedKey !== getActiveMenuItem()?.key) {
|
if (menuSelectedKey && menuSelectedKey !== getActiveMenuItem()?.key) {
|
||||||
navigate(menuSelectedKey);
|
navigate(menuSelectedKey);
|
||||||
}
|
}
|
||||||
}, [menuSelectedKey, navigate, getActiveMenuItem]);
|
}, [menuSelectedKey]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
@ -125,7 +125,7 @@ const AccessList = () => {
|
|||||||
console.error(err);
|
console.error(err);
|
||||||
notificationApi.error({ message: t("common.text.request_error"), description: getErrMsg(err) });
|
notificationApi.error({ message: t("common.text.request_error"), description: getErrMsg(err) });
|
||||||
});
|
});
|
||||||
}, [fetchAccesses]);
|
}, []);
|
||||||
|
|
||||||
const { loading } = useRequest(
|
const { loading } = useRequest(
|
||||||
() => {
|
() => {
|
||||||
|
@ -25,7 +25,7 @@ const Settings = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
setTabValue(path);
|
setTabValue(path);
|
||||||
}, [location, navigate]);
|
}, [location.pathname]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="p-4">
|
<div className="p-4">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user