@onehat/ui 0.2.5 → 0.2.7

package/package.json

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

package/src/Components/Form/Form.js

@@ -1,4 +1,4 @@
-import { useEffect, useState, } from 'react';
+import { useEffect, useState, isValidElement, } from 'react';
 import {
 	Box,
 	Button,
@@ -192,7 +192,12 @@ function Form(props) {
 												// Getting an error that the OrdersEditor is missing users__email.
 												// Why is this even on the OrdersEditor? Runner?
 											}
-											let element = <Element
+											let element;
+											if (isValidElement(Element)) {
+												element = Element;
+												debugger;
+											} else {
+												element = <Element
 																name={name}
 																value={value}
 																setValue={(newValue) => {
@@ -206,6 +211,7 @@ function Form(props) {
 																// {...defaults}
 																// {...propsToPass}
 															/>;
+											}
 
 											// element = <Tooltip key={ix} label={header} placement="bottom">
 											// 				{element}
@@ -251,7 +257,7 @@ function Form(props) {
 				type = t;
 				editorTypeProps = p;
 			}
-			if (type.match(/Combo$/) && Repository?.isRemote && !Repository?.isLoaded) {
+			if (type?.match && type.match(/Combo$/) && Repository?.isRemote && !Repository?.isLoaded) {
 				editorTypeProps.autoLoad = true;
 			}
 			const Element = getComponentFromType(type);
@@ -493,26 +499,26 @@ function disableRequiredYupFields(validator) {
 		return null;
 	}
 
-	// const nextSchema = validator.clone();
-	// return nextSchema.withMutation((next) => {
-	// 	if (typeof next.fields === 'object' && next.fields != null) {
-	// 		for (const key in next.fields) {
-	// 			const nestedField = next.fields[key];
+	const nextSchema = validator.clone();
+	return nextSchema.withMutation((next) => {
+		if (typeof next.fields === 'object' && next.fields != null) {
+			for (const key in next.fields) {
+				const nestedField = next.fields[key];
 		
-	// 			let nestedFieldNext = nestedField.notRequired();
+				let nestedFieldNext = nestedField.notRequired();
 		
-	// 			if (Array.isArray(nestedField.conditions) && nestedField.conditions.length > 0) {
-	// 				// Next is done to disable required() inside a condition
-	// 				// https://github.com/jquense/yup/issues/1002
-	// 				nestedFieldNext = nestedFieldNext.when('whatever', (_: unknown, schema: yup.AnySchema) =>
-	// 					schema.notRequired(),
-	// 				);
-	// 			}
+				if (Array.isArray(nestedField.conditions) && nestedField.conditions.length > 0) {
+					// Next is done to disable required() inside a condition
+					// https://github.com/jquense/yup/issues/1002
+					nestedFieldNext = nestedFieldNext.when('whatever', (unused, schema) => {
+						return schema.notRequired();
+					});
+				}
 		
-	// 			next.fields[key] = nestedFieldNext;
-	// 		}
-	// 	}
-	// });
+				next.fields[key] = nestedFieldNext;
+			}
+		}
+	});
 }
 function getNullFieldValues(initialValues, Repository) {
 	const ret = {};