@onehat/ui 0.3.187 → 0.3.189

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/ui",
-	"version": "0.3.187",
+	"version": "0.3.189",
 	"description": "Base UI for OneHat apps",
 	"main": "src/index.js",
 	"type": "module",

package/src/Components/Form/Field/Combo/Combo.js

@@ -745,15 +745,15 @@ export function ComboComponent(props) {
 						}
 
 					}}
-					onAdd={(entity) => {
-						if (entity?.id !== value && !isInTag) {
+					onAdd={(selection) => {
+						const entity = selection[0];
+						if (entity.id !== value && !isInTag) {
 							// Select it and set the value of the combo.
-							setGridSelection([entity]);
-							const id = entity.id;
-							setValue(id);
+							setGridSelection(selection);
+							setValue(entity.id);
 						}
 						if (onGridAdd) {
-							onGridAdd([entity]);
+							onGridAdd(selection);
 						}
 					}}
 					onSave={(selection) => {
@@ -761,9 +761,8 @@ export function ComboComponent(props) {
 						if (entity?.id !== value && !isInTag) { // Tag doesn't use value, so don't do this comparison in the Tag
 							// Either a phantom record was just solidified into a real record, or a new (non-phantom) record was added.
 							// Select it and set the value of the combo.
-							setGridSelection([entity]);
-							const id = entity.id;
-							setValue(id);
+							setGridSelection(selection);
+							setValue(entity.id);
 						}
 						if (onGridSave) {
 							onGridSave(selection);

package/src/Components/Form/Form.js

@@ -287,17 +287,12 @@ function Form(props) {
 			return <Row>{elements}</Row>;
 		},
 		buildFromItems = () => {
-			const builtItems = [];
-			_.each(items, (item, ix) => {
-				if (!item) {
-					return;
-				}
-				const builtItem = buildFromItem(item, ix, columnDefaults);
-				builtItems.push(builtItem);
-			});
-			return builtItems;
+			return _.map(items, (item, ix) => buildFromItem(item, ix, columnDefaults));
 		},
 		buildFromItem = (item, ix, defaults) => {
+			if (!item) {
+				return null;
+			}
 			if (React.isValidElement(item)) {
 				return item;
 			}

package/src/Components/Viewer/Viewer.js

@@ -57,17 +57,12 @@ function Viewer(props) {
 		styles = UiGlobals.styles,
 		flex = props.flex || 1,
 		buildFromItems = () => {
-			const builtItems = [];
-			_.each(items, (item, ix) => {
-				if (!item) {
-					return;
-				}
-				const builtItem = buildFromItem(item, ix, columnDefaults);
-				builtItems.push(builtItem);
-			});
-			return builtItems;
+			return _.map(items, (item, ix) => buildFromItem(item, ix, columnDefaults));
 		},
 		buildFromItem = (item, ix, defaults) => {
+			if (!item) {
+				return null;
+			}
 			let {
 					type,
 					title,