@onehat/ui 0.3.111 → 0.3.113

package/package.json

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

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

@@ -20,7 +20,7 @@ import _ from 'lodash';
 function TagComponent(props) {
 
 	const {
-			isEditor = false,
+			isViewOnly = false,
 			isValueAlwaysArray,
 			isValueAsStringifiedJson,
 			Editor,
@@ -143,13 +143,13 @@ function TagComponent(props) {
 						key={ix}
 						text={val.text}
 						onView={() => onView(val)}
-						onDelete={isEditor ? () => onDelete(val) : null}
+						onDelete={!isViewOnly ? () => onDelete(val) : null}
 					/>;
 		});
 
-	let WhichCombo = ComboEditor;
-	if (!_.isNil(_combo.isEditor) && !_combo.isEditor) {
-		WhichCombo = Combo;
+	let WhichCombo = Combo;
+	if (_combo.isEditor) {
+		WhichCombo = ComboEditor;
 	}
 
 	const sizeProps = {};
@@ -164,7 +164,7 @@ function TagComponent(props) {
 		}
 	}
 
-	if (isEditor && propsToPass.selectorId) {
+	if (propsToPass.selectorId) {
 		_combo.selectorId = propsToPass.selectorId;
 		_combo.selectorSelected = propsToPass.selectorSelected;
 	}
@@ -187,15 +187,14 @@ function TagComponent(props) {
 						minHeight={10}
 						flexWrap="wrap"
 					>{valueBoxes}</Row>
-					{isEditor && 
-						<WhichCombo
-							Repository={props.Repository}
-							Editor={props.Editor}
-							onChangeValue={onChangeComboValue}
-							parent={self}
-							reference="combo"
-							{..._combo}
-						/>}
+					{!isViewOnly && <WhichCombo
+										Repository={props.Repository}
+										Editor={props.Editor}
+										onChangeValue={onChangeComboValue}
+										parent={self}
+										reference="combo"
+										{..._combo}
+									/>}
 				</Column>
 				{isViewerShown && 
 					<Modal
@@ -245,24 +244,12 @@ export const Tag = withAdditionalProps(
 function withAdditionalEditorProps(WrappedComponent) {
 	return (props) => {
 		return <WrappedComponent
-					isEditor={true}
-					isValueAlwaysArray={true}
-					isValueAsStringifiedJson={true}
+					_combo={{ isEditor: true }}
 					{...props}
 				/>;
 	};
 }
 
-export const TagEditor = withAdditionalEditorProps(
-							withComponent(
-								withAlert(
-									withData(
-										withValue(
-											TagComponent
-										)
-									)
-								)
-							)
-						);
+export const TagEditor = withAdditionalEditorProps(Tag);
 
 export default Tag;

package/src/Components/Grid/GridRow.js

@@ -103,13 +103,17 @@ export default function GridRow(props) {
 								if (item?.properties && item.properties[config.fieldName]) {
 									const property = item.properties[config.fieldName];
 									value = property.displayValue;
+									const type = property?.viewerType?.type;
 
-									if (property?.viewerType?.type) {
-										const Element = getComponentFromType(property?.viewerType?.type);
+									if (type) {
+										const Element = getComponentFromType(type);
 										const elementProps = {};
 										if (UiGlobals.mode === UI_MODE_WEB) {
 											elementProps.textOverflow = 'ellipsis';
 										}
+										if (type.match(/(Tag|TagEditor)$/)) {
+											elementProps.isViewOnly = true; // TODO: this won't work for InlineGridEditor, bc that Grid can't use isViewOnly when actually editing
+										}
 										return <Element
 													value={value}
 													key={key}