mirror of
https://github.com/scratchfoundation/scratch-paint.git
synced 2024-12-23 05:52:42 -05:00
Add missing code for updating stroke color from eyedropper
This commit is contained in:
parent
21dc3a4b7f
commit
bdd70165c8
1 changed files with 11 additions and 1 deletions
|
@ -13,7 +13,8 @@ class StrokeColorIndicator extends React.Component {
|
|||
constructor (props) {
|
||||
super(props);
|
||||
bindAll(this, [
|
||||
'handleChangeStrokeColor'
|
||||
'handleChangeStrokeColor',
|
||||
'handleCloseStrokeColor'
|
||||
]);
|
||||
|
||||
// Flag to track whether an svg-update-worthy change has been made
|
||||
|
@ -33,11 +34,17 @@ class StrokeColorIndicator extends React.Component {
|
|||
this._hasChanged = this._hasChanged || isDifferent;
|
||||
this.props.onChangeStrokeColor(newColor);
|
||||
}
|
||||
handleCloseStrokeColor () {
|
||||
if (!this.props.isEyeDropping) {
|
||||
this.props.onCloseStrokeColor();
|
||||
}
|
||||
}
|
||||
render () {
|
||||
return (
|
||||
<StrokeColorIndicatorComponent
|
||||
{...this.props}
|
||||
onChangeStrokeColor={this.handleChangeStrokeColor}
|
||||
onCloseStrokeColor={this.handleCloseStrokeColor}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
@ -45,6 +52,7 @@ class StrokeColorIndicator extends React.Component {
|
|||
|
||||
const mapStateToProps = state => ({
|
||||
disabled: state.scratchPaint.mode === Modes.BRUSH,
|
||||
isEyeDropping: state.scratchPaint.color.eyeDropper.active,
|
||||
strokeColor: state.scratchPaint.color.strokeColor,
|
||||
strokeColorModalVisible: state.scratchPaint.modals.strokeColor
|
||||
});
|
||||
|
@ -63,7 +71,9 @@ const mapDispatchToProps = dispatch => ({
|
|||
|
||||
StrokeColorIndicator.propTypes = {
|
||||
disabled: PropTypes.bool.isRequired,
|
||||
isEyeDropping: PropTypes.bool.isRequired,
|
||||
onChangeStrokeColor: PropTypes.func.isRequired,
|
||||
onCloseStrokeColor: PropTypes.func.isRequired,
|
||||
onUpdateSvg: PropTypes.func.isRequired,
|
||||
strokeColor: PropTypes.string,
|
||||
strokeColorModalVisible: PropTypes.bool.isRequired
|
||||
|
|
Loading…
Reference in a new issue