diff options
| author | Tyler Schicke <tyler_schicke@brown.edu> | 2019-05-18 00:38:07 -0400 |
|---|---|---|
| committer | Tyler Schicke <tyler_schicke@brown.edu> | 2019-05-18 00:38:07 -0400 |
| commit | c89cd609b9887e9dd5c32b74297699d8c675cc9b (patch) | |
| tree | ebd2c33d022faf66b58d9807d7f103804e71a5f8 /src | |
| parent | 618b4a42795b59cde47510b86b6e25dc03e15935 (diff) | |
Fixed errors
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/views/ContextMenuItem.tsx | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/client/views/ContextMenuItem.tsx b/src/client/views/ContextMenuItem.tsx index aefc633bc..ed583942a 100644 --- a/src/client/views/ContextMenuItem.tsx +++ b/src/client/views/ContextMenuItem.tsx @@ -7,7 +7,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; export interface OriginalMenuProps { description: string; event: (e: React.MouseEvent<HTMLDivElement>) => void; - icon: IconProp; //maybe should be optional (icon?) + icon?: IconProp; //maybe should be optional (icon?) } export interface SubmenuProps { @@ -38,27 +38,28 @@ export class ContextMenuItem extends React.Component<ContextMenuProps> { <div className="contextMenu-item" onClick={this.props.event}> <span className="icon-background"> <FontAwesomeIcon icon="circle" size="sm" /> - <FontAwesomeIcon icon={this.props.icon} size="sm" /> + {this.props.icon ? <FontAwesomeIcon icon={this.props.icon} size="sm" /> : null} </span> <div className="contextMenu-description"> {this.props.description}</div> - </div>) + </div> + ); } else { let submenu = null; if (this.overItem) { - submenu = (<div className="subMenu-cont" style={{ marginLeft: "100.5%", left: "0px" }}> - {this._items.map(prop => { - return <ContextMenuItem {...prop} key={prop.description} /> - })} - </div>) + submenu = ( + <div className="subMenu-cont" style={{ marginLeft: "100.5%", left: "0px" }}> + {this._items.map(prop => <ContextMenuItem {...prop} key={prop.description} />)} + </div> + ); } return ( - <div className="contextMenu-item" onClick={this.props.event} onMouseEnter={action(() => { - this.overItem = true - })} onMouseLeave={action(() => this.overItem = false)}> + <div className="contextMenu-item" onMouseEnter={action(() => { this.overItem = true; })} + onMouseLeave={action(() => this.overItem = false)}> <div className="contextMenu-description"> {this.props.description}</div> {submenu} - </div>) + </div> + ); } } }
\ No newline at end of file |