@onehat/ui 0.3.107 → 0.3.110

package/package.json

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

package/src/Components/Form/Form.js

@@ -127,6 +127,7 @@ function Form(props) {
 		[containerWidth, setContainerWidth] = useState(),
 		initialValues =  _.merge(startingValues, (record && !record.isDestroyed ? record.submitValues : {})),
 		defaultValues = isMultiple ? getNullFieldValues(initialValues, Repository) : initialValues, // when multiple entities, set all default values to null
+		validatorToUse = validator || (isMultiple ? disableRequiredYupFields(Repository?.schema?.model?.validator) : Repository?.schema?.model?.validator) || yup.object(),
 		{
 			control,
 			formState,
@@ -142,7 +143,7 @@ function Form(props) {
 			// setFocus,
 			getValues: formGetValues,
 			// getFieldState,
-			// trigger,
+			trigger,
 		} = useForm({
 			mode: 'onChange', // onChange | onBlur | onSubmit | onTouched | all
 			// reValidateMode: 'onChange', // onChange | onBlur | onSubmit
@@ -157,7 +158,7 @@ function Form(props) {
 			// delayError: 0,
 			// shouldUnregister: false,
 			// shouldUseNativeValidation: false,
-			resolver: yupResolver(validator || (isMultiple ? disableRequiredYupFields(Repository?.schema?.model?.validator) : Repository?.schema?.model?.validator) || yup.object()),
+			resolver: yupResolver(validatorToUse),
 			context: { isPhantom },
 		}),
 		buildFromColumnsConfig = () => {
@@ -297,6 +298,7 @@ function Form(props) {
 					useSelectorId = false,
 					isHidden = false,
 					getDynamicProps,
+					getIsRequired,
 					...propsToPass
 				} = item,
 				editorTypeProps = {};
@@ -384,7 +386,17 @@ function Form(props) {
 			}
 
 			if (isEditorViewOnly || !isEditable) {
-				const value = (record && record[name]) || (startingValues && startingValues[name]) || null;
+				let value = null;
+				if (record?.properties && record.properties[name]) {
+					value = record.properties[name].displayValue;
+				}
+				if (_.isNil(value) && record && record[name]) {
+					value = record[name];
+				}
+				if (_.isNil(value) && startingValues && startingValues[name]) {
+					value = startingValues[name];
+				}
+		
 				let element = <Element
 									value={value}
 									parent={self}
@@ -473,7 +485,7 @@ function Form(props) {
 													}
 													onChange(newValue);
 													if (onEditorChange) {
-														onEditorChange(newValue, formSetValue, formGetValues, formState);
+														onEditorChange(newValue, formSetValue, formGetValues, formState, trigger);
 													}
 												}}
 												onBlur={onBlur}
@@ -511,11 +523,11 @@ function Form(props) {
 								
 							let isRequired = false,
 								requiredIndicator = null;
-							if (editorType === EDITOR_TYPE__PLAIN) {
+							if (getIsRequired) {
+								isRequired = getIsRequired(formGetValues, formState);
+							} else if (validatorToUse?.fields && validatorToUse.fields[name]?.exclusiveTests?.required) {
 								// submitted validator
-								if (validator?.fields && validator.fields[name]?.exclusiveTests?.required) {
-									isRequired = true;
-								}
+								isRequired = true;
 							} else if ((propertyDef?.validator?.spec && !propertyDef.validator.spec.optional) ||
 								(propertyDef?.requiredIfPhantom && isPhantom) ||
 								(propertyDef?.requiredIfNotPhantom && !isPhantom)) {