@onehat/ui 0.4.108 → 0.4.109

package/package.json

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

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

@@ -320,7 +320,7 @@ function TagComponent(props) {
 						/>;
 			}
 			switch (items.length) {
-				case 1: height = 250; break;
+				case 1: height = 300; break;
 				case 2: height = 400; break;
 				default: height = 600; break;
 			}

package/src/Components/Form/Form.js

@@ -321,7 +321,11 @@ function Form(props) {
 						type = 'Text';
 					}
 				}
-				const isCombo = type?.match && type.match(/Combo/);
+				const
+					Element = getComponentFromType(type),
+					shouldHideFieldUi = type === 'Hidden',
+					isCombo = type?.match && type.match(/Combo/);
+				
 				if (config.hasOwnProperty('autoLoad')) {
 					editorTypeProps.autoLoad = config.autoLoad;
 				} else {
@@ -335,9 +339,8 @@ function Form(props) {
 						editorTypeProps.showXButton = true;
 					}
 				}
-				const Element = getComponentFromType(type);
 
-				if (isEditorViewOnly || !isEditable) {
+				if ((isEditorViewOnly || !isEditable) && !shouldHideFieldUi) {
 					let value = null;
 					if (renderer) {
 						value = renderer(record);
@@ -483,6 +486,9 @@ function Form(props) {
 														{...dynamicProps}
 														className={elementClassName}
 													/>;
+										if (shouldHideFieldUi) {
+											return element;
+										}
 
 										const dirtyIcon = isDirty && !disableDirtyIcon ? 
 															<Icon
@@ -532,6 +538,7 @@ function Form(props) {
 					isEditable = true,
 					isEditingEnabledInPlainEditor,
 					label,
+					disableLabel = false,
 					labelWidth,
 					items,
 					onChange: onEditorChange,
@@ -588,7 +595,11 @@ function Form(props) {
 					type = 'Text';
 				}
 			}
-			const isCombo = type?.match && type.match(/Combo/);
+			const
+				Element = getComponentFromType(type),
+				shouldHideFieldUi = type === 'Hidden',
+				isCombo = type?.match && type.match(/Combo/);
+			
 			if (item.hasOwnProperty('autoLoad')) {
 				editorTypeProps.autoLoad = item.autoLoad;
 			} else {
@@ -602,7 +613,6 @@ function Form(props) {
 					editorTypeProps.showXButton = true;
 				}
 			}
-			const Element = getComponentFromType(type);
 			
 			if (inArray(type, ['Column', 'Row', 'FieldSet'])) {
 				if (_.isEmpty(items)) {
@@ -676,7 +686,7 @@ function Form(props) {
 				label = propertyDef.title;
 			}
 
-			if (isEditorViewOnly || !isEditable) {
+			if ((isEditorViewOnly || !isEditable) && !shouldHideFieldUi) {
 				let value = null;
 				if (isSingle) {
 					value = record?.properties?.[name]?.displayValue || null;
@@ -713,7 +723,10 @@ function Form(props) {
 									{...viewerTypeProps}
 									className={elementClassName}
 								/>;
-				if (!disableLabels && label) {
+				if (shouldHideFieldUi) {
+					return null;
+				}
+				if (!disableLabels && !disableLabel && label) {
 					const style = {};
 					if (defaults?.labelWidth) {
 						style.width = defaults.labelWidth;
@@ -846,6 +859,9 @@ function Form(props) {
 												{...dynamicProps}
 												className={elementClassName}
 											/>;
+							if (shouldHideFieldUi) {
+								return element;
+							}
 							let message = null;
 							if (error) {
 								message = error.message;
@@ -905,7 +921,7 @@ function Form(props) {
 								}
 							}
 							const labelToUse = dynamicProps.label || label;
-							if (!disableLabels && labelToUse && editorType !== EDITOR_TYPE__INLINE) {
+							if (!disableLabels && !disableLabel && labelToUse && editorType !== EDITOR_TYPE__INLINE) {
 								const style = {};
 								if (defaults?.labelWidth) {
 									style.width = defaults.labelWidth;
@@ -933,7 +949,7 @@ function Form(props) {
 													{element}
 												</VStack>;
 								}
-							} else if (disableLabels && requiredIndicator) {
+							} else if ((disableLabels || disableLabel) && requiredIndicator) {
 								element = <HStack className="Form-HStack10 w-full">
 												{requiredIndicator}
 												{element}
@@ -1274,7 +1290,10 @@ function Form(props) {
 		showCancelBtn = false,
 		showSaveBtn = false,
 		showSubmitBtn = false,
-		isAddMode = getEditorMode() === EDITOR_MODE__ADD;
+		isAddMode = getEditorMode() === EDITOR_MODE__ADD,
+		isEditableMode =
+			getEditorMode() === EDITOR_MODE__ADD ||
+			getEditorMode() === EDITOR_MODE__EDIT;
 	if (containerWidth) { // we need to render this component twice in order to get the container width. Skip this on first render
 
 		// create editor
@@ -1363,7 +1382,7 @@ function Form(props) {
 		if (onDelete && getEditorMode() === EDITOR_MODE__EDIT && isSingle) {
 			showDeleteBtn = true;
 		}
-		if (!isEditorViewOnly && !hideResetButton) {
+		if (!isEditorViewOnly && isEditableMode && !hideResetButton) {
 			showResetBtn = true;
 		}
 		// determine whether we should show the close or cancel button
@@ -1394,7 +1413,7 @@ function Form(props) {
 				}
 			}
 		}
-		if (!isEditorViewOnly && onSave) {
+		if (!isEditorViewOnly && isEditableMode && onSave) {
 			showSaveBtn = true;
 		}
 		if (!!onSubmit) {

package/src/Components/Hoc/withPdfButtons.js

@@ -62,9 +62,9 @@ export default function withPdfButtons(WrappedComponent) {
 			buildModalItems = () => {
 				// Build a cloned PDF item tree so we never mutate source items by reference.
 				const
-					itemsTouse = pdfItems || items,
+					itemsToUse = pdfItems || _.filter(items, (item) => item?.type !== 'Hidden'),
 					ancillaryItemsToUse = pdfAncillaryItems || ancillaryItems,
-					modalItems = _.compact(_.map(itemsTouse, (item, ix) => buildNextLayer(item, ix, columnDefaults)));
+					modalItems = _.compact(_.map(itemsToUse, (item, ix) => buildNextLayer(item, ix, columnDefaults)));
 
 				if (!_.isEmpty(ancillaryItemsToUse)) {
 					const

package/src/Components/Hoc/withPresetButtons.js

@@ -436,6 +436,10 @@ export default function withPresetButtons(WrappedComponent) {
 					showInfo('Copied to clipboard!');
 				}
 			},
+			getColumnsConfigForDownload = () => {
+				const activeColumnsConfig = localColumnsConfig.length ? localColumnsConfig : props.columnsConfig;
+				return _.filter(activeColumnsConfig, (config) => !config.isHidden);
+			},
 			onUploadDownload = () => {
 				const onUploadDecorator = async () => {
 					if (onUpload) {
@@ -454,7 +458,7 @@ export default function withPresetButtons(WrappedComponent) {
 								reference="uploadsDownloads"
 								onClose={hideModal}
 								Repository={Repository}
-								columnsConfig={props.columnsConfig}
+								columnsConfig={getColumnsConfigForDownload()}
 								uploadHeaders={uploadHeaders}
 								uploadParams={uploadParams}
 								onUpload={onUploadDecorator}
@@ -471,7 +475,7 @@ export default function withPresetButtons(WrappedComponent) {
 								onClose={hideModal}
 								isDownloadOnly={true}
 								Repository={Repository}
-								columnsConfig={props.columnsConfig}
+								columnsConfig={getColumnsConfigForDownload()}
 								downloadHeaders={downloadHeaders}
 								downloadParams={downloadParams}
 							/>,

package/src/Components/Viewer/Viewer.js

@@ -107,6 +107,14 @@ function Viewer(props) {
 		}),
 		isSideEditor = editorType === EDITOR_TYPE__SIDE,
 		isSmartEditor = editorType === EDITOR_TYPE__SMART,
+		parentEditorModeRaw = (getEditorMode && getEditorMode()) || editorMode || null,
+		parentEditorMode = parentEditorModeRaw === EDITOR_MODE__ADD
+			? EDITOR_MODE__EDIT
+			: parentEditorModeRaw,
+		normalizedParentEditorMode =
+			parentEditorMode === EDITOR_MODE__EDIT || parentEditorMode === EDITOR_MODE__VIEW
+				? parentEditorMode
+				: null,
 		styles = UiGlobals.styles,
 		flex = props.flex || 1,
 		buildFromItems = () => {
@@ -125,6 +133,7 @@ function Viewer(props) {
 					title,
 					name,
 					label,
+					disableLabel = false,
 					items,
 					useSelectorId = false,
 					isHidden = false,
@@ -160,7 +169,11 @@ function Viewer(props) {
 					type = 'Text';
 				}
 			}
-			const isCombo = type?.match && type.match(/Combo/);
+			const
+				Element = getComponentFromType(type),
+				shouldHideFieldUi = type === 'Hidden',
+				isCombo = type?.match && type.match(/Combo/);
+			
 			if (item.hasOwnProperty('autoLoad')) {
 				viewerTypeProps.autoLoad = item.autoLoad;
 			} else {
@@ -175,7 +188,6 @@ function Viewer(props) {
 			if (type?.match(/(Grid|GridEditor)$/)) {
 				viewerTypeProps.canEditorViewOnly = true;
 			}
-			const Element = getComponentFromType(type);
 
 			if (inArray(type, ['Column', 'Row', 'FieldSet'])) {
 				if (_.isEmpty(items)) {
@@ -264,6 +276,10 @@ function Viewer(props) {
 						>{children}</Element>;
 			}
 
+			if (shouldHideFieldUi) {
+				return null;
+			}
+
 			if (!label && Repository && propertyDef?.title) {
 				label = propertyDef.title;
 			}
@@ -334,7 +350,7 @@ function Viewer(props) {
 							</HStack>;
 			}
 
-			if (!disableLabels && label) {
+			if (!disableLabels && !disableLabel && label) {
 				const style = {};
 				if (defaults?.labelWidth) {
 					style.width = defaults.labelWidth;
@@ -359,14 +375,6 @@ function Viewer(props) {
 		buildAncillary = () => {
 			const
 				validAncillaryItems = _.filter(ancillaryItems, (item) => !!item), // filter out any null/undefined items
-				parentEditorModeRaw = (getEditorMode && getEditorMode()) || editorMode || null,
-				parentEditorMode = parentEditorModeRaw === EDITOR_MODE__ADD
-					? EDITOR_MODE__EDIT
-					: parentEditorModeRaw,
-				normalizedParentEditorMode =
-					parentEditorMode === EDITOR_MODE__EDIT || parentEditorMode === EDITOR_MODE__VIEW
-						? parentEditorMode
-						: null,
 				components = [];
 			setAncillaryButtons([]);
 			if (validAncillaryItems.length) {
@@ -584,7 +592,7 @@ function Viewer(props) {
 
 						<Toolbar className="justify-end">
 							<HStack className="flex-1 items-center">
-									<Text className="text-[20px] ml-1 text-grey-500">{isEditorModeControlledByParent ? 'View Mode (Inherited)' : 'View Mode'}</Text>
+									<Text className="text-[20px] ml-1 text-grey-500">{isEditorModeControlledByParent && normalizedParentEditorMode === EDITOR_MODE__VIEW ? 'View Mode (Inherited)' : 'View Mode'}</Text>
 							</HStack>
 							{onEditMode && (!canUser || canUser(EDIT)) && 
 								<Button

package/src/Components/Window/UploadsDownloadsWindow.js

@@ -18,6 +18,11 @@ import Upload from '../Icons/Upload';
 import Cookies from 'js-cookie';
 import _ from 'lodash';
 
+const
+	MODES__GRID = 'grid',
+	MODES__BATCH = 'batch',
+	MODES__TEMPLATE = 'template';
+
 function UploadsDownloadsWindow(props) {
 	const {
 			Repository,
@@ -37,8 +42,8 @@ function UploadsDownloadsWindow(props) {
 			showInfo,
 		} = props,
 		[importFile, setImportFile] = useState(null),
-		[width, height] = useAdjustedWindowSize(400, 450),
-		onDownload = (isTemplate = false) => {
+		[width, height] = useAdjustedWindowSize(400, 550),
+		onDownload = (mode) => {
 
 			const win = window.open('');
 			win.document.write('<html><head><title>Downloading</title></head><body><img style="position:absolute;top:50%;left:50%;transform:translate(-50%, -50%);" src="' + 
@@ -63,7 +68,7 @@ function UploadsDownloadsWindow(props) {
 						columns,
 						order,
 						model,
-						isTemplate,
+						mode,
 						...Repository._params,
 						...downloadParams,
 					}),
@@ -79,9 +84,6 @@ function UploadsDownloadsWindow(props) {
 				}
 			}, 1000);
 		},
-		onDownloadTemplate = () => {
-			onDownload(true);
-		},
 		onUploadLocal = async () => {
 			const
 				url = Repository.api.baseURL + Repository.name + '/uploadBatch',
@@ -130,24 +132,40 @@ function UploadsDownloadsWindow(props) {
 		const items = [
 			{
 				type: 'DisplayField',
-				text: 'Download an Excel file of the current grid contents.',
+				text: "Get the current grid's contents as an Excel file.",
+			},
+			{
+				type: 'Button',
+				text: 'Get as Excel',
+				isEditable: false,
+				icon: Excel,
+				_icon: {
+					size: 'md',
+				},
+				onPress: () => onDownload(MODES__GRID),
+				className: 'mb-5',
+			},
+			{
+				type: 'DisplayField',
+				text: "Batch download the current grid's records,\n"
+					+ "so they can be edited and re-uploaded.",
 			},
 			{
 				type: 'Button',
-				text: 'Download',
+				text: 'Batch Download',
 				isEditable: false,
 				icon: Excel,
 				_icon: {
 					size: 'md',
 				},
-				onPress: () => onDownload(),
+				onPress: () => onDownload(MODES__BATCH),
 				className: 'mb-5',
 			},
 		];
 		if (!isDownloadOnly) {
 			items.push({
 				type: 'DisplayField',
-				text: 'Upload an Excel file to the current grid.',
+				text: 'Batch upload an Excel file to the current grid.',
 			});
 			items.push({
 				type: 'File',
@@ -161,7 +179,7 @@ function UploadsDownloadsWindow(props) {
 				items: [
 					{
 						type: 'Button',
-						text: 'Upload',
+						text: 'Batch Upload',
 						isEditable: false,
 						icon: Upload,
 						_icon: {
@@ -175,7 +193,7 @@ function UploadsDownloadsWindow(props) {
 						text: 'Get Template',
 						icon: Download,
 						isEditable: false,
-						onPress: onDownloadTemplate,
+						onPress: () => onDownload(MODES__TEMPLATE),
 					},
 
 				],

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

@@ -1,1019 +0,0 @@
-import React, { useEffect, useState, useRef, isValidElement, } from 'react';
-import {
-	Box,
-	HStack,
-	Icon,
-	ScrollView,
-	Text,
-	TextNative,
-	VStack,
-	VStackNative,
-} from '@project-components/Gluestack';
-import clsx from 'clsx';
-import { View, } from 'react-native';
-import {
-	EDITOR_TYPE__INLINE,
-	EDITOR_TYPE__WINDOWED,
-	EDITOR_TYPE__SIDE,
-	EDITOR_TYPE__SMART,
-	EDITOR_TYPE__PLAIN,
-	EDITOR_MODE__VIEW,
-	EDITOR_MODE__ADD,
-	EDITOR_MODE__EDIT,
-} from '../../../Constants/Editor.js';
-import { Form, Formik, Field } from "formik"; // https://formik.org/docs/overview
-import { useForm, Controller } from 'react-hook-form'; // https://react-hook-form.com/api/
-import * as yup from 'yup'; // https://github.com/jquense/yup#string
-import { yupResolver } from '@hookform/resolvers/yup';
-import useForceUpdate from '../../../Hooks/useForceUpdate.js';
-import UiGlobals from '../../../UiGlobals.js';
-import withAlert from '../../../Hoc/withAlert.js';
-import withComponent from '../../../Hoc/withComponent.js';
-import withEditor from '../../../Hoc/withEditor.js';
-import withPdfButton from '../../../Hoc/withPdfButton.js';
-import inArray from '../../../Functions/inArray.js';
-import getComponentFromType from '../../../Functions/getComponentFromType.js';
-import buildAdditionalButtons from '../../../Functions/buildAdditionalButtons.js';
-import Button from '../../../Buttons/Button.js';
-import IconButton from '../../../Buttons/IconButton.js';
-import AngleLeft from '../../../Icons/AngleLeft.js';
-import Eye from '../../../Icons/Eye.js';
-import Rotate from '../../../Icons/Rotate.js';
-import Pencil from '../../../Icons/Pencil.js';
-import Footer from '../../../Layout/Footer.js';
-import Label from '../../../Form/Label.js';
-import _ from 'lodash';
-
-// TODO: memoize field Components
-
-// Modes:
-// EDITOR_TYPE__INLINE
-// Form is a single scrollable row, based on columnsConfig and Repository
-//
-// EDITOR_TYPE__WINDOWED
-// EDITOR_TYPE__SIDE
-// Form is a popup or side window, used for editing items in a grid. Integrated with Repository
-//
-// EDITOR_TYPE__SMART
-// Form is a standalone editor
-//
-// EDITOR_TYPE__PLAIN
-// Form is embedded on screen in some other way. Mainly use startingValues, items, validator
-
-function FormikForm(props) {
-	const
-		{
-			editorType = EDITOR_TYPE__WINDOWED, // EDITOR_TYPE__INLINE | EDITOR_TYPE__WINDOWED | EDITOR_TYPE__SIDE | EDITOR_TYPE__SMART | EDITOR_TYPE__PLAIN
-			startingValues = {},
-			items = [], // Columns, FieldSets, Fields, etc to define the form
-			ancillaryItems = [], // additional items which are not controllable form elements, but should appear in the form
-			columnDefaults = {}, // defaults for each Column defined in items (above)
-			columnsConfig, // Which columns are shown in Grid, so the inline editor can match. Used only for EDITOR_TYPE__INLINE
-			validator, // custom validator, mainly for EDITOR_TYPE__PLAIN
-			footerProps = {},
-			buttonGroupProps = {}, // buttons in footer
-			checkIsEditingDisabled = true,
-			disableLabels = false,
-			disableDirtyIcon = false,
-			onBack,
-			onReset,
-			onInit,
-			onViewMode,
-			submitBtnLabel,
-			onSubmit,
-			formSetup, // this fn will be executed after the form setup is complete
-			additionalEditButtons,
-			useAdditionalEditButtons = true,
-			additionalFooterButtons,
-			
-			// sizing of outer container
-			h,
-			maxHeight,
-			minHeight = 0,
-			w,
-			maxWidth,
-			flex,
-			onLayout, // onLayout handler for main view
-
-			// withComponent
-			self,
-
-			// withData
-			Repository,
-			
-			// withEditor
-			isEditorViewOnly = false,
-			isSaving = false,
-			editorMode,
-			onCancel,
-			onSave,
-			onClose,
-			onDelete,
-			editorStateRef,
-			disableView,
-
-			// parent container
-			selectorId,
-			selectorSelected,
-
-			// withAlert
-			alert,
-		} = props,
-		formRef = useRef(),
-		styles = UiGlobals.styles,
-		record = props.record?.length === 1 ? props.record[0] : props.record;
-	let skipAll = false;
-	if (record?.isDestroyed) {
-		skipAll = true; // if record is destroyed, skip render, but allow hooks to still be called
-		if (self?.parent?.parent?.setIsEditorShown) {
-			self.parent.parent.setIsEditorShown(false); // close the editor
-		}
-	}
-	const
-		isMultiple = _.isArray(record),
-		isSingle = !isMultiple, // for convenience
-		isPhantom = !skipAll && !!record?.isPhantom, //
-		forceUpdate = useForceUpdate(),
-		[previousRecord, setPreviousRecord] = useState(record),
-		[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,
-			handleSubmit,
-			// register, 
-			// unregister,
-			reset,
-			// watch,
-			// resetField,
-			// setError,
-			// clearErrors,
-			setValue: formSetValue,
-			// setFocus,
-			getValues: formGetValues,
-			// getFieldState,
-			trigger,
-		} = useForm({
-			mode: 'onChange', // onChange | onBlur | onSubmit | onTouched | all
-			// reValidateMode: 'onChange', // onChange | onBlur | onSubmit
-			defaultValues,
-			// values: defaultValues,
-			// resetOptions: {
-			// 	keepDirtyValues: false, // user-interacted input will be retained
-			// 	keepErrors: false, // input errors will be retained with value update
-			// },
-			// criteriaMode: 'firstError', // firstError | all
-			// shouldFocusError: false,
-			// delayError: 0,
-			// shouldUnregister: false,
-			// shouldUseNativeValidation: false,
-			resolver: yupResolver(validatorToUse),
-			context: { isPhantom },
-		}),
-		buildFromColumnsConfig = () => {
-			// For InlineEditor
-			// Build the fields that match the current columnsConfig in the grid
-			const
-				model = Repository.getSchema().model,
-				elements = [],
-				columnProps = {
-					justifyContent: 'center',
-					alignItems: 'center',
-					borderRightWidth: 1,
-					borderRightColor: 'grey-200',
-					px: 1,
-				};
-
-			if (editorType === EDITOR_TYPE__INLINE) {
-				columnProps.minWidth = styles.INLINE_EDITOR_MIN_WIDTH;
-			}
-
-			_.each(columnsConfig, (config, ix) => {
-				let {
-						fieldName,
-						isEditable,
-						editor,
-						renderer,
-						w,
-						flex,
-						useSelectorId = false,
-					} = config;
-
-				if (!isEditable) {
-					let renderedValue = renderer ? renderer(record) : record[fieldName];
-					if (_.isBoolean(renderedValue)) {
-						renderedValue = renderedValue.toString();
-					}
-					renderedValue += "\n(not editable)";
-					elements.push(<Box key={ix} {...columnProps} className={` flex-${flex} w-${w} `}>
-										<TextNative numberOfLines={1} ellipsizeMode="head">{renderedValue}</TextNative>
-									</Box>);
-				} else {
-					elements.push(<Controller
-										key={'controller-' + ix}
-										name={fieldName}
-										// rules={rules}
-										control={control}
-										render={(args) => {
-											const {
-													field,
-													fieldState,
-													// formState,
-												} = args,
-												{
-													onChange,
-													onBlur,
-													name,
-													value,
-													// ref,
-												} = field,
-												{
-													isTouched,
-													isDirty,
-													error,
-												} = fieldState;
-											let _editor = {};
-											if (!editor) {
-												const propertyDef = fieldName && Repository?.getSchema().getPropertyDefinition(fieldName);
-												editor = propertyDef && propertyDef[fieldName].editorType;
-												if (_.isPlainObject(editor)) {
-													const {
-															type,
-															onChange: onEditorChange,
-															...p
-														} = editor;
-													_editor = p;
-													editor = type;
-												}
-											}
-											const Element = getComponentFromType(editor);
-
-											if (useSelectorId) {
-												_editor.selectorId = selectorId;
-												_editor.selectorSelected = _editor;
-											}
-											
-											let element = <Element
-																name={name}
-																value={value}
-																setValue={(newValue) => {
-																	onChange(newValue);
-																	if (onEditorChange) {
-																		onEditorChange(newValue, formSetValue, formGetValues, formState);
-																	}
-																}}
-																onBlur={onBlur}
-																flex={1}
-																{..._editor}
-																parent={self}
-																reference={fieldName}
-																// {...defaults}
-																// {...propsToPass}
-															/>;
-
-											// element = <Tooltip key={ix} label={header} placement="bottom">
-											// 				{element}
-											// 			</Tooltip>;
-											// if (error) {
-											// 	element = <VStack className="pt-1 flex-1">
-											// 				{element}
-											// 				<Text color="#f00">{error.message}</Text>
-											// 			</VStack>;
-											// }
-
-											const dirtyIcon = isDirty && !disableDirtyIcon ? <Icon
-																								as={Pencil}
-																								size="2xs"
-																								className="text-grey-300 absolute top-[2px] left-[2px]"
-																							/> : null;
-											return <HStack
-														key={ix}
-														{...columnProps}
-														className={` flex-${flex} w-${w} ${error ? "bg-[#fdd]" : "bg-white"} `}
-													>{dirtyIcon}{element}</HStack>;
-										}}
-									/>);
-				}
-			});
-			return <HStack>{elements}</HStack>;
-		},
-		buildFromItems = () => {
-			return _.map(items, (item, ix) => buildFromItem(item, ix, columnDefaults));
-		},
-		buildFromItem = (item, ix, defaults) => {
-			if (!item) {
-				return null;
-			}
-			if (React.isValidElement(item)) {
-				return item;
-			}
-			let {
-					type,
-					title,
-					name,
-					isEditable = true,
-					label,
-					items,
-					onChange: onEditorChange,
-					useSelectorId = false,
-					isHidden = false,
-					getDynamicProps,
-					getIsRequired,
-					...propsToPass
-				} = item,
-				editorTypeProps = {};
-
-			if (isHidden) {
-				return null;
-			}
-			if (type === 'DisplayField') {
-				isEditable = false;
-			}
-			const propertyDef = name && Repository?.getSchema().getPropertyDefinition(name);
-			if (!useAdditionalEditButtons) {
-				item = _.omit(item, 'additionalEditButtons');
-			}
-			if (propertyDef?.isEditingDisabled && checkIsEditingDisabled) {
-				isEditable = false;
-			}
-			if (!type) {
-				if (isEditable) {
-					const
-						{
-							type: t,
-							...p
-						} = propertyDef?.editorType;
-					type = t;
-					editorTypeProps = p;
-				} else if (propertyDef?.viewerType) {
-					const
-						{
-							type: t,
-							...p
-						} =  propertyDef?.viewerType;
-					type = t;
-				} else {
-					type = 'Text';
-				}
-			}
-			const isCombo = type?.match && type.match(/Combo/);
-			if (item.hasOwnProperty('autoLoad')) {
-				editorTypeProps.autoLoad = item.autoLoad;
-			} else {
-				if (isCombo && Repository?.isRemote && !Repository?.isLoaded) {
-					editorTypeProps.autoLoad = true;
-				}
-			}
-			if (isCombo) {
-				// editorTypeProps.showEyeButton = true;
-				if (_.isNil(propsToPass.showXButton)) {
-					editorTypeProps.showXButton = true;
-				}
-			}
-			const Element = getComponentFromType(type);
-			let children;
-			
-			if (inArray(type, ['Column', 'Row', 'FieldSet'])) {
-				if (_.isEmpty(items)) {
-					return null;
-				}
-				if (type === 'Column') {
-					if (containerWidth < styles.FORM_ONE_COLUMN_THRESHOLD) {
-						// everything is in one column
-						if (propsToPass.hasOwnProperty('flex')) {
-							delete propsToPass.flex;
-						}
-						if (propsToPass.hasOwnProperty('width')) {
-							delete propsToPass.width;
-						}
-						if (propsToPass.hasOwnProperty('w')) {
-							delete propsToPass.w;
-						}
-						propsToPass.w = '100%';
-						propsToPass.mb = 1;
-					}
-					propsToPass.pl = 3;
-				}
-				if (type === 'Row') {
-					propsToPass.w = '100%';
-				}
-				const itemDefaults = item.defaults;
-				children = _.map(items, (item, ix) => {
-					return buildFromItem(item, ix, itemDefaults);
-				});
-				return <Element key={ix} title={title} {...itemDefaults} {...propsToPass} {...editorTypeProps}>{children}</Element>;
-			}
-
-			if (!label && Repository && propertyDef?.title) {
-				label = propertyDef.title;
-			}
-
-			if (isEditorViewOnly || !isEditable) {
-				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}
-									reference={name}
-									{...propsToPass}
-								/>;
-				if (!disableLabels && label) {
-					const labelProps = {};
-					if (defaults?.labelWidth) {
-						labelProps.w = defaults.labelWidth;
-					}
-					if (containerWidth > styles.FORM_STACK_ROW_THRESHOLD) {
-						element = <><Label {...labelProps}>{label}</Label>{element}</>;
-					} else {
-						element = <VStack><Label {...labelProps}>{label}</Label>{element}</VStack>;
-					}
-				}
-				return <HStack key={ix} className="px-2 pb-1">{element}</HStack>;
-			}
-
-
-		
-			// // These rules are for fields *outside* the model
-			// // but which want validation on the form anyway.
-			// // The useForm() resolver disables this
-			// const
-			// 	rules = {},
-			// 	rulesToCheck = [
-			// 		'required',
-			// 		'min',
-			// 		'max',
-			// 		'minLength',
-			// 		'maxLength',
-			// 		'pattern',
-			// 		'validate',
-			// 	];
-			// _.each(rulesToCheck, (rule) => {
-			// 	if (item.hasOwnProperty(rule)) {
-			// 		rules[rule] = item[rule];
-			// 	}
-			// });
-
-			return <Controller
-						key={'controller-' + ix}
-						name={name}
-						// rules={rules}
-						control={control}
-						render={(args) => {
-							const {
-									field,
-									fieldState,
-									// formState,
-								} = args,
-								{
-									onChange,
-									onBlur,
-									name,
-									value,
-									// ref,
-								} = field,
-								{
-									isTouched,
-									isDirty,
-									error,
-								} = fieldState;
-							if (isValidElement(Element)) {
-								throw new Error('Should not yet be valid React element. Did you use <Element> instead of () => <Element> when defining it?')
-							}
-
-							if (useSelectorId) { // This causes the whole form to use selectorId
-								editorTypeProps.selectorId = selectorId;
-							}
-							if (propsToPass.selectorId || editorTypeProps.selectorId) { // editorTypeProps.selectorId causes just this one field to use selectorId
-								if (_.isNil(propsToPass.selectorSelected)) {
-									editorTypeProps.selectorSelected = record;
-								}
-							}
-							let dynamicProps = {};
-							if (getDynamicProps) {
-								dynamicProps = getDynamicProps({ fieldState, formSetValue, formGetValues, formState });
-							}
-							let element = <Element
-												name={name}
-												value={value}
-												onChangeValue={(newValue) => {
-													if (newValue === undefined) {
-														newValue = null; // React Hook Form doesn't respond well when setting value to undefined
-													}
-													onChange(newValue);
-													if (onEditorChange) {
-														onEditorChange(newValue, formSetValue, formGetValues, formState, trigger);
-													}
-												}}
-												onBlur={onBlur}
-												flex={1}
-												parent={self}
-												reference={name}
-												{...defaults}
-												{...propsToPass}
-												{...editorTypeProps}
-												{...dynamicProps}
-											/>;
-							if (editorType !== EDITOR_TYPE__INLINE) {
-								let message = null;
-								if (error) {
-									message = error.message;
-									if (label && error.ref?.name) {
-										message = message.replace(error.ref.name, label);
-									}
-								}
-								if (message) {
-									message = <Text className="text-[#f00]">{message}</Text>;
-								}
-								element = <VStack className="pt-1 flex-1">
-											{element}
-											{message}
-										</VStack>;
-							}
-
-							if (item.additionalEditButtons) {
-								const buttons = buildAdditionalButtons(item.additionalEditButtons, self, { fieldState, formSetValue, formGetValues, formState });
-								if (containerWidth > styles.FORM_STACK_ROW_THRESHOLD) {
-									element = <HStack className="flex-1 flex-wrap">
-													{element}
-													{buttons}
-												</HStack>;
-								} else {
-									element = <VStack className="flex-1 w-full">
-												{element}
-												<HStack className="flex-1 w-full mt-2 flex-wrap">
-													{buttons}
-												</HStack>
-											</VStack>;
-								}
-							}
-								
-							let isRequired = false,
-								requiredIndicator = null;
-							if (!isMultiple) { // Don't require fields if editing multiple records
-								if (getIsRequired) {
-									isRequired = getIsRequired(formGetValues, formState);
-								} else if (validatorToUse?.fields && validatorToUse.fields[name]?.exclusiveTests?.required) {
-									// submitted validator
-									isRequired = true;
-								} else if ((propertyDef?.validator?.spec && !propertyDef.validator.spec.optional) ||
-									(propertyDef?.requiredIfPhantom && isPhantom) ||
-									(propertyDef?.requiredIfNotPhantom && !isPhantom)) {
-									// property definition
-									isRequired = true;
-								}
-								if (isRequired) {
-									requiredIndicator = <Text className="text-[#f00] text-[30px] pr-1">*</Text>;
-								}
-							}
-							if (!disableLabels && label && editorType !== EDITOR_TYPE__INLINE) {
-								const labelProps = {};
-								if (defaults?.labelWidth) {
-									labelProps.w = defaults.labelWidth;
-								}
-								if (containerWidth > styles.FORM_STACK_ROW_THRESHOLD) {
-									element = <HStack className="w-full py-1">
-													<Label {...labelProps}>{requiredIndicator}{label}</Label>
-													{element}
-												</HStack>;
-								} else {
-									element = <VStack className="w-full py-1 mt-3">
-													<Label {...labelProps}>{requiredIndicator}{label}</Label>
-													{element}
-												</VStack>;
-								}
-							} else if (disableLabels && requiredIndicator) {
-								element = <HStack className="w-full py-1">
-												{requiredIndicator}
-												{element}
-											</HStack>;
-							}
-
-							const dirtyIcon = isDirty && !disableDirtyIcon ? <Icon
-								as={Pencil}
-								size="2xs"
-								className="text-grey-300 absolute top-[2px] left-[2px]" /> : null;
-							return (
-								<HStack
-									key={ix}
-									className={` ${error ? "bg-[#fdd]" : "bg-[null]"} px-2 pb-1 `}>{dirtyIcon}{element}</HStack>
-							);
-						}}
-					/>;
-		},
-		buildAncillary = () => {
-			const components = [];
-			if (ancillaryItems.length) {
-				_.each(ancillaryItems, (item, ix) => {
-					let {
-						type,
-						title = null,
-						description = null,
-						selectorId,
-						...propsToPass
-					} = item;
-					if (isMultiple && type !== 'Attachments') {
-						return;
-					}
-					if (!propsToPass.h) {
-						propsToPass.h = 400;
-					}
-					const
-						Element = getComponentFromType(type),
-						element = <Element
-										selectorId={selectorId}
-										selectorSelected={selectorSelected || record}
-										flex={1}
-										uniqueRepository={true}
-										parent={self}
-										{...propsToPass}
-									/>;
-					if (title) {
-						if (record?.displayValue) {
-							title += ' for ' + record.displayValue;
-						}
-						title = <Text
-									className={` ${styles.FORM_ANCILLARY_TITLE_CLASSNAME} font-bold `}
-								>{title}</Text>;
-					}
-					if (description) {
-						description = <Text
-											className={` ${styles.FORM_ANCILLARY_DESCRIPTION_CLASSNAME} italic-italic `}
-										>{description}</Text>;
-					}
-					components.push(<VStack key={'ancillary-' + ix} className="mx-1 my-3">{title}{description}{element}</VStack>);
-				});
-			}
-			return components;
-		},
-		onSubmitError = (errors, e) => {
-			if (editorType === EDITOR_TYPE__INLINE) {
-				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;
-				doReset(values);
-			}
-		},
-		onSubmitDecorated = async (data, e) => {
-			const result = await onSubmit(data, e);
-			if (result) {
-				const values = record.submitValues;
-				doReset(values);
-			}
-		},
-		onLayoutDecorated = (e) => {
-			if (onLayout) {
-				onLayout(e);
-			}
-
-			setContainerWidth(e.nativeEvent.layout.width);
-		};
-
-	useEffect(() => {
-		if (skipAll) {
-			return;
-		}
-		if (record === previousRecord) {
-			if (onInit) {
-				onInit(initialValues, formSetValue, formGetValues);
-			}
-		} else {
-			setPreviousRecord(record);
-			doReset(defaultValues);
-		}
-		if (formSetup) {
-			formSetup(formSetValue, formGetValues, formState)
-		}
-	}, [record]);
-
-	useEffect(() => {
-		if (skipAll) {
-			return;
-		}
-		if (!Repository) {
-			return () => {
-				if (!_.isNil(editorStateRef)) {
-					editorStateRef.current = null; // clean up the editorStateRef on unmount
-				}
-			};
-		}
-
-		Repository.ons(['changeData', 'change'], forceUpdate);
-
-		return () => {
-			Repository.offs(['changeData', 'change'], forceUpdate);
-			if (!_.isNil(editorStateRef)) {
-				editorStateRef.current = null; // clean up the editorStateRef on unmount
-			}
-		};
-	}, [Repository]);
-
-	if (skipAll) {
-		return null;
-	}
-
-	// if (Repository && (!record || _.isEmpty(record) || record.isDestroyed)) {
-	// 	return null;
-	// }
-
-	if (!_.isNil(editorStateRef)) {
-		editorStateRef.current = formState; // Update state so HOC can know what's going on
-	}
-
-	if (self) {
-		self.ref = formRef;
-		self.formState = formState;
-		self.formSetValue = formSetValue;
-		self.formGetValues = formGetValues;
-	}
-	
-	const sizeProps = {};
-	if (!flex && !h && !w) {
-		sizeProps.flex = 1;
-	} else {
-		if (h) {
-			sizeProps.h = h;
-		}
-		if (w) {
-			sizeProps.w = w;
-		}
-		if (flex) {
-			sizeProps.flex = flex;
-		}
-	}
-	if (maxWidth) {
-		sizeProps.maxWidth = maxWidth;
-	}
-	if (maxHeight) {
-		sizeProps.maxHeight = maxHeight;
-	}
-
-	const formButtons = [];
-	let formComponents,
-		editor,
-		additionalButtons,
-		isSaveDisabled = false,
-		isSubmitDisabled = false,
-		savingProps = {},
-
-		showDeleteBtn = false,
-		showResetBtn = false,
-		showCloseBtn = false,
-		showCancelBtn = false,
-		showSaveBtn = false,
-		showSubmitBtn = false;
-
-	if (containerWidth) { // we need to render this component twice in order to get the container width. Skip this on first render
-		
-		if (isSaving) {
-			savingProps.borderTopWidth = 2;
-			savingProps.borderTopColor = '#f00';
-		}
-
-		if (editorType === EDITOR_TYPE__INLINE) {
-			editor = buildFromColumnsConfig();
-		// } else if (editorType === EDITOR_TYPE__PLAIN) {
-		// 	formComponents = buildFromItems();
-		// 	const formAncillaryComponents = buildAncillary();
-		// 	editor = <>
-		// 				<VStack className="p-4">{formComponents}</VStack>
-		// 				<VStack className="pt-4">{formAncillaryComponents}</VStack>
-		// 			</>;
-		} else {
-			formComponents = buildFromItems();
-			const formAncillaryComponents = buildAncillary();
-			editor = <>
-						{containerWidth >= styles.FORM_ONE_COLUMN_THRESHOLD ? <HStack className="p-4 pl-0">{formComponents}</HStack> : null}
-						{containerWidth < styles.FORM_ONE_COLUMN_THRESHOLD ? <VStack className="p-4">{formComponents}</VStack> : null}
-						<VStack className="m-2 pt-4 px-2">{formAncillaryComponents}</VStack>
-					</>;
-
-			additionalButtons = buildAdditionalButtons(additionalEditButtons);
-
-			formButtons.push(<HStack key="buttonsRow" className="px-4 pt-4 items-center justify-end">
-								{isSingle && editorMode === EDITOR_MODE__EDIT && onBack && 
-									<Button
-										key="backBtn"
-										onPress={onBack}
-										leftIcon={<Icon as={AngleLeft} size="sm" className="text-white" />}	
-										color="#fff"
-									>Back</Button>}
-								{isSingle && editorMode === EDITOR_MODE__EDIT && onViewMode && !disableView &&
-									<Button
-										key="viewBtn"
-										onPress={onViewMode}
-										leftIcon={<Icon as={Eye} size="sm" className="text-white" />}	
-										color="#fff"
-									>To View</Button>}
-							</HStack>);
-			if (editorMode === EDITOR_MODE__EDIT && !_.isEmpty(additionalButtons)) {
-				formButtons.push(<HStack
-									key="additionalButtonsRow"
-									className="p-[4px] items-center justify-end flex-wrap"
-								>
-									{additionalButtons}
-								</HStack>)
-			}
-		}
-
-		if (!formState.isValid) {
-			isSaveDisabled = true;
-			isSubmitDisabled = true;
-		}
-		if (_.isEmpty(formState.dirtyFields) && !isPhantom) {
-			isSaveDisabled = true;
-		}
-
-		if (editorType === EDITOR_TYPE__INLINE) {
-			buttonGroupProps.position = 'fixed';
-			buttonGroupProps.left = 10; // TODO: I would prefer to have this be centered, but it's a lot more complex than just making it stick to the left
-			footerProps.alignItems = 'flex-start';
-		}
-
-		if (onDelete && editorMode === EDITOR_MODE__EDIT && isSingle) {
-			showDeleteBtn = true;
-		}
-		if (!isEditorViewOnly) {
-			showResetBtn = true;
-		}
-		if (editorType !== EDITOR_TYPE__SIDE) { // side editor won't show either close or cancel buttons!
-			// determine whether we should show the close or cancel button
-			if (isEditorViewOnly) {
-				showCloseBtn = true;
-			} else {
-				const formIsDirty = formState.isDirty;
-				// console.log('formIsDirty', formIsDirty);
-				// console.log('isPhantom', isPhantom);
-				if (formIsDirty || isPhantom) {
-					if (isSingle && onCancel) {
-						showCancelBtn = true;
-					}
-				} else {
-					if (onClose) {
-						showCloseBtn = true;
-					}
-				}
-			}
-		}
-		if (!isEditorViewOnly && onSave) {
-			showSaveBtn = true;
-		}
-		if (!!onSubmit) {
-			showSubmitBtn = true;
-		}
-	}
-	
-	return <VStackNative
-				{...sizeProps}
-				onLayout={onLayoutDecorated}
-				ref={formRef}
-			>
-				{!!containerWidth && <>
-					{editorType === EDITOR_TYPE__INLINE &&
-						<ScrollView
-							horizontal={true}
-							className="flex-1 bg-white py-1 border-t-[3px] border-b-[5px] border-t-primary-100 border-b-primary-100">{editor}</ScrollView>}
-					{editorType !== EDITOR_TYPE__INLINE &&
-						<ScrollView _web={{ minHeight, }} className="w-full pb-1">
-							{formButtons}
-							{editor}
-						</ScrollView>}
-					
-					<Footer className="justify-end" {...footerProps}  {...savingProps}>
-						{onDelete && editorMode === EDITOR_MODE__EDIT && isSingle &&
-
-							<HStack className="flex-1 justify-start">
-								<Button
-									key="deleteBtn"
-									onPress={onDelete}
-									bg="warning"
-									_hover={{
-										bg: 'warningHover',
-									}}
-									color="#fff"
-								>Delete</Button>
-							</HStack>}
-
-						{showResetBtn && 
-							<IconButton
-								key="resetBtn"
-								onPress={() => doReset()}
-								icon={Rotate}
-								_icon={{
-									color: !formState.isDirty ? 'grey-400' : '#000',
-								}}
-								isDisabled={!formState.isDirty}
-								mr={2}
-							/>}
-
-						{showCancelBtn &&
-							<Button
-								key="cancelBtn"
-								variant="outline"
-								onPress={onCancel}
-								color="#fff"
-							>Cancel</Button>}
-							
-						{showCloseBtn && 
-							<Button
-								key="closeBtn"
-								variant="outline"
-								onPress={onClose}
-								color="#fff"
-							>Close</Button>}
-
-						{showSaveBtn && 
-							<Button
-								key="saveBtn"
-								onPress={(e) => handleSubmit(onSaveDecorated, onSubmitError)(e)}
-								isDisabled={isSaveDisabled}
-								color="#fff"
-							>{editorMode === EDITOR_MODE__ADD ? 'Add' : 'Save'}</Button>}
-						
-						{showSubmitBtn && 
-							<Button
-								key="submitBtn"
-								onPress={(e) => handleSubmit(onSubmitDecorated, onSubmitError)(e)}
-								isDisabled={isSubmitDisabled}
-								color="#fff"
-							>{submitBtnLabel || 'Submit'}</Button>}
-					
-						{additionalFooterButtons && _.map(additionalFooterButtons, (props) => {
-							return <Button
-										{...props}
-										onPress={(e) => handleSubmit(props.onPress, onSubmitError)(e)}
-									>{props.text}</Button>;
-						})}
-					</Footer>
-				</>}
-			</VStackNative>;
-}
-
-// helper fns
-function disableRequiredYupFields(validator) {
-	// based on https://github.com/jquense/yup/issues/1466#issuecomment-944386480
-	if (!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];
-		
-				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', (unused, schema) => {
-						return schema.notRequired();
-					});
-				}
-		
-				next.fields[key] = nestedFieldNext;
-			}
-		}
-	});
-}
-function getNullFieldValues(initialValues, Repository) {
-	const ret = {};
-	if (Repository) {
-		const properties = Repository.getSchema().model.properties;
-		_.each(properties, (propertyDef) => {
-			ret[propertyDef.name] = null;
-		});
-	} else {
-		// takes a JSON object of fieldValues and sets them all to null
-		_.each(initialValues, (value, field) => {
-			ret[field] = null;
-		});
-	}
-	return ret;
-}
-
-export const FormEditor = withComponent(withAlert(withEditor(withPdfButton(FormikForm))));
-
-export default withComponent(withAlert(withPdfButton(FormikForm)));