From 490385788abaf98ea54129920e4357417c38b887 Mon Sep 17 00:00:00 2001
From: Mattrixwv <m_ellison@ymail.com>
Date: Sun, 16 Mar 2025 12:30:27 -0400
Subject: [PATCH] Fix modal resets

---
 src/ui/calendar/modals/CalendarEventModal.tsx        |  2 +-
 src/ui/classGroup/modal/ClassGroupModal.tsx          |  2 +-
 src/ui/game/modals/GameModal.tsx                     |  2 +-
 src/ui/gameClass/modals/GameClassModal.tsx           |  2 +-
 src/ui/person/modals/PersonModal.tsx                 |  2 +-
 .../personCharacter/modal/PersonCharacterModal.tsx   | 12 +++++-------
 src/ui/raidLayout/modal/RaidLayoutModal.tsx          |  2 +-
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/ui/calendar/modals/CalendarEventModal.tsx b/src/ui/calendar/modals/CalendarEventModal.tsx
index 304a281..6252236 100644
--- a/src/ui/calendar/modals/CalendarEventModal.tsx
+++ b/src/ui/calendar/modals/CalendarEventModal.tsx
@@ -99,7 +99,7 @@ export default function CalendarEventModal({
 			setEventStartDate(new Date());
 			setEventEndDate(new Date());
 		}
-	}, [ calendarEvent ]);
+	}, [ display, calendarEvent ]);
 
 
 	return (
diff --git a/src/ui/classGroup/modal/ClassGroupModal.tsx b/src/ui/classGroup/modal/ClassGroupModal.tsx
index 977378a..51076fd 100644
--- a/src/ui/classGroup/modal/ClassGroupModal.tsx
+++ b/src/ui/classGroup/modal/ClassGroupModal.tsx
@@ -32,7 +32,7 @@ export default function ClassGroupModal({
 	useEffect(() => {
 		setClassGroupName(classGroup?.classGroupName ?? "");
 		setSelectedGameClassIds(selectedGameClasses.map(gc => gc.gameClassId ?? ""));
-	}, [classGroup, selectedGameClasses]);
+	}, [ display, classGroup, selectedGameClasses ]);
 
 
 	const createClassGroupMutate = useCreateClassGroup(raidGroup.raidGroupId ?? "");
diff --git a/src/ui/game/modals/GameModal.tsx b/src/ui/game/modals/GameModal.tsx
index b2153a2..2e0e0c3 100644
--- a/src/ui/game/modals/GameModal.tsx
+++ b/src/ui/game/modals/GameModal.tsx
@@ -27,7 +27,7 @@ export default function GameModal({
 	useEffect(() => {
 		setGameName(game?.gameName ?? "");
 		setGameIcon(game?.gameIcon ?? "");
-	}, [ game, setGameName, setGameIcon ]);
+	}, [ display, game, setGameName, setGameIcon ]);
 
 
 	const updateGameMutate = useUpdateGame();
diff --git a/src/ui/gameClass/modals/GameClassModal.tsx b/src/ui/gameClass/modals/GameClassModal.tsx
index 8560212..11aeb97 100644
--- a/src/ui/gameClass/modals/GameClassModal.tsx
+++ b/src/ui/gameClass/modals/GameClassModal.tsx
@@ -30,7 +30,7 @@ export default function GameClassModal({
 		setGameClassName(gameClass?.gameClassName ?? "");
 		setGameClassIcon(gameClass?.gameClassIcon);
 		setIconFile(null);
-	}, [ gameClass, setGameClassName, setGameClassIcon, setIconFile ]);
+	}, [ display, gameClass, setGameClassName, setGameClassIcon, setIconFile ]);
 
 
 	const updateGameClassMutate = useUpdateGameClass();
diff --git a/src/ui/person/modals/PersonModal.tsx b/src/ui/person/modals/PersonModal.tsx
index bd12398..7539440 100644
--- a/src/ui/person/modals/PersonModal.tsx
+++ b/src/ui/person/modals/PersonModal.tsx
@@ -27,7 +27,7 @@ export default function PersonModal({
 	useEffect(() => {
 		setPersonName(person?.personName ?? "");
 		setDiscordId(person?.discordId ?? "");
-	}, [ person, raidGroupId, setPersonName, setDiscordId ]);
+	}, [ display, person, raidGroupId, setPersonName, setDiscordId ]);
 
 
 	const createPersonMutate = useCreatePerson();
diff --git a/src/ui/personCharacter/modal/PersonCharacterModal.tsx b/src/ui/personCharacter/modal/PersonCharacterModal.tsx
index bc36328..e145e91 100644
--- a/src/ui/personCharacter/modal/PersonCharacterModal.tsx
+++ b/src/ui/personCharacter/modal/PersonCharacterModal.tsx
@@ -33,13 +33,11 @@ export default function PersonCharacterModal({
 
 
 	useEffect(() => {
-		if(personCharacter){
-			setCharacterName(personCharacter.characterName);
-			setGameClassId(personCharacter.gameClassId);
-			setCharacterRating(personCharacter.characterRating);
-			setCharacterComments(personCharacter.characterComments);
-		}
-	}, [ personCharacter, setCharacterName, setGameClassId, setCharacterRating, setCharacterComments ]);
+		setCharacterName(personCharacter?.characterName ?? "");
+		setGameClassId(personCharacter?.gameClassId);
+		setCharacterRating(personCharacter?.characterRating);
+		setCharacterComments(personCharacter?.characterComments ?? "");
+	}, [ display, personCharacter, setCharacterName, setGameClassId, setCharacterRating, setCharacterComments ]);
 
 
 	const createPersonCharacterMutate = useCreatePersonCharacter(raidGroupId, personId);
diff --git a/src/ui/raidLayout/modal/RaidLayoutModal.tsx b/src/ui/raidLayout/modal/RaidLayoutModal.tsx
index a0dbf51..b395e7a 100644
--- a/src/ui/raidLayout/modal/RaidLayoutModal.tsx
+++ b/src/ui/raidLayout/modal/RaidLayoutModal.tsx
@@ -35,7 +35,7 @@ export default function RaidLayoutModal({
 		setRaidLayoutName(raidLayout?.raidLayoutName ?? "");
 		setRaidLayoutSize(raidLayout?.raidSize ?? 0);
 		setClassGroups(selectedClassGroups);
-	}, [ raidLayout, selectedClassGroups ]);
+	}, [ display, raidLayout, selectedClassGroups ]);
 
 	const updateRaidLayoutSize = (newLayoutSize: number) => {
 		setRaidLayoutSize(newLayoutSize);