orc-shared 5.10.2-dev.3 → 5.10.2-dev.4

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

@@ -420,6 +420,19 @@ var InputBase = function InputBase(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [inputText, metadata, timeoutDelay, update, value]);
+  if (onKeyDown) {
+    if (inputAttributes.onKeyDown) {
+      var originalKeyDown = inputAttributes.onKeyDown;
+      inputAttributes.onKeyDown = function (event) {
+        originalKeyDown(event);
+        if (!event.isDefaultPrevented()) {
+          onKeyDown(event);
+        }
+      };
+    } else {
+      inputAttributes.onKeyDown = onKeyDown;
+    }
+  }
   return /*#__PURE__*/_react.default.createElement("div", {
     className: classes.container
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -445,7 +458,6 @@ var InputBase = function InputBase(_ref) {
     placeholder: placeholder,
     value: textToDisplay,
     fullWidth: true,
-    onKeyDown: onKeyDown,
     onWheel: onWheel,
     onChange: function onChange(event) {
       return onChangeHandler(event);

package/package.json

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

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

@@ -413,6 +413,21 @@ const InputBase = ({ inputProps }) => {
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [inputText, metadata, timeoutDelay, update, value]);
 
+	if (onKeyDown) {
+		if (inputAttributes.onKeyDown) {
+			const originalKeyDown = inputAttributes.onKeyDown;
+			inputAttributes.onKeyDown = event => {
+				originalKeyDown(event);
+
+				if (!event.isDefaultPrevented()) {
+					onKeyDown(event);
+				}
+			};
+		} else {
+			inputAttributes.onKeyDown = onKeyDown;
+		}
+	}
+
 	return (
 		<div className={classes.container}>
 			<div className={classes.inputContainer}>
@@ -432,7 +447,6 @@ const InputBase = ({ inputProps }) => {
 						placeholder={placeholder}
 						value={textToDisplay}
 						fullWidth={true}
-						onKeyDown={onKeyDown}
 						onWheel={onWheel}
 						onChange={event => onChangeHandler(event)}
 						error={!!error}

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

@@ -1002,6 +1002,54 @@ describe("AdvancedNumericInput", () => {
 		btnDecrease.simulate("mouseDown");
 	});
 
+	it("Advanced numeric input value without decimals but with custom onKeyDown with prevent default", () => {
+		const keydownSpy = sinon.stub().callsFake(e => {
+			e.preventDefault();
+		});
+
+		const inputProps = new InputBaseProps();
+		const aLabel = "aLabel";
+		const aValue = "";
+
+		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, { onKeyDown: keydownSpy });
+
+		const component = <InputBase inputProps={inputProps} />;
+		const mountedComponent = mount(component);
+		const input = mountedComponent.find("input");
+		input.simulate("keydown", { key: "ArrowUp" });
+
+		expect(keydownSpy, "was called once");
+		expect(update, "was not called");
+	});
+
+	it("Advanced numeric input value without decimals but with custom onKeyDown without prevent default", () => {
+		const keydownSpy = sinon.stub().callsFake(e => {});
+
+		const inputProps = new InputBaseProps();
+		const aLabel = "aLabel";
+		const aValue = "";
+
+		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, { onKeyDown: keydownSpy });
+
+		const component = <InputBase inputProps={inputProps} />;
+		const mountedComponent = mount(component);
+		const input = mountedComponent.find("input");
+		input.simulate("keydown", { key: "ArrowUp" });
+
+		expect(keydownSpy, "was called once");
+		expect(update, "to have calls satisfying", [{ args: ["1", null] }]);
+	});
+
 	it("Change advanced numeric input value, empty initial value with increase button", () => {
 		const inputProps = new InputBaseProps();
 		const aLabel = "aLabel";