@onehat/ui 0.4.32 → 0.4.33

package/package.json

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

package/src/Components/Form/FieldSet.js

@@ -81,6 +81,8 @@ export default function FieldSet(props) {
 		mb-4
 		mx-0
 		p-1
+		pb-2
+		gap-2
 		border
 		border-grey-400
 		${styles.FORM_FIELDSET_BG}

package/src/Components/Form/Form.js

@@ -782,7 +782,7 @@ function Form(props) {
 							if (message) {
 								message = <Text className="text-[#f00]">{message}</Text>;
 							}
-							element = <VStack className="Form-VStack4 flex-1 pt-1">
+							element = <VStack className="Form-VStack4 flex-1">
 											{element}
 											{message}
 										</VStack>;
@@ -790,7 +790,7 @@ function Form(props) {
 							if (item.additionalEditButtons) {
 								const buttons = buildAdditionalButtons(item.additionalEditButtons, self, { fieldState, formSetValue, formGetValues, formState });
 								if (containerWidth > styles.FORM_STACK_ROW_THRESHOLD) {
-									element = <HStack className="Form-HStack5 flex-1 flex-wrap">
+									element = <HStack className="Form-HStack5 flex-1 flex-wrap items-center">
 													{element}
 													{buttons}
 												</HStack>;
@@ -883,7 +883,6 @@ function Form(props) {
 											min-h-[50px]
 											w-full
 											flex-none
-											pb-2
 											${error ? 'bg-[#fdd]' : ''}
 										`}
 									>

package/src/Constants/Dates.js

@@ -14,3 +14,4 @@ export const ONE_YEAR_AGO = moment().add(-1, 'years');
 export const MOMENT_DATE_FORMAT_1 = 'YYYY-MM-DD HH:mm:ss';
 export const MOMENT_DATE_FORMAT_2 = 'MMMM Do YYYY, h:mm:ss a';
 export const MOMENT_DATE_FORMAT_3 = 'h:mm A';
+export const MOMENT_DATE_FORMAT_4 = 'YYYY-MM-DD';

package/src/Functions/Cypress/form_functions.js

@@ -188,7 +188,9 @@ export function setTagValue(selectors, value) {
 				cy.get(field)
 					.wait(1000) // render
 					.type('{downarrow}')
-					.wait(500); // allow time for selection
+					.wait(500) // allow time for selection
+					.type('{enter}')
+					.wait(250); // allow time to register enter key
 			});
 
 			// press trigger to hide dropdown

package/src/Functions/buildAdditionalButtons.js

@@ -1,6 +1,3 @@
-import {
-	Icon,
-} from '@project-components/Gluestack';
 import Button from '../Components/Buttons/Button.js';
 import testProps from './testProps.js';
 import _ from 'lodash';
@@ -14,32 +11,28 @@ export default function buildAdditionalButtons(configs, self, handlerArgs = {})
 				handler,
 				icon,
 				isDisabled,
+				tooltip,
 				color = '#fff',
 			} = config,
 			buttonProps = {
 				key,
+				parent: self,
 				reference: key,
+				text,
+				icon,
+				isDisabled,
 				className: 'ml-2',
+				tooltip,
+				color,
 			};
 		if (handler) {
 			buttonProps.onPress = () => handler(handlerArgs);
 		}
-		if (icon) {
-			buttonProps.leftIcon = <Icon as={icon} size="sm" className="text-[#fff]" />;
-		}
-		if (isDisabled) {
-			buttonProps.isDisabled = isDisabled;
-		}
 		
-		const button = <Button
-							{...testProps('btn-' + key)}
-							color={color}
-							parent={self}
-							reference={key}
-							text={text}
-							{...buttonProps}
-						/>;
-		additionalButtons.push(button);
+		additionalButtons.push(<Button
+			{...testProps(key)}
+			{...buttonProps}
+		/>);
 	});
 	return additionalButtons;
 }