Merge pull request #2207 from woocommerce/issue/2205-edit-the-menu-order-with-negative-values

Product Settings: Menu Order now allow negative values

Author: pmusolino

WooCommerce/Classes/Tools/UnitInputFormatter/IntegerInputFormatter.swift

@@ -3,6 +3,13 @@ import Foundation
 /// `UnitInputFormatter` implementation for integer number input (positive, negative, or zero)
 ///
 struct IntegerInputFormatter: UnitInputFormatter {
+
+    /// The default value used by format() when the text is empty or the number formatter returns a nil value
+    ///
+    let defaultValue: String
+
+    private let minus: Character = "-"
+
     private let numberFormatter: NumberFormatter = {
         let numberFormatter = NumberFormatter()
         numberFormatter.allowsFloats = false
@@ -11,18 +18,27 @@ struct IntegerInputFormatter: UnitInputFormatter {
 
     func isValid(input: String) -> Bool {
         guard input.isEmpty == false else {
-            // Allows empty input to be replaced by 0.
+            // Allows empty input to be replaced by defaultValue
             return true
         }
-        return numberFormatter.number(from: input) != nil
+        return numberFormatter.number(from: input) != nil || input == String(minus)
     }
 
     func format(input text: String?) -> String {
         guard let text = text, text.isEmpty == false else {
-            return "0"
+            return defaultValue
         }
 
-        let formattedText = numberFormatter.number(from: text)?.stringValue ?? "0"
+        var formattedText = numberFormatter.number(from: text)?.stringValue ?? defaultValue
+
+        // The minus sign is maintained if present
+        if text.first == minus {
+            formattedText = String(minus) + formattedText.replacingOccurrences(of: "-", with: "")
+        }
         return formattedText
     }
+
+    init(defaultValue: String = "0") {
+        self.defaultValue = defaultValue
+    }
 }

WooCommerce/Classes/ViewRelated/Products/Edit Product/Product Settings/Menu Order/ProductMenuOrderViewController.swift

@@ -146,7 +146,7 @@ private extension ProductMenuOrderViewController {
             }
             }, onTextDidBeginEditing: {
                 //TODO: Add analytics track
-        }, inputFormatter: IntegerInputFormatter())
+        }, inputFormatter: IntegerInputFormatter(defaultValue: ""))
         cell.configure(viewModel: viewModel)
         cell.textField.applyBodyStyle()
         cell.textField.keyboardType = .numbersAndPunctuation

WooCommerce/WooCommerceTests/Tools/IntegerInputFormatterTests.swift

@@ -3,7 +3,7 @@ import XCTest
 @testable import WooCommerce
 
 final class IntegerInputFormatterTests: XCTestCase {
-    private let formatter = IntegerInputFormatter()
+    private let formatter = IntegerInputFormatter(defaultValue: "1")
 
     // MARK: test cases for `isValid(input:)`
 
@@ -37,11 +37,16 @@ final class IntegerInputFormatterTests: XCTestCase {
         XCTAssertTrue(formatter.isValid(input: input))
     }
 
+    func testMinusSignInputIsValid() {
+        let input = "-"
+        XCTAssertTrue(formatter.isValid(input: input))
+    }
+
     // MARK: test cases for `format(input:)`
 
     func testFormattingEmptyInput() {
         let input = ""
-        XCTAssertEqual(formatter.format(input: input), "0")
+        XCTAssertEqual(formatter.format(input: input), "1")
     }
 
     func testFormattingInputWithLeadingZeros() {
@@ -58,4 +63,14 @@ final class IntegerInputFormatterTests: XCTestCase {
         let input = "-3412424214"
         XCTAssertEqual(formatter.format(input: input), "-3412424214")
     }
+
+    func testFormattingMinusSignInput() {
+        let input = "-"
+        XCTAssertEqual(formatter.format(input: input), "-1")
+    }
+
+    func testFormattingMultipleMinusSignInput() {
+        let input = "--"
+        XCTAssertEqual(formatter.format(input: input), "-1")
+    }
 }