diff --git a/assets/js/dashboard/comparison-input.js b/assets/js/dashboard/comparison-input.js index 23f74c2e9..e3d526c90 100644 --- a/assets/js/dashboard/comparison-input.js +++ b/assets/js/dashboard/comparison-input.js @@ -53,12 +53,10 @@ export const toggleComparisons = function(history, query, site) { } } -function DropdownItem({ label, value, isCurrentlySelected, updateMode, calendar }) { +function DropdownItem({ label, value, isCurrentlySelected, updateMode, setUiMode }) { const click = () => { if (value == "custom") { - // https://github.com/flatpickr/flatpickr/issues/399#issuecomment-260007013 - // FIXME: Use setState to prevent this issue - setTimeout(() => calendar.current.flatpickr.open(), 100) + setUiMode("datepicker") } else { updateMode(value) } @@ -104,6 +102,11 @@ const ComparisonInput = function({ site, query, history }) { const calendar = React.useRef(null) + const [uiMode, setUiMode] = React.useState("menu") + React.useEffect(() => { + if (uiMode == "datepicker" && calendar) calendar.current.flatpickr.open() + }, [uiMode]) + const flatpickrOptions = { mode: 'range', showMonths: 1, @@ -111,16 +114,14 @@ const ComparisonInput = function({ site, query, history }) { minDate: parseUTCDate(site.statsBegin), animate: true, static: true, - onChange: ([from, to]) => { + onClose: ([from, to], _dateStr, _instance) => { + setUiMode("menu") if (from && to) updateMode("custom", formatISO(from), formatISO(to)) } } return ( <> - - - vs.
@@ -138,9 +139,15 @@ const ComparisonInput = function({ site, query, history }) { leaveFrom="transform opacity-100 scale-100" leaveTo="transform opacity-0 scale-95"> - { Object.keys(COMPARISON_MODES).map((key) => DropdownItem({ label: COMPARISON_MODES[key], value: key, isCurrentlySelected: key == query.comparison, updateMode, calendar })) } + { Object.keys(COMPARISON_MODES).map((key) => DropdownItem({ label: COMPARISON_MODES[key], value: key, isCurrentlySelected: key == query.comparison, updateMode, setUiMode })) } + + { uiMode == "datepicker" && +
+ +
+ }