orc-shared 1.7.0-dev.7 → 1.7.0-dev.8

package/dist/components/MaterialUI/DataDisplay/tableHelpers.js

@@ -43,12 +43,12 @@ var defaultRendering = function defaultRendering(e, def, rowId, readOnly, transf
     titleValue: transformedValue
   }) : null;
 };
-var renderByType = function renderByType(e, def, rowId, readOnly, transformedValue) {
+var renderByType = function renderByType(e, def, rowId, readOnly, transformedValue, index) {
   var _def$transform, _def$switch, _def$switch2, _def$transform2, _def$transform3, _def$switch3, _def$transform4, _def$transform5, _def$transform6, _def$transform7, _def$transform8;
   switch (def.type) {
     case "custom":
       {
-        return [def.builder(e, readOnly, def) || defaultRendering(e, def, rowId, readOnly, transformedValue)];
+        return [def.builder(e, readOnly, def, index) || defaultRendering(e, def, rowId, readOnly, transformedValue)];
       }
     case "currency":
       {
@@ -151,9 +151,9 @@ var renderByType = function renderByType(e, def, rowId, readOnly, transformedVal
       return [defaultRendering(e, def, rowId, readOnly, transformedValue)];
   }
 };
-var renderByTypeInEditingMode = function renderByTypeInEditingMode(e, def, rowId, readOnly, transformedValue) {
-  if ((def.editingBuilder || null) !== null) return [def.editingBuilder(e, readOnly, def) || defaultRendering(e, def, rowId, readOnly, transformedValue)];
-  return renderByType(e, def, rowId, readOnly, transformedValue);
+var renderByTypeInEditingMode = function renderByTypeInEditingMode(e, def, rowId, readOnly, transformedValue, index) {
+  if ((def.editingBuilder || null) !== null) return [def.editingBuilder(e, readOnly, def, index) || defaultRendering(e, def, rowId, readOnly, transformedValue)];
+  return renderByType(e, def, rowId, readOnly, transformedValue, index);
 };
 var buildHeaderAndRowFromConfig = exports.buildHeaderAndRowFromConfig = function buildHeaderAndRowFromConfig(columnDefinitions, elements, readOnly, keyField, showCustomClass) {
   if (readOnly === void 0) {
@@ -180,7 +180,7 @@ var buildHeaderAndRowFromConfig = exports.buildHeaderAndRowFromConfig = function
       className: def.className
     };
   });
-  var rows = elements.map(function (e) {
+  var rows = elements.map(function (e, index) {
     var rowId = e[keyField];
     var elementClass = e.customClass || "";
     return {
@@ -195,7 +195,7 @@ var buildHeaderAndRowFromConfig = exports.buildHeaderAndRowFromConfig = function
       }).map(function (def) {
         var _def$transform9;
         var transformedValue = (_def$transform9 = def.transform) != null && _def$transform9.value ? def.transform.value(e[def.fieldName]) : e[def.fieldName];
-        var _ref = readOnly ? renderByType(e, def, rowId, readOnly, transformedValue) : renderByTypeInEditingMode(e, def, rowId, readOnly, transformedValue),
+        var _ref = readOnly ? renderByType(e, def, rowId, readOnly, transformedValue, index) : renderByTypeInEditingMode(e, def, rowId, readOnly, transformedValue, index),
           _ref2 = _slicedToArray(_ref, 2),
           cellElement = _ref2[0],
           title = _ref2[1];

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

@@ -39,10 +39,15 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
       textTransform: "none",
       color: theme.palette.text.primary,
       borderRadius: 0,
-      "&:hover, &:focus": {
+      "&:hover": {
         borderRadius: 0,
         boxShadow: "none",
         backgroundColor: theme.palette.primary.light
+      },
+      "&:focus, &:active, &.Mui-focusVisible": {
+        borderRadius: 0,
+        boxShadow: "none",
+        outline: "none"
       }
     },
     menu: {

package/package.json

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

package/src/components/MaterialUI/DataDisplay/tableHelpers.js

@@ -18,10 +18,10 @@ const defaultRendering = (e, def, rowId, readOnly, transformedValue) => {
 	) : null;
 };
 
-const renderByType = (e, def, rowId, readOnly, transformedValue) => {
+const renderByType = (e, def, rowId, readOnly, transformedValue, index) => {
 	switch (def.type) {
 		case "custom": {
-			return [def.builder(e, readOnly, def) || defaultRendering(e, def, rowId, readOnly, transformedValue)];
+			return [def.builder(e, readOnly, def, index) || defaultRendering(e, def, rowId, readOnly, transformedValue)];
 		}
 
 		case "currency": {
@@ -130,11 +130,11 @@ const renderByType = (e, def, rowId, readOnly, transformedValue) => {
 	}
 };
 
-const renderByTypeInEditingMode = (e, def, rowId, readOnly, transformedValue) => {
+const renderByTypeInEditingMode = (e, def, rowId, readOnly, transformedValue, index) => {
 	if ((def.editingBuilder || null) !== null)
-		return [def.editingBuilder(e, readOnly, def) || defaultRendering(e, def, rowId, readOnly, transformedValue)];
+		return [def.editingBuilder(e, readOnly, def, index) || defaultRendering(e, def, rowId, readOnly, transformedValue)];
 
-	return renderByType(e, def, rowId, readOnly, transformedValue);
+	return renderByType(e, def, rowId, readOnly, transformedValue, index);
 };
 
 export const buildHeaderAndRowFromConfig = (
@@ -155,7 +155,7 @@ export const buildHeaderAndRowFromConfig = (
 			className: def.className,
 		}));
 
-	const rows = elements.map(e => {
+	const rows = elements.map((e, index) => {
 		const rowId = e[keyField];
 		const elementClass = e.customClass || "";
 		return {
@@ -168,8 +168,8 @@ export const buildHeaderAndRowFromConfig = (
 					const transformedValue = def.transform?.value ? def.transform.value(e[def.fieldName]) : e[def.fieldName];
 
 					const [cellElement, title] = readOnly
-						? renderByType(e, def, rowId, readOnly, transformedValue)
-						: renderByTypeInEditingMode(e, def, rowId, readOnly, transformedValue);
+						? renderByType(e, def, rowId, readOnly, transformedValue, index)
+						: renderByTypeInEditingMode(e, def, rowId, readOnly, transformedValue, index);
 
 					return {
 						title: def.tooltipable !== false ? (title === undefined ? cellElement : title) : null,

package/src/components/MaterialUI/DataDisplay/tableHelpers.test.js

@@ -358,6 +358,59 @@ describe("table helpers buildHeaderAndRowFromConfig", () => {
 		expect(rows[1].columns[0].title, "to equal", "44 a value from builder");
 	});
 
+	it("validate builder inputs", () => {
+		const elements = [
+			{
+				id: "an_id1",
+				test: "A text row 1",
+				another: "another 1",
+				extraneous: "Don't show 1",
+			},
+			{
+				id: "an_id2",
+				test: "A text row 2",
+				another: "another 2",
+				extraneous: "Don't show 2",
+			},
+		];
+
+		let counter = 0;
+
+		const builder = (e, readOnly, def, index) => {
+			if (e.id === "an_id1") {
+				expect(index, "to equal", 0);
+			} else {
+				expect(index, "to equal", 1);
+			}
+
+			expect(readOnly, "to be", false);
+
+			counter++;
+		};
+
+		const columnDef = [
+			{
+				type: "custom",
+				builder: builder,
+				label: messages.a_label,
+			},
+			{
+				type: "custom",
+				builder: builder,
+				label: messages.a_label,
+			},
+			{
+				type: "custom",
+				builder: builder,
+				label: messages.a_label,
+			},
+		];
+
+		buildHeaderAndRowFromConfig(columnDef, elements, false);
+
+		expect(counter, "to equal", 6);
+	});
+
 	it("build table rows as expected with a custom builder returning not valid component", () => {
 		const columnDef = [
 			{
@@ -1592,6 +1645,46 @@ describe("table helpers buildHeaderAndRowFromConfig", () => {
 		expect(rows[1].columns[1].title, "to equal", "another 2 a value from builder");
 	});
 
+	it("validate editingBuilder inputs", () => {
+		const elements = [
+			{
+				id: "an_id1",
+				test: "A text row 1",
+				another: "another 1",
+				extraneous: "Don't show 1",
+			},
+			{
+				id: "an_id2",
+				test: "A text row 2",
+				another: "another 2",
+				extraneous: "Don't show 2",
+			},
+		];
+
+		let counter = 0;
+
+		const editingBuilder = (e, readOnly, def, index) => {
+			if (e.id === "an_id1") {
+				expect(index, "to equal", 0);
+			} else {
+				expect(index, "to equal", 1);
+			}
+
+			expect(readOnly, "to be", false);
+
+			counter++;
+		};
+
+		const columnDef = [
+			{ fieldName: "test", label: messages.a_label, className: "aClassXYZ", editingBuilder: editingBuilder },
+			{ fieldName: "another", label: messages.another, editingBuilder: editingBuilder },
+		];
+
+		buildHeaderAndRowFromConfig(columnDef, elements, false);
+
+		expect(counter, "to equal", 4);
+	});
+
 	it("build table headers and rows as expected when a column should not be visible", () => {
 		const editingBuilder = (e, readOnly, def) =>
 			def.fieldName === "test" ? null : e.another + " a value from builder";

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

@@ -12,11 +12,16 @@ const useStyles = makeStyles(theme => ({
 		textTransform: "none",
 		color: theme.palette.text.primary,
 		borderRadius: 0,
-		"&:hover, &:focus": {
+		"&:hover": {
 			borderRadius: 0,
 			boxShadow: "none",
 			backgroundColor: theme.palette.primary.light,
 		},
+		"&:focus, &:active, &.Mui-focusVisible": {
+			borderRadius: 0,
+			boxShadow: "none",
+			outline: "none",
+		},
 	},
 	menu: {
 		border: `${theme.spacing(0.1)} solid ${theme.palette.grey.borders}`,