@onehat/ui 0.4.31 → 0.4.32

package/package.json

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

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

@@ -65,6 +65,7 @@ export function ComboComponent(props) {
 			onGridAdd, // to hook into when menu adds (ComboEditor only)
 			onGridSave, // to hook into when menu saves (ComboEditor only)
 			onGridDelete, // to hook into when menu deletes (ComboEditor only)
+			onSubmit, // when Combo is used in a Tag, call this when the user submits the Combo value (i.e. presses Enter or clicks a row)
 			newEntityDisplayProperty,
 			testID,
 
@@ -252,6 +253,9 @@ export function ComboComponent(props) {
 					if (id !== value) {
 						setValue(id);
 					}
+					if (onSubmit) {
+						onSubmit(id);
+					}
 					hideMenu();
 					break;
 				case 'ArrowDown':
@@ -815,6 +819,9 @@ export function ComboComponent(props) {
 							hideMenu();
 							onInputFocus();
 						}
+						if (onSubmit) {
+							onSubmit(id);
+						}
 					}}
 					reference="grid"
 					parent={self}

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

@@ -50,13 +50,6 @@ function TagComponent(props) {
 		} = props,
 		styles = UiGlobals.styles,
 		valueRef = useRef(value),
-		ignoreNextComboValueChangeRef = useRef(false),
-		getIgnoreNextComboValueChange = () => {
-			return ignoreNextComboValueChangeRef.current;
-		},
-		setIgnoreNextComboValueChange = (bool) => {
-			ignoreNextComboValueChangeRef.current = bool;
-		},
 		onView = async (item, e) => {
 			const
 				id = item.id,
@@ -91,14 +84,9 @@ function TagComponent(props) {
 			});
 		},
 		clearComboValue = () => {
-			setIgnoreNextComboValueChange(true); // we're clearing out the value of the underlying Combo, so ignore it when this combo submits the new value change
 			self.children.combo.setValue(null);
 		},
 		onChangeComboValue = (comboValue) => {
-			if (getIgnoreNextComboValueChange()) {
-				setIgnoreNextComboValueChange(false);
-				return;
-			}
 
 			if (_.isNil(comboValue)) {
 				// NOTE: We *shouldn't* get here, but for some unknown reason, we *were* getting here on rare occasions.
@@ -309,21 +297,22 @@ function TagComponent(props) {
 			>
 				<HStack className={valueBoxesClassName}>{valueBoxes}</HStack>
 				
-				{!isViewOnly && <WhichCombo
-									Repository={props.Repository}
-									Editor={props.Editor}
-									onChangeValue={onChangeComboValue}
-									parent={self}
-									reference="combo"
-									isInTag={true}
-									onGridAdd={onGridAdd}
-									onGridSave={onGridSave}
-									onGridDelete={onGridDelete}
-									tooltip={tooltip}
-									usePermissions={props.usePermissions}
-									{..._combo}
-									className={comboClassName}
-								/>}
+				{!isViewOnly && 
+					<WhichCombo
+						Repository={props.Repository}
+						Editor={props.Editor}
+						onSubmit={onChangeComboValue}
+						parent={self}
+						reference="combo"
+						isInTag={true}
+						onGridAdd={onGridAdd}
+						onGridSave={onGridSave}
+						onGridDelete={onGridDelete}
+						tooltip={tooltip}
+						usePermissions={props.usePermissions}
+						{..._combo}
+						className={comboClassName}
+					/>}
 			</VStackNative>;
 	
 }

package/src/Components/Hoc/withValue.js

@@ -20,8 +20,7 @@ export default function withValue(WrappedComponent) {
 			return <WrappedComponent {...props} ref={ref} />;
 		}
 
-		const
-			{
+		const {
 				onChangeValue,
 				value,
 				startingValue = null,