fixed lint errors from stage zoom update

This commit is contained in:
Josiah Neuberger committed 2017-08-27 04:05:51 -04:00
1 parent 65ab58d9a6
commit 1e2240faff
4 files changed
+55 -52

No files matched your search

+23 -25
View File
@@ -11,26 +11,25 @@ import styles from './stage-header.css';
const StageHeaderComponent = function (props) {
const {
isZoomed,
onZoom,
onUnzoom,
width,
height,
vm,
className,
title,
titleZoomIcon,
height,
isZoomed,
onUnzoom,
onZoom,
titleZoomIcon,
vm,
width,
...componentProps
} = props;
return isZoomed === false ? (
<Box className={styles.stageHeaderWrapper}>
<Box
className={styles.stageMenuWrapper}
height={height}
className={styles.stageMenuWrapper}
height={height}
width={width}
>
>
<Controls vm={vm} />
<img
<img
className={classNames(
className,
styles.stageZoomIcon
@@ -44,11 +43,11 @@ const StageHeaderComponent = function (props) {
</Box>
) : (
<Box className={styles.stageHeaderWrapperOverlay}>
<Box
className={styles.stageMenuWrapper}
height={"100%"}
width={"100%"}
>
<Box
className={styles.stageMenuWrapper}
height={'100%'}
width={'100%'}
>
<Controls vm={vm} />
<img
className={classNames(
@@ -65,19 +64,18 @@ const StageHeaderComponent = function (props) {
);
};
StageHeaderComponent.propTypes = {
isZoomed: PropTypes.bool.isRequired,
onZoom: PropTypes.func.isRequired,
onUnzoom: PropTypes.func.isRequired,
height: PropTypes.number,
width: PropTypes.number,
className: PropTypes.string,
title: PropTypes.string,
titleZoomIcon: PropTypes.string
height: PropTypes.number,
isZoomed: PropTypes.bool.isRequired,
onUnzoom: PropTypes.func.isRequired,
onZoom: PropTypes.func.isRequired,
titleZoomIcon: PropTypes.string,
vm: PropTypes.instanceOf(VM).isRequired,
width: PropTypes.number
};
StageHeaderComponent.defaultProps = {
width: 480,
height: 360,
title: 'Stage Header',
titleZoomIcon: 'Zoom Control'
};
export default StageHeaderComponent;
+6 -6
View File
@@ -7,10 +7,10 @@ import styles from './stage.css';
const StageComponent = props => {
const {
isZoomed,
canvasRef,
width,
height,
isZoomed,
width,
...boxProps
} = props;
return isZoomed === false ? (
@@ -33,20 +33,20 @@ const StageComponent = props => {
className={styles.stage}
componentRef={canvasRef}
element="canvas"
height={"100%"}
width={"100%"}
height={'100%'}
width={'100%'}
{...boxProps}
/>
<Box className={styles.monitorWrapper}>
<MonitorList />
</Box>
</Box>
</Box>
);
};
StageComponent.propTypes = {
isZoomed: PropTypes.bool.isRequired,
canvasRef: PropTypes.func,
height: PropTypes.number,
isZoomed: PropTypes.bool.isRequired,
width: PropTypes.number
};
StageComponent.defaultProps = {
+10 -8
View File
@@ -19,16 +19,18 @@ class StageHeader extends React.Component {
};
}
shouldComponentUpdate (nextProps, nextState) {
return this.props.width !== nextProps.width || this.props.height !== nextProps.height || this.state.isZoomed !== nextState.isZoomed;
return this.props.width !== nextProps.width ||
this.props.height !== nextProps.height ||
this.state.isZoomed !== nextState.isZoomed;
}
handleZoom () {
this.setState({isZoomed: true});
this.props.dispatch({type: 'scratch-gui/Zoomed/SET_ZOOMED', isZoomed: true });
this.props.dispatch({type: 'scratch-gui/Zoomed/SET_ZOOMED', isZoomed: true});
}
handleUnzoom () {
this.setState({isZoomed: false});
this.props.dispatch({type: 'scratch-gui/Zoomed/SET_ZOOMED', isZoomed: false });
this.props.dispatch({type: 'scratch-gui/Zoomed/SET_ZOOMED', isZoomed: false});
}
render () {
const {
@@ -38,9 +40,9 @@ class StageHeader extends React.Component {
return (
<StageHeaderComponent
isZoomed={this.state.isZoomed}
onZoom={this.handleZoom}
vm={this.props.vm}
onUnzoom={this.handleUnzoom}
vm={this.props.vm}
onZoom={this.handleZoom}
{...props}
/>
);
@@ -48,9 +50,10 @@ class StageHeader extends React.Component {
}
StageHeader.propTypes = {
dispatch: PropTypes.func.isRequired,
height: PropTypes.number,
width: PropTypes.number,
vm: PropTypes.instanceOf(VM).isRequired
vm: PropTypes.instanceOf(VM).isRequired,
width: PropTypes.number
};
const mapStateToProps = state => ({
@@ -60,4 +63,3 @@ const mapStateToProps = state => ({
export default connect(
mapStateToProps
)(StageHeader);
+16 -13
View File
@@ -34,13 +34,6 @@ class Stage extends React.Component {
isZoomed: false
};
}
componentWillReceiveProps(nextProps) {
const {
isZoomed
} = nextProps;
this.setState({isZoomed: isZoomed});
}
componentDidMount () {
this.attachRectEvents();
this.attachMouseEvents(this.canvas);
@@ -48,12 +41,21 @@ class Stage extends React.Component {
this.renderer = new Renderer(this.canvas);
this.props.vm.attachRenderer(this.renderer);
}
shouldComponentUpdate (nextProps, nextState) {
return this.props.width !== nextProps.width || this.props.height !== nextProps.height || this.state.isZoomed !== nextState.isZoomed;
componentWillReceiveProps (nextProps) {
const {
isZoomed
} = nextProps;
this.setState({isZoomed: isZoomed});
}
componentDidUpdate() {
this.updateRect();
this.renderer.resize(this.rect.width, this.rect.height);
shouldComponentUpdate (nextProps, nextState) {
return this.props.width !== nextProps.width ||
this.props.height !== nextProps.height ||
this.state.isZoomed !== nextState.isZoomed;
}
componentDidUpdate () {
this.updateRect();
this.renderer.resize(this.rect.width, this.rect.height);
}
componentWillUnmount () {
this.detachMouseEvents(this.canvas);
@@ -209,8 +211,8 @@ class Stage extends React.Component {
} = this.props;
return (
<StageComponent
isZoomed={this.state.isZoomed}
canvasRef={this.setCanvas}
isZoomed={this.state.isZoomed}
onDoubleClick={this.handleDoubleClick}
{...props}
/>
@@ -220,6 +222,7 @@ class Stage extends React.Component {
Stage.propTypes = {
height: PropTypes.number,
isZoomed: PropTypes.bool,
vm: PropTypes.instanceOf(VM).isRequired,
width: PropTypes.number
};