@onehat/ui 0.3.110 → 0.3.112

package/package.json

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

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

@@ -143,13 +143,13 @@ function TagComponent(props) {
 						key={ix}
 						text={val.text}
 						onView={() => onView(val)}
-						onDelete={isEditor ? () => onDelete(val) : null}
+						onDelete={() => onDelete(val)}
 					/>;
 		});
 
-	let WhichCombo = ComboEditor;
-	if (!_.isNil(_combo.isEditor) && !_combo.isEditor) {
-		WhichCombo = Combo;
+	let WhichCombo = Combo;
+	if (_combo.isEditor) {
+		WhichCombo = ComboEditor;
 	}
 
 	const sizeProps = {};
@@ -164,7 +164,7 @@ function TagComponent(props) {
 		}
 	}
 
-	if (isEditor && propsToPass.selectorId) {
+	if (propsToPass.selectorId) {
 		_combo.selectorId = propsToPass.selectorId;
 		_combo.selectorSelected = propsToPass.selectorSelected;
 	}
@@ -187,15 +187,14 @@ function TagComponent(props) {
 						minHeight={10}
 						flexWrap="wrap"
 					>{valueBoxes}</Row>
-					{isEditor && 
-						<WhichCombo
-							Repository={props.Repository}
-							Editor={props.Editor}
-							onChangeValue={onChangeComboValue}
-							parent={self}
-							reference="combo"
-							{..._combo}
-						/>}
+					<WhichCombo
+						Repository={props.Repository}
+						Editor={props.Editor}
+						onChangeValue={onChangeComboValue}
+						parent={self}
+						reference="combo"
+						{..._combo}
+					/>
 				</Column>
 				{isViewerShown && 
 					<Modal
@@ -245,24 +244,12 @@ export const Tag = withAdditionalProps(
 function withAdditionalEditorProps(WrappedComponent) {
 	return (props) => {
 		return <WrappedComponent
-					isEditor={true}
-					isValueAlwaysArray={true}
-					isValueAsStringifiedJson={true}
+					_combo={{ isEditor: true }}
 					{...props}
 				/>;
 	};
 }
 
-export const TagEditor = withAdditionalEditorProps(
-							withComponent(
-								withAlert(
-									withData(
-										withValue(
-											TagComponent
-										)
-									)
-								)
-							)
-						);
+export const TagEditor = withAdditionalEditorProps(Tag);
 
 export default Tag;

package/src/Components/Form/Form.js

@@ -75,6 +75,7 @@ function Form(props) {
 			disableDirtyIcon = false,
 			onBack,
 			onReset,
+			onInit,
 			onViewMode,
 			submitBtnLabel,
 			onSubmit,
@@ -614,19 +615,25 @@ function Form(props) {
 				alert(errors.message);
 			}
 		},
+		doReset = (values) => {
+			reset(values);
+			if (onReset) {
+				onReset(values, formSetValue, formGetValues);
+			}
+		},
 		onSaveDecorated = async (data, e) => {
 			// reset the form after a save
 			const result = await onSave(data, e);
 			if (result) {
 				const values = record.submitValues;
-				reset(values);
+				doReset(values);
 			}
 		},
 		onSubmitDecorated = async (data, e) => {
 			const result = await onSubmit(data, e);
 			if (result) {
 				const values = record.submitValues;
-				reset(values);
+				doReset(values);
 			}
 		},
 		onLayoutDecorated = (e) => {
@@ -638,9 +645,13 @@ function Form(props) {
 		};
 
 	useEffect(() => {
-		if (record !== previousRecord) {
+		if (record === previousRecord) {
+			if (onInit) {
+				onInit(initialValues, formSetValue, formGetValues);
+			}
+		} else {
 			setPreviousRecord(record);
-			reset(defaultValues);
+			doReset(defaultValues);
 		}
 		if (formSetup) {
 			formSetup(formSetValue, formGetValues, formState)
@@ -849,12 +860,7 @@ function Form(props) {
 						{showResetBtn && 
 							<IconButton
 								key="resetBtn"
-								onPress={() => {
-									if (onReset) {
-										onReset();
-									}
-									reset();
-								}}
+								onPress={() => doReset()}
 								icon={Rotate}
 								_icon={{
 									color: !formState.isDirty ? 'trueGray.400' : '#000',