typing infix operators inserts previous solution before it

antingle · May 1, 2022 · 01cd44a · 01cd44a
1 parent 6c101f4
commit 01cd44a
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/Calculator/CalculatorView.swift b/Calculator/CalculatorView.swift
@@ -82,6 +82,15 @@ struct CalculatorView: View {
         },
                           // On every update of the text by keyboard
                           onTextChange: { newExpression in
+            if !history.isEmpty &&
+                (newExpression == "+" ||
+                newExpression == "*" ||
+                newExpression == "/" ||
+                newExpression == "^" ||
+                newExpression == "%")
+            {
+                expression.insert(contentsOf: history[0].solution, at: expression.startIndex)
+            }
             do {
                 historyIndex = -1 // reset the history index counter for arrow keys
                 solution = try evaluateExpression(newExpression)