@onehat/ui 0.3.138 → 0.3.140

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/ui",
-	"version": "0.3.138",
+	"version": "0.3.140",
 	"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,
@@ -68,6 +70,7 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 			[secondaryIsSaving, setIsSaving] = useState(false),
 			[secondaryIsEditorShown, secondarySetIsEditorShown] = useState(false),
 			[secondaryIsEditorViewOnly, setIsEditorViewOnly] = useState(secondaryCanEditorViewOnly), // current state of whether editor is in view-only mode
+			[secondaryIsIgnoreNextSelectionChange, setSecondaryIsIgnoreNextSelectionChange] = useState(false),
 			[secondaryLastSelection, setLastSelection] = useState(),
 			secondarySetSelectionDecorated = (newSelection) => {
 				function doIt() {
@@ -91,8 +94,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;
@@ -135,6 +149,7 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 				setIsSaving(true);
 				const entity = await SecondaryRepository.add(addValues, false, true);
 				setIsSaving(false);
+				setSecondaryIsIgnoreNextSelectionChange(true);
 				secondarySetSelection([entity]);
 				setIsEditorViewOnly(false);
 				secondarySetEditorMode(EDITOR_MODE__ADD);
@@ -263,6 +278,7 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 					idProperty = SecondaryRepository.getSchema().model.idProperty,
 					rawValues = _.omit(entity.rawValues, idProperty),
 					duplicate = await SecondaryRepository.add(rawValues, false, true);
+				setSecondaryIsIgnoreNextSelectionChange(true);
 				secondarySetSelection([duplicate]);
 				secondarySetEditorMode(EDITOR_MODE__EDIT);
 				secondarySetIsEditorShown(true);
@@ -272,6 +288,7 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 					entity = secondarySelection[0],
 					duplicateEntity = await SecondaryRepository.remoteDuplicate(entity);
 
+				setSecondaryIsIgnoreNextSelectionChange(true);
 				secondarySetSelection([duplicateEntity]);
 				secondaryOnEdit();
 			},
@@ -307,6 +324,7 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 					await SecondaryRepository.save();
 					success = true;
 				} catch (e) {
+					alert(e.context);
 					success = false;
 				}
 				setIsSaving(false);
@@ -394,13 +412,21 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 			};
 
 		useEffect(() => {
-			// When secondarySelection changes, set the mode appropriately
-			const mode = calculateEditorMode();
-			secondarySetEditorMode(mode);
-
-			setLastSelection(secondarySelection);
-		}, [secondarySelection]);
-
+			// When selection changes, set the mode appropriately
+			let mode;
+			if (secondaryIsIgnoreNextSelectionChange) {
+				// on selection change from onAdd/onDuplicate/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);
+
+			setSecondaryIsIgnoreNextSelectionChange(false);
+			setLastSelection(selection);
+		}, [selection]);
+	
 		if (self) {
 			self.secondaryAdd = secondaryOnAdd;
 			self.secondaryEdit = secondaryOnEdit;
@@ -412,9 +438,14 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 		secondaryNewEntityDisplayValueRef.current = secondaryNewEntityDisplayValue;
 
 		if (secondaryLastSelection !== secondarySelection) {
-			// NOTE: If I don't calculate this on the fly for secondarySelection changes,
+			// 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.
-			secondaryEditorMode = calculateEditorMode();
+			// (basically redo what's in the useEffect, above)
+			if (secondaryIsIgnoreNextSelectionChange) {
+				editorMode = calculateEditorMode();
+			} else {
+				editorMode = EDITOR_MODE__VIEW;
+			}
 		}
 
 		return <WrappedComponent

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) {
@@ -66,6 +67,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 			[isSaving, setIsSaving] = useState(false),
 			[isEditorShown, setIsEditorShown] = useState(false),
 			[isEditorViewOnly, setIsEditorViewOnly] = useState(canEditorViewOnly), // current state of whether editor is in view-only mode
+			[isIgnoreNextSelectionChange, setIsIgnoreNextSelectionChange] = useState(false),
 			[lastSelection, setLastSelection] = useState(),
 			setSelectionDecorated = (newSelection) => {
 				function doIt() {
@@ -144,6 +146,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				setIsSaving(true);
 				const entity = await Repository.add(addValues, false, true);
 				setIsSaving(false);
+				setIsIgnoreNextSelectionChange(true);
 				setSelection([entity]);
 				setIsEditorViewOnly(false);
 				setEditorMode(EDITOR_MODE__ADD);
@@ -272,6 +275,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 					idProperty = Repository.getSchema().model.idProperty,
 					rawValues = _.omit(entity.rawValues, idProperty),
 					duplicate = await Repository.add(rawValues, false, true);
+				setIsIgnoreNextSelectionChange(true);
 				setSelection([duplicate]);
 				setEditorMode(EDITOR_MODE__EDIT);
 				setIsEditorShown(true);
@@ -281,6 +285,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 					entity = selection[0],
 					duplicateEntity = await Repository.remoteDuplicate(entity);
 
+				setIsIgnoreNextSelectionChange(true);
 				setSelection([duplicateEntity]);
 				onEdit();
 			},
@@ -405,9 +410,17 @@ export default function withEditor(WrappedComponent, isTree = false) {
 
 		useEffect(() => {
 			// When selection changes, set the mode appropriately
-			const mode = calculateEditorMode();
+			let mode;
+			if (isIgnoreNextSelectionChange) {
+				// on selection change from onAdd/onDuplicate/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);
 
+			setIsIgnoreNextSelectionChange(false);
 			setLastSelection(selection);
 		}, [selection]);
 
@@ -424,7 +437,12 @@ export default function withEditor(WrappedComponent, isTree = false) {
 		if (lastSelection !== selection) {
 			// 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.
-			editorMode = calculateEditorMode();
+			// (basically redo what's in the useEffect, above)
+			if (isIgnoreNextSelectionChange) {
+				editorMode = calculateEditorMode();
+			} else {
+				editorMode = EDITOR_MODE__VIEW;
+			}
 		}
 
 		return <WrappedComponent

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;