Skip to content
Snippets Groups Projects
Commit cfdcb747 authored by Paul Rosenzweig's avatar Paul Rosenzweig
Browse files

use generic props override instead of just `title` and `onBack`

parent ca943f60
Branches jest-role-hidden
Tags
No related merge requests found
......@@ -10,7 +10,6 @@ export default function SidebarContent({
className,
icon,
title,
titleOverride,
color,
onBack,
onClose,
......@@ -23,9 +22,6 @@ export default function SidebarContent({
) : null,
children,
}) {
if (titleOverride) {
({ title, onBack } = titleOverride);
}
return (
<div className={cx(className, "flex flex-column justify-between")}>
<div className="scroll-y">
......
......@@ -6,10 +6,10 @@ import visualizations from "metabase/visualizations";
import SidebarContent from "metabase/query_builder/components/SidebarContent";
export default class ChartSettingsSidebar extends React.Component {
state = { isSidebarTitleHidden: false };
state = { sidebarPropsOverride: undefined };
setSidebarTitleOverride = sidebarTitleOverride =>
this.setState({ sidebarTitleOverride });
setSidebarPropsOverride = sidebarPropsOverride =>
this.setState({ sidebarPropsOverride });
render() {
const {
......@@ -21,7 +21,7 @@ export default class ChartSettingsSidebar extends React.Component {
onClose,
onOpenChartType,
} = this.props;
const { sidebarTitleOverride } = this.state;
const { sidebarPropsOverride } = this.state;
return (
result && (
<SidebarContent
......@@ -29,7 +29,7 @@ export default class ChartSettingsSidebar extends React.Component {
title={t`${visualizations.get(question.display()).uiName} options`}
onDone={onClose}
onBack={onOpenChartType}
titleOverride={sidebarTitleOverride}
{...sidebarPropsOverride || {}}
>
<ChartSettings
question={question}
......@@ -44,7 +44,7 @@ export default class ChartSettingsSidebar extends React.Component {
onClose={onClose}
noPreview
initial={initialChartSetting}
setSidebarTitleOverride={this.setSidebarTitleOverride}
setSidebarPropsOverride={this.setSidebarPropsOverride}
/>
</SidebarContent>
)
......
......@@ -141,7 +141,7 @@ class ChartSettings extends Component {
addField,
noPreview,
children,
setSidebarTitleOverride,
setSidebarPropsOverride,
} = this.props;
const { currentWidget } = this.state;
......@@ -214,7 +214,7 @@ class ChartSettings extends Component {
key={`${widget.id}`}
{...widget}
{...extraWidgetProps}
setSidebarTitleOverride={setSidebarTitleOverride}
setSidebarPropsOverride={setSidebarPropsOverride}
/>
));
......
......@@ -37,13 +37,13 @@ export default class ChartNestedSettingColumns extends React.Component {
class ColumnWidgets extends React.Component {
componentDidMount() {
const {
setSidebarTitleOverride,
setSidebarPropsOverride,
onChangeEditingObject,
object,
} = this.props;
if (setSidebarTitleOverride) {
setSidebarTitleOverride({
if (setSidebarPropsOverride) {
setSidebarPropsOverride({
title: displayNameForColumn(object),
onBack: () => onChangeEditingObject(),
});
......@@ -51,9 +51,9 @@ class ColumnWidgets extends React.Component {
}
componentWillUnmount() {
const { setSidebarTitleOverride } = this.props;
if (setSidebarTitleOverride) {
setSidebarTitleOverride(undefined);
const { setSidebarPropsOverride } = this.props;
if (setSidebarPropsOverride) {
setSidebarPropsOverride(undefined);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment