@onehat/ui 0.3.181 → 0.3.183

package/package.json

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

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

@@ -686,6 +686,7 @@ export function ComboComponent(props) {
 					h={UiGlobals.mode === UI_MODE_WEB ? styles.FORM_COMBO_MENU_HEIGHT + 'px' : null}
 					newEntityDisplayValue={newEntityDisplayValue}
 					disablePresetButtons={!isEditor}
+					alternateRowBackgrounds={false}
 					onChangeSelection={(selection) => {
 
 						if (Repository && selection[0]?.isPhantom) {

package/src/Components/Grid/Grid.js

@@ -121,6 +121,7 @@ function GridComponent(props) {
 			flex,
 			bg = '#fff',
 			verifyCanEdit,
+			alternateRowBackgrounds = true,
 			alternatingInterval = 2,
 
 			// withComponent
@@ -410,7 +411,7 @@ function GridComponent(props) {
 								}
 							} else if (showHovers && isHovered) {
 								mixWith = styles.GRID_ROW_HOVER_BG;
-							} else if (index % alternatingInterval === 0) { // i.e. every second line, or every third line
+							} else if (alternateRowBackgrounds && index % alternatingInterval === 0) { // i.e. every second line, or every third line
 								mixWith = styles.GRID_ROW_ALTERNATE_BG;
 							}
 							if (mixWith) {

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

@@ -138,7 +138,15 @@ export default function withSecondaryEditor(WrappedComponent, isTree = false) {
 				} else {
 					// Set repository to sort by id DESC and switch to page 1, so this new entity is guaranteed to show up on the current page, even after saving
 					const currentSorter = SecondaryRepository.sorters[0];
-					if (currentSorter.name !== SecondaryRepository.schema.model.idProperty || currentSorter.direction !== 'DESC') {
+					if (currentSorter.name.match(/__sort_order$/)) { // when it's using a sort column, keep using it
+						if (currentSorter.direction !== 'DESC') {
+							SecondaryRepository.pauseEvents();
+							SecondaryRepository.sort(currentSorter.name, 'DESC');
+							SecondaryRepository.setPage(1);
+							SecondaryRepository.resumeEvents();
+							await SecondaryRepository.reload();
+						}
+					} else if (currentSorter.name !== SecondaryRepository.schema.model.idProperty || currentSorter.direction !== 'DESC') {
 						SecondaryRepository.pauseEvents();
 						SecondaryRepository.sort(SecondaryRepository.schema.model.idProperty, 'DESC');
 						SecondaryRepository.setPage(1);

package/src/Components/Hoc/withEditor.js

@@ -135,7 +135,15 @@ export default function withEditor(WrappedComponent, isTree = false) {
 				} else {
 					// Set repository to sort by id DESC and switch to page 1, so this new entity is guaranteed to show up on the current page, even after saving
 					const currentSorter = Repository.sorters[0];
-					if (currentSorter.name !== Repository.schema.model.idProperty || currentSorter.direction !== 'DESC') {
+					if (currentSorter.name.match(/__sort_order$/)) { // when it's using a sort column, keep using it
+						if (currentSorter.direction !== 'DESC') {
+							Repository.pauseEvents();
+							Repository.sort(currentSorter.name, 'DESC');
+							Repository.setPage(1);
+							Repository.resumeEvents();
+							await Repository.reload();
+						}
+					} else if (currentSorter.name !== Repository.schema.model.idProperty || currentSorter.direction !== 'DESC') {
 						Repository.pauseEvents();
 						Repository.sort(Repository.schema.model.idProperty, 'DESC');
 						Repository.setPage(1);