diff options
| author | Bob Zeleznik <zzzman@gmail.com> | 2020-06-25 01:50:51 -0400 |
|---|---|---|
| committer | Bob Zeleznik <zzzman@gmail.com> | 2020-06-25 01:50:51 -0400 |
| commit | d7a9610c198b7a88b338dfc847b93ae4640efca9 (patch) | |
| tree | 2ca2bcf08264e28832a322c97ede95140600365a | |
| parent | 92ea47bc7c42966f68ccfed4f1da57eb9b352d40 (diff) | |
| parent | 4f028a0f41cfeedb9d4842648b487551450e788b (diff) | |
Merge branch 'anika_schema_view' of https://github.com/browngraphicslab/Dash-Web into anika_schema_view
| -rw-r--r-- | src/client/views/collections/CollectionSchemaView.tsx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/client/views/collections/CollectionSchemaView.tsx b/src/client/views/collections/CollectionSchemaView.tsx index feef4fec5..9b2d05b6a 100644 --- a/src/client/views/collections/CollectionSchemaView.tsx +++ b/src/client/views/collections/CollectionSchemaView.tsx @@ -368,8 +368,10 @@ export class CollectionSchemaView extends CollectionSubView(doc => doc) { @observable _menuWidth = 0 @observable _menuHeight = 0; @computed get renderMenu() { + const scale = this.props.ScreenToLocalTransform().Scale; return ( <div className="collectionSchema-header-menu" ref={this.setNode} + onWheel={e => this.props.active(true) && e.stopPropagation()} style={{ position: "absolute", background: "white", transform: `translate(${this.menuCoordinates[0]}px, ${this.menuCoordinates[1]}px)` @@ -1040,7 +1042,8 @@ export class SchemaTable extends React.Component<SchemaTableProps> { render() { const preview = ""; - return <div className="collectionSchemaView-table" onPointerDown={this.props.onPointerDown} onWheel={e => this.props.active(true) && e.stopPropagation()} onDrop={e => this.props.onDrop(e, {})} onContextMenu={this.onContextMenu} > + return <div className="collectionSchemaView-table" onPointerDown={this.props.onPointerDown} onWheel={e => this.props.active(true) && e.stopPropagation()} + onDrop={e => this.props.onDrop(e, {})} onContextMenu={this.onContextMenu} > {this.reactTable} <div className="collectionSchemaView-addRow" onClick={() => this.createRow()}>+ new</div> {!this._showDoc ? (null) : |