orc-shared 5.7.0-dev.14 → 5.7.0-dev.15

package/dist/components/MaterialUI/Inputs/InputBase.js

@@ -175,14 +175,19 @@ var InputBase = function InputBase(_ref) {
     });
   }
   if (isAdvancedNumericInput) {
+    var _numericInputProps$de;
     if (inputAttributes.max === undefined) {
       inputAttributes.max = 2147483647;
     }
     if (inputAttributes.min === undefined) {
       inputAttributes.min = -2147483648;
     }
+    var decimalScale = (_numericInputProps$de = numericInputProps == null ? void 0 : numericInputProps.decimalScale) != null ? _numericInputProps$de : 0;
+    var lengthForMin = Math.trunc(inputAttributes.min).toString().length;
+    var lengthForMax = Math.trunc(inputAttributes.max).toString().length;
+    inputAttributes.maxLength = Math.max(lengthForMin, lengthForMax) + (decimalScale > 0 ? decimalScale + 1 : 0);
     inputAttributes.isAllowed = function (val) {
-      return val.value === "" || val.value === "-" || val.floatValue >= inputAttributes.min && val.floatValue <= inputAttributes.max;
+      return val.value === "" || val.value === "-" || val.value !== null;
     };
   }
   var defaultRows = 4;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "orc-shared",
-	"version": "5.7.0-dev.14",
+	"version": "5.7.0-dev.15",
 	"description": "Shared code for Orckestra applications",
 	"main": "./src/index.js",
 	"exports": {

package/src/components/MaterialUI/Inputs/InputBase.js

@@ -146,12 +146,15 @@ const InputBase = ({ inputProps }) => {
 			inputAttributes.min = -2147483648;
 		}
 
+		const decimalScale = numericInputProps?.decimalScale ?? 0;
+
+		const lengthForMin = Math.trunc(inputAttributes.min).toString().length;
+		const lengthForMax = Math.trunc(inputAttributes.max).toString().length;
+
+		inputAttributes.maxLength = Math.max(lengthForMin, lengthForMax) + (decimalScale > 0 ? decimalScale + 1 : 0);
+
 		inputAttributes.isAllowed = val => {
-			return (
-				val.value === "" ||
-				val.value === "-" ||
-				(val.floatValue >= inputAttributes.min && val.floatValue <= inputAttributes.max)
-			);
+			return val.value === "" || val.value === "-" || val.value !== null;
 		};
 	}
 

package/src/components/MaterialUI/Inputs/InputBase.test.js

@@ -436,6 +436,166 @@ describe("AdvancedNumericInput", () => {
 		expect(advInput.props().decimalScale, "to be", 2);
 	});
 
+	it("Renders InputBase component as advanced numeric input without min max", () => {
+		const inputProps = new InputBaseProps();
+		const aLabel = "aLabel";
+		const aValue = "value";
+
+		inputProps.set(InputBaseProps.propNames.update, update);
+		inputProps.set(InputBaseProps.propNames.value, aValue);
+		inputProps.set(InputBaseProps.propNames.label, aLabel);
+		inputProps.set(InputBaseProps.propNames.type, "AdvancedNumericInput");
+		inputProps.set(InputBaseProps.propNames.numericInputProps, { decimalScale: 2 });
+
+		const component = <InputBase inputProps={inputProps} />;
+
+		const mountedComponent = mount(component);
+
+		const advInput = mountedComponent.find("AdvancedNumericInput");
+		expect(advInput.props().decimalScale, "to be", 2);
+		expect(advInput.props().min, "to be", -2147483648);
+		expect(advInput.props().max, "to be", 2147483647);
+		expect(advInput.props().maxLength, "to be", 14);
+	});
+
+	it("Renders InputBase component as advanced numeric input without min", () => {
+		const inputProps = new InputBaseProps();
+		const aLabel = "aLabel";
+		const aValue = "value";
+
+		inputProps.set(InputBaseProps.propNames.update, update);
+		inputProps.set(InputBaseProps.propNames.value, aValue);
+		inputProps.set(InputBaseProps.propNames.label, aLabel);
+		inputProps.set(InputBaseProps.propNames.type, "AdvancedNumericInput");
+		inputProps.set(InputBaseProps.propNames.numericInputProps, { decimalScale: 0 });
+		inputProps.set(InputBaseProps.propNames.inputAttributes, { max: 122 });
+
+		const component = <InputBase inputProps={inputProps} />;
+
+		const mountedComponent = mount(component);
+
+		const advInput = mountedComponent.find("AdvancedNumericInput");
+		expect(advInput.props().decimalScale, "to be", 0);
+		expect(advInput.props().min, "to be", -2147483648);
+		expect(advInput.props().max, "to be", 122);
+		expect(advInput.props().maxLength, "to be", 11);
+	});
+
+	it("Renders InputBase component as advanced numeric input without max", () => {
+		const inputProps = new InputBaseProps();
+		const aLabel = "aLabel";
+		const aValue = "value";
+
+		inputProps.set(InputBaseProps.propNames.update, update);
+		inputProps.set(InputBaseProps.propNames.value, aValue);
+		inputProps.set(InputBaseProps.propNames.label, aLabel);
+		inputProps.set(InputBaseProps.propNames.type, "AdvancedNumericInput");
+		inputProps.set(InputBaseProps.propNames.numericInputProps, { decimalScale: 2 });
+		inputProps.set(InputBaseProps.propNames.inputAttributes, { min: -9.9 });
+
+		const component = <InputBase inputProps={inputProps} />;
+
+		const mountedComponent = mount(component);
+
+		const advInput = mountedComponent.find("AdvancedNumericInput");
+		expect(advInput.props().decimalScale, "to be", 2);
+		expect(advInput.props().min, "to be", -9.9);
+		expect(advInput.props().max, "to be", 2147483647);
+		expect(advInput.props().maxLength, "to be", 13);
+	});
+
+	it("Renders InputBase component as advanced numeric input with negative min positive max", () => {
+		const inputProps = new InputBaseProps();
+		const aLabel = "aLabel";
+		const aValue = "value";
+
+		inputProps.set(InputBaseProps.propNames.update, update);
+		inputProps.set(InputBaseProps.propNames.value, aValue);
+		inputProps.set(InputBaseProps.propNames.label, aLabel);
+		inputProps.set(InputBaseProps.propNames.type, "AdvancedNumericInput");
+		inputProps.set(InputBaseProps.propNames.numericInputProps, { decimalScale: 1 });
+		inputProps.set(InputBaseProps.propNames.inputAttributes, { min: -999.9, max: 9.8 });
+
+		const component = <InputBase inputProps={inputProps} />;
+
+		const mountedComponent = mount(component);
+
+		const advInput = mountedComponent.find("AdvancedNumericInput");
+		expect(advInput.props().decimalScale, "to be", 1);
+		expect(advInput.props().min, "to be", -999.9);
+		expect(advInput.props().max, "to be", 9.8);
+		expect(advInput.props().maxLength, "to be", 6);
+	});
+
+	it("Renders InputBase component as advanced numeric input with negative min large positive max", () => {
+		const inputProps = new InputBaseProps();
+		const aLabel = "aLabel";
+		const aValue = "value";
+
+		inputProps.set(InputBaseProps.propNames.update, update);
+		inputProps.set(InputBaseProps.propNames.value, aValue);
+		inputProps.set(InputBaseProps.propNames.label, aLabel);
+		inputProps.set(InputBaseProps.propNames.type, "AdvancedNumericInput");
+		inputProps.set(InputBaseProps.propNames.numericInputProps, { decimalScale: 1 });
+		inputProps.set(InputBaseProps.propNames.inputAttributes, { min: -9.9, max: 99999.8 });
+
+		const component = <InputBase inputProps={inputProps} />;
+
+		const mountedComponent = mount(component);
+
+		const advInput = mountedComponent.find("AdvancedNumericInput");
+		expect(advInput.props().decimalScale, "to be", 1);
+		expect(advInput.props().min, "to be", -9.9);
+		expect(advInput.props().max, "to be", 99999.8);
+		expect(advInput.props().maxLength, "to be", 7);
+	});
+
+	it("Renders InputBase component as advanced numeric input with negative min negative max", () => {
+		const inputProps = new InputBaseProps();
+		const aLabel = "aLabel";
+		const aValue = "value";
+
+		inputProps.set(InputBaseProps.propNames.update, update);
+		inputProps.set(InputBaseProps.propNames.value, aValue);
+		inputProps.set(InputBaseProps.propNames.label, aLabel);
+		inputProps.set(InputBaseProps.propNames.type, "AdvancedNumericInput");
+		inputProps.set(InputBaseProps.propNames.numericInputProps, { decimalScale: 3 });
+		inputProps.set(InputBaseProps.propNames.inputAttributes, { min: -99.9, max: -9.8 });
+
+		const component = <InputBase inputProps={inputProps} />;
+
+		const mountedComponent = mount(component);
+
+		const advInput = mountedComponent.find("AdvancedNumericInput");
+		expect(advInput.props().decimalScale, "to be", 3);
+		expect(advInput.props().min, "to be", -99.9);
+		expect(advInput.props().max, "to be", -9.8);
+		expect(advInput.props().maxLength, "to be", 7);
+	});
+
+	it("Renders InputBase component as advanced numeric input with positive min positive max", () => {
+		const inputProps = new InputBaseProps();
+		const aLabel = "aLabel";
+		const aValue = "value";
+
+		inputProps.set(InputBaseProps.propNames.update, update);
+		inputProps.set(InputBaseProps.propNames.value, aValue);
+		inputProps.set(InputBaseProps.propNames.label, aLabel);
+		inputProps.set(InputBaseProps.propNames.type, "AdvancedNumericInput");
+		inputProps.set(InputBaseProps.propNames.numericInputProps, { decimalScale: 5 });
+		inputProps.set(InputBaseProps.propNames.inputAttributes, { min: 9.9, max: 99.8 });
+
+		const component = <InputBase inputProps={inputProps} />;
+
+		const mountedComponent = mount(component);
+
+		const advInput = mountedComponent.find("AdvancedNumericInput");
+		expect(advInput.props().decimalScale, "to be", 5);
+		expect(advInput.props().min, "to be", 9.9);
+		expect(advInput.props().max, "to be", 99.8);
+		expect(advInput.props().maxLength, "to be", 8);
+	});
+
 	it("Change advanced numeric input value", () => {
 		const inputProps = new InputBaseProps();
 		const aLabel = "aLabel";
@@ -686,116 +846,6 @@ describe("AdvancedNumericInput", () => {
 		// no idea what to assert here, this test is mostly for code coverage
 	});
 
-	it("Change advanced numeric input value with min value out of default bounds", () => {
-		const inputProps = new InputBaseProps();
-		const aLabel = "aLabel";
-		const aValue = "12.2";
-		const metadata = {
-			test: "value",
-		};
-
-		inputProps.set(InputBaseProps.propNames.update, update);
-		inputProps.set(InputBaseProps.propNames.value, aValue);
-		inputProps.set(InputBaseProps.propNames.label, aLabel);
-		inputProps.set(InputBaseProps.propNames.type, "AdvancedNumericInput");
-		inputProps.set(InputBaseProps.propNames.numericInputProps, { decimalScale: 2 });
-		inputProps.set(InputBaseProps.propNames.metadata, metadata);
-
-		const component = <InputBase inputProps={inputProps} />;
-		const mountedComponent = mount(component);
-		const input = mountedComponent.find("input");
-		input.simulate("change", { target: { value: "-3147483648", focus: noop } });
-
-		expect(update, "not to have calls satisfying", [{ args: ["-3147483648", metadata] }]);
-
-		input.simulate("change", { target: { value: "-111", focus: noop } });
-		expect(update, "to have calls satisfying", [{ args: ["-111", metadata] }]);
-	});
-
-	it("Change advanced numeric input value with min value out of specified bounds", () => {
-		const inputProps = new InputBaseProps();
-		const aLabel = "aLabel";
-		const aValue = "12.2";
-		const metadata = {
-			test: "value",
-		};
-
-		inputProps.set(InputBaseProps.propNames.update, update);
-		inputProps.set(InputBaseProps.propNames.value, aValue);
-		inputProps.set(InputBaseProps.propNames.label, aLabel);
-		inputProps.set(InputBaseProps.propNames.type, "AdvancedNumericInput");
-		inputProps.set(InputBaseProps.propNames.numericInputProps, { decimalScale: 2 });
-		inputProps.set(InputBaseProps.propNames.metadata, metadata);
-		inputProps.set(InputBaseProps.propNames.inputAttributes, {
-			min: -100,
-		});
-
-		const component = <InputBase inputProps={inputProps} />;
-		const mountedComponent = mount(component);
-		const input = mountedComponent.find("input");
-		input.simulate("change", { target: { value: "-2000", focus: noop } });
-
-		expect(update, "not to have calls satisfying", [{ args: ["-2000", metadata] }]);
-
-		input.simulate("change", { target: { value: "-11", focus: noop } });
-		expect(update, "to have calls satisfying", [{ args: ["-11", metadata] }]);
-	});
-
-	it("Change advanced numeric input value with max value out of default bounds", () => {
-		const inputProps = new InputBaseProps();
-		const aLabel = "aLabel";
-		const aValue = "12.2";
-		const metadata = {
-			test: "value",
-		};
-
-		inputProps.set(InputBaseProps.propNames.update, update);
-		inputProps.set(InputBaseProps.propNames.value, aValue);
-		inputProps.set(InputBaseProps.propNames.label, aLabel);
-		inputProps.set(InputBaseProps.propNames.type, "AdvancedNumericInput");
-		inputProps.set(InputBaseProps.propNames.numericInputProps, { decimalScale: 2 });
-		inputProps.set(InputBaseProps.propNames.metadata, metadata);
-
-		const component = <InputBase inputProps={inputProps} />;
-		const mountedComponent = mount(component);
-		const input = mountedComponent.find("input");
-		input.simulate("change", { target: { value: "3147483648", focus: noop } });
-
-		expect(update, "not to have calls satisfying", [{ args: ["3147483648", metadata] }]);
-
-		input.simulate("change", { target: { value: "111", focus: noop } });
-		expect(update, "to have calls satisfying", [{ args: ["111", metadata] }]);
-	});
-
-	it("Change advanced numeric input value with max value out of specified bounds", () => {
-		const inputProps = new InputBaseProps();
-		const aLabel = "aLabel";
-		const aValue = "12.2";
-		const metadata = {
-			test: "value",
-		};
-
-		inputProps.set(InputBaseProps.propNames.update, update);
-		inputProps.set(InputBaseProps.propNames.value, aValue);
-		inputProps.set(InputBaseProps.propNames.label, aLabel);
-		inputProps.set(InputBaseProps.propNames.type, "AdvancedNumericInput");
-		inputProps.set(InputBaseProps.propNames.numericInputProps, { decimalScale: 2 });
-		inputProps.set(InputBaseProps.propNames.metadata, metadata);
-		inputProps.set(InputBaseProps.propNames.inputAttributes, {
-			max: 100,
-		});
-
-		const component = <InputBase inputProps={inputProps} />;
-		const mountedComponent = mount(component);
-		const input = mountedComponent.find("input");
-		input.simulate("change", { target: { value: "2000", focus: noop } });
-
-		expect(update, "not to have calls satisfying", [{ args: ["2000", metadata] }]);
-
-		input.simulate("change", { target: { value: "11", focus: noop } });
-		expect(update, "to have calls satisfying", [{ args: ["11", metadata] }]);
-	});
-
 	it("Change advanced numeric input value: dash is allowed", () => {
 		const inputProps = new InputBaseProps();
 		const aLabel = "aLabel";