diff --git a/src/components/app.js b/src/components/app.js index 4c2fad76..8f8492ed 100644 --- a/src/components/app.js +++ b/src/components/app.js @@ -8,7 +8,6 @@ import PulseLoader from "halogen/PulseLoader"; import LeftSideBar from "./leftsidebar"; import Parallel from "./continuous/parallel"; -import DynamicScatterplot from "./scatterplot/scatterplot"; import Joy from "./joy/joy"; import Graph from "./graph/graph"; import * as globals from "../globals"; @@ -71,13 +70,11 @@ class App extends React.Component {
- {/**/}
diff --git a/src/components/expression/cellSetButtons.js b/src/components/expression/cellSetButtons.js index 2be330b0..f3e8c32e 100644 --- a/src/components/expression/cellSetButtons.js +++ b/src/components/expression/cellSetButtons.js @@ -30,6 +30,7 @@ class CellSetButton extends React.Component { -
- - deselected opacity - - - - - - -
-
+
+ + + + +
+
+ +
-
- { - this.reglCanvas = canvas; + style={{ position: "fixed", right: 80, bottom: 50, zIndex: -9999 }} + > +
+
+ { + this.reglCanvas = canvas; + }} + /> +
); @@ -322,3 +316,15 @@ class Graph extends React.Component { } export default Graph; + +// +// deselected opacity +// +// diff --git a/src/components/leftsidebar.js b/src/components/leftsidebar.js index 62cc7a72..b0206d41 100644 --- a/src/components/leftsidebar.js +++ b/src/components/leftsidebar.js @@ -7,6 +7,7 @@ import ExpressionButtons from "./expression/expressionButtons"; import { connect } from "react-redux"; import Heatmap from "./expression/diffExpHeatmap"; import * as globals from "../globals"; +import DynamicScatterplot from "./scatterplot/scatterplot"; @connect(state => { return {}; @@ -21,7 +22,15 @@ class LeftSideBar extends React.Component { render() { return (
-

+

CELLxGENE {globals.datasetTitle}{" "}

@@ -97,7 +106,7 @@ class LeftSideBar extends React.Component { height: 500, width: 350, padding: 10, - overflowY: "scroll", + overflowY: "auto", overflowX: "hidden" }} > @@ -105,13 +114,11 @@ class LeftSideBar extends React.Component { {this.state.currentTab === "metadata" ? : null} {this.state.currentTab === "expression" ? : null}
-
- +
+ {this.state.currentTab === "metadata" ? : null} + {this.state.currentTab === "expression" ? ( + + ) : null}
); diff --git a/src/components/scatterplot/scatterplot.js b/src/components/scatterplot/scatterplot.js index 7582e769..d853d869 100644 --- a/src/components/scatterplot/scatterplot.js +++ b/src/components/scatterplot/scatterplot.js @@ -265,10 +265,7 @@ class Scatterplot extends React.Component {