merge with Colin responsive edits

This commit is contained in:
bkmartinjr
2018-05-14 16:18:18 -07:00
5 changed files with 47 additions and 16 deletions
+17
View File
@@ -39,6 +39,23 @@ class App extends React.Component {
first request includes query straight off the url bar for now
*/
this.props.dispatch(actions.requestCells(window.location.search));
/* listen for resize events */
window.addEventListener("resize", () => {
this.props.dispatch({
type: "window resize",
data: {
height: window.innerHeight,
width: window.innerWidth
}
});
});
this.props.dispatch({
type: "window resize",
data: {
height: window.innerHeight,
width: window.innerWidth
}
});
}
render() {
+15 -4
View File
@@ -45,7 +45,8 @@ import FaSave from "react-icons/lib/fa/download";
graphVec: state.controls.graphVec,
currentCellSelection: state.controls.currentCellSelection,
graphBrushSelection: state.controls.graphBrushSelection,
opacityForDeselectedCells: state.controls.opacityForDeselectedCells
opacityForDeselectedCells: state.controls.opacityForDeselectedCells,
responsive: state.responsive
};
})
class Graph extends React.Component {
@@ -53,6 +54,7 @@ class Graph extends React.Component {
super(props);
this.count = 0;
this.inverse = mat4.identity([]);
this.graphPaddingTop = 100;
this.state = {
drawn: false,
svg: null,
@@ -291,7 +293,16 @@ class Graph extends React.Component {
</div>
</div>
</div>
<div style={{ marginRight: 50, marginTop: 50, zIndex: -9999 }}>
<div
style={{
marginRight: 50,
marginTop: 50,
zIndex: -9999,
position: "fixed",
right: 20,
bottom: 20
}}
>
<div
style={{
display: this.state.mode === "brush" ? "inherit" : "none"
@@ -300,8 +311,8 @@ class Graph extends React.Component {
/>
<div style={{ padding: 0, margin: 0 }}>
<canvas
width={globals.graphWidth}
height={globals.graphHeight}
width={this.props.responsive.height - this.graphPaddingTop}
height={this.props.responsive.height - this.graphPaddingTop}
ref={canvas => {
this.reglCanvas = canvas;
}}
+9 -8
View File
@@ -10,11 +10,14 @@ import * as globals from "../globals";
import DynamicScatterplot from "./scatterplot/scatterplot";
@connect(state => {
return {};
return {
responsive: state.responsive
};
})
class LeftSideBar extends React.Component {
constructor(props) {
super(props);
this.metadataSectionPadding = 300;
this.state = {
currentTab: "metadata"
};
@@ -39,8 +42,7 @@ class LeftSideBar extends React.Component {
padding: "none",
outline: 0,
fontSize: 14,
fontWeight:
this.state.currentTab === "metadata" ? 700 : 400,
fontWeight: this.state.currentTab === "metadata" ? 700 : 400,
fontStyle:
this.state.currentTab === "metadata" ? "inherit" : "italic",
cursor: "pointer",
@@ -49,7 +51,7 @@ class LeftSideBar extends React.Component {
borderTop: "none",
borderBottom: "none",
borderRight: "none",
borderLeft: "none",
borderLeft: "none"
}}
onClick={() => {
this.setState({ currentTab: "metadata" });
@@ -62,8 +64,7 @@ class LeftSideBar extends React.Component {
padding: "none",
outline: 0,
fontSize: 14,
fontWeight:
this.state.currentTab === "expression" ? 700 : 400,
fontWeight: this.state.currentTab === "expression" ? 700 : 400,
fontStyle:
this.state.currentTab === "expression" ? "inherit" : "italic",
cursor: "pointer",
@@ -72,7 +73,7 @@ class LeftSideBar extends React.Component {
borderTop: "none",
borderBottom: "none",
borderRight: "none",
borderLeft: "none",
borderLeft: "none"
}}
onClick={() => {
this.setState({ currentTab: "expression" });
@@ -83,7 +84,7 @@ class LeftSideBar extends React.Component {
</div>
<div
style={{
height: 350,
height: this.props.responsive.height - this.metadataSectionPadding,
width: 400,
padding: 10,
overflowY: "auto",
+3 -1
View File
@@ -11,13 +11,15 @@ import cells from "./cells";
import expression from "./expression";
import controls from "./controls";
import differential from "./differential";
import responsive from "./responsive";
const Reducer = combineReducers({
initialize,
cells,
expression,
controls,
differential
differential,
responsive
});
let store = createStore(
+3 -3
View File
@@ -7,10 +7,10 @@ const Responsive = (
action
) => {
switch (action.type) {
case "resize event":
case "window resize":
return Object.assign({}, state, {
width: action.data,
height: action.data
width: action.data.width,
height: action.data.height
});
default:
return state;