@onehat/ui 0.3.352 → 0.3.355

package/package.json

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

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

@@ -778,7 +778,7 @@ export function ComboComponent(props) {
 
 					}}
 					onAdd={(selection) => {
-						const entity = selection[0];
+						const entity = _.isArray(selection) ? selection[0] : selection;
 						if (entity.id !== value && !isInTag) {
 							// Select it and set the value of the combo.
 							setGridSelection(selection);
@@ -789,7 +789,7 @@ export function ComboComponent(props) {
 						}
 					}}
 					onSave={(selection) => {
-						const entity = selection[0];
+						const entity = _.isArray(selection) ? selection[0] : selection;
 						if (!isInTag) {
 							if (entity?.id !== value) { // Tag doesn't use value, so don't do this comparison in the Tag
 								// Either a phantom record was just solidified into a real record, or a new (non-phantom) record was added.

package/src/Components/Grid/Grid.js

@@ -105,6 +105,7 @@ function GridComponent(props) {
 			flatListProps = {},
 			onRowPress,
 			onRender,
+			disableLoadOnRender = false,
 			forceLoadOnRender = false,
 			pullToRefresh = true,
 			hideNavColumn = true,
@@ -801,6 +802,10 @@ function GridComponent(props) {
 			}
 		};
 
+	if (forceLoadOnRender && disableLoadOnRender) {
+		throw new Error('incompatible config! forceLoadOnRender and disableLoadOnRender cannot both be true');
+	}
+
 	useEffect(() => {
 		if (!isInited) {
 			// first call -- meant to render placeholder so we get container dimensions
@@ -934,7 +939,7 @@ function GridComponent(props) {
 		applySelectorSelected();
 		Repository.resumeEvents();
 
-		if ((Repository.isRemote && !Repository.isLoaded) || forceLoadOnRender) {
+		if (((Repository.isRemote && !Repository.isLoaded) || forceLoadOnRender) && !disableLoadOnRender) { // default remote repositories to load on render, optionally force or disable load on render
 			Repository.load();
 		}
 

package/src/Components/Messages/WaitMessage.js

@@ -17,15 +17,18 @@ const
 	height = 50,
 	width = 200;
 
-// NOTE: THis component does NOT use the native-base Modal
+// NOTE: This component does NOT use the native-base Modal
 // because we need it to appear on top of all other Modals.
 // Therefore, we're using the ReactNative Modal, which at least for web
 // we can control the zIndex of.
 
 export default function WaitMessage(props) {
-	const {
-			textMessage = 'Please wait...',
+	let {
+			text,
 		} = props;
+	if (!text) { // do this here instead of setting default value in deconstructor, so we can use the default for text, even if text is defined and passed as null or empty string
+		text = 'Please wait...';
+	}
 
 	let transform;
 	if (UiGlobals.mode === UI_MODE_WEB) {
@@ -74,7 +77,7 @@ export default function WaitMessage(props) {
 							flexDirection="row"
 						>
 							<Loading minHeight="auto" h={5} w={5} mr={2} />
-							<Text color="#000">{textMessage}</Text>
+							<Text color="#000">{text}</Text>
 						</Box>
 					</View>
 				</View>