fix SettingsModal close

This commit is contained in:
Tom
2023-05-03 17:35:38 +02:00
parent cec0a8a3c9
commit bb16165e78
+6 -6
View File
@@ -108,12 +108,12 @@ const SettingsModal = ({ isOpen, closeModal }) => {
const handleCloseModal = () => { const handleCloseModal = () => {
closeModal(); if (location.pathname.endsWith("/settings")) {
const newPath = location.pathname.slice(0, -9);
if (location.pathname === "/settings") { closeModal();
navigate(-1, { replace: true }); navigate(newPath, { replace: true });
} else { } else {
navigate("/settings", { state: { from: location } }); closeModal();
} }
}; };
@@ -152,7 +152,7 @@ const SettingsModal = ({ isOpen, closeModal }) => {
return ( return (
<StyledModal <StyledModal
isOpen={isOpen} isOpen={isOpen}
onRequestClose={closeModal} onRequestClose={handleCloseModal}
contentLabel="Settings" contentLabel="Settings"
style={customOverlayStyles} style={customOverlayStyles}
selectedStyle={selectedStyle} selectedStyle={selectedStyle}