@onehat/ui 0.3.233 → 0.3.235

package/package.json

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

package/src/Components/Grid/Grid.js

@@ -205,7 +205,7 @@ function GridComponent(props) {
 		isAddingRef = useRef(),
 		expandedRowsRef = useRef({}),
 		cachedDragElements = useRef(),
-		idsRef = useRef([]),
+		dragSelectionRef = useRef([]),
 		[isInited, setIsInited] = useState(false),
 		[isReady, setIsReady] = useState(false),
 		[isLoading, setIsLoading] = useState(false),
@@ -449,9 +449,8 @@ function GridComponent(props) {
 						let WhichRow = GridRow;
 						if (CURRENT_MODE === UI_MODE_WEB) { // DND is currrently web-only  TODO: implement for RN
 							// Create a method that gets an always-current copy of the selection ids
-							const ids = _.map(selection, (item) => item.id);
-							idsRef.current = ids;
-							const getIds = () => idsRef.current;
+							dragSelectionRef.current = selection;
+							const getSelection = () => dragSelectionRef.current;
 
 							// assign event handlers
 							if (canRowsReorder && isDragMode) {
@@ -461,7 +460,7 @@ function GridComponent(props) {
 								const dragIx = showHeaders ? index - 1 : index;
 								rowReorderProps.dragSourceItem = {
 									id: item.id,
-									getIds,
+									getSelection,
 									onDrag: (dragState) => {
 										onRowReorderDrag(dragState, dragIx);
 									},
@@ -474,11 +473,11 @@ function GridComponent(props) {
 									rowDragProps.isDragSource = true;
 									rowDragProps.dragSourceType = rowDragSourceType;
 									if (getRowDragSourceItem) {
-										rowDragProps.dragSourceItem = getRowDragSourceItem(item, getIds, rowDragSourceType);
+										rowDragProps.dragSourceItem = getRowDragSourceItem(item, getSelection, rowDragSourceType);
 									} else {
 										rowDragProps.dragSourceItem = {
 											id: item.id,
-											getIds,
+											getSelection,
 											type: rowDragSourceType,
 										};
 									}

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) {
@@ -41,6 +42,7 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				newEntityDisplayValue,
 				newEntityDisplayProperty, // in case the field to set for newEntityDisplayValue is different from model
 				defaultValues,
+				stayInEditModeOnSelectionChange = false,
 
 				// withComponent
 				self,
@@ -423,6 +425,16 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				});
 			},
 			calculateEditorMode = (isIgnoreNextSelectionChange = false) => {
+
+				let doStayInEditModeOnSelectionChange = stayInEditModeOnSelectionChange;
+				if (!_.isNil(UiGlobals.stayInEditModeOnSelectionChange)) {
+					// allow global override to for this property
+					doStayInEditModeOnSelectionChange = UiGlobals.stayInEditModeOnSelectionChange;
+				}
+				if (doStayInEditModeOnSelectionChange) {
+					isIgnoreNextSelectionChange = true;
+				}
+
 				// calculateEditorMode gets called only on selection changes
 				let mode;
 				if (isIgnoreNextSelectionChange) {