@onehat/ui 0.3.78 → 0.3.80

package/package.json

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

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

@@ -332,11 +332,10 @@ export function ComboComponent(props) {
 				const filterName = getFilterName();
 				if (Repository.hasFilter(filterName)) {
 					Repository.clearFilters(filterName);
-				}
-				
-				if (Repository.isRemote) {
-					if (!this.isAutoLoad) {
-						await Repository.reload();
+					if (Repository.isRemote) {
+						if (!this.isAutoLoad) {
+							await Repository.reload();
+						}
 					}
 				}
 			} else {

package/src/Components/Grid/GridRow.js

@@ -65,6 +65,9 @@ export default function GridRow(props) {
 						}
 
 						let value;
+						if (_.isFunction(config)) {
+							return config(item, key);
+						}
 						if (_.isPlainObject(config)) {
 							if (config.renderer) {
 								const extraProps = _.omit(config, [
@@ -140,9 +143,6 @@ export default function GridRow(props) {
 								value = item[config];
 							}
 						}
-						if (_.isFunction(config)) {
-							value = config(item);
-						}
 						if (_.isFunction(value)) {
 							return value(key);
 						}
@@ -187,7 +187,7 @@ export default function GridRow(props) {
 												variant="ghost"
 												w={30}
 												alignSelf="center"
-												ml={3}
+												mx={3}
 											/>}
 					</Row>;
 		}, [

package/src/Functions/parseNotification.js

@@ -0,0 +1,14 @@
+export default function parseNotification(notification) {
+	if (notification.notification) {
+		notification = notification.notification;
+	}
+	const
+		body = notification?.request?.content?.body,
+		title = notification?.request?.content?.title,
+		data = notification?.request?.content?.data;
+	return {
+		body,
+		title,
+		data,
+	};
+};