orc-shared 5.9.0-dev.14 → 5.9.0-dev.16

package/dist/components/MaterialUI/Navigation/DropDownMenu.js

@@ -78,6 +78,13 @@ var DropDownMenu = function DropDownMenu(_ref) {
     event.stopPropagation();
     setAnchorEl(null);
   };
+
+  // Even though we do nothing, we need to avoid mouse event propagation when the mouse
+  // button is released after hovering out the menu
+  var onMainMenuClick = function onMainMenuClick(event) {
+    event.preventDefault();
+    event.stopPropagation();
+  };
   var onMenuItemClick = function onMenuItemClick(action, itemContext) {
     return function (event) {
       onClose(event);
@@ -110,6 +117,7 @@ var DropDownMenu = function DropDownMenu(_ref) {
     },
     id: "scope-menu",
     open: isOpened,
+    onClick: onMainMenuClick,
     onClose: onClose,
     autoFocus: autoFocus,
     anchorEl: anchorEl

package/dist/utils/propertyBagHelper.js

@@ -30,7 +30,8 @@ var customDataType = exports.customDataType = {
   carrierProviderSelector: "CarrierProviderSelector",
   routingProviderSelector: "RoutingProviderSelector",
   multipleCarrierProvidersSelector: "MultipleCarrierProvidersSelector",
-  serviceLevelSelector: "ServiceLevelSelector"
+  serviceLevelSelector: "ServiceLevelSelector",
+  percentageDecimal: "PercentageDecimal"
 };
 var tieredAttributeTypes = [customDataType.priceTieredRateTable, customDataType.quantityTieredRateTable];
 var isTieredAttribute = exports.isTieredAttribute = function isTieredAttribute(attribute) {
@@ -78,6 +79,7 @@ var toJsonCargo = exports.toJsonCargo = function toJsonCargo(attribute, value) {
         case customDataType.money:
           return createJsonCargo(_constants.jsonCargoType.double, Number(formatNumber(value, 2)));
         case customDataType.moneyDecimal:
+        case customDataType.percentageDecimal:
           return createJsonCargo(_constants.jsonCargoType.decimal, Number(formatNumber(value, 2)));
         case customDataType.priceTieredRateTable:
         case customDataType.quantityTieredRateTable:

package/package.json

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

package/src/components/MaterialUI/Navigation/DropDownMenu.js

@@ -47,6 +47,13 @@ const DropDownMenu = ({ payload, menuItems, children, dropDownMenuProps = new Dr
 		setAnchorEl(null);
 	};
 
+	// Even though we do nothing, we need to avoid mouse event propagation when the mouse
+	// button is released after hovering out the menu
+	const onMainMenuClick = event => {
+		event.preventDefault();
+		event.stopPropagation();
+	};
+
 	const onMenuItemClick = (action, itemContext) => event => {
 		onClose(event);
 		action(payload, itemContext);
@@ -76,6 +83,7 @@ const DropDownMenu = ({ payload, menuItems, children, dropDownMenuProps = new Dr
 				classes={{ paper: classes.menu }}
 				id="scope-menu"
 				open={isOpened}
+				onClick={onMainMenuClick}
 				onClose={onClose}
 				autoFocus={autoFocus}
 				anchorEl={anchorEl}

package/src/components/MaterialUI/Navigation/DropDownMenu.test.js

@@ -8,6 +8,7 @@ import Icon from "../DataDisplay/Icon";
 import DropDownMenu from "./DropDownMenu";
 import { ignoreConsoleError } from "../../../utils/testUtils";
 import { TestWrapper, createMuiTheme } from "./../../../utils/testUtils";
+import Menu from "@material-ui/core/Menu";
 
 describe("DropDownMenu", () => {
 	let store, menuItems, container;
@@ -92,4 +93,27 @@ describe("DropDownMenu", () => {
 		expect(menuItems[0].action, "to have calls satisfying", [{ args: [payload, "aContext"] }]);
 		expect(menuItems[1].action, "to have calls satisfying", [{ args: [payload, "myContext"] }]);
 	});
+
+	it("should handle onClick event on the menu", () => {
+		const payload = "payload";
+
+		const component = (
+			<Provider store={store}>
+				<DropDownMenu payload={payload} menuItems={menuItems} />
+			</Provider>
+		);
+
+		const mountedComponent = mount(component);
+
+		const event = {
+			preventDefault: sinon.spy().named("preventDefault"),
+			stopPropagation: sinon.spy().named("stopPropagation"),
+		};
+
+		const dropDownMenu = mountedComponent.find(Menu).at(0);
+		dropDownMenu.invoke("onClick")(event);
+
+		expect(event.preventDefault, "was called");
+		expect(event.stopPropagation, "was called");
+	});
 });

package/src/utils/propertyBagHelper.js

@@ -19,6 +19,7 @@ export const customDataType = {
 	routingProviderSelector: "RoutingProviderSelector",
 	multipleCarrierProvidersSelector: "MultipleCarrierProvidersSelector",
 	serviceLevelSelector: "ServiceLevelSelector",
+	percentageDecimal: "PercentageDecimal",
 };
 
 const tieredAttributeTypes = [customDataType.priceTieredRateTable, customDataType.quantityTieredRateTable];
@@ -73,6 +74,7 @@ export const toJsonCargo = (attribute, value) => {
 				case customDataType.money:
 					return createJsonCargo(jsonCargoType.double, Number(formatNumber(value, 2)));
 				case customDataType.moneyDecimal:
+				case customDataType.percentageDecimal:
 					return createJsonCargo(jsonCargoType.decimal, Number(formatNumber(value, 2)));
 				case customDataType.priceTieredRateTable:
 				case customDataType.quantityTieredRateTable: