aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoranika-ahluwalia <anika.ahluwalia@gmail.com>2020-06-22 16:21:33 -0500
committeranika-ahluwalia <anika.ahluwalia@gmail.com>2020-06-22 16:21:33 -0500
commit53e8663b619e5e09461b7e0e2d71bb486dea1295 (patch)
treef9f167069036ac202616fbc01c138b8f31ac2b91
parent1bf722fd65d30112cbae24f330d17748b5f6cedb (diff)
parent97090506ca22ce2f96b0c0cb44bf30b3c17f7b90 (diff)
Merge branch 'anika_schema_view' of https://github.com/browngraphicslab/Dash-Web into anika_schema_view
-rw-r--r--src/client/views/collections/CollectionSchemaCells.tsx8
-rw-r--r--src/client/views/collections/CollectionSchemaView.tsx5
2 files changed, 7 insertions, 6 deletions
diff --git a/src/client/views/collections/CollectionSchemaCells.tsx b/src/client/views/collections/CollectionSchemaCells.tsx
index b9be3b64f..7b76a5c84 100644
--- a/src/client/views/collections/CollectionSchemaCells.tsx
+++ b/src/client/views/collections/CollectionSchemaCells.tsx
@@ -405,7 +405,7 @@ export class CollectionSchemaDocCell extends CollectionSchemaCell {
} else {
if (bool) {
console.log("show doc");
- this.props.showDoc(this._doc, this.prop.DataDoc, e.screenX - 230, e.screenY - 570);
+ this.props.showDoc(this._doc, this.prop.DataDoc, e.clientX, e.clientY);
} else {
console.log("no doc");
this.props.showDoc(undefined);
@@ -445,11 +445,11 @@ export class CollectionSchemaDocCell extends CollectionSchemaCell {
return (
<div className="collectionSchemaView-cellWrapper" ref={this._focusRef} tabIndex={-1}
- // onPointerDown={(e) => { this.onDown(e); }}
+ onPointerDown={(e) => { this.onDown(e); }}
// onFocus={(e) => this.showPreview(true, e)}
- onMouseEnter={(e) => { this.showPreview(true, e); }}
+ onPointerEnter={(e) => { this.showPreview(true, e); }}
// onBlur={(e) => { console.log("Blur"); this.showPreview(false, e) }}
- onMouseLeave={(e) => { this.showPreview(false, e); }}
+ onPointerLeave={(e) => { this.showPreview(false, e); }}
>
<div className="collectionSchemaView-cellContents-document"
diff --git a/src/client/views/collections/CollectionSchemaView.tsx b/src/client/views/collections/CollectionSchemaView.tsx
index 574884e86..03db0377a 100644
--- a/src/client/views/collections/CollectionSchemaView.tsx
+++ b/src/client/views/collections/CollectionSchemaView.tsx
@@ -796,8 +796,9 @@ export class SchemaTable extends React.Component<SchemaTableProps> {
{!this._showDoc ? (null) :
<div className="collectionSchemaView-documentPreview" //onClick={() => { this.onOpenClick(); }}
style={{
- position: "absolute", width: 400, height: 300,
- transform: `translate(${this._showDocPos[0]}px, ${this._showDocPos[1]}px)`
+ position: "absolute", width: 150, height: 150,
+ background: "dimGray", display: "block", top: 0, left: 0,
+ transform: `translate(${this._showDocPos[0]}px, ${this._showDocPos[1] - 180}px)`
}}
ref="overlay"><ContentFittingDocumentView
Document={this._showDoc}