@onehat/ui 0.4.10 → 0.4.11

package/package.json

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

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

@@ -372,8 +372,7 @@ export const DateElement = forwardRef((props, ref) => {
 					flex-1
 					h-full
 					m-0
-					rounded-tr-none
-					rounded-br-none
+					rounded-r-lg
 					${styles.FORM_DATE_INPUT_BG}
 					${styles.FORM_DATE_INPUT_BG_FOCUS}
 					${styles.FORM_DATE_READOUT_FONTSIZE}

package/src/Components/Form/Form.js

@@ -1205,7 +1205,6 @@ function Form(props) {
 						key="resetBtn"
 						onPress={() => doReset()}
 						icon={Rotate}
-						className="mr-2"
 						isDisabled={!formState.isDirty}
 					/>}
 
@@ -1215,7 +1214,7 @@ function Form(props) {
 						key="cancelBtn"
 						variant={editorType === EDITOR_TYPE__INLINE ? 'solid' : 'outline'}
 						onPress={onCancel}
-						className="text-white mr-2"
+						className="text-white"
 						text="Cancel"
 					/>}
 					
@@ -1225,7 +1224,7 @@ function Form(props) {
 						key="closeBtn"
 						variant={editorType === EDITOR_TYPE__INLINE ? 'solid' : 'outline'}
 						onPress={onClose}
-						className="text-white mr-2"
+						className="text-white"
 						text="Close"
 					/>}
 
@@ -1277,6 +1276,7 @@ function Form(props) {
 							w-[100px]
 							min-w-[300px]
 							py-2
+							gap-2
 							justify-center
 							items-center
 							rounded-b-lg
@@ -1287,8 +1287,11 @@ function Form(props) {
 				</Box>;
 		} else {
 			if (!disableFooter) {
-				let footerClassName = '';
-				footerClassName += ' justify-end';
+				let footerClassName = `
+					Form-Footer
+					justify-end
+					gap-2
+				`;
 				if (editorType === EDITOR_TYPE__INLINE) {
 					footerClassName += `
 						sticky

package/src/Components/Panel/Panel.js

@@ -137,13 +137,12 @@ function Panel(props) {
 						className={`
 							Panel-VSstack
 							flex-1
-							flex
 							w-full
 							overflow-hidden
 						`}
 					>
 						{isScrollable ? 
-							<ScrollView className="ScrollView">
+							<ScrollView className="Panel-ScrollView">
 								{children}
 							</ScrollView> : 
 							children}

package/src/Components/Report/Report.js

@@ -1,9 +1,11 @@
-import React from 'react';
+import { cloneElement, isValidElement } from 'react';
 import {
+	Box,
 	HStack,
 	Icon,
 	Text,
 	VStack,
+	VStackNative,
 } from '@project-components/Gluestack';
 import { EDITOR_TYPE__PLAIN } from '../../Constants/Editor';
 import {
@@ -41,15 +43,14 @@ function Report(props) {
 		buttons = [];
 
 	const propsIcon = props._icon || {};
-	propsIcon.size = 60;
-	propsIcon.px = 5;
+	propsIcon.className = 'w-full h-full text-primary-500';
 	let icon = props.icon;
 	if (_.isEmpty(icon)) {
 		icon = ChartLine;
 	}
-	if (React.isValidElement(icon)) {
+	if (isValidElement(icon)) {
 		if (!_.isEmpty(propsIcon)) {
-			icon = React.cloneElement(icon, {...propsIcon});
+			icon = cloneElement(icon, {...propsIcon});
 		}
 	} else {
 		icon = <Icon as={icon} {...propsIcon} />;
@@ -60,14 +61,13 @@ function Report(props) {
 			...testProps('excelBtn'),
 			key: 'excelBtn',
 			text: 'Download Excel',
-			leftIcon: <Icon as={Excel} size="md" className="text-white" />,
+			icon: Excel,
 			onPress: (data) => getReport({
 				reportId,
 				data,
 				reportType: REPORT_TYPES__EXCEL,
 				showReportHeaders,
 			}),
-			ml: 1,
 		});
 	}
 	if (!disablePdf) {
@@ -75,22 +75,30 @@ function Report(props) {
 			...testProps('pdfBtn'),
 			key: 'pdfBtn',
 			text: 'Download PDF',
-			leftIcon: <Icon as={Pdf} size="md" className="text-white" />,
+			icon: Pdf,
 			onPress: (data) => getReport({
 				reportId,
 				data,
 				reportType: REPORT_TYPES__PDF,
 				showReportHeaders,
 			}),
-			ml: 1,
 		});
 	}
-	return <VStack
+	return <VStackNative
 				{...testProps('Report-' + reportId)}
-				className="w-full border border-primary-300 pt-4 mb-3"
+				className={`
+					w-full
+					border
+					border-primary-300
+					p-4
+					mb-3
+					rounded-lg
+				`}
 			>
 				<HStack>
-					{icon && <VStack>{icon}</VStack>}
+					<Box className="w-[50px] mr-4">
+						{icon}
+					</Box>
 					<VStack className="flex-1">
 						<Text className="text-2xl max-w-full">{title}</Text>
 						<Text className="text-sm">{description}</Text>
@@ -101,7 +109,7 @@ function Report(props) {
 					additionalFooterButtons={buttons}
 					{...props._form}
 				/>
-			</VStack>;
+			</VStackNative>;
 }
 
 export default withComponent(Report);

package/src/Components/Viewer/Viewer.js

@@ -362,14 +362,17 @@ function Viewer(props) {
 		canEdit = false;
 	}
 
-	let className = 'Viewer-VStackNative';
+	let className = `
+		Viewer-VStackNative
+		h-full
+		bg-white
+	`;
 	if (props.className) {
 		className += ' ' + props.className;
 	}
 
 	return <VStackNative
 				{...testProps(self)}
-				{...props}
 				className={className}
 				onLayout={onLayout}
 			>
@@ -379,9 +382,10 @@ function Viewer(props) {
 						_web={{ height: 1 }}
 						ref={scrollViewRef}
 						className={`
-							ScrollView
+							Viewer-ScrollView
 							w-full
 							pb-1
+							flex-1
 						`}
 					>
 						{canEdit && onEditMode &&