From af7b4994fa97a2aee0a2e90b30d21d4b030bd2b7 Mon Sep 17 00:00:00 2001
From: anika-ahluwalia <anika.ahluwalia@gmail.com>
Date: Sun, 28 Jun 2020 01:54:55 -0500
Subject: merge fix

---
 src/client/views/EditableView.tsx | 28 ----------------------------
 1 file changed, 28 deletions(-)

(limited to 'src')

diff --git a/src/client/views/EditableView.tsx b/src/client/views/EditableView.tsx
index a4f2f17fc..628db366f 100644
--- a/src/client/views/EditableView.tsx
+++ b/src/client/views/EditableView.tsx
@@ -182,39 +182,11 @@ export class EditableView extends React.Component<EditableProps> {
     }
     render() {
         if (this._editing && this.props.GetValue() !== undefined) {
-<<<<<<< HEAD
-            return this.props.autosuggestProps
-                ? <Autosuggest
-                    {...this.props.autosuggestProps.autosuggestProps}
-                    inputProps={{
-                        className: "editableView-input",
-                        onKeyDown: this.onKeyDown,
-                        autoFocus: true,
-                        onBlur: e => this.finalizeEdit(e.currentTarget.value, false, true),
-                        onPointerDown: this.stopPropagation,
-                        onClick: this.stopPropagation,
-                        onPointerUp: this.stopPropagation,
-                        value: this.props.autosuggestProps.value,
-                        onChange: this.props.autosuggestProps.onChange
-                    }}
-                />
-                :
-                <input className="editableView-input"
-                    defaultValue={this.props.GetValue()}
-                    onKeyDown={this.onKeyDown}
-                    autoFocus={true}
-                    onBlur={e => this.finalizeEdit(e.currentTarget.value, false, true)}
-                    onPointerDown={this.stopPropagation} onClick={this.stopPropagation} onPointerUp={this.stopPropagation}
-                    style={{ display: this.props.display, fontSize: this.props.fontSize }}
-                    placeholder={this.props.placeholder}
-                />;
-=======
             return this.props.sizeToContent ?
                 <div style={{ display: "grid", minWidth: 100 }}>
                     <div style={{ display: "inline-block", position: "relative", height: 0, width: "100%", overflow: "hidden" }}>{this.props.GetValue()}</div>
                     {this.renderEditor()}
                 </div> : this.renderEditor();
->>>>>>> 790cc785a5cad47f0dd274c7f4773eff7d7d9c2e
         } else {
             this.props.autosuggestProps?.resetValue();
             return (this.props.contents instanceof ObjectField ? (null) :
-- 
cgit v1.2.3-70-g09d2