Refactor StepAbilities component to handle newCharacter prop

gvorbeck · Jan 26, 2024 · 827fff9 · 827fff9
1 parent 6e93e9e
commit 827fff9
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 19 deletions.
diff --git a/src/components/PageNewCharacter/StepAbilities/StepAbilities.tsx b/src/components/PageNewCharacter/StepAbilities/StepAbilities.tsx
@@ -11,11 +11,12 @@ interface StepAbilitiesProps {
   setComboClass?: (comboClass: boolean) => void;
   setComboClassSwitch?: (comboClassSwitch: boolean) => void;
   hideRollAll?: boolean;
+  newCharacter?: boolean;
 }
 
 const StepAbilities: React.FC<
   StepAbilitiesProps & React.ComponentPropsWithRef<"div">
-> = ({ className, character, setCharacter, hideRollAll }) => {
+> = ({ className, character, setCharacter, hideRollAll, newCharacter }) => {
   const dataSource = [
     {
       key: "1",
@@ -104,22 +105,32 @@ const StepAbilities: React.FC<
     scores: Record<string, number>,
     modifiers: Record<string, string>,
   ) => {
-    setCharacter({
-      ...character,
-      abilities: {
-        scores: { ...character.abilities?.scores, ...scores },
-        modifiers: { ...character.abilities?.modifiers, ...modifiers },
-      },
-      class: [],
-      race: "",
-      hp: {
-        dice: "",
-        points: 0,
-        max: 0,
-        desc: "",
-      },
-      equipment: [],
-    });
+    if (newCharacter) {
+      setCharacter({
+        ...character,
+        abilities: {
+          scores: { ...character.abilities?.scores, ...scores },
+          modifiers: { ...character.abilities?.modifiers, ...modifiers },
+        },
+        class: [],
+        race: "",
+        hp: {
+          dice: "",
+          points: 0,
+          max: 0,
+          desc: "",
+        },
+        equipment: [],
+      });
+    } else {
+      setCharacter({
+        ...character,
+        abilities: {
+          scores: { ...character.abilities?.scores, ...scores },
+          modifiers: { ...character.abilities?.modifiers, ...modifiers },
+        },
+      });
+    }
   };
 
   const rollAllAbilities = () => {

diff --git a/src/components/PageNewCharacter/StepHitPoints/StepHitPoints.tsx b/src/components/PageNewCharacter/StepHitPoints/StepHitPoints.tsx
@@ -29,6 +29,9 @@ const StepHitPoints: React.FC<
     roll = roll < 1 ? 1 : roll;
     setMax(roll);
   };
+  const handleInputChange = (value: number | null) => {
+    if (value) setMax(value);
+  };
   const onSelectChange = (value: DiceTypes) => {
     setDie(value);
   };
@@ -55,7 +58,7 @@ const StepHitPoints: React.FC<
         <Select options={options} onChange={onSelectChange} value={die} />
       )}
       <Space.Compact>
-        <InputNumber value={max} />
+        <InputNumber value={max} onChange={handleInputChange} />
         <Button onClick={handleButtonClick} disabled={!die}>
           Roll&nbsp;{character.level === 1 && "1"}
           {die}

diff --git a/src/support/pageNewCharacterSupport.tsx b/src/support/pageNewCharacterSupport.tsx
@@ -46,7 +46,11 @@ export const getStepsItems = (
     fulltitle: "Roll for Ability Scores",
     description: newCharacterStepDescriptions.abilities,
     content: (
-      <StepAbilities character={character} setCharacter={setCharacter} />
+      <StepAbilities
+        character={character}
+        setCharacter={setCharacter}
+        newCharacter
+      />
     ),
   },
   {