@onehat/ui 0.3.139 → 0.3.140

package/package.json

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

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

@@ -70,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() {
@@ -148,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);
@@ -276,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);
@@ -285,6 +288,7 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 					entity = secondarySelection[0],
 					duplicateEntity = await SecondaryRepository.remoteDuplicate(entity);
 
+				setSecondaryIsIgnoreNextSelectionChange(true);
 				secondarySetSelection([duplicateEntity]);
 				secondaryOnEdit();
 			},
@@ -408,17 +412,21 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 			};
 
 		useEffect(() => {
-			// When secondarySelection changes, set the mode appropriately
-			if (UiGlobals.editorStaysInEditModeOnChangeSelection) {
-				const mode = calculateEditorMode();
-				secondarySetEditorMode(mode);
+			// 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 {
-				secondarySetEditorMode(EDITOR_MODE__VIEW);
+				// Most of the time, if selection changed, put the Editor in "view" mode
+				mode = EDITOR_MODE__VIEW;
 			}
+			setEditorMode(mode);
 
-			setLastSelection(secondarySelection);
-		}, [secondarySelection]);
-
+			setSecondaryIsIgnoreNextSelectionChange(false);
+			setLastSelection(selection);
+		}, [selection]);
+	
 		if (self) {
 			self.secondaryAdd = secondaryOnAdd;
 			self.secondaryEdit = secondaryOnEdit;
@@ -430,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

@@ -67,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() {
@@ -145,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);
@@ -273,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);
@@ -282,6 +285,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 					entity = selection[0],
 					duplicateEntity = await Repository.remoteDuplicate(entity);
 
+				setIsIgnoreNextSelectionChange(true);
 				setSelection([duplicateEntity]);
 				onEdit();
 			},
@@ -406,13 +410,17 @@ export default function withEditor(WrappedComponent, isTree = false) {
 
 		useEffect(() => {
 			// When selection changes, set the mode appropriately
-			if (UiGlobals.editorStaysInEditModeOnChangeSelection) {
-				const mode = calculateEditorMode();
-				setEditorMode(mode);
+			let mode;
+			if (isIgnoreNextSelectionChange) {
+				// on selection change from onAdd/onDuplicate/etc, calculate whether to put Editor in "add" or "edit" mode
+				mode = calculateEditorMode();
 			} else {
-				setEditorMode(EDITOR_MODE__VIEW);
+				// Most of the time, if selection changed, put the Editor in "view" mode
+				mode = EDITOR_MODE__VIEW;
 			}
+			setEditorMode(mode);
 
+			setIsIgnoreNextSelectionChange(false);
 			setLastSelection(selection);
 		}, [selection]);
 
@@ -429,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