From b5b61d4466e1562f9977c9f1cd5c013e26e86adc Mon Sep 17 00:00:00 2001
From: Kyle Doherty <kdoh@users.noreply.github.com>
Date: Mon, 24 Feb 2020 08:31:51 -0800
Subject: [PATCH] fix selected state in single date widget (#11955)
DateSingleWidget wasn't explicitly setting itself to not be a range
picker nor were we checking that prop in the css class we applied which
resulted in an inconsistent selected state in the single date widget.
---
frontend/src/metabase/components/Calendar.jsx | 5 ++++-
.../parameters/components/widgets/DateSingleWidget.jsx | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/frontend/src/metabase/components/Calendar.jsx b/frontend/src/metabase/components/Calendar.jsx
index 74f363fd5a4..8886f8a3c6e 100644
--- a/frontend/src/metabase/components/Calendar.jsx
+++ b/frontend/src/metabase/components/Calendar.jsx
@@ -158,7 +158,10 @@ export default class Calendar extends Component {
return (
<div
className={cx("Calendar Grid-cell", {
- "Calendar--range": this.props.selected && this.props.selectedEnd,
+ "Calendar--range":
+ this.props.isRangePicker &&
+ this.props.selected &&
+ this.props.selectedEnd,
})}
>
{this.renderMonthHeader(current, side)}
diff --git a/frontend/src/metabase/parameters/components/widgets/DateSingleWidget.jsx b/frontend/src/metabase/parameters/components/widgets/DateSingleWidget.jsx
index 22458ce368e..158697ba4c8 100644
--- a/frontend/src/metabase/parameters/components/widgets/DateSingleWidget.jsx
+++ b/frontend/src/metabase/parameters/components/widgets/DateSingleWidget.jsx
@@ -11,6 +11,7 @@ const DateSingleWidget = ({ value, setValue, onClose }) => {
initial={value}
selected={value}
selectedEnd={value}
+ isRangePicker={false}
onChange={value => {
setValue(value);
onClose();
--
GitLab