@onehat/ui 0.3.21 → 0.3.23

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/ui",
-	"version": "0.3.21",
+	"version": "0.3.23",
 	"description": "Base UI for OneHat apps",
 	"main": "src/index.js",
 	"type": "module",
@@ -35,7 +35,6 @@
 		"js-cookie": "^3.0.5",
 		"native-base": "^3.4.28",
 		"react-hook-form": "^7.45.0",
-		"react-native-svg": "^13.13.0",
 		"react-redux": "^8.1.2",
 		"yup": "^1.2.0"
 	},
@@ -48,7 +47,8 @@
 		"react-dom": "*",
 		"react-draggable": "^4.4.5",
 		"react-native": "*",
-		"react-native-draggable": "^3.3.0"
+		"react-native-draggable": "^3.3.0",
+		"react-native-svg": "*"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.22.1",

package/src/Components/Form/Form.js

@@ -203,7 +203,7 @@ function Form(props) {
 											let editorProps = {};
 											if (!editor) {
 												const propertyDef = fieldName && Repository?.getSchema().getPropertyDefinition(fieldName);
-												editor = propertyDef[fieldName].editoType;
+												editor = propertyDef[fieldName].editorType;
 												if (_.isPlainObject(editor)) {
 													const {
 															type,
@@ -276,14 +276,25 @@ function Form(props) {
 			if (propertyDef?.isEditingDisabled) {
 				isEditable = false;
 			}
-			if (isEditable && !type && Repository) {
-				const
-					{
-						type: t,
-						...p
-					} =  propertyDef.editorType;
-				type = t;
-				editorTypeProps = p;
+			if (!type && Repository) {
+				if (isEditable) {
+					const
+						{
+							type: t,
+							...p
+						} =  propertyDef.editorType;
+					type = t;
+					editorTypeProps = p;
+				} else if (propertyDef.viewerType) {
+					const
+						{
+							type: t,
+							...p
+						} =  propertyDef.viewerType;
+					type = t
+				} else {
+					type = 'Text';
+				}
 			}
 			if (type?.match && type.match(/Combo$/) && Repository?.isRemote && !Repository?.isLoaded) {
 				editorTypeProps.autoLoad = true;
@@ -307,10 +318,8 @@ function Form(props) {
 			}
 
 			if (isEditorViewOnly || !isEditable) {
-				const
-					Text = getComponentFromType('Text'),
-					value = (record && record[name]) || (startingValues && startingValues[name]) || null;
-				let element = <Text
+				const value = (record && record[name]) || (startingValues && startingValues[name]) || null;
+				let element = <Element
 									value={value}
 									{...propsToPass}
 								/>;

package/src/Components/Panel/Panel.js

@@ -66,14 +66,17 @@ function Panel(props) {
 
 		useEffect(() => {
 			let titleSuffix = '';
+			if (props.titleSuffix) {
+				titleSuffix += ' ' + props.titleSuffix;
+			}
 			if (selectorSelected?.[0]?.displayValue) {
-				titleSuffix = ' for ' + selectorSelected[0].displayValue;
+				titleSuffix += ' for ' + selectorSelected[0].displayValue;
 			} 
 			setTitleSuffix(titleSuffix);
 			if (!isReady) {
 				setIsReady(true);
 			}
-		}, [selectorSelected, disableTitleChange]);
+		}, [selectorSelected, props.titleSuffix]);
 	
 		if (!isReady) {
 			return null;

package/src/Components/Viewer/TagViewer.js

@@ -18,10 +18,10 @@ function TagViewer(props) {
 	return <Text
 				numberOfLines={1}
 				ellipsizeMode="head"
-				// fontSize={styles.FORM_TEXT_FONTSIZE}
-				// minHeight='40px'
-				// px={3}
-				// py={2}
+				fontSize={styles.FORM_TEXT_FONTSIZE}
+				minHeight='40px'
+				px={3}
+				py={2}
 				{...props}
 			>{values}</Text>;
 }