mirror of
https://github.com/apache/superset.git
synced 2026-05-12 11:25:56 +00:00
@@ -75,11 +75,10 @@ class ControlPanelsContainer extends React.Component {
|
||||
}
|
||||
// Applying mapStateToProps if needed
|
||||
if (mapF) {
|
||||
return Object.assign(
|
||||
{},
|
||||
control,
|
||||
mapF(this.props.exploreState, control, this.props.actions),
|
||||
);
|
||||
return {
|
||||
...control,
|
||||
...mapF(this.props.exploreState, control, this.props.actions),
|
||||
};
|
||||
}
|
||||
return control;
|
||||
}
|
||||
|
||||
@@ -418,13 +418,12 @@ function mapStateToProps(state) {
|
||||
}
|
||||
|
||||
function mapDispatchToProps(dispatch) {
|
||||
const actions = Object.assign(
|
||||
{},
|
||||
exploreActions,
|
||||
saveModalActions,
|
||||
chartActions,
|
||||
logActions,
|
||||
);
|
||||
const actions = {
|
||||
...exploreActions,
|
||||
...saveModalActions,
|
||||
...chartActions,
|
||||
...logActions,
|
||||
};
|
||||
return {
|
||||
actions: bindActionCreators(actions, dispatch),
|
||||
};
|
||||
|
||||
@@ -88,9 +88,10 @@ export default class ColorPickerControl extends React.Component {
|
||||
}
|
||||
render() {
|
||||
const c = this.props.value || { r: 0, g: 0, b: 0, a: 0 };
|
||||
const colStyle = Object.assign({}, styles.color, {
|
||||
const colStyle = {
|
||||
...styles.color,
|
||||
background: `rgba(${c.r}, ${c.g}, ${c.b}, ${c.a})`,
|
||||
});
|
||||
};
|
||||
return (
|
||||
<div>
|
||||
<ControlHeader {...this.props} />
|
||||
|
||||
Reference in New Issue
Block a user