@onehat/ui 0.3.137 → 0.3.139

package/package.json

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

package/src/Components/Grid/Grid.js

@@ -27,7 +27,7 @@ import {
 	UI_MODE_REACT_NATIVE,
 	CURRENT_MODE,
 } from '../../Constants/UiModes.js';
-import * as colourMixer from '@k-renwick/colour-mixer'
+import * as colourMixer from '@k-renwick/colour-mixer';
 import UiGlobals from '../../UiGlobals.js';
 import useForceUpdate from '../../Hooks/useForceUpdate.js';
 import withContextMenu from '../Hoc/withContextMenu.js';

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

@@ -7,6 +7,7 @@ import {
 	EDITOR_MODE__ADD,
 	EDITOR_MODE__EDIT,
 } from '../../../Constants/Editor.js';
+import UiGlobals from '../../../UiGlobals.js';
 import _ from 'lodash';
 
 // NOTE: This is a modified version of @onehat/ui/src/Hoc/withEditor
@@ -40,6 +41,7 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 				secondaryOnChange,
 				secondaryOnSave,
 				secondaryNewEntityDisplayValue,
+				secondaryDefaultValues,
 
 				// withComponent
 				self,
@@ -91,8 +93,19 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 				return secondaryNewEntityDisplayValueRef.current;
 			},
 			secondaryOnAdd = async (e, values) => {
-				const defaultValues = SecondaryRepository.getSchema().getDefaultValues();
-				let addValues = values || _.clone(defaultValues);
+				let addValues = values;
+
+				if (!values) {
+					// you can either:
+					// 1. directlty submit 'values' to use in onAdd(), or
+					// 2. Use the repository's default values (defined on each property as 'defaultValue'), or
+					// 3. Individually override the repository's default values with submitted 'defaultValues' (given as a prop to this HOC)
+					let defaultValuesToUse = Repository.getSchema().getDefaultValues();
+					if (secondaryDefaultValues) {
+						_.merge(defaultValuesToUse, secondaryDefaultValues);
+					}
+					addValues = _.clone(defaultValuesToUse);
+				}
 
 				if (secondarySelectorId && !_.isEmpty(secondarySelectorSelected)) {
 					addValues[secondarySelectorId] = secondarySelectorSelected.id;
@@ -307,6 +320,7 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 					await SecondaryRepository.save();
 					success = true;
 				} catch (e) {
+					alert(e.context);
 					success = false;
 				}
 				setIsSaving(false);
@@ -395,8 +409,12 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 
 		useEffect(() => {
 			// When secondarySelection changes, set the mode appropriately
-			const mode = calculateEditorMode();
-			secondarySetEditorMode(mode);
+			if (UiGlobals.editorStaysInEditModeOnChangeSelection) {
+				const mode = calculateEditorMode();
+				secondarySetEditorMode(mode);
+			} else {
+				secondarySetEditorMode(EDITOR_MODE__VIEW);
+			}
 
 			setLastSelection(secondarySelection);
 		}, [secondarySelection]);

package/src/Components/Hoc/withEditor.js

@@ -7,6 +7,7 @@ import {
 	EDITOR_MODE__ADD,
 	EDITOR_MODE__EDIT,
 } from '../../Constants/Editor.js';
+import UiGlobals from '../../UiGlobals.js';
 import _ from 'lodash';
 
 export default function withEditor(WrappedComponent, isTree = false) {
@@ -316,6 +317,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 					await Repository.save();
 					success = true;
 				} catch (e) {
+					alert(e.context);
 					success = false;
 				}
 				setIsSaving(false);
@@ -404,8 +406,12 @@ export default function withEditor(WrappedComponent, isTree = false) {
 
 		useEffect(() => {
 			// When selection changes, set the mode appropriately
-			const mode = calculateEditorMode();
-			setEditorMode(mode);
+			if (UiGlobals.editorStaysInEditModeOnChangeSelection) {
+				const mode = calculateEditorMode();
+				setEditorMode(mode);
+			} else {
+				setEditorMode(EDITOR_MODE__VIEW);
+			}
 
 			setLastSelection(selection);
 		}, [selection]);

package/src/UiGlobals.js

@@ -5,6 +5,11 @@ import _ from 'lodash';
 const Globals = {
 	mode: CURRENT_MODE,
 	customInflect: (str) => str,
+
+	// global defaults
+	paginationIsShowMoreOnly: false,
+	autoAdjustPageSizeToHeight: true,
+	editorStaysInEditModeOnChangeSelection: false,
 };
 
 export default Globals;