@onehat/ui 0.3.111 → 0.3.112

package/package.json

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

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

@@ -143,13 +143,13 @@ function TagComponent(props) {
 						key={ix}
 						text={val.text}
 						onView={() => onView(val)}
-						onDelete={isEditor ? () => onDelete(val) : null}
+						onDelete={() => onDelete(val)}
 					/>;
 		});
 
-	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}
-						/>}
+					<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;