diff --git a/src/components/Holiday/Holiday.tsx b/src/components/Holiday/Holiday.tsx index 2104dc5..cec69c4 100644 --- a/src/components/Holiday/Holiday.tsx +++ b/src/components/Holiday/Holiday.tsx @@ -1,7 +1,7 @@ import { getHolidayByName } from "../../utils/getHoliday"; import holidays from "../../data/holidays.json"; import { getMessage } from "../../utils/getMessage"; -import { useState } from "react"; +import { useCallback, useState } from "react"; import type { Message } from "../../types/typings"; import Contribution from "./Contribution"; import MessageChanger from "./MessageChanger"; @@ -18,7 +18,7 @@ interface HolidayProps { export default function Holiday({ holidayData, alecrimUrl }: HolidayProps) { const [currentMessage, setCurrentMessage] = useState(holidayData.message); - const [isModalOpen, setIsModalOpen] = useState(true); + const [isModalOpen, setIsModalOpen] = useState(false); const handleCloseModal = () => { setIsModalOpen(false); @@ -28,12 +28,14 @@ export default function Holiday({ holidayData, alecrimUrl }: HolidayProps) { setIsModalOpen(true); }; - const changeMessage = () => { + const changeMessage = useCallback(() => { const { messages } = getHolidayByName({ holidays, name: holidayData.name }); const message = getMessage(messages); - setCurrentMessage(message); - }; + if (!isModalOpen) { + setCurrentMessage(message); + } + }, [isModalOpen]); const contribution = currentMessage.contribution; diff --git a/src/components/Holiday/MessageChanger.tsx b/src/components/Holiday/MessageChanger.tsx index 5325cea..2312c32 100644 --- a/src/components/Holiday/MessageChanger.tsx +++ b/src/components/Holiday/MessageChanger.tsx @@ -6,26 +6,26 @@ export default function MessageChanger({ changeMessage: () => void; }) { useEffect(() => { - function changeMessageOnKeydown(event: KeyboardEvent) { + const changeMessageOnKeydown = (event: KeyboardEvent) => { if (event.keyCode === 32) { changeMessage(); } - } + }; document.addEventListener("keydown", changeMessageOnKeydown); return () => { document.removeEventListener("keydown", changeMessageOnKeydown); }; - }, []); + }, [changeMessage]); return (

Aperte{" "} - + Espaço {" "} ou clique aqui diff --git a/src/components/Suggestions/Modal.tsx b/src/components/Suggestions/Modal.tsx index af955e8..08483b2 100644 --- a/src/components/Suggestions/Modal.tsx +++ b/src/components/Suggestions/Modal.tsx @@ -37,7 +37,7 @@ export default function Modal({ d="M19 6.41L17.59 5L12 10.59L6.41 5L5 6.41L10.59 12L5 17.59L6.41 19L12 13.41L17.59 19L19 17.59L13.41 12z" /> -

{children}
+
{children}
); diff --git a/src/components/Suggestions/Suggestions.tsx b/src/components/Suggestions/Suggestions.tsx index 72c58e8..f226c2c 100644 --- a/src/components/Suggestions/Suggestions.tsx +++ b/src/components/Suggestions/Suggestions.tsx @@ -43,7 +43,7 @@ export default function SuggestionsForm({ if (hasSubmissionError) { return (
-

+

Houve um erro ao enviar seus dados 😔

Tente novamente mais tarde @@ -54,7 +54,7 @@ export default function SuggestionsForm({ if (hasSubmitted) { return (
-

+

Obrigado por sua contribuição!

Você é top 🤙 @@ -176,7 +176,7 @@ export default function SuggestionsForm({