@onehat/ui 0.3.236 → 0.3.238

package/package.json

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

package/src/Components/Form/Field/CKEditor/CKEditor.js

@@ -2,9 +2,7 @@ import React, { useState, useEffect, useRef, } from 'react';
 import {
 	Row,
 } from 'native-base';
-import {
-	AUTO_SUBMIT_DELAY,
-} from '../../../../Constants/Input.js';
+import UiGlobals from '../../../../UiGlobals.js';
 import { CKEditor } from '@ckeditor/ckeditor5-react'; // https://ckeditor.com/docs/ckeditor5/latest/installation/frameworks/react.html
 import './ckeditor.css';
 import Editor from '../../../../../ckeditor5/build/ckeditor.js'; // built using https://ckeditor.com/ckeditor-5/online-builder/
@@ -19,6 +17,7 @@ const
 		const {
 				value,
 				setValue,
+				autoSubmitDelay = UiGlobals.autoSubmitDelay,
 				h = 150,
 			} = props,
 			debouncedSetValueRef = useRef(),
@@ -30,7 +29,7 @@ const
 		useEffect(() => {
 			// Set up debounce fn
 			// Have to do this because otherwise, lodash tries to create a debounced version of the fn from only this render
-			debouncedSetValueRef.current = _.debounce(setValue, AUTO_SUBMIT_DELAY);
+			debouncedSetValueRef.current = _.debounce(setValue, autoSubmitDelay);
 		}, [setValue]);
 
 		return <Row h={h} flex={1} ref={props.outerRef} {...props}>

package/src/Components/Form/Field/Input.js

@@ -3,9 +3,6 @@ import {
 	Input,
 	Tooltip,
 } from 'native-base';
-import {
-	AUTO_SUBMIT_DELAY,
-} from '../../../Constants/Input.js';
 import UiGlobals from '../../../UiGlobals.js';
 import withComponent from '../../Hoc/withComponent.js';
 import withValue from '../../Hoc/withValue.js';
@@ -16,7 +13,7 @@ function InputElement(props) {
 			value,
 			setValue,
 			autoSubmit = true, // automatically setValue after user stops typing for autoSubmitDelay
-			autoSubmitDelay = AUTO_SUBMIT_DELAY,
+			autoSubmitDelay = UiGlobals.autoSubmitDelay,
 			autoCapitalize = 'none',
 			maxLength,
 			onKeyPress,

package/src/Components/Form/Field/Number.js

@@ -5,9 +5,6 @@ import {
 	Input,
 	Row,
 } from 'native-base';
-import {
-	AUTO_SUBMIT_DELAY,
-} from '../../../Constants/Input.js';
 import UiGlobals from '../../../UiGlobals.js';
 import IconButton from '../../Buttons/IconButton.js';
 import withComponent from '../../Hoc/withComponent.js';
@@ -25,6 +22,7 @@ function NumberElement(props) {
 		setValue,
 		minValue,
 		maxValue,
+		autoSubmitDelay = UiGlobals.autoSubmitDelay,
 		tooltip = null,
 		isDisabled = false,
 	} = props,
@@ -94,7 +92,7 @@ function NumberElement(props) {
 	useEffect(() => {
 		// Set up debounce fn
 		// Have to do this because otherwise, lodash tries to create a debounced version of the fn from only this render
-		debouncedSetValueRef.current = _.debounce(setValue, AUTO_SUBMIT_DELAY);
+		debouncedSetValueRef.current = _.debounce(setValue, autoSubmitDelay);
 	}, [setValue]);
 	
 	useEffect(() => {

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));
 }

package/src/UiGlobals.js

@@ -9,6 +9,9 @@ const Globals = {
 	// global defaults
 	paginationIsShowMoreOnly: false,
 	autoAdjustPageSizeToHeight: true,
+	doubleClickingGridRowOpensEditorInViewMode: false,
+	disableSavedColumnsConfig: false,
+	autoSubmitDelay: 500,
 };
 
 export default Globals;

package/src/Constants/Input.js

@@ -1 +0,0 @@
-export const AUTO_SUBMIT_DELAY = 500;