瀏覽代碼

fixed empty carry, fixed carry not set yet

Bernadette Elena Hammerle 2 年之前
父節點
當前提交
e31796d80c
共有 2 個文件被更改,包括 8 次插入9 次删除
  1. 4 4
      src/Addition.js
  2. 4 5
      src/Subtraction.js

+ 4 - 4
src/Addition.js

@@ -54,7 +54,7 @@ function Addition() {
       carryArrCopy.unshift(e.target.value);
       setCarryArr(carryArrCopy);
 
-      let noCarry = carryArrCopy[0] === "0" || carryArrCopy[0] === undefined
+      let noCarry = carryArrCopy[0] === "" || carryArrCopy[0] === "0" || carryArrCopy[0] === undefined
       if((nosLeft === 1 && noCarry) ||
          // if stop after first iteration, numbers left is undefined at first
          (nosLeft !== nosLeft && realResult.toString().length === 1 && noCarry)){
@@ -63,7 +63,7 @@ function Addition() {
       }
 
       if(nosLeft === 0){
-        createIdmtResults();
+        createIdmtResults(carryArrCopy);
         setShowAlert(true);
       }
     }
@@ -200,13 +200,13 @@ function Addition() {
     addButtonsToImdtSteps();
   }
 
-  const createIdmtResults = () => {
+  const createIdmtResults = (carryArrCopy) => {
     let realResArr = realResult.toString().split("");
     while(realResArr.length < resArr.length){
       realResArr.unshift("&nbsp;"); // add " " before
     }
 
-    let carries = carryArr.map(x => x || "0")
+    let carries = carryArrCopy.map(x => x || "0")
     carries.push("0");
     while(carries.length < resArr.length){
       carries.unshift("0"); // add "0" before

+ 4 - 5
src/Subtraction.js

@@ -53,8 +53,7 @@ function Subtraction() {
       let carryArrCopy = [...carryArr];
       carryArrCopy.unshift(e.target.value);
       setCarryArr(carryArrCopy);
-
-      let noCarry = carryArrCopy[0] === "0" || carryArrCopy[0] === undefined;
+      let noCarry = carryArrCopy[0] === "" || carryArrCopy[0] === "0" || carryArrCopy[0] === undefined;
       if((nosLeft === 1 && noCarry) ||
          // if stop after first iteration, numbers left is undefined at first
          (nosLeft !== nosLeft && realResult.toString().length === 1 && noCarry)){
@@ -63,7 +62,7 @@ function Subtraction() {
       }
 
       if(nosLeft === 0){
-        createIdmtResults()
+        createIdmtResults(carryArrCopy)
         setShowAlert(true);
       }
     }
@@ -219,13 +218,13 @@ function Subtraction() {
     addButtonsToImdtSteps();
   }
 
-  const createIdmtResults = () => {
+  const createIdmtResults = (carryArrCopy) => {
     let realResArr = realResult.toString().split("");
     while(realResArr.length < resArr.length){
       realResArr.unshift("&nbsp;"); // add " " before
     }
 
-    let carries = carryArr.map(x => x || "0")
+    let carries = carryArrCopy.map(x => x || "0")
     carries.push("0");
     while(carries.length < resArr.length){
       carries.unshift("0"); // add "0" before