@onehat/ui 0.3.207 → 0.3.209

package/package.json

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

package/src/Components/Form/Form.js

@@ -552,19 +552,21 @@ function Form(props) {
 								
 							let isRequired = false,
 								requiredIndicator = null;
-							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 color="#f00" fontSize="30px" pr={1}>*</Text>;
+							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 color="#f00" fontSize="30px" pr={1}>*</Text>;
+								}
 							}
 							if (!disableLabels && label && editorType !== EDITOR_TYPE__INLINE) {
 								const labelProps = {};

package/src/Components/Hoc/withEditor.js

@@ -37,6 +37,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				onChange, // any kind of crud change
 				onDelete,
 				onSave, // this could also be called 'onEdit'
+				onEditorClose,
 				newEntityDisplayValue,
 				newEntityDisplayProperty, // in case the field to set for newEntityDisplayValue is different from model
 				defaultValues,
@@ -66,10 +67,16 @@ export default function withEditor(WrappedComponent, isTree = false) {
 			[currentRecord, setCurrentRecord] = useState(null),
 			[isAdding, setIsAdding] = useState(false),
 			[isSaving, setIsSaving] = useState(false),
-			[isEditorShown, setIsEditorShown] = useState(false),
+			[isEditorShown, setIsEditorShownRaw] = useState(false),
 			[isEditorViewOnly, setIsEditorViewOnly] = useState(canEditorViewOnly), // current state of whether editor is in view-only mode
 			[isIgnoreNextSelectionChange, setIsIgnoreNextSelectionChange] = useState(false),
 			[lastSelection, setLastSelection] = useState(),
+			setIsEditorShown = (bool) => {
+				setIsEditorShownRaw(bool);
+				if (!bool && onEditorClose) {
+					onEditorClose();
+				}
+			},
 			setSelectionDecorated = (newSelection) => {
 				function doIt() {
 					setSelection(newSelection);
@@ -407,20 +414,26 @@ export default function withEditor(WrappedComponent, isTree = false) {
 					setIsEditorShown(false);
 				});
 			},
-			calculateEditorMode = () => {
-				let mode = editorMode;
-				if (!canEditorViewOnly && userCanEdit) {
-					if (selection.length > 1) {
-						if (!disableEdit) {
-							// For multiple entities selected, change it to edit multiple mode
-							mode = EDITOR_MODE__EDIT;
-						}
-					} else if (selection.length === 1 && !selection[0].isDestroyed && selection[0].isPhantom) {
-						if (!disableAdd) {
-							// When a phantom entity is selected, change it to add mode.
-							mode = EDITOR_MODE__ADD;
+			calculateEditorMode = (isIgnoreNextSelectionChange = false) => {
+				// calculateEditorMode gets called only on selection changes
+				let mode;
+				if (isIgnoreNextSelectionChange) {
+					mode = editorMode;
+					if (!canEditorViewOnly && userCanEdit) {
+						if (selection.length > 1) {
+							if (!disableEdit) {
+								// For multiple entities selected, change it to edit multiple mode
+								mode = EDITOR_MODE__EDIT;
+							}
+						} else if (selection.length === 1 && !selection[0].isDestroyed && selection[0].isPhantom) {
+							if (!disableAdd) {
+								// When a phantom entity is selected, change it to add mode.
+								mode = EDITOR_MODE__ADD;
+							}
 						}
 					}
+				} else {
+					mode = selection.length > 1 ? EDITOR_MODE__EDIT : EDITOR_MODE__VIEW;
 				}
 				return mode;
 			},
@@ -455,16 +468,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 		}, []);
 
 		useEffect(() => {
-			// When selection changes, set the mode appropriately
-			let mode;
-			if (isIgnoreNextSelectionChange) {
-				// on selection change from doAdd/doDuplicate/etc, calculate whether to put Editor in "add" or "edit" mode
-				mode = calculateEditorMode();
-			} else {
-				// Most of the time, if selection changed, put the Editor in "view" mode
-				mode = EDITOR_MODE__VIEW;
-			}
-			setEditorMode(mode);
+			setEditorMode(calculateEditorMode(isIgnoreNextSelectionChange));
 
 			setIsIgnoreNextSelectionChange(false);
 			setLastSelection(selection);
@@ -485,11 +489,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 			// NOTE: If I don't calculate this on the fly for selection changes,
 			// we see a flash of the previous state, since useEffect hasn't yet run.
 			// (basically redo what's in the useEffect, above)
-			if (isIgnoreNextSelectionChange) {
-				editorMode = calculateEditorMode();
-			} else {
-				editorMode = EDITOR_MODE__VIEW;
-			}
+			editorMode = calculateEditorMode(isIgnoreNextSelectionChange);
 		}
 
 		return <WrappedComponent