Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

flatpicker for compare

kruzhambus4a5215291ff3
diff --git a/src/pages/Project/View/ViewProject.tsx b/src/pages/Project/View/ViewProject.tsx
index 2bfd3ee5c..42019dce7 100644
--- a/src/pages/Project/View/ViewProject.tsx
+++ b/src/pages/Project/View/ViewProject.tsx
@@ -185,6 +185,7 @@ const ViewProject = ({
const isLoading = authenticated ? _isLoading : false
const tnMapping = typeNameMapping(t)
const refCalendar = useRef(null)
+ const refCalendarCompare = useRef(null)
const localStorageDateRange = projectViewPrefs ? projectViewPrefs[id]?.rangeDate : null
const [dateRange, setDateRange] = useState<null | Date[]>(localStorageDateRange ? [new Date(localStorageDateRange[0]), new Date(localStorageDateRange[1])] : null)
const [activeTab, setActiveTab] = useState<string>(() => {
@@ -1706,7 +1707,7 @@ const ViewProject = ({
if (pair.period === PERIOD_PAIRS_COMPARE.CUSTOM) {
setTimeout(() => {
// @ts-ignore
- refCalendar.current.openCalendar()
+ refCalendarCompare.current.openCalendar()
}, 100)
} else {
setPeriodPairsCompare(tbPeriodPairsCompare(t))
@@ -1719,18 +1720,21 @@ const ViewProject = ({
)}
<FlatPicker
ref={refCalendar}
+ onChange={setDateRange}
+ value={dateRange || []}
+ maxDateMonths={MAX_MONTHS_IN_PAST}
+ maxRange={0}
+ />
+ <FlatPicker
+ ref={refCalendarCompare}
onChange={(date) => {
- if (isActiveCompare) {
- setDateRangeCompare(date)
- setActivePeriodCompare(PERIOD_PAIRS_COMPARE.CUSTOM)
- setPeriodPairsCompare(tbPeriodPairsCompare(t, date))
- } else {
- setDateRange(date)
- }
+ setDateRangeCompare(date)
+ setActivePeriodCompare(PERIOD_PAIRS_COMPARE.CUSTOM)
+ setPeriodPairsCompare(tbPeriodPairsCompare(t, date))
}}
- value={isActiveCompare ? dateRangeCompare || [] : dateRange || []}
+ value={dateRangeCompare || []}
maxDateMonths={MAX_MONTHS_IN_PAST}
- maxRange={isActiveCompare ? maxRangeCompare : 0}
+ maxRange={maxRangeCompare}
/>
</div>
</div>