aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/ContextMenu.tsx
diff options
context:
space:
mode:
authorandrewdkim <adkim414@gmail.com>2019-06-20 16:33:20 -0400
committerandrewdkim <adkim414@gmail.com>2019-06-20 16:33:20 -0400
commit1fa8e6c102b41bf99b7af9d803b6060284afc8b7 (patch)
tree8cbe91a4f3ea866abc6f160d63a7a812446a66d1 /src/client/views/ContextMenu.tsx
parent82f21b627c4823b1984cd1865aea6eb91f290eca (diff)
parenta5dc0e04add05f2f5bf1e17f1ac0a5e0aba1ea41 (diff)
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into animationtimeline
Diffstat (limited to 'src/client/views/ContextMenu.tsx')
-rw-r--r--src/client/views/ContextMenu.tsx19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/client/views/ContextMenu.tsx b/src/client/views/ContextMenu.tsx
index fd2f970da..69692dbb8 100644
--- a/src/client/views/ContextMenu.tsx
+++ b/src/client/views/ContextMenu.tsx
@@ -167,17 +167,22 @@ export class ContextMenu extends React.Component {
console.log(this.pageX);
console.log();
+ const contents = (
+ <>
+ <span>
+ <span className="icon-background">
+ <FontAwesomeIcon icon="search" size="lg" />
+ </span>
+ <input className="contextMenu-item contextMenu-description" type="text" placeholder="Search . . ." value={this._searchString} onKeyDown={this.onKeyDown} onChange={this.onChange} autoFocus />
+ </span>
+ {this.menuItems}
+ </>
+ );
return (
<Measure offset onResize={action((r: any) => { this._width = r.offset.width; this._height = r.offset.height; })}>
{({ measureRef }) => (
<div className="contextMenu-cont" style={style} ref={measureRef}>
- <span>
- <span className="icon-background">
- <FontAwesomeIcon icon="search" size="lg" />
- </span>
- <input className="contextMenu-item contextMenu-description" type="text" placeholder="Search . . ." value={this._searchString} onKeyDown={this.onKeyDown} onChange={this.onChange} autoFocus />
- </span>
- {this.menuItems}
+ {contents}
</div>
)
}