@onehat/ui 0.4.112 → 0.4.113

package/package.json

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

package/src/Components/Buttons/Button.js

@@ -28,6 +28,10 @@ const ButtonComponent = forwardRef((props, ref) => {
 			...propsToPass
 		} = props;
 
+	if (propsToPass.handler) {
+		propsToPass.onPress = propsToPass.handler; // alias
+	}
+
 	if (icon) {
 		if (isValidElement(icon)) {
 			if (_icon) {

package/src/Components/Hoc/Secondary/withSecondaryEditor.js

@@ -38,6 +38,7 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 				secondaryDisableDelete = false,
 				secondaryDisableDuplicate = false,
 				secondaryDisableView = false,
+				secondaryWaitWhileSaving = false, // when true, show global wait modal while doEditorSave is in-flight
 				secondaryUseRemoteDuplicate = false, // call specific copyToNew function on server, rather than simple duplicate on client
 				secondaryGetRecordIdentifier = (secondarySelection) => {
 					if (secondarySelection.length > 1) {
@@ -558,16 +559,24 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 				}
 
 				setIsSaving(true);
+				if (secondaryWaitWhileSaving) {
+					setIsWaitModalShown(true);
+				}
 				let success = true;
 				const tempListener = (msg, data) => {
 					success = { msg, data };
 				};
 
-				SecondaryRepository.on('error', tempListener); // add a temporary listener for the error event
-				await SecondaryRepository.save(null, useStaged);
-				SecondaryRepository.off('error', tempListener); // remove the temporary listener
-				
-				setIsSaving(false);
+				try {
+					SecondaryRepository.on('error', tempListener); // add a temporary listener for the error event
+					await SecondaryRepository.save(null, useStaged);
+				} finally {
+					SecondaryRepository.off('error', tempListener); // remove the temporary listener
+					setIsSaving(false);
+					if (secondaryWaitWhileSaving) {
+						setIsWaitModalShown(false);
+					}
+				}
 
 				if (_.isBoolean(success) && success) {
 					if (secondaryOnChange) {

package/src/Components/Hoc/withEditor.js

@@ -39,6 +39,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				enableMultiDelete = false, // deleting multiple records at once is opt-in only
 				disableDuplicate = false,
 				disableView = false,
+				waitWhileSaving = false, // when true, show global wait modal while doEditorSave is in-flight
 				useRemoteDuplicate = false, // call specific copyToNew function on server, rather than simple duplicate on client
 				getDuplicateValues, // fn(entity) to get default values for duplication
 				getRecordIdentifier = (selection) => {
@@ -716,16 +717,24 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				}
 
 				setIsSaving(true);
+				if (waitWhileSaving) {
+					setIsWaitModalShown(true);
+				}
 				let success = true;
 				const tempListener = (msg, data) => {
 					success = false;
 				};
 
-				Repository.on('error', tempListener); // add a temporary listener for the error event
-				await Repository.save(null, useStaged);
-				Repository.off('error', tempListener); // remove the temporary listener
-				
-				setIsSaving(false);
+				try {
+					Repository.on('error', tempListener); // add a temporary listener for the error event
+					await Repository.save(null, useStaged);
+				} finally {
+					Repository.off('error', tempListener); // remove the temporary listener
+					setIsSaving(false);
+					if (waitWhileSaving) {
+						setIsWaitModalShown(false);
+					}
+				}
 
 				if (_.isBoolean(success) && success) {
 					if (onChange) {