@onehat/ui 0.3.236 → 0.3.237

package/package.json

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

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

@@ -6,6 +6,7 @@ import {
 	EDITOR_MODE__VIEW,
 	EDITOR_MODE__ADD,
 	EDITOR_MODE__EDIT,
+	EDITOR_TYPE__SIDE,
 } from '../../../Constants/Editor.js';
 import _ from 'lodash';
 
@@ -36,6 +37,7 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 					}
 					return 'record' + (secondarySelection[0].displayValue ? ' "' + secondarySelection[0].displayValue + '"' : '') + '?';
 				},
+				secondaryEditorType,
 				secondaryOnAdd,
 				secondaryOnChange, // any kind of crud change
 				secondaryOnDelete,
@@ -428,23 +430,28 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 			calculateEditorMode = (secondaryIsIgnoreNextSelectionChange = false) => {
 				// calculateEditorMode gets called only on selection changes
 				let mode;
-				if (secondaryIsIgnoreNextSelectionChange) {
-					mode = secondaryEditorMode;
-					if (!secondaryCanEditorViewOnly && secondaryUserCanEdit) {
-						if (secondarySelection.length > 1) {
-							if (!secondaryDisableEdit) {
-								// For multiple entities selected, change it to edit multiple mode
-								mode = EDITOR_MODE__EDIT;
-							}
-						} else if (secondarySelection.length === 1 && !secondarySelection[0].isDestroyed && secondarySelection[0].isPhantom) {
-							if (!secondaryDisableAdd) {
-								// When a phantom entity is selected, change it to add mode.
-								mode = EDITOR_MODE__ADD;
+				if (secondaryEditorType === EDITOR_TYPE__SIDE && !_.isNil(UiGlobals.isSideEditorAlwaysEditMode) && UiGlobals.isSideEditorAlwaysEditMode) {
+					// special case: side editor is always edit mode
+					mode = EDITOR_MODE__EDIT;
+				} else {
+					if (secondaryIsIgnoreNextSelectionChange) {
+						mode = secondaryEditorMode;
+						if (!secondaryCanEditorViewOnly && secondaryUserCanEdit) {
+							if (secondarySelection.length > 1) {
+								if (!secondaryDisableEdit) {
+									// For multiple entities selected, change it to edit multiple mode
+									mode = EDITOR_MODE__EDIT;
+								}
+							} else if (secondarySelection.length === 1 && !secondarySelection[0].isDestroyed && secondarySelection[0].isPhantom) {
+								if (!secondaryDisableAdd) {
+									// When a phantom entity is selected, change it to add mode.
+									mode = EDITOR_MODE__ADD;
+								}
 							}
 						}
+					} else {
+						mode = secondarySelection.length > 1 ? EDITOR_MODE__EDIT : EDITOR_MODE__VIEW;
 					}
-				} else {
-					mode = secondarySelection.length > 1 ? EDITOR_MODE__EDIT : EDITOR_MODE__VIEW;
 				}
 				return mode;
 			},

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

@@ -8,8 +8,22 @@ import _ from 'lodash';
 // NOTE: This is a modified version of @onehat/ui/src/Hoc/withSideEditor
 // This HOC will eventually get out of sync with that one, and may need to be updated.
 
-export default function withSideEditor(WrappedComponent, isTree = false) {
-	return withSecondaryEditor((props) => {
+
+function withAdditionalProps(WrappedComponent) {
+	return (props) => {
+		// provide the editorType to withEditor
+		return <WrappedComponent
+					editorType={EDITOR_TYPE__SIDE}
+					{...props}
+				/>;
+	};
+}
+
+// NOTE: Effectivtly, the HOC composition is:
+// withAdditionalProps(withSecondaryEditor(withSecondarySideEditor))
+
+export default function withSecondarySideEditor(WrappedComponent, isTree = false) {
+	return withAdditionalProps(withSecondaryEditor((props) => {
 		const {
 				SecondaryEditor,
 				secondaryEditorProps = {},
@@ -46,5 +60,5 @@ export default function withSideEditor(WrappedComponent, isTree = false) {
 								reference="secondaryEditor"
 							/>}
 				/>;
-	});
+	}));
 }

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

@@ -13,8 +13,22 @@ import _ from 'lodash';
 // NOTE: This is a modified version of @onehat/ui/src/Hoc/withWindowedEditor
 // This HOC will eventually get out of sync with that one, and may need to be updated.
 
+
+function withAdditionalProps(WrappedComponent) {
+	return (props) => {
+		// provide the editorType to withEditor
+		return <WrappedComponent
+					editorType={EDITOR_TYPE__WINDOWED}
+					{...props}
+				/>;
+	};
+}
+
+// NOTE: Effectivtly, the HOC composition is:
+// withAdditionalProps(withSecondaryEditor(withSecondaryWindowedEditor))
+
 export default function withSecondaryWindowedEditor(WrappedComponent, isTree = false) {
-	return withSecondaryEditor((props) => {
+	return withAdditionalProps(withSecondaryEditor((props) => {
 		const {
 				secondaryIsEditorShown = false,
 				secondarySetIsEditorShown,
@@ -67,5 +81,5 @@ export default function withSecondaryWindowedEditor(WrappedComponent, isTree = f
 							/>
 						</Modal>}
 				</>;
-	}, isTree);
+	}, isTree));
 }