Merge pull request #67 from Elizabethhub/fix-bug/modal-edit

fix span for identical value condition
Elizabethhub · Mar 19, 2024 · e7fe802 · e7fe802
2 parents eba7160 + 56fe9a6
commit e7fe802
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/components/ModalAddWater/ModalAddWater.jsx b/src/components/ModalAddWater/ModalAddWater.jsx
@@ -57,7 +57,13 @@ const ModalAddWater = () => {
   };
 
   const handleManualValueChange = (e) => {
-    const value = e.target.value;
+    let value = e.target.value;
+    if (
+      value !== '' &&
+      (isNaN(value) || parseInt(value) > 5000 || parseInt(value) < 1)
+    ) {
+      value = '5000';
+    }
     setManualValue(value);
   };
 
@@ -93,7 +99,7 @@ const ModalAddWater = () => {
         >
           <SvgMinus size="24" />
         </button>
-        <span>{`${counter}ml`}</span>
+        <span>{displayValue ? displayValue : `${counter}ml`}</span>
         <button type="button" name="increment" onClick={handleUpdate}>
           <SvgPlus size="24" />
         </button>

diff --git a/src/components/ModalEditWater/ModalEditWater.jsx b/src/components/ModalEditWater/ModalEditWater.jsx
@@ -33,7 +33,13 @@ const ModalEditWater = () => {
   const formattedTime = format(time, 'hh:mm a');
 
   const handleManualValueChange = (e) => {
-    const value = e.target.value;
+    let value = e.target.value;
+    if (
+      value !== '' &&
+      (isNaN(value) || parseInt(value) > 5000 || parseInt(value) < 1)
+    ) {
+      value = '5000';
+    }
     setManualValue(value);
   };
 
@@ -74,7 +80,7 @@ const ModalEditWater = () => {
         >
           <SvgMinus size="24" />
         </button>
-        <span>{`${counter}ml`}</span>
+        <span>{displayValue ? displayValue : `${counter}ml`}</span>
         <button type="button" name="increment" onClick={handleUpdate}>
           <SvgPlus size="24" />
         </button>