@onehat/ui 0.3.71 → 0.3.73

package/package.json

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

package/src/Components/Buttons/SquareButton.js

@@ -4,12 +4,14 @@ import {
 	Pressable,
 	Text,
 } from 'native-base';
+import IconButton from './IconButton.js';
 import UiGlobals from '../../UiGlobals.js';
 
 export default function SquareButton(props) {
 	const {
 			text,
 			isActive = false,
+			showText = true,
 			activeColor,
 			invertColorWhenActive = false,
 			disableInteractions = false,
@@ -17,7 +19,9 @@ export default function SquareButton(props) {
 			...propsToPass
 		} = props,
 		styles = UiGlobals.styles,
+		bg = isActive ? activeColor || '#56a6f8' : '#fff',
 		color = invertColorWhenActive && isActive ? '#fff' : '#000';
+
 	const propsIcon = props._icon || {};
 	let icon = props.icon;
 	if (!icon) {
@@ -26,14 +30,6 @@ export default function SquareButton(props) {
 	if (!text) {
 		throw Error('text missing');
 	}
-	
-	if (React.isValidElement(icon)) {
-		if (!_.isEmpty(propsIcon)) {
-			icon = React.cloneElement(icon, {...propsIcon});
-		}
-	} else {
-		icon = <Icon as={icon} {...propsIcon} />;
-	}
 
 	const
 		hoverProps = {},
@@ -42,7 +38,29 @@ export default function SquareButton(props) {
 		hoverProps.bg = styles.ICON_BUTTON_BG_HOVER;
 		pressedProps.bg = styles.ICON_BUTTON_BG_PRESSED;
 	}
-	
+
+	if (!showText) {
+		return <IconButton
+					icon={icon}
+					borderRadius="md"
+					p={2}
+					_icon={{
+						size: '20px',
+						color,
+					}}
+					{...propsToPass}
+					bg={bg}
+				/>;
+	}
+
+	if (React.isValidElement(icon)) {
+		if (!_.isEmpty(propsIcon)) {
+			icon = React.cloneElement(icon, {...propsIcon});
+		}
+	} else {
+		icon = <Icon as={icon} {...propsIcon} />;
+	}
+
 	return <Pressable
 				borderRadius="md"
 				flexDirection="column"
@@ -50,7 +68,7 @@ export default function SquareButton(props) {
 				alignItems="center"
 				p={2}
 				{...propsToPass}
-				bg={isActive ? activeColor || '#56a6f8' : '#fff'}
+				bg={bg}
 				// _hover={hoverProps}
 				// _pressed={pressedProps}
 			>

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

@@ -406,7 +406,7 @@ export function ComboComponent(props) {
 		}
 
 		return () => {
-			if (Repository && !Repository.isUnique) {
+			if (Repository && !Repository.isUnique && !Repository.isDestroyed) {
 				clearGridFilters();
 			}
 		};

package/src/Components/Form/Form.js

@@ -761,7 +761,7 @@ function Form(props) {
 		}
 	}
 	
-	return <Column {...sizeProps} onLayout={onLayoutDecorated} ref={formRef}>
+	return <Column {...sizeProps} pb={10} onLayout={onLayoutDecorated} ref={formRef}>
 				{!!containerWidth && <>
 					{editorType === EDITOR_TYPE__INLINE &&
 						<ScrollView

package/src/Components/Messages/ErrorMessage.js

@@ -6,10 +6,27 @@ import {
 import TriangleExclamation from '../Icons/TriangleExclamation.js';
 
 export default function ErrorMsg(props) {
-	return <Row justifyContent="center" alignItems="center" my={2} w="100%">
-				<Icon as={TriangleExclamation} color="red.500" size="sm" mr={1} />
-				<Text color="red.500">
-					{props.children}
-				</Text>
-			</Row>;
+	const {
+			textMessage = 'Error',
+			textColor = 'red.500',
+		} = props;
+
+	return <Modal {...props} _backdrop={{ bg: "#000" }}>
+				<Modal.Content>
+					<Modal.Body
+						borderTopWidth={0}
+						bg="#fff"
+						p={3}
+						justifyContent="center"
+						alignItems="center"
+						borderRadius={5}
+						flexDirection="row"
+					>
+						<Row justifyContent="center" alignItems="center" my={2} w="100%">
+							<Icon as={TriangleExclamation} color="red.500" size="sm" mr={1} />
+							<Text color={textColor}>{textMessage}</Text>
+						</Row>
+					</Modal.Body>
+				</Modal.Content>
+			</Modal>;
 }

package/src/Functions/buildAdditionalButtons.js

@@ -32,7 +32,7 @@ export default function buildAdditionalButtons(configs, self, handlerArgs = {})
 		const button = <Button
 							color={color}
 							ml={2}
-							mb={2}
+							// mb={2}
 							parent={self}
 							reference={key}
 							{...buttonProps}