Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Replace second line for filters with UI from segments variant D (#5022)
Artur Pata18ca43909015
diff --git a/assets/css/app.css b/assets/css/app.cssindex 7d294a1279..0e1401d092 100644--- a/assets/css/app.css+++ b/assets/css/app.css@@ -5,7 +5,7 @@@import './modal.css';@import './loader.css';@import './tooltip.css';-@import './flatpickr.css';+@import './flatpickr-colors.css';@import './chartjs.css';@import 'tailwindcss/components';@import 'tailwindcss/utilities';@@ -246,11 +246,6 @@ blockquote {transition: opacity 100ms ease-in;}-.flatpickr-calendar.static.open {- right: 2px;- top: 12px;-}-.datamaps-subunit {cursor: pointer;}diff --git a/assets/css/flatpickr.css b/assets/css/flatpickr-colors.csssimilarity index 88%rename from assets/css/flatpickr.cssrename to assets/css/flatpickr-colors.cssindex 3b15f7718d..44dbdf34c9 100644--- a/assets/css/flatpickr.css+++ b/assets/css/flatpickr-colors.css@@ -1,28 +1,6 @@/* @format *//* stylelint-disable media-feature-range-notation *//* stylelint-disable selector-class-pattern */-.flatpickr-calendar::before,-.flatpickr-calendar::after {- right: 22px !important;-}--.flatpickr-wrapper {- right: 35% !important;-}--@media (max-width: 768px) {- .flatpickr-wrapper {- right: 50% !important;- }-}--@media (max-width: 768px) {- .flatpickr-wrapper {- position: absolute !important;- right: 0 !important;- left: 0 !important;- }-}/* Because Flatpickr offers zero support for dynamic theming on its own (outside of third-party plugins) */.dark .flatpickr-calendar {diff --git a/assets/js/dashboard/components/dropdown.tsx b/assets/js/dashboard/components/dropdown.tsxdeleted file mode 100644index c3397211f1..0000000000--- a/assets/js/dashboard/components/dropdown.tsx+++ /dev/null@@ -1,150 +0,0 @@-/** @format */--import React, {- DetailedHTMLProps,- forwardRef,- HTMLAttributes,- ReactNode-} from 'react'-import { ChevronDownIcon } from '@heroicons/react/20/solid'-import classNames from 'classnames'-import { Transition } from '@headlessui/react'-import {- AppNavigationLink,- AppNavigationTarget-} from '../navigation/use-app-navigate'--export const ToggleDropdownButton = forwardRef<- HTMLDivElement,- {- variant?: 'ghost' | 'button'- withDropdownIndicator?: boolean- className?: string- currentOption: ReactNode- children: ReactNode- onClick: () => void- dropdownContainerProps: DetailedHTMLProps<- HTMLAttributes<HTMLButtonElement>,- HTMLButtonElement- >- }->(- (- {- className,- currentOption,- withDropdownIndicator,- children,- onClick,- dropdownContainerProps,- ...props- },- ref- ) => {- const { variant } = { variant: 'button', ...props }- const sharedButtonClass =- 'flex items-center rounded text-sm leading-tight px-2 py-2 h-9'-- const buttonClass = {- ghost:- 'text-gray-500 hover:text-gray-800 hover:bg-gray-200 dark:hover:text-gray-200 dark:hover:bg-gray-900',- button:- 'w-full justify-between bg-white dark:bg-gray-800 shadow text-gray-800 dark:text-gray-200 hover:bg-gray-200 dark:hover:bg-gray-900'- }[variant]-- return (- <div className={className} ref={ref}>- <button- onClick={onClick}- className={classNames(sharedButtonClass, buttonClass)}- tabIndex={0}- aria-haspopup="true"- {...dropdownContainerProps}- >- <span className="truncate block font-medium">{currentOption}</span>- {!!withDropdownIndicator && (- <ChevronDownIcon className="hidden lg:inline-block h-4 w-4 md:h-5 md:w-5 ml-1 md:ml-2 text-gray-500" />- )}- </button>- {children}- </div>- )- }-)--export const DropdownMenuWrapper = forwardRef<- HTMLDivElement,- { innerContainerClassName?: string; children: ReactNode } & DetailedHTMLProps<- HTMLAttributes<HTMLDivElement>,- HTMLDivElement- >->(({ children, className, innerContainerClassName, ...props }, ref) => {- return (- <div- ref={ref}- {...props}- className={classNames(- 'absolute left-0 right-0 mt-2 origin-top-right z-10',- className- )}- >- <Transition- as="div"- show={true}- appear={true}- enter="transition ease-out duration-100"- enterFrom="opacity-0 scale-95"- enterTo="opacity-100 scale-100"- leave="transition ease-in duration-75"- leaveFrom="opacity-100 scale-100"- leaveTo="opacity-0 scale-95"- className={classNames(- 'rounded-md shadow-lg bg-white dark:bg-gray-800 ring-1 ring-black ring-opacity-5 font-medium text-gray-800 dark:text-gray-200',- innerContainerClassName- )}- >- {children}- </Transition>- </div>- )-})--export const DropdownLinkGroup = ({- className,- children,- ...props-}: DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement>) => (- <div- {...props}- className={classNames(- className,- 'py-1 border-gray-200 dark:border-gray-500 border-b last:border-none'- )}- >- {children}- </div>-)--export const DropdownNavigationLink = ({- children,- active,- className,- ...props-}: AppNavigationTarget & {- active?: boolean- children: ReactNode- className?: string- onClick?: () => void-}) => (- <AppNavigationLink- {...props}- className={classNames(- className,- { 'font-bold': !!active },- 'flex items-center justify-between',- `px-4 py-2 text-sm leading-tight hover:bg-gray-100 hover:text-gray-900 dark:hover:bg-gray-900 dark:hover:text-gray-100`- )}- >- {children}- </AppNavigationLink>-)diff --git a/assets/js/dashboard/components/filter-operator-selector.js b/assets/js/dashboard/components/filter-operator-selector.jsindex a45c560e38..f9289d85d9 100644--- a/assets/js/dashboard/components/filter-operator-selector.js+++ b/assets/js/dashboard/components/filter-operator-selector.js@@ -1,6 +1,6 @@/** @format */-import React, { Fragment } from 'react'+import React, { Fragment, useRef } from 'react'import {FILTER_OPERATIONS,@@ -12,9 +12,11 @@ import {import { Menu, Transition } from '@headlessui/react'import { ChevronDownIcon } from '@heroicons/react/20/solid'import classNames from 'classnames'+import { BlurMenuButtonOnEscape } from '../keybinding'export default function FilterOperatorSelector(props) {const filterName = props.forFilter+ const buttonRef = useRef()function renderTypeItem(operation, shouldDisplay) {return (@@ -46,8 +48,12 @@ export default function FilterOperatorSelector(props) {<Menu as="div" className="relative inline-block text-left w-full">{({ open }) => (<>+ <BlurMenuButtonOnEscape targetRef={buttonRef} /><div className="w-full">- <Menu.Button className="inline-flex justify-between items-center w-full rounded-md border border-gray-300 dark:border-gray-500 shadow-sm px-4 py-2 bg-white dark:bg-gray-800 text-sm text-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-850 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 dark:focus:ring-offset-gray-900 focus:ring-indigo-500 text-left">+ <Menu.Button+ ref={buttonRef}+ className="inline-flex justify-between items-center w-full rounded-md border border-gray-300 dark:border-gray-500 shadow-sm px-4 py-2 bg-white dark:bg-gray-800 text-sm text-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-850 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 dark:focus:ring-offset-gray-900 focus:ring-indigo-500 text-left"+ >{FILTER_OPERATIONS_DISPLAY_NAMES[props.selectedType]}<ChevronDownIconclassName="-mr-2 ml-2 h-4 w-4 text-gray-500 dark:text-gray-400"diff --git a/assets/js/dashboard/components/popover.tsx b/assets/js/dashboard/components/popover.tsxnew file mode 100644index 0000000000..81a41811c6--- /dev/null+++ b/assets/js/dashboard/components/popover.tsx@@ -0,0 +1,67 @@+/** @format */+import { TransitionClasses } from '@headlessui/react'+import classNames from 'classnames'++const TRANSITION_CONFIG: TransitionClasses = {+ enter: 'transition ease-out duration-100',+ enterFrom: 'opacity-0 scale-95',+ enterTo: 'opacity-100 scale-100',+ leave: 'transition ease-in duration-75',+ leaveFrom: 'opacity-100 scale-100',+ leaveTo: 'opacity-0 scale-95'+}++const transition = {+ props: TRANSITION_CONFIG,+ classNames: { fullwidth: 'z-10 absolute left-0 right-0' }+}++const panel = {+ classNames: {+ roundedSheet:+ 'focus:outline-none rounded-md shadow-lg bg-white dark:bg-gray-800 ring-1 ring-black ring-opacity-5 font-medium text-gray-800 dark:text-gray-200'+ }+}++const toggleButton = {+ classNames: {+ rounded: 'flex items-center rounded text-sm leading-tight h-9',+ shadow:+ 'bg-white dark:bg-gray-800 shadow text-gray-800 dark:text-gray-200 hover:bg-gray-200 dark:hover:bg-gray-900',+ ghost:+ 'text-gray-500 hover:text-gray-800 hover:bg-gray-200 dark:hover:text-gray-200 dark:hover:bg-gray-900',+ truncatedText: 'truncate block font-medium'+ }+}++const items = {+ classNames: {+ navigationLink: classNames(+ 'flex items-center justify-between',+ 'px-4 py-2 text-sm leading-tight'+ ),+ selectedOption: classNames('data-[selected=true]:font-bold'),+ hoverLink: classNames(+ 'hover:bg-gray-100',+ 'hover:text-gray-900',+ 'dark:hover:bg-gray-900',+ 'dark:hover:text-gray-100',++ 'focus-within:bg-gray-100',+ 'focus-within:text-gray-900',+ 'dark:focus-within:bg-gray-900',+ 'dark:focus-within:text-gray-100'+ ),+ roundedStartEnd: classNames(+ 'first-of-type:rounded-t-md',+ 'last-of-type:rounded-b-md'+ )+ }+}++export const popover = {+ toggleButton,+ panel,+ transition,+ items+}diff --git a/assets/js/dashboard/components/search-input.tsx b/assets/js/dashboard/components/search-input.tsxindex 5c8cbc6551..1c7b6e8fbc 100644--- a/assets/js/dashboard/components/search-input.tsx+++ b/assets/js/dashboard/components/search-input.tsx@@ -43,14 +43,14 @@ export const SearchInput = ({type="keyup"handler={blurSearchBox}shouldIgnoreWhen={[isModifierPressed, () => !isFocused]}- target={searchBoxRef.current}+ targetRef={searchBoxRef}/><KeybindkeyboardKey="/"type="keyup"handler={focusSearchBox}shouldIgnoreWhen={[isModifierPressed, () => isFocused]}- target={document}+ targetRef="document"/><inputonBlur={() => setIsFocused(false)}diff --git a/assets/js/dashboard/date-range-calendar.tsx b/assets/js/dashboard/date-range-calendar.tsxdeleted file mode 100644index 76aeca4a76..0000000000--- a/assets/js/dashboard/date-range-calendar.tsx+++ /dev/null@@ -1,64 +0,0 @@-/* @format */-import React, { useEffect, useRef } from 'react'-import DatePicker from 'react-flatpickr'--export function DateRangeCalendar({- minDate,- maxDate,- defaultDates,- onCloseWithNoSelection,- onCloseWithSelection-}: {- minDate?: string- maxDate?: string- defaultDates?: [string, string]- onCloseWithNoSelection?: () => void- onCloseWithSelection?: ([selectionStart, selectionEnd]: [Date, Date]) => void-}) {- const calendarRef = useRef<DatePicker>(null)-- useEffect(() => {- const calendar = calendarRef.current- if (calendar) {- calendar.flatpickr.open()- }-- return () => {- calendar?.flatpickr?.destroy()- }- }, [])-- return (- <div className="h-0 w-0">- <DatePicker- id="calendar"- options={{- mode: 'range',- maxDate,- minDate,- defaultDate: defaultDates,- showMonths: 1,- static: true,- animate: true- }}- ref={calendarRef}- onClose={- onCloseWithSelection || onCloseWithNoSelection- ? ([selectionStart, selectionEnd]) => {- if (selectionStart && selectionEnd) {- if (onCloseWithSelection) {- onCloseWithSelection([selectionStart, selectionEnd])- }- } else {- if (onCloseWithNoSelection) {- onCloseWithNoSelection()- }- }- }- : undefined- }- className="invisible"- />- </div>- )-}diff --git a/assets/js/dashboard/datepicker.tsx b/assets/js/dashboard/datepicker.tsxdeleted file mode 100644index 913089100f..0000000000--- a/assets/js/dashboard/datepicker.tsx+++ /dev/null@@ -1,468 +0,0 @@-/* @format */-import React, { useState, useEffect, useRef, useCallback, useMemo } from 'react'-import { formatDateRange, formatISO, nowForSite } from './util/date'-import {- shiftQueryPeriod,- getDateForShiftedPeriod,- clearedComparisonSearch-} from './query'-import classNames from 'classnames'-import { useQueryContext } from './query-context'-import { useSiteContext } from './site-context'-import {- isModifierPressed,- isTyping,- Keybind,- KeybindHint,- NavigateKeybind-} from './keybinding'-import {- AppNavigationLink,- useAppNavigate-} from './navigation/use-app-navigate'-import { DateRangeCalendar } from './date-range-calendar'-import {- COMPARISON_DISABLED_PERIODS,- COMPARISON_MODES,- ComparisonMode,- DisplaySelectedPeriod,- getCompareLinkItem,- isComparisonEnabled,- getSearchToApplyCustomComparisonDates,- getSearchToApplyCustomDates,- QueryPeriod,- last6MonthsLinkItem,- getDatePeriodGroups,- LinkItem,- COMPARISON_MATCH_MODE_LABELS,- ComparisonMatchMode-} from './query-time-periods'-import { useOnClickOutside } from './util/use-on-click-outside'-import {- DropdownLinkGroup,- DropdownMenuWrapper,- DropdownNavigationLink,- ToggleDropdownButton-} from './components/dropdown'-import { useMatch } from 'react-router-dom'-import { rootRoute } from './router'--const ArrowKeybind = ({- keyboardKey-}: {- keyboardKey: 'ArrowLeft' | 'ArrowRight'-}) => {- const site = useSiteContext()- const { query } = useQueryContext()-- const search = useMemo(- () =>- shiftQueryPeriod({- query,- site,- direction: ({ ArrowLeft: -1, ArrowRight: 1 } as const)[keyboardKey],- keybindHint: keyboardKey- }),- [site, query, keyboardKey]- )-- return (- <NavigateKeybind- type="keydown"- keyboardKey={keyboardKey}- navigateProps={{ search }}- />- )-}--function ArrowIcon({ direction }: { direction: 'left' | 'right' }) {- return (- <svg- className="feather h-4 w-4"- xmlns="http://www.w3.org/2000/svg"- viewBox="0 0 24 24"- fill="none"- stroke="currentColor"- strokeWidth="2"- strokeLinecap="round"- strokeLinejoin="round"- >- {direction === 'left' && <polyline points="15 18 9 12 15 6"></polyline>}- {direction === 'right' && <polyline points="9 18 15 12 9 6"></polyline>}- </svg>- )-}--function MovePeriodArrows() {- const periodsWithArrows = [- QueryPeriod.year,- QueryPeriod.month,- QueryPeriod.day- ]- const { query } = useQueryContext()- const site = useSiteContext()- if (!periodsWithArrows.includes(query.period)) {- return null- }-- const canGoBack =- getDateForShiftedPeriod({ site, query, direction: -1 }) !== null- const canGoForward =- getDateForShiftedPeriod({ site, query, direction: 1 }) !== null-- const isComparing = isComparisonEnabled(query.comparison)-- const sharedClass = 'flex items-center px-1 sm:px-2 dark:text-gray-100'- const enabledClass = 'hover:bg-gray-100 dark:hover:bg-gray-900'- const disabledClass = 'bg-gray-300 dark:bg-gray-950 cursor-not-allowed'-- const containerClass = classNames(- 'rounded shadow bg-white mr-2 sm:mr-4 cursor-pointer dark:bg-gray-800',- {- 'hidden md:flex': isComparing,- flex: !isComparing- }- )-- return (- <div className={containerClass}>- <AppNavigationLink- className={classNames(- sharedClass,- 'rounded-l border-gray-300 dark:border-gray-500',- { [enabledClass]: canGoBack, [disabledClass]: !canGoBack }- )}- search={- canGoBack- ? shiftQueryPeriod({- site,- query,- direction: -1,- keybindHint: null- })- : (search) => search- }- >- <ArrowIcon direction="left" />- </AppNavigationLink>- <AppNavigationLink- className={classNames(sharedClass, {- [enabledClass]: canGoForward,- [disabledClass]: !canGoForward- })}- search={- canGoForward- ? shiftQueryPeriod({- site,- query,- direction: 1,- keybindHint: null- })- : (search) => search- }- >- <ArrowIcon direction="right" />- </AppNavigationLink>- </div>- )-}--function ComparisonMenu({- toggleCompareMenuCalendar-}: {- toggleCompareMenuCalendar: () => void-}) {- const { query } = useQueryContext()-- return (- <DropdownMenuWrapper- id="compare-menu"- data-testid="compare-menu"- className="md:left-auto md:w-56"- >- <DropdownLinkGroup>- {[- ComparisonMode.off,- ComparisonMode.previous_period,- ComparisonMode.year_over_year- ].map((comparisonMode) => (- <DropdownNavigationLink- key={comparisonMode}- active={query.comparison === comparisonMode}- search={(search) => ({- ...search,- ...clearedComparisonSearch,- comparison: comparisonMode- })}- >- {COMPARISON_MODES[comparisonMode]}- </DropdownNavigationLink>- ))}- <DropdownNavigationLink- active={query.comparison === ComparisonMode.custom}- search={(s) => s}- onClick={toggleCompareMenuCalendar}- >- {COMPARISON_MODES[ComparisonMode.custom]}- </DropdownNavigationLink>- </DropdownLinkGroup>- {query.comparison !== ComparisonMode.custom && (- <DropdownLinkGroup>- <DropdownNavigationLink- active={query.match_day_of_week === true}- search={(s) => ({ ...s, match_day_of_week: true })}- >- {COMPARISON_MATCH_MODE_LABELS[ComparisonMatchMode.MatchDayOfWeek]}- </DropdownNavigationLink>- <DropdownNavigationLink- active={query.match_day_of_week === false}- search={(s) => ({ ...s, match_day_of_week: false })}- >- {COMPARISON_MATCH_MODE_LABELS[ComparisonMatchMode.MatchExactDate]}- </DropdownNavigationLink>- </DropdownLinkGroup>- )}- </DropdownMenuWrapper>- )-}--function QueryPeriodsMenu({- groups,- closeMenu-}: {- groups: LinkItem[][]- closeMenu: () => void-}) {- const site = useSiteContext()- const { query } = useQueryContext()- return (- <DropdownMenuWrapper- id="datemenu"- data-testid="datemenu"- innerContainerClassName="date-options"- className="md:left-auto md:w-56"- >- {groups.map((group, index) => (- <DropdownLinkGroup key={index} className="date-options-group">- {group.map(- ([[label, keyboardKey], { search, isActive, onClick }]) => (- <DropdownNavigationLink- key={label}- active={isActive({ site, query })}- search={search}- onClick={onClick || closeMenu}- >- {label}- {!!keyboardKey && <KeybindHint>{keyboardKey}</KeybindHint>}- </DropdownNavigationLink>- )- )}- </DropdownLinkGroup>- ))}- </DropdownMenuWrapper>- )-}--export default function QueryPeriodPicker() {- const site = useSiteContext()- const { query } = useQueryContext()- const navigate = useAppNavigate()- const [menuVisible, setMenuVisible] = useState<- | 'datemenu'- | 'datemenu-calendar'- | 'compare-menu'- | 'compare-menu-calendar'- | null- >(null)- const dropdownRef = useRef<HTMLDivElement>(null)- const compareDropdownRef = useRef<HTMLDivElement>(null)-- const dashboardRouteMatch = useMatch(rootRoute.path)-- const closeMenu = useCallback(() => {- setMenuVisible(null)- }, [])-- const toggleDateMenu = useCallback(() => {- setMenuVisible((prevState) =>- prevState === 'datemenu' ? null : 'datemenu'- )- }, [])-- const toggleCompareMenu = useCallback(() => {- setMenuVisible((prevState) =>- prevState === 'compare-menu' ? null : 'compare-menu'- )- }, [])-- const toggleDateMenuCalendar = useCallback(() => {- setMenuVisible((prevState) =>- prevState === 'datemenu-calendar' ? null : 'datemenu-calendar'- )- }, [])-- const toggleCompareMenuCalendar = useCallback(() => {- setMenuVisible((prevState) =>- prevState === 'compare-menu-calendar' ? null : 'compare-menu-calendar'- )- }, [])-- const customRangeLink: LinkItem = useMemo(- () => [- ['Custom Range', 'C'],- {- search: (s) => s,- isActive: ({ query }) => query.period === QueryPeriod.custom,- onClick: toggleDateMenuCalendar- }- ],- [toggleDateMenuCalendar]- )- const compareLink: LinkItem = useMemo(- () => getCompareLinkItem({ site, query }),- [site, query]- )-- const datePeriodGroups = useMemo(() => {- const groups = getDatePeriodGroups(site)- // add Custom Range link to the last group- groups[groups.length - 1].push(customRangeLink)-- if (COMPARISON_DISABLED_PERIODS.includes(query.period)) {- return groups- }- // maybe add Compare link as another group to the very end- return groups.concat([[compareLink]])- }, [site, query, customRangeLink, compareLink])-- useOnClickOutside({- ref: dropdownRef,- active: menuVisible === 'datemenu',- handler: closeMenu- })-- useOnClickOutside({- ref: compareDropdownRef,- active: menuVisible === 'compare-menu',- handler: closeMenu- })-- useEffect(() => {- closeMenu()- }, [closeMenu, query])-- return (- <div className="flex ml-auto pl-2">- <MovePeriodArrows />- <ToggleDropdownButton- withDropdownIndicator- className="min-w-36 md:relative lg:w-48"- currentOption={<DisplaySelectedPeriod />}- ref={dropdownRef}- onClick={toggleDateMenu}- dropdownContainerProps={{- ['aria-controls']: 'datemenu',- ['aria-expanded']: menuVisible === 'datemenu'- }}- >- {menuVisible === 'datemenu' && (- <QueryPeriodsMenu groups={datePeriodGroups} closeMenu={closeMenu} />- )}- {menuVisible === 'datemenu-calendar' && (- <DateRangeCalendar- onCloseWithSelection={(selection) =>- navigate({ search: getSearchToApplyCustomDates(selection) })- }- minDate={site.statsBegin}- maxDate={formatISO(nowForSite(site))}- defaultDates={- query.to && query.from- ? [formatISO(query.from), formatISO(query.to)]- : undefined- }- />- )}- </ToggleDropdownButton>- {isComparisonEnabled(query.comparison) && (- <>- <div className="my-auto px-1 text-sm font-medium text-gray-800 dark:text-gray-200">- <span className="hidden md:inline px-1">vs.</span>- </div>- <ToggleDropdownButton- withDropdownIndicator- className="min-w-36 md:relative lg:w-48"- ref={compareDropdownRef}- currentOption={- query.comparison === ComparisonMode.custom &&- query.compare_from &&- query.compare_to- ? formatDateRange(site, query.compare_from, query.compare_to)- : COMPARISON_MODES[query.comparison]- }- onClick={toggleCompareMenu}- dropdownContainerProps={{- ['aria-controls']: 'compare-menu',- ['aria-expanded']: menuVisible === 'compare-menu'- }}- >- {menuVisible === 'compare-menu' && (- <ComparisonMenu- toggleCompareMenuCalendar={toggleCompareMenuCalendar}- />- )}- {menuVisible === 'compare-menu-calendar' && (- <DateRangeCalendar- onCloseWithSelection={(selection) =>- navigate({- search: getSearchToApplyCustomComparisonDates(selection)- })- }- minDate={site.statsBegin}- maxDate={formatISO(nowForSite(site))}- defaultDates={- query.compare_from && query.compare_to- ? [- formatISO(query.compare_from),- formatISO(query.compare_to)- ]- : undefined- }- />- )}- </ToggleDropdownButton>- </>- )}- {!!dashboardRouteMatch && (- <>- <ArrowKeybind keyboardKey="ArrowLeft" />- <ArrowKeybind keyboardKey="ArrowRight" />- {datePeriodGroups- .concat([[last6MonthsLinkItem]])- .flatMap((group) =>- group- .filter(([[_name, keyboardKey]]) => !!keyboardKey)- .map(([[_name, keyboardKey], { search, onClick, isActive }]) =>- onClick || isActive({ site, query }) ? (- <Keybind- key={keyboardKey}- keyboardKey={keyboardKey}- type="keydown"- handler={onClick || closeMenu}- shouldIgnoreWhen={[isModifierPressed, isTyping]}- target={document}- />- ) : (- <NavigateKeybind- key={keyboardKey}- keyboardKey={keyboardKey}- type="keydown"- navigateProps={{ search }}- />- )- )- )}- </>- )}- </div>- )-}diff --git a/assets/js/dashboard/filters.js b/assets/js/dashboard/filters.jsindex a0765e076d..31d5d56edd 100644--- a/assets/js/dashboard/filters.js+++ b/assets/js/dashboard/filters.js@@ -230,11 +230,11 @@ function Filters() {function renderDropDown() {return (- <Menu as="div" className="md:relative ml-auto">+ <Menu as="div" className="md:relative ml-auto shrink-0">{({ open }) => (<><div>- <Menu.Button onClick={trackFilterMenu} className="flex items-center text-xs md:text-sm font-medium leading-tight px-3 py-2 cursor-pointer ml-auto text-gray-500 dark:text-gray-200 hover:bg-gray-200 dark:hover:bg-gray-900 rounded">+ <Menu.Button onClick={trackFilterMenu} className="flex items-center text-xs md:text-sm font-medium leading-tight px-3 py-2 cursor-pointer ml-auto text-gray-500 dark:text-gray-200 hover:bg-gray-200 dark:hover:bg-gray-900 rounded whitespace-nowrap">{renderDropdownButton()}</Menu.Button></div>diff --git a/assets/js/dashboard/index.tsx b/assets/js/dashboard/index.tsxindex afa3fe356f..a815451243 100644--- a/assets/js/dashboard/index.tsx+++ b/assets/js/dashboard/index.tsx@@ -8,7 +8,6 @@ import Locations from './stats/locations'import Devices from './stats/devices'import { TopBar } from './nav-menu/top-bar'import Behaviours from './stats/behaviours'-import { FiltersBar } from './nav-menu/filters-bar'import { useQueryContext } from './query-context'import { isRealTimeDashboard } from './util/filters'@@ -61,10 +60,7 @@ function Dashboard() {return (<div className="mb-12">- <TopBar- showCurrentVisitors={!isRealTimeDashboard}- extraBar={<FiltersBar />}- />+ <TopBar showCurrentVisitors={!isRealTimeDashboard} /><DashboardStatsimportedDataInView={isRealTimeDashboard ? undefined : importedDataInViewdiff --git a/assets/js/dashboard/keybinding.tsx b/assets/js/dashboard/keybinding.tsxindex f2d6f111b7..52199ec27b 100644--- a/assets/js/dashboard/keybinding.tsx+++ b/assets/js/dashboard/keybinding.tsx@@ -1,5 +1,5 @@/* @format */-import React, { ReactNode, useCallback, useEffect } from 'react'+import React, { ReactNode, RefObject, useCallback, useEffect } from 'react'import {AppNavigationTarget,useAppNavigate@@ -65,7 +65,7 @@ type KeybindOptions = {type: KeyboardEventTypehandler: (event: KeyboardEvent) => voidshouldIgnoreWhen?: Array<(event: KeyboardEvent) => boolean>- target?: Document | HTMLElement | null+ targetRef?: 'document' | RefObject<HTMLElement> | null}function useKeybind({@@ -73,7 +73,7 @@ function useKeybind({type,handler,shouldIgnoreWhen = [],- target+ targetRef}: KeybindOptions) {const wrappedHandler = useCallback((event: KeyboardEvent) => {@@ -85,22 +85,23 @@ function useKeybind({) as EventListeneruseEffect(() => {+ const element = targetRef === 'document' ? document : targetRef?.currentconst registerKeybind = (t: HTMLElement | Document) =>t.addEventListener(type, wrappedHandler)const deregisterKeybind = (t: HTMLElement | Document) =>t.removeEventListener(type, wrappedHandler)- if (target) {- registerKeybind(target)+ if (element) {+ registerKeybind(element)}return () => {- if (target) {- deregisterKeybind(target)+ if (element) {+ deregisterKeybind(element)}}- }, [target, type, wrappedHandler])+ }, [targetRef, type, wrappedHandler])}export function Keybind(opts: KeybindOptions) {@@ -129,7 +130,7 @@ export function NavigateKeybind({type={type}handler={handler}shouldIgnoreWhen={[isModifierPressed, isTyping]}- target={document}+ targetRef="document"/>)}@@ -141,3 +142,32 @@ export function KeybindHint({ children }: { children: ReactNode }) {</kbd>)}++/**+ * Rendering this component captures the Escape key on targetRef.current,+ * blurring the element on Escape, and stopping the event from propagating.+ * Needed to prevent other Escape handlers that may exist from running.+ */+export function BlurMenuButtonOnEscape({+ targetRef: targetRef+}: {+ targetRef: RefObject<HTMLElement>+}) {+ return (+ <Keybind+ keyboardKey="Escape"+ type="keyup"+ handler={(event) => {+ const t = event.target as HTMLElement | null+ if (typeof t?.blur === 'function') {+ if (t === targetRef.current) {+ t.blur()+ event.stopPropagation()+ }+ }+ }}+ targetRef={targetRef}+ shouldIgnoreWhen={[isModifierPressed, isTyping]}+ />+ )+}diff --git a/assets/js/dashboard/nav-menu/filter-menu.tsx b/assets/js/dashboard/nav-menu/filter-menu.tsxindex 63bc7cd67b..6b88f6605a 100644--- a/assets/js/dashboard/nav-menu/filter-menu.tsx+++ b/assets/js/dashboard/nav-menu/filter-menu.tsx@@ -1,83 +1,119 @@/** @format */-import React, { useMemo, useRef, useState } from 'react'-import {- DropdownLinkGroup,- DropdownMenuWrapper,- DropdownNavigationLink,- ToggleDropdownButton-} from '../components/dropdown'-import { MagnifyingGlassIcon } from '@heroicons/react/20/solid'+import React, { useMemo, useRef } from 'react'import {FILTER_MODAL_TO_FILTER_GROUP,formatFilterGroup} from '../util/filters'import { PlausibleSite, useSiteContext } from '../site-context'import { filterRoute } from '../router'-import { useOnClickOutside } from '../util/use-on-click-outside'+import { PlusIcon } from '@heroicons/react/20/solid'+import { Popover, Transition } from '@headlessui/react'+import { popover } from '../components/popover'+import classNames from 'classnames'+import { AppNavigationLink } from '../navigation/use-app-navigate'+import { BlurMenuButtonOnEscape } from '../keybinding'export function getFilterListItems({propsAvailable-}: Pick<PlausibleSite, 'propsAvailable'>): {- modalKey: string- label: string-}[] {- const allKeys = Object.keys(FILTER_MODAL_TO_FILTER_GROUP) as Array<- keyof typeof FILTER_MODAL_TO_FILTER_GROUP- >- const keysToOmit: Array<keyof typeof FILTER_MODAL_TO_FILTER_GROUP> =- propsAvailable ? [] : ['props']- return allKeys- .filter((k) => !keysToOmit.includes(k))- .map((modalKey) => ({ modalKey, label: formatFilterGroup(modalKey) }))+}: Pick<PlausibleSite, 'propsAvailable'>): Array<+ Array<{+ title: string+ modals: Array<false | keyof typeof FILTER_MODAL_TO_FILTER_GROUP>+ }>+> {+ return [+ [+ {+ title: 'URL',+ modals: ['page', 'hostname']+ },+ {+ title: 'Acquisition',+ modals: ['source', 'utm']+ }+ ],+ [+ {+ title: 'Device',+ modals: ['location', 'screen', 'browser', 'os']+ },+ {+ title: 'Behaviour',+ modals: ['goal', !!propsAvailable && 'props']+ }+ ]+ ]}-export const FilterMenu = () => {- const dropdownRef = useRef<HTMLDivElement>(null)- const [opened, setOpened] = useState(false)+const FilterMenuItems = ({ closeDropdown }: { closeDropdown: () => void }) => {const site = useSiteContext()- const filterListItems = useMemo(() => getFilterListItems(site), [site])-- useOnClickOutside({- ref: dropdownRef,- active: opened,- handler: () => setOpened(false)- })-+ const columns = useMemo(() => getFilterListItems(site), [site])+ const buttonRef = useRef<HTMLButtonElement>(null)return (- <ToggleDropdownButton- ref={dropdownRef}- variant="ghost"- className="ml-auto md:relative"- dropdownContainerProps={{- ['aria-controls']: 'filter-menu',- ['aria-expanded']: opened- }}- onClick={() => setOpened((opened) => !opened)}- currentOption={- <span className="flex items-center">- <MagnifyingGlassIcon className="block h-4 w-4" />- <span className="block ml-1">Filter</span>+ <>+ <BlurMenuButtonOnEscape targetRef={buttonRef} />+ <Popover.Button+ ref={buttonRef}+ className={classNames(+ popover.toggleButton.classNames.rounded,+ popover.toggleButton.classNames.ghost,+ 'justify-center gap-1 px-3'+ )}+ >+ <PlusIcon className="block h-4 w-4" />+ <span className={popover.toggleButton.classNames.truncatedText}>+ Add filter</span>- }- >- {opened && (- <DropdownMenuWrapper id="filter-menu" className="md:left-auto md:w-56">- <DropdownLinkGroup>- {filterListItems.map(({ modalKey, label }) => (- <DropdownNavigationLink- active={false}- key={modalKey}- path={filterRoute.path}- params={{ field: modalKey }}- search={(search) => search}- >- {label}- </DropdownNavigationLink>- ))}- </DropdownLinkGroup>- </DropdownMenuWrapper>- )}- </ToggleDropdownButton>+ </Popover.Button>+ <Transition+ {...popover.transition.props}+ className={classNames(+ 'mt-2',+ popover.transition.classNames.fullwidth,+ 'md:left-auto md:w-80'+ )}+ >+ <Popover.Panel+ className={classNames(popover.panel.classNames.roundedSheet, 'flex')}+ >+ {columns.map((filterGroups, index) => (+ <div key={index} className="flex flex-col w-1/2">+ {filterGroups.map(({ title, modals }) => (+ <div key={title}>+ <div className="text-xs pb-1 px-4 pt-2 font-bold uppercase text-indigo-500 dark:text-indigo-400">+ {title}+ </div>+ {modals+ .filter((m) => !!m)+ .map((modalKey) => (+ <AppNavigationLink+ className={classNames(+ popover.items.classNames.navigationLink,+ popover.items.classNames.hoverLink,+ 'text-xs'+ )}+ onClick={() => closeDropdown()}+ key={modalKey}+ path={filterRoute.path}+ params={{ field: modalKey }}+ search={(s) => s}+ >+ {formatFilterGroup(modalKey)}+ </AppNavigationLink>+ ))}+ </div>+ ))}+ </div>+ ))}+ </Popover.Panel>+ </Transition>+ </>)}++export const FilterMenu = () => (+ <Popover className="shrink-0 md:relative">+ {({ close }) => <FilterMenuItems closeDropdown={close} />}+ </Popover>+)diff --git a/assets/js/dashboard/nav-menu/filter-pill.tsx b/assets/js/dashboard/nav-menu/filter-pill.tsxindex 20ac38e654..690477a44d 100644--- a/assets/js/dashboard/nav-menu/filter-pill.tsx+++ b/assets/js/dashboard/nav-menu/filter-pill.tsx@@ -1,24 +1,41 @@/** @format */import React, { ReactNode } from 'react'-import { AppNavigationLink } from '../navigation/use-app-navigate'-import { filterRoute } from '../router'+import {+ AppNavigationLink,+ AppNavigationTarget+} from '../navigation/use-app-navigate'import { XMarkIcon } from '@heroicons/react/20/solid'import classNames from 'classnames'+export type FilterPillProps = {+ className?: string+ plainText: string+ interactive:+ | {+ onRemoveClick?: () => void+ navigationTarget: AppNavigationTarget+ }+ | false+ children: ReactNode+ actions?: ReactNode+}++const PillContent = ({ children }: { children?: ReactNode }) => (+ <span className="inline-block max-w-2xs md:max-w-xs truncate">+ {children}+ </span>+)+export function FilterPill({className,plainText,children,- modalToOpen,- onRemoveClick-}: {- className?: string- plainText: string- modalToOpen: string- children: ReactNode- onRemoveClick: () => void-}) {+ interactive,+ actions+}: FilterPillProps) {+ const contentClassName = 'flex w-full h-full items-center py-2 pl-3 last:pr-3'+return (<divclassName={classNames(@@ -26,24 +43,34 @@ export function FilterPill({className)}>- <AppNavigationLink- title={`Edit filter: ${plainText}`}- className="flex w-full h-full items-center py-2 pl-3"- path={filterRoute.path}- params={{ field: modalToOpen }}- search={(search) => search}- >- <span className="inline-block max-w-2xs md:max-w-xs truncate">- {children}- </span>- </AppNavigationLink>- <button- title={`Remove filter: ${plainText}`}- className="flex items-center h-full px-2 mr-1 cursor-pointer hover:text-indigo-700 dark:hover:text-indigo-500 "- onClick={() => onRemoveClick()}- >- <XMarkIcon className="w-4 h-4" />- </button>+ {interactive ? (+ <>+ <AppNavigationLink+ className={contentClassName}+ title={`Edit filter: ${plainText}`}+ {...interactive.navigationTarget}+ >+ <PillContent>{children}</PillContent>+ </AppNavigationLink>+ {!!interactive.onRemoveClick && (+ <button+ title={`Remove filter: ${plainText}`}+ className="flex items-center h-full px-2 mr-1 cursor-pointer hover:text-indigo-700 dark:hover:text-indigo-500 "+ onClick={interactive.onRemoveClick}+ >+ <XMarkIcon className="w-4 h-4" />+ </button>+ )}+ {actions}+ </>+ ) : (+ <>+ <div className={contentClassName} title={plainText}>+ <PillContent>{children}</PillContent>+ </div>+ {actions}+ </>+ )}</div>)}diff --git a/assets/js/dashboard/nav-menu/filter-pills-list.tsx b/assets/js/dashboard/nav-menu/filter-pills-list.tsxindex a6c21758e4..d501b290d0 100644--- a/assets/js/dashboard/nav-menu/filter-pills-list.tsx+++ b/assets/js/dashboard/nav-menu/filter-pills-list.tsx@@ -2,7 +2,7 @@import React, { DetailedHTMLProps, HTMLAttributes } from 'react'import { useQueryContext } from '../query-context'-import { FilterPill } from './filter-pill'+import { FilterPill, FilterPillProps } from './filter-pill'import {cleanLabels,EVENT_PROPS_PREFIX,@@ -11,28 +11,40 @@ import {import { styledFilterText, plainFilterText } from '../util/filter-text'import { useAppNavigate } from '../navigation/use-app-navigate'import classNames from 'classnames'+import { filterRoute } from '../router'-export const PILL_X_GAP = 16-export const PILL_Y_GAP = 8+export const PILL_X_GAP_PX = 16+export const PILL_Y_GAP_PX = 8-/** Restricts output to slice of DashboardQuery['filters'], or makes the output outside the slice invisible */-type Slice = {+type SliceStartEnd = {/** The beginning index of the specified portion of the array. If start is undefined, then the slice begins at index 0. */start?: number/** The end index of the specified portion of the array. This is exclusive of the element at the index 'end'. If end is undefined, then the slice extends to the end of the array. */end?: number- /** Determines if it renders the elements outside the slice with invisible or doesn't render the elements at all */- type: 'hide-outside' | 'no-render-outside'}-type FilterPillsProps = {+type InvisibleOutsideSlice = {+ type: 'invisible-outside'+} & SliceStartEnd++type NoRenderOutsideSlice = {+ type: 'no-render-outside'+} & SliceStartEnd++type AppliedFilterPillsListProps = Omit<+ FilterPillsListProps,+ 'slice' | 'pillProps' | 'pills'+> & { slice?: InvisibleOutsideSlice | NoRenderOutsideSlice }++type FilterPillsListProps = {direction: 'horizontal' | 'vertical'- slice?: Slice-} & DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement>+} & DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement> & {+ pills: FilterPillProps[]+ }-export const FilterPillsList = React.forwardRef<+export const AppliedFilterPillsList = React.forwardRef<HTMLDivElement,- FilterPillsProps+ AppliedFilterPillsListProps>(({ className, style, slice, direction }, ref) => {const { query } = useQueryContext()const navigate = useAppNavigate()@@ -46,50 +58,82 @@ export const FilterPillsList = React.forwardRef<slice?.type === 'no-render-outside' ? (slice.start ?? 0) : 0const isInvisible = (index: number) => {- return slice?.type === 'hide-outside'+ return slice?.type === 'invisible-outside'? index < (slice.start ?? 0) ||index > (slice.end ?? query.filters.length) - 1: false}return (- <div- ref={ref}- className={classNames(- 'flex',- {- 'flex-row': direction === 'horizontal',- 'flex-col items-start': direction === 'vertical'- },- className- )}- style={{ columnGap: PILL_X_GAP, rowGap: PILL_Y_GAP, ...style }}- >- {renderableFilters.map((filter, index) => (- <FilterPill- className={classNames(isInvisible(index) && 'invisible')}- modalToOpen={- FILTER_GROUP_TO_MODAL_TYPE[- filter[1].startsWith(EVENT_PROPS_PREFIX) ? 'props' : filter[1]- ]- }- plainText={plainFilterText(query, filter)}- key={index}- onRemoveClick={() =>+ <FilterPillsList+ pills={renderableFilters.map((filter, index) => ({+ className: classNames(isInvisible(index) && 'invisible'),+ plainText: plainFilterText(query, filter),+ children: styledFilterText(query, filter),+ interactive: {+ navigationTarget: {+ path: filterRoute.path,+ search: (s) => s,+ params: {+ field:+ FILTER_GROUP_TO_MODAL_TYPE[+ filter[1].startsWith(EVENT_PROPS_PREFIX) ? 'props' : filter[1]+ ]+ }+ },+ onRemoveClick: () => {+ const newFilters = query.filters.filter(+ (_, i) => i !== index + indexAdjustment+ )+navigate({search: (search) => ({...search,- filters: query.filters.filter(- (_, i) => i !== index + indexAdjustment- ),- labels: cleanLabels(query.filters, query.labels)+ filters: newFilters,+ labels: cleanLabels(newFilters, query.labels)})})}- >- {styledFilterText(query, filter)}- </FilterPill>- ))}+ }+ }))}+ className={className}+ style={style}+ ref={ref}+ direction={direction}+ />+ )+})++export const FilterPillsList = React.forwardRef<+ HTMLDivElement,+ FilterPillsListProps+>(({ className, style, direction, pills }, ref) => {+ // this padding allows pill dropshadows to be visible+ // even when overflow:hidden is given to pill parent container+ // box-content guarantees width given as style to apply to available space+ const innerClassName = 'p-1 box-content'+ // this hides the padding of the inner component to ease placement+ const wrapperClassName = '-m-1'+ return (+ <div className={wrapperClassName}>+ <div+ ref={ref}+ className={classNames(+ 'flex',+ {+ 'flex-row': direction === 'horizontal',+ 'flex-col items-start': direction === 'vertical'+ },+ innerClassName,+ className+ )}+ // gaps given as style to be able to use their numeric values in calculations+ style={{ columnGap: PILL_X_GAP_PX, rowGap: PILL_Y_GAP_PX, ...style }}+ >+ {pills.map((options, index) => (+ <FilterPill key={index} {...options} />+ ))}+ </div></div>)})diff --git a/assets/js/dashboard/nav-menu/filters-bar.test.tsx b/assets/js/dashboard/nav-menu/filters-bar.test.tsxindex 13c99786a3..f9bae645f7 100644--- a/assets/js/dashboard/nav-menu/filters-bar.test.tsx+++ b/assets/js/dashboard/nav-menu/filters-bar.test.tsx@@ -14,11 +14,9 @@ beforeAll(() => {const mockResizeObserver = jest.fn((handleEntries) =>({- observe: jest- .fn()- .mockImplementation((entry) =>- handleEntries([entry], null as unknown as ResizeObserver)- ),+ observe: jest.fn().mockImplementation((entry) => {+ handleEntries([entry], null as unknown as ResizeObserver)+ }),unobserve: jest.fn(),disconnect: jest.fn()}) as unknown as ResizeObserver@@ -37,15 +35,39 @@ test('user can see expected filters and clear them one by one or all together',}const startUrl = `${getRouterBasepath({ domain, shared: false })}${stringifySearch(searchRecord)}`- render(<FiltersBar />, {- wrapper: (props) => (- <TestContextProviders- routerProps={{ initialEntries: [startUrl] }}- siteOptions={{ domain }}- {...props}- />- )- })+ render(+ <FiltersBar+ accessors={{+ topBar: jest.fn(+ () =>+ ({+ getBoundingClientRect: jest.fn().mockReturnValue(600)+ }) as unknown as HTMLElement+ ),+ leftSection: jest.fn(+ () =>+ ({+ getBoundingClientRect: jest.fn().mockReturnValue(200)+ }) as unknown as HTMLElement+ ),+ rightSection: jest.fn(+ () =>+ ({+ getBoundingClientRect: jest.fn().mockReturnValue(300)+ }) as unknown as HTMLElement+ )+ }}+ />,+ {+ wrapper: (props) => (+ <TestContextProviders+ routerProps={{ initialEntries: [startUrl] }}+ siteOptions={{ domain }}+ {...props}+ />+ )+ }+ )const queryFilterPills = () =>screen.queryAllByRole('link', { hidden: false, name: /.* is .*/i })@@ -56,7 +78,7 @@ test('user can see expected filters and clear them one by one or all together',await userEvent.click(screen.getByRole('button', {hidden: false,- name: 'Show rest of the filters'+ name: 'See more'}))@@ -90,10 +112,8 @@ describe(`${handleVisibility.name}`, () => {const setVisibility = jest.fn()const input = {setVisibility,- topBarWidth: 1000,- actionsWidth: 100,- seeMorePresent: false,- seeMoreWidth: 50,+ leftoverWidth: 1000,+ seeMoreWidth: 100,pillWidths: [200, 200, 200, 200],pillGap: 25}@@ -105,9 +125,7 @@ describe(`${handleVisibility.name}`, () => {})handleVisibility({- ...input,- seeMorePresent: true,- actionsWidth: input.actionsWidth + input.seeMoreWidth+ ...input})expect(setVisibility).toHaveBeenCalledTimes(2)expect(setVisibility).toHaveBeenLastCalledWith({@@ -115,7 +133,7 @@ describe(`${handleVisibility.name}`, () => {visibleCount: 4})- handleVisibility({ ...input, topBarWidth: 999 })+ handleVisibility({ ...input, leftoverWidth: 999 })expect(setVisibility).toHaveBeenCalledTimes(3)expect(setVisibility).toHaveBeenLastCalledWith({width: 675,@@ -123,19 +141,34 @@ describe(`${handleVisibility.name}`, () => {})})- it('can shrink to 0 width', () => {+ it('handles 1 filter correctly', () => {const setVisibility = jest.fn()const input = {setVisibility,- topBarWidth: 300,- actionsWidth: 100,- seeMorePresent: true,+ leftoverWidth: 300,seeMoreWidth: 50,pillWidths: [250],pillGap: 25}handleVisibility(input)expect(setVisibility).toHaveBeenCalledTimes(1)+ expect(setVisibility).toHaveBeenLastCalledWith({+ width: 275,+ visibleCount: 1+ })+ })++ it('handles 2 filters correctly, shrinking to 0 width', () => {+ const setVisibility = jest.fn()+ const input = {+ setVisibility,+ leftoverWidth: 300,+ seeMoreWidth: 50,+ pillWidths: [250, 200],+ pillGap: 25+ }+ handleVisibility(input)+ expect(setVisibility).toHaveBeenCalledTimes(1)expect(setVisibility).toHaveBeenLastCalledWith({width: 0,visibleCount: 0diff --git a/assets/js/dashboard/nav-menu/filters-bar.tsx b/assets/js/dashboard/nav-menu/filters-bar.tsxindex e0f48e3426..27155605af 100644--- a/assets/js/dashboard/nav-menu/filters-bar.tsx+++ b/assets/js/dashboard/nav-menu/filters-bar.tsx@@ -1,38 +1,39 @@/** @format */-import { EllipsisHorizontalIcon, XMarkIcon } from '@heroicons/react/20/solid'+import { EllipsisHorizontalIcon } from '@heroicons/react/24/solid'import classNames from 'classnames'-import React, { useRef, useState, useLayoutEffect, useEffect } from 'react'-import { AppNavigationLink } from '../navigation/use-app-navigate'-import { useOnClickOutside } from '../util/use-on-click-outside'-import {- DropdownMenuWrapper,- ToggleDropdownButton-} from '../components/dropdown'-import { FilterPillsList, PILL_X_GAP } from './filter-pills-list'+import React, { useRef, useState, useLayoutEffect } from 'react'+import { AppliedFilterPillsList, PILL_X_GAP_PX } from './filter-pills-list'import { useQueryContext } from '../query-context'--const SEE_MORE_GAP_PX = 16+import { AppNavigationLink } from '../navigation/use-app-navigate'+import { Popover, Transition } from '@headlessui/react'+import { popover } from '../components/popover'+import { BlurMenuButtonOnEscape } from '../keybinding'++// Component structure is+// `..[ filter (x) ]..[ filter (x) ]..[ three dot menu ]..`+// where `..` represents an ideally equal length.+// The following calculations guarantee that.+const BUFFER_RIGHT_PX = 16 - PILL_X_GAP_PX+const BUFFER_LEFT_PX = 16const SEE_MORE_WIDTH_PX = 36+const SEE_MORE_RIGHT_MARGIN_PX = PILL_X_GAP_PX+const SEE_MORE_LEFT_MARGIN_PX = 0export const handleVisibility = ({setVisibility,- topBarWidth,- actionsWidth,- seeMorePresent,+ leftoverWidth,seeMoreWidth,pillWidths,pillGap}: {setVisibility: (v: VisibilityState) => void- topBarWidth: number | null- actionsWidth: number | null+ leftoverWidth: number | nullpillWidths: (number | null)[] | null- seeMorePresent: booleanseeMoreWidth: numberpillGap: number}): void => {- if (topBarWidth === null || actionsWidth === null || pillWidths === null) {+ if (leftoverWidth === null || pillWidths === null) {return}@@ -52,22 +53,14 @@ export const handleVisibility = ({return { visibleCount, lastValidWidth }}- const fits = fitToWidth(topBarWidth - actionsWidth)+ const fits = fitToWidth(leftoverWidth)- // Check if possible to fit one more if "See more" is removed- if (seeMorePresent && fits.visibleCount === pillWidths.length - 1) {- const maybeFitsMore = fitToWidth(topBarWidth - actionsWidth + seeMoreWidth)- if (maybeFitsMore.visibleCount === pillWidths.length) {- return setVisibility({- width: maybeFitsMore.lastValidWidth,- visibleCount: maybeFitsMore.visibleCount- })- }- }+ const seeMoreWillBePresent =+ fits.visibleCount < pillWidths.length || pillWidths.length > 1// Check if the appearance of "See more" would cause overflow- if (!seeMorePresent && fits.visibleCount < pillWidths.length) {- const maybeFitsLess = fitToWidth(topBarWidth - actionsWidth - seeMoreWidth)+ if (seeMoreWillBePresent) {+ const maybeFitsLess = fitToWidth(leftoverWidth - seeMoreWidth)if (maybeFitsLess.visibleCount < fits.visibleCount) {return setVisibility({width: maybeFitsLess.lastValidWidth,@@ -82,137 +75,173 @@ export const handleVisibility = ({})}-const getElementWidthOrNull = <T extends HTMLElement>(element: T | null) =>- element === null ? null : element.getBoundingClientRect().width+const getElementWidthOrNull = <+ T extends Pick<HTMLElement, 'getBoundingClientRect'>+>(+ element: T | null+) => (element === null ? null : element.getBoundingClientRect().width)type VisibilityState = {width: numbervisibleCount: number}-export const FiltersBar = () => {+type ElementAccessor = (+ filtersBarElement: HTMLElement | null+) => HTMLElement | null | undefined++/**+ * The accessors are paths to other elements that FiltersBar needs to measure:+ * they depend on the structure of the parent and are thus passed as props.+ * Passing these with refs would be more reactive, but the main layout effect+ * didn't trigger then as expected.+ */+interface FiltersBarProps {+ accessors: {+ topBar: ElementAccessor+ leftSection: ElementAccessor+ rightSection: ElementAccessor+ }+}++export const FiltersBar = ({ accessors }: FiltersBarProps) => {const containerRef = useRef<HTMLDivElement>(null)const pillsRef = useRef<HTMLDivElement>(null)- const actionsRef = useRef<HTMLDivElement>(null)- const seeMoreRef = useRef<HTMLDivElement>(null)const [visibility, setVisibility] = useState<null | VisibilityState>(null)const { query } = useQueryContext()-- const [opened, setOpened] = useState(false)-- useEffect(() => {- if (visibility?.visibleCount === query.filters.length) {- setOpened(false)- }- }, [visibility?.visibleCount, query.filters.length])-- useOnClickOutside({- ref: seeMoreRef,- active: opened,- handler: () => setOpened(false)- })+ const seeMoreRef = useRef<HTMLButtonElement>(null)useLayoutEffect(() => {- const resizeObserver = new ResizeObserver((_entries) => {+ const topBar = accessors.topBar(containerRef.current)+ const leftSection = accessors.leftSection(containerRef.current)+ const rightSection = accessors.rightSection(containerRef.current)++ const resizeObserver = new ResizeObserver(() => {const pillWidths = pillsRef.current? Array.from(pillsRef.current.children).map((el) =>- getElementWidthOrNull(el as HTMLElement)+ getElementWidthOrNull(el)): nullhandleVisibility({setVisibility,pillWidths,- pillGap: PILL_X_GAP,- topBarWidth: getElementWidthOrNull(containerRef.current),- actionsWidth: getElementWidthOrNull(actionsRef.current),- seeMorePresent: !!seeMoreRef.current,- seeMoreWidth: SEE_MORE_WIDTH_PX + SEE_MORE_GAP_PX+ pillGap: PILL_X_GAP_PX,+ leftoverWidth:+ topBar && leftSection && rightSection+ ? getElementWidthOrNull(topBar)! -+ getElementWidthOrNull(leftSection)! -+ getElementWidthOrNull(rightSection)! -+ BUFFER_LEFT_PX -+ BUFFER_RIGHT_PX+ : null,+ seeMoreWidth:+ SEE_MORE_LEFT_MARGIN_PX + SEE_MORE_WIDTH_PX + SEE_MORE_RIGHT_MARGIN_PX})})- if (containerRef.current) {- resizeObserver.observe(containerRef.current)+ if (containerRef.current && topBar) {+ resizeObserver.observe(topBar)}return () => {resizeObserver.disconnect()}- }, [query.filters])+ }, [accessors, query.filters])if (!query.filters.length) {- return null+ // functions as spacer between elements.leftSection and elements.rightSection+ return <div className="w-4" />}+ const canClear = query.filters.length > 1+return (<div+ style={{ paddingRight: BUFFER_RIGHT_PX, paddingLeft: BUFFER_LEFT_PX }}className={classNames(- 'flex w-full mt-4',+ 'flex w-full items-center',visibility === null && 'invisible' // hide until we've calculated the positions)}ref={containerRef}>- <FilterPillsList- ref={pillsRef}- direction="horizontal"- slice={{- type: 'hide-outside',- start: 0,- end: visibility?.visibleCount- }}- className="pb-1 overflow-hidden"- style={{ width: visibility?.width ?? '100%' }}- />- <div className="flex items-center gap-x-4 pb-1" ref={actionsRef}>- {visibility !== null &&- visibility.visibleCount !== query.filters.length && (- <ToggleDropdownButton- className={classNames('w-9 md:relative')}+ <div className="flex items-center">+ <AppliedFilterPillsList+ ref={pillsRef}+ direction="horizontal"+ slice={{+ type: 'invisible-outside',+ start: 0,+ end: visibility?.visibleCount+ }}+ className="overflow-hidden"+ style={{ width: visibility?.width ?? 0 }}+ />+ </div>+ {visibility !== null &&+ (query.filters.length !== visibility.visibleCount || canClear) && (+ <Popover className="md:relative">+ <BlurMenuButtonOnEscape targetRef={seeMoreRef} />+ <Popover.Button+ title="See more"ref={seeMoreRef}- dropdownContainerProps={{- ['title']: opened- ? 'Hide rest of the filters'- : 'Show rest of the filters',- ['aria-controls']: 'more-filters-menu',- ['aria-expanded']: opened+ className={classNames(+ popover.toggleButton.classNames.rounded,+ popover.toggleButton.classNames.shadow,+ 'justify-center'+ )}+ style={{+ height: SEE_MORE_WIDTH_PX,+ width: SEE_MORE_WIDTH_PX,+ marginLeft: SEE_MORE_LEFT_MARGIN_PX,+ marginRight: SEE_MORE_RIGHT_MARGIN_PX}}- onClick={() => setOpened((opened) => !opened)}- currentOption={- <EllipsisHorizontalIcon className="h-full w-full" />- }>- {opened && typeof visibility.visibleCount === 'number' ? (- <DropdownMenuWrapper- id={'more-filters-menu'}- className="md:left-auto md:w-auto"- innerContainerClassName="p-4"- >- <FilterPillsList+ <EllipsisHorizontalIcon className="block h-5 w-5" />+ </Popover.Button>+ <Transition+ {...popover.transition.props}+ className={classNames(+ 'mt-2',+ popover.transition.classNames.fullwidth,+ 'md:right-auto'+ )}+ >+ <Popover.Panel+ className={classNames(+ popover.panel.classNames.roundedSheet,+ 'flex flex-col p-4 gap-y-2'+ )}+ >+ {query.filters.length !== visibility.visibleCount && (+ <AppliedFilterPillsListdirection="vertical"slice={{type: 'no-render-outside',start: visibility.visibleCount}}/>- </DropdownMenuWrapper>- ) : null}- </ToggleDropdownButton>- )}- <ClearAction />- </div>+ )}+ {canClear && <ClearAction />}+ </Popover.Panel>+ </Transition>+ </Popover>+ )}</div>)}-export const ClearAction = () => (+const ClearAction = () => (<AppNavigationLinktitle="Clear all filters"- className="w-9 text-gray-500 hover:text-indigo-700 dark:hover:text-indigo-500 flex items-center justify-center"+ className={classNames(+ 'self-start button h-9 !px-3 !py-2 flex !bg-red-500 dark:!bg-red-500 hover:!bg-red-600 dark:hover:!bg-red-700 whitespace-nowrap'+ )}search={(search) => ({...search,filters: null,labels: null})}>- <XMarkIcon className="w-4 h-4" />+ Clear all filters</AppNavigationLink>)diff --git a/assets/js/dashboard/nav-menu/query-periods/comparison-period-menu.tsx b/assets/js/dashboard/nav-menu/query-periods/comparison-period-menu.tsxnew file mode 100644index 0000000000..1cdb7143b2--- /dev/null+++ b/assets/js/dashboard/nav-menu/query-periods/comparison-period-menu.tsx@@ -0,0 +1,179 @@+/** @format */++import React, { useRef } from 'react'+import { clearedComparisonSearch } from '../../query'+import classNames from 'classnames'+import { useQueryContext } from '../../query-context'+import { useSiteContext } from '../../site-context'+import { BlurMenuButtonOnEscape } from '../../keybinding'+import {+ AppNavigationLink,+ useAppNavigate+} from '../../navigation/use-app-navigate'+import {+ COMPARISON_MODES,+ ComparisonMode,+ isComparisonEnabled,+ COMPARISON_MATCH_MODE_LABELS,+ ComparisonMatchMode,+ getCurrentComparisonPeriodDisplayName,+ getSearchToApplyCustomComparisonDates+} from '../../query-time-periods'+import { Popover, Transition } from '@headlessui/react'+import { popover } from '../../components/popover'+import {+ datemenuButtonClassName,+ DateMenuChevron,+ PopoverMenuProps,+ linkClassName,+ MenuSeparator,+ CalendarPanel,+ hiddenCalendarButtonClassName+} from './shared-menu-items'+import { DateRangeCalendar } from './date-range-calendar'+import { formatISO, nowForSite } from '../../util/date'++export const ComparisonPeriodMenuItems = ({+ closeDropdown,+ toggleCalendar+}: {+ closeDropdown: () => void+ toggleCalendar: () => void+}) => {+ const { query } = useQueryContext()++ if (!isComparisonEnabled(query.comparison)) {+ return null+ }++ return (+ <Transition+ {...popover.transition.props}+ className={classNames(+ 'mt-2',+ popover.transition.classNames.fullwidth,+ 'md:left-auto md:w-56'+ )}+ >+ <Popover.Panel className={popover.panel.classNames.roundedSheet}>+ {[+ ComparisonMode.off,+ ComparisonMode.previous_period,+ ComparisonMode.year_over_year+ ].map((comparisonMode) => (+ <AppNavigationLink+ key={comparisonMode}+ data-selected={query.comparison === comparisonMode}+ className={linkClassName}+ search={(search) => ({+ ...search,+ ...clearedComparisonSearch,+ comparison: comparisonMode+ })}+ onClick={closeDropdown}+ >+ {COMPARISON_MODES[comparisonMode]}+ </AppNavigationLink>+ ))}+ <AppNavigationLink+ data-selected={query.comparison === ComparisonMode.custom}+ className={linkClassName}+ search={(s) => s}+ onClick={toggleCalendar}+ >+ {COMPARISON_MODES[ComparisonMode.custom]}+ </AppNavigationLink>+ {query.comparison !== ComparisonMode.custom && (+ <>+ <MenuSeparator />+ <AppNavigationLink+ data-selected={query.match_day_of_week === true}+ className={linkClassName}+ search={(s) => ({ ...s, match_day_of_week: true })}+ onClick={closeDropdown}+ >+ {COMPARISON_MATCH_MODE_LABELS[ComparisonMatchMode.MatchDayOfWeek]}+ </AppNavigationLink>+ <AppNavigationLink+ data-selected={query.match_day_of_week === false}+ className={linkClassName}+ search={(s) => ({ ...s, match_day_of_week: false })}+ onClick={closeDropdown}+ >+ {COMPARISON_MATCH_MODE_LABELS[ComparisonMatchMode.MatchExactDate]}+ </AppNavigationLink>+ </>+ )}+ </Popover.Panel>+ </Transition>+ )+}++export const ComparisonPeriodMenu = ({+ calendarButtonRef,+ closeDropdown+}: PopoverMenuProps) => {+ const site = useSiteContext()+ const { query } = useQueryContext()++ const buttonRef = useRef<HTMLButtonElement>(null)+ const toggleCalendar = () => {+ if (typeof calendarButtonRef.current?.click === 'function') {+ calendarButtonRef.current.click()+ }+ }++ return (+ <>+ <BlurMenuButtonOnEscape targetRef={buttonRef} />+ <Popover.Button className={datemenuButtonClassName} ref={buttonRef}>+ <span className={popover.toggleButton.classNames.truncatedText}>+ {getCurrentComparisonPeriodDisplayName({ site, query })}+ </span>+ <DateMenuChevron />+ </Popover.Button>+ <ComparisonPeriodMenuItems+ closeDropdown={closeDropdown}+ toggleCalendar={toggleCalendar}+ />+ </>+ )+}++export const ComparisonCalendarMenu = ({+ closeDropdown,+ calendarButtonRef+}: PopoverMenuProps) => {+ const site = useSiteContext()+ const navigate = useAppNavigate()+ const { query } = useQueryContext()++ return (+ <>+ <BlurMenuButtonOnEscape targetRef={calendarButtonRef} />+ <Popover.Button+ className={hiddenCalendarButtonClassName}+ tabIndex={-1}+ ref={calendarButtonRef}+ />+ <CalendarPanel className="mt-2">+ <DateRangeCalendar+ id="calendar"+ onCloseWithSelection={(selection) => {+ navigate({+ search: getSearchToApplyCustomComparisonDates(selection)+ })+ closeDropdown()+ }}+ minDate={site.statsBegin}+ maxDate={formatISO(nowForSite(site))}+ defaultDates={+ query.compare_from && query.compare_to+ ? [formatISO(query.compare_from), formatISO(query.compare_to)]+ : undefined+ }+ />+ </CalendarPanel>+ </>+ )+}diff --git a/assets/js/dashboard/date-range-calendar.test.tsx b/assets/js/dashboard/nav-menu/query-periods/date-range-calendar.test.tsxsimilarity index 99%rename from assets/js/dashboard/date-range-calendar.test.tsxrename to assets/js/dashboard/nav-menu/query-periods/date-range-calendar.test.tsxindex 0511d96327..bb33ed3e2c 100644--- a/assets/js/dashboard/date-range-calendar.test.tsx+++ b/assets/js/dashboard/nav-menu/query-periods/date-range-calendar.test.tsx@@ -12,6 +12,7 @@ test('renders with default dates in view, respects max and min dates', async ()render(<DateRangeCalendar+ id="calendar"minDate="2024-09-10"maxDate="2024-09-25"defaultDates={['2024-09-12', '2024-09-19']}diff --git a/assets/js/dashboard/nav-menu/query-periods/date-range-calendar.tsx b/assets/js/dashboard/nav-menu/query-periods/date-range-calendar.tsxnew file mode 100644index 0000000000..88be90ea10--- /dev/null+++ b/assets/js/dashboard/nav-menu/query-periods/date-range-calendar.tsx@@ -0,0 +1,65 @@+/* @format */+import React, { useLayoutEffect, useRef } from 'react'+import DatePicker from 'react-flatpickr'++export interface DateRangeCalendarProps {+ id: string+ minDate?: string+ maxDate?: string+ defaultDates?: [string, string]+ onCloseWithNoSelection?: () => void+ onCloseWithSelection?: ([selectionStart, selectionEnd]: [Date, Date]) => void+}++export function DateRangeCalendar({+ id,+ minDate,+ maxDate,+ defaultDates,+ onCloseWithNoSelection,+ onCloseWithSelection+}: DateRangeCalendarProps) {+ const hideInputFieldClassName = '!invisible !h-0 !w-0 !p-0 !m-0 !border-0'+ const calendarRef = useRef<DatePicker>(null)+ useLayoutEffect(() => {+ // on Safari, this removes little arrow pointing to (hidden) input,+ // which didn't appear with other browsers+ calendarRef.current?.flatpickr?.calendarContainer?.classList.remove(+ 'arrowTop',+ 'arrowBottom',+ 'arrowLeft',+ 'arrowRight'+ )+ }, [])+ return (+ <DatePicker+ ref={calendarRef}+ className={hideInputFieldClassName}+ id={id}+ options={{+ animate: false,+ inline: true,+ mode: 'range',+ maxDate,+ minDate,+ defaultDate: defaultDates,+ showMonths: 1+ }}+ onClose={+ onCloseWithSelection || onCloseWithNoSelection+ ? ([selectionStart, selectionEnd]) => {+ if (selectionStart && selectionEnd) {+ if (onCloseWithSelection) {+ onCloseWithSelection([selectionStart, selectionEnd])+ }+ } else {+ if (onCloseWithNoSelection) {+ onCloseWithNoSelection()+ }+ }+ }+ : undefined+ }+ />+ )+}diff --git a/assets/js/dashboard/nav-menu/query-periods/move-period-arrows.tsx b/assets/js/dashboard/nav-menu/query-periods/move-period-arrows.tsxnew file mode 100644index 0000000000..3fda3fe013--- /dev/null+++ b/assets/js/dashboard/nav-menu/query-periods/move-period-arrows.tsx@@ -0,0 +1,130 @@+/* @format */+import React, { useMemo } from 'react'+import { shiftQueryPeriod, getDateForShiftedPeriod } from '../../query'+import classNames from 'classnames'+import { useQueryContext } from '../../query-context'+import { useSiteContext } from '../../site-context'+import { NavigateKeybind } from '../../keybinding'+import { AppNavigationLink } from '../../navigation/use-app-navigate'+import { QueryPeriod } from '../../query-time-periods'+import { useMatch } from 'react-router-dom'+import { rootRoute } from '../../router'++const ArrowKeybind = ({+ keyboardKey+}: {+ keyboardKey: 'ArrowLeft' | 'ArrowRight'+}) => {+ const site = useSiteContext()+ const { query } = useQueryContext()++ const search = useMemo(+ () =>+ shiftQueryPeriod({+ query,+ site,+ direction: ({ ArrowLeft: -1, ArrowRight: 1 } as const)[keyboardKey],+ keybindHint: keyboardKey+ }),+ [site, query, keyboardKey]+ )++ return (+ <NavigateKeybind+ type="keydown"+ keyboardKey={keyboardKey}+ navigateProps={{ search }}+ />+ )+}++function ArrowIcon({ direction }: { direction: 'left' | 'right' }) {+ return (+ <svg+ className="feather h-4 w-4"+ xmlns="http://www.w3.org/2000/svg"+ viewBox="0 0 24 24"+ fill="none"+ stroke="currentColor"+ strokeWidth="2"+ strokeLinecap="round"+ strokeLinejoin="round"+ >+ {direction === 'left' && <polyline points="15 18 9 12 15 6"></polyline>}+ {direction === 'right' && <polyline points="9 18 15 12 9 6"></polyline>}+ </svg>+ )+}++export function MovePeriodArrows({ className }: { className?: string }) {+ const periodsWithArrows = [+ QueryPeriod.year,+ QueryPeriod.month,+ QueryPeriod.day+ ]+ const { query } = useQueryContext()+ const site = useSiteContext()+ const dashboardRouteMatch = useMatch(rootRoute.path)++ if (!periodsWithArrows.includes(query.period)) {+ return null+ }++ const canGoBack =+ getDateForShiftedPeriod({ site, query, direction: -1 }) !== null+ const canGoForward =+ getDateForShiftedPeriod({ site, query, direction: 1 }) !== null++ const sharedClass = 'flex items-center px-1 sm:px-2 dark:text-gray-100'+ const enabledClass = 'hover:bg-gray-100 dark:hover:bg-gray-900'+ const disabledClass = 'bg-gray-300 dark:bg-gray-950 cursor-not-allowed'++ return (+ <div+ className={classNames(+ 'flex rounded shadow bg-white mr-2 sm:mr-4 cursor-pointer dark:bg-gray-800',+ className+ )}+ >+ <AppNavigationLink+ className={classNames(+ sharedClass,+ 'rounded-l border-gray-300 dark:border-gray-500',+ { [enabledClass]: canGoBack, [disabledClass]: !canGoBack }+ )}+ search={+ canGoBack+ ? shiftQueryPeriod({+ site,+ query,+ direction: -1,+ keybindHint: null+ })+ : (search) => search+ }+ >+ <ArrowIcon direction="left" />+ </AppNavigationLink>+ <AppNavigationLink+ className={classNames(sharedClass, {+ [enabledClass]: canGoForward,+ [disabledClass]: !canGoForward+ })}+ search={+ canGoForward+ ? shiftQueryPeriod({+ site,+ query,+ direction: 1,+ keybindHint: null+ })+ : (search) => search+ }+ >+ <ArrowIcon direction="right" />+ </AppNavigationLink>+ {!!dashboardRouteMatch && <ArrowKeybind keyboardKey="ArrowLeft" />}+ {!!dashboardRouteMatch && <ArrowKeybind keyboardKey="ArrowRight" />}+ </div>+ )+}diff --git a/assets/js/dashboard/query-dates.test.tsx b/assets/js/dashboard/nav-menu/query-periods/query-dates.test.tsxsimilarity index 91%rename from assets/js/dashboard/query-dates.test.tsxrename to assets/js/dashboard/nav-menu/query-periods/query-dates.test.tsxindex 234f96693b..ee0581259c 100644--- a/assets/js/dashboard/query-dates.test.tsx+++ b/assets/js/dashboard/nav-menu/query-periods/query-dates.test.tsx@@ -3,18 +3,18 @@import React from 'react'import { render, screen } from '@testing-library/react'import userEvent from '@testing-library/user-event'-import DatePicker from './datepicker'-import { TestContextProviders } from '../../test-utils/app-context-providers'-import { stringifySearch } from './util/url-search-params'+import { TestContextProviders } from '../../../../test-utils/app-context-providers'+import { stringifySearch } from '../../util/url-search-params'import { useNavigate } from 'react-router-dom'-import { getRouterBasepath } from './router'+import { getRouterBasepath } from '../../router'+import { QueryPeriodsPicker } from './query-periods-picker'const domain = 'picking-query-dates.test'const periodStorageKey = `period__${domain}`test('if no period is stored, loads with default value of "Last 30 days", all expected options are present', async () => {expect(localStorage.getItem(periodStorageKey)).toBe(null)- render(<DatePicker />, {+ render(<QueryPeriodsPicker />, {wrapper: (props) => (<TestContextProviders siteOptions={{ domain }} {...props} />)@@ -42,7 +42,7 @@ test('if no period is stored, loads with default value of "Last 30 days", all ex})test('user can select a new period and its value is stored', async () => {- render(<DatePicker />, {+ render(<QueryPeriodsPicker />, {wrapper: (props) => (<TestContextProviders siteOptions={{ domain }} {...props} />)@@ -58,7 +58,7 @@ test('user can select a new period and its value is stored', async () => {test('period "all" is respected, and Compare option is not present for it in menu', async () => {localStorage.setItem(periodStorageKey, 'all')- render(<DatePicker />, {+ render(<QueryPeriodsPicker />, {wrapper: (props) => (<TestContextProviders siteOptions={{ domain }} {...props} />)@@ -78,7 +78,7 @@ test.each([async (searchRecord, buttonText) => {const startUrl = `${getRouterBasepath({ domain, shared: false })}${stringifySearch(searchRecord)}`- render(<DatePicker />, {+ render(<QueryPeriodsPicker />, {wrapper: (props) => (<TestContextProviderssiteOptions={{ domain }}@@ -104,7 +104,7 @@ test.each([async (searchRecord, buttonText) => {const startUrl = `${getRouterBasepath({ domain, shared: false })}${stringifySearch(searchRecord)}`- render(<DatePicker />, {+ render(<QueryPeriodsPicker />, {wrapper: (props) => (<TestContextProviderssiteOptions={{ domain }}@@ -127,7 +127,7 @@ test.each([localStorage.setItem(periodStorageKey, storedPeriod)const startUrl = `${getRouterBasepath({ domain, shared: false })}${stringifySearch({ period: queryPeriod })}`- render(<DatePicker />, {+ render(<QueryPeriodsPicker />, {wrapper: (props) => (<TestContextProviderssiteOptions={{ domain, shared: false }}@@ -154,7 +154,7 @@ test('going back resets the stored query period to previous value', async () =>}render(<>- <DatePicker />+ <QueryPeriodsPicker /><BrowserBackButton /></>,{diff --git a/assets/js/dashboard/nav-menu/query-periods/query-period-menu.tsx b/assets/js/dashboard/nav-menu/query-periods/query-period-menu.tsxnew file mode 100644index 0000000000..3f188438ce--- /dev/null+++ b/assets/js/dashboard/nav-menu/query-periods/query-period-menu.tsx@@ -0,0 +1,223 @@+/** @format */++import React, { useMemo, useRef } from 'react'+import classNames from 'classnames'+import { useQueryContext } from '../../query-context'+import { useSiteContext } from '../../site-context'+import {+ BlurMenuButtonOnEscape,+ isModifierPressed,+ isTyping,+ Keybind,+ KeybindHint+} from '../../keybinding'+import {+ AppNavigationLink,+ useAppNavigate+} from '../../navigation/use-app-navigate'+import {+ COMPARISON_DISABLED_PERIODS,+ getCompareLinkItem,+ last6MonthsLinkItem,+ getDatePeriodGroups,+ LinkItem,+ QueryPeriod,+ getCurrentPeriodDisplayName,+ getSearchToApplyCustomDates+} from '../../query-time-periods'+import { useMatch } from 'react-router-dom'+import { rootRoute } from '../../router'+import { Popover, Transition } from '@headlessui/react'+import { popover } from '../../components/popover'+import {+ datemenuButtonClassName,+ DateMenuChevron,+ PopoverMenuProps,+ linkClassName,+ MenuSeparator,+ CalendarPanel,+ hiddenCalendarButtonClassName+} from './shared-menu-items'+import { DateRangeCalendar } from './date-range-calendar'+import { formatISO, nowForSite } from '../../util/date'++function QueryPeriodMenuKeybinds({+ closeDropdown,+ groups+}: {+ groups: LinkItem[][]+ closeDropdown: () => void+}) {+ const dashboardRouteMatch = useMatch(rootRoute.path)+ const navigate = useAppNavigate()++ if (!dashboardRouteMatch) {+ return null+ }+ return (+ <>+ {groups.concat([[last6MonthsLinkItem]]).flatMap((group) =>+ group+ .filter(([[_name, keyboardKey]]) => !!keyboardKey)+ .map(([[_name, keyboardKey], { search, onEvent }]) => (+ <Keybind+ key={keyboardKey}+ keyboardKey={keyboardKey}+ type="keydown"+ handler={(e) => {+ if (typeof search === 'function') {+ navigate({ search })+ }+ if (typeof onEvent === 'function') {+ onEvent(e)+ } else {+ closeDropdown()+ }+ }}+ shouldIgnoreWhen={[isModifierPressed, isTyping]}+ targetRef="document"+ />+ ))+ )}+ </>+ )+}++export const QueryPeriodMenu = ({+ closeDropdown,+ calendarButtonRef+}: PopoverMenuProps) => {+ const site = useSiteContext()+ const { query } = useQueryContext()+ const buttonRef = useRef<HTMLButtonElement>(null)+ const toggleCalendar = () => {+ if (typeof calendarButtonRef.current?.click === 'function') {+ calendarButtonRef.current.click()+ }+ }++ return (+ <>+ <BlurMenuButtonOnEscape targetRef={buttonRef} />+ <Popover.Button ref={buttonRef} className={datemenuButtonClassName}>+ <span className={popover.toggleButton.classNames.truncatedText}>+ {getCurrentPeriodDisplayName({ query, site })}+ </span>+ <DateMenuChevron />+ </Popover.Button>+ <QueryPeriodMenuInner+ toggleCalendar={toggleCalendar}+ closeDropdown={closeDropdown}+ />+ </>+ )+}++const QueryPeriodMenuInner = ({+ closeDropdown,+ toggleCalendar+}: {+ closeDropdown: () => void+ toggleCalendar: () => void+}) => {+ const site = useSiteContext()+ const { query } = useQueryContext()++ const groups = useMemo(() => {+ const compareLink = getCompareLinkItem({ site, query })+ return getDatePeriodGroups({+ site,+ onEvent: closeDropdown,+ extraItemsInLastGroup: [+ [+ ['Custom Range', 'C'],+ {+ search: (s) => s,+ isActive: ({ query }) => query.period === QueryPeriod.custom,+ onEvent: toggleCalendar+ }+ ]+ ],+ extraGroups: COMPARISON_DISABLED_PERIODS.includes(query.period)+ ? []+ : [[compareLink]]+ })+ }, [site, query, closeDropdown, toggleCalendar])++ return (+ <>+ <QueryPeriodMenuKeybinds closeDropdown={closeDropdown} groups={groups} />+ <Transition+ {...popover.transition.props}+ className={classNames(+ 'mt-2',+ popover.transition.classNames.fullwidth,+ 'md:left-auto md:w-56'+ )}+ >+ <Popover.Panel+ className={popover.panel.classNames.roundedSheet}+ data-testid="datemenu"+ >+ {groups.map((group, index) => (+ <React.Fragment key={index}>+ {group.map(+ ([[label, keyboardKey], { search, isActive, onEvent }]) => (+ <AppNavigationLink+ key={label}+ data-selected={isActive({ site, query })}+ className={linkClassName}+ search={search}+ onClick={onEvent && ((e) => onEvent(e))}+ >+ {label}+ {!!keyboardKey && <KeybindHint>{keyboardKey}</KeybindHint>}+ </AppNavigationLink>+ )+ )}+ {index < groups.length - 1 && <MenuSeparator />}+ </React.Fragment>+ ))}+ </Popover.Panel>+ </Transition>+ </>+ )+}++export const MainCalendar = ({+ closeDropdown,+ calendarButtonRef+}: PopoverMenuProps) => {+ const site = useSiteContext()+ const { query } = useQueryContext()+ const navigate = useAppNavigate()++ return (+ <>+ <BlurMenuButtonOnEscape targetRef={calendarButtonRef} />+ <Popover.Button+ className={hiddenCalendarButtonClassName}+ tabIndex={-1}+ ref={calendarButtonRef}+ />+ <CalendarPanel className="mt-2">+ <DateRangeCalendar+ id="calendar"+ onCloseWithSelection={(selection) => {+ navigate({+ search: getSearchToApplyCustomDates(selection)+ })+ closeDropdown()+ }}+ minDate={site.statsBegin}+ maxDate={formatISO(nowForSite(site))}+ defaultDates={+ query.from && query.to+ ? [formatISO(query.from), formatISO(query.to)]+ : undefined+ }+ />+ </CalendarPanel>+ </>+ )+}diff --git a/assets/js/dashboard/nav-menu/query-periods/query-periods-picker.tsx b/assets/js/dashboard/nav-menu/query-periods/query-periods-picker.tsxnew file mode 100644index 0000000000..12f69b9912--- /dev/null+++ b/assets/js/dashboard/nav-menu/query-periods/query-periods-picker.tsx@@ -0,0 +1,65 @@+/** @format */++import React, { useRef } from 'react'+import classNames from 'classnames'+import { useQueryContext } from '../../query-context'+import { isComparisonEnabled } from '../../query-time-periods'+import { MovePeriodArrows } from './move-period-arrows'+import { MainCalendar, QueryPeriodMenu } from './query-period-menu'+import {+ ComparisonCalendarMenu,+ ComparisonPeriodMenu+} from './comparison-period-menu'+import { Popover } from '@headlessui/react'++export function QueryPeriodsPicker({ className }: { className?: string }) {+ const { query } = useQueryContext()+ const isComparing = isComparisonEnabled(query.comparison)+ const mainCalendarButtonRef = useRef<HTMLButtonElement>(null)+ const compareCalendarButtonRef = useRef<HTMLButtonElement>(null)++ return (+ <div className={classNames('flex shrink-0', className)}>+ <MovePeriodArrows className={isComparing ? 'hidden md:flex' : ''} />+ <Popover className="min-w-36 md:relative lg:w-48">+ {({ close }) => (+ <QueryPeriodMenu+ closeDropdown={close}+ calendarButtonRef={mainCalendarButtonRef}+ />+ )}+ </Popover>+ <Popover className="w-0 h-9 md:relative">+ {({ close }) => (+ <MainCalendar+ calendarButtonRef={mainCalendarButtonRef}+ closeDropdown={close}+ />+ )}+ </Popover>+ {isComparing && (+ <>+ <div className="my-auto px-1 text-sm font-medium text-gray-800 dark:text-gray-200">+ <span className="hidden md:inline px-1">vs.</span>+ </div>+ <Popover className="min-w-36 md:relative lg:w-48">+ {({ close }) => (+ <ComparisonPeriodMenu+ closeDropdown={close}+ calendarButtonRef={compareCalendarButtonRef}+ />+ )}+ </Popover>+ <Popover className="w-0 h-9 md:relative">+ {({ close }) => (+ <ComparisonCalendarMenu+ calendarButtonRef={compareCalendarButtonRef}+ closeDropdown={close}+ />+ )}+ </Popover>+ </>+ )}+ </div>+ )+}diff --git a/assets/js/dashboard/nav-menu/query-periods/shared-menu-items.tsx b/assets/js/dashboard/nav-menu/query-periods/shared-menu-items.tsxnew file mode 100644index 0000000000..f1b14e1e94--- /dev/null+++ b/assets/js/dashboard/nav-menu/query-periods/shared-menu-items.tsx@@ -0,0 +1,76 @@+/** @format */++import React, { ReactNode, RefObject } from 'react'+import classNames from 'classnames'+import { popover } from '../../components/popover'+import { ChevronDownIcon } from '@heroicons/react/20/solid'+import { Popover, Transition } from '@headlessui/react'++export const linkClassName = classNames(+ popover.items.classNames.navigationLink,+ popover.items.classNames.selectedOption,+ popover.items.classNames.hoverLink,+ popover.items.classNames.roundedStartEnd+)++export const datemenuButtonClassName = classNames(+ popover.toggleButton.classNames.rounded,+ popover.toggleButton.classNames.shadow,+ 'justify-between px-2 w-full'+)++export const hiddenCalendarButtonClassName = 'flex h-9 w-0 outline-none'++export const DateMenuChevron = () => (+ <ChevronDownIcon className="hidden lg:inline-block h-4 w-4 md:h-5 md:w-5 ml-1 md:ml-2 text-gray-500" />+)++export const MenuSeparator = () => (+ <div className="my-1 border-gray-200 dark:border-gray-500 border-b" />+)++export interface PopoverMenuProps {+ closeDropdown: () => void+ calendarButtonRef: RefObject<HTMLButtonElement>+}++export enum DropdownState {+ CLOSED = 'CLOSED',+ MENU = 'MENU',+ CALENDAR = 'CALENDAR'+}++export interface DropdownWithCalendarState {+ closeDropdown: () => void+ toggleDropdown: (mode: 'menu' | 'calendar') => void+ dropdownState: DropdownState+ buttonRef: RefObject<HTMLButtonElement>+ toggleCalendar: () => void+}++const calendarPositionClassName = '*:!top-auto *:!right-0 *:!absolute'++type CalendarPanelProps = {+ className?: string+ children: ReactNode+}++export const CalendarPanel = React.forwardRef<+ HTMLDivElement,+ CalendarPanelProps+>(({ children, className }, ref) => {+ return (+ <Transition+ {...popover.transition.props}+ className={classNames(+ popover.transition.classNames.fullwidth,+ 'md:left-auto',+ className+ )}+ >+ <Popover.Panel ref={ref} className={calendarPositionClassName}>+ {children}+ </Popover.Panel>+ </Transition>+ )+})diff --git a/assets/js/dashboard/nav-menu/top-bar.test.tsx b/assets/js/dashboard/nav-menu/top-bar.test.tsxindex bc6c8f389f..832bcdf1e5 100644--- a/assets/js/dashboard/nav-menu/top-bar.test.tsx+++ b/assets/js/dashboard/nav-menu/top-bar.test.tsx@@ -30,6 +30,15 @@ beforeAll(() => {disconnect: jest.fn()}) as unknown as IntersectionObserver)+ global.ResizeObserver = jest.fn(+ () =>+ ({+ observe: jest.fn(),+ unobserve: jest.fn(),+ disconnect: jest.fn()+ }) as unknown as ResizeObserver+ )+mockAPI = new MockAPI().start()})@@ -71,18 +80,18 @@ test('user can open and close filters dropdown', async () => {)})- const toggleFilters = screen.getByRole('button', { name: /Filter/ })+ const toggleFilters = screen.getByRole('button', { name: /Add filter/ })await userEvent.click(toggleFilters)expect(screen.queryAllByRole('link').map((el) => el.textContent)).toEqual(['Page',+ 'Hostname','Source',+ 'UTM tags','Location','Screen size','Browser','Operating System',- 'UTM tags',- 'Goal',- 'Hostname'+ 'Goal'])await userEvent.click(toggleFilters)expect(screen.queryAllByRole('menuitem')).toEqual([])diff --git a/assets/js/dashboard/nav-menu/top-bar.tsx b/assets/js/dashboard/nav-menu/top-bar.tsxindex d2134a4fea..f6b6e43dc4 100644--- a/assets/js/dashboard/nav-menu/top-bar.tsx+++ b/assets/js/dashboard/nav-menu/top-bar.tsx@@ -5,23 +5,28 @@ import SiteSwitcher from '../site-switcher'import { useSiteContext } from '../site-context'import { useUserContext } from '../user-context'import CurrentVisitors from '../stats/current-visitors'-import QueryPeriodPicker from '../datepicker'import Filters from '../filters'import classNames from 'classnames'import { useInView } from 'react-intersection-observer'import { FilterMenu } from './filter-menu'+import { FiltersBar } from './filters-bar'+import { QueryPeriodsPicker } from './query-periods/query-periods-picker'interface TopBarProps {showCurrentVisitors: boolean- extraBar?: ReactNode}-export function TopBar({ showCurrentVisitors, extraBar }: TopBarProps) {+export function TopBar({ showCurrentVisitors }: TopBarProps) {+ return (+ <TopBarStickyWrapper>+ <TopBarInner showCurrentVisitors={showCurrentVisitors} />+ </TopBarStickyWrapper>+ )+}++function TopBarStickyWrapper({ children }: { children: ReactNode }) {const site = useSiteContext()- const user = useUserContext()- const tooltipBoundary = useRef(null)const { ref, inView } = useInView({ threshold: 0 })- const { saved_segments } = site.flagsreturn (<>@@ -34,22 +39,74 @@ export function TopBar({ showCurrentVisitors, extraBar }: TopBarProps) {'sticky fullwidth-shadow bg-gray-50 dark:bg-gray-850')}>- <div className="flex items-center w-full">- <div className="flex items-center w-full" ref={tooltipBoundary}>+ {children}+ </div>+ </>+ )+}++function TopBarInner({ showCurrentVisitors }: TopBarProps) {+ const site = useSiteContext()+ const user = useUserContext()+ const { saved_segments } = site.flags+ const leftActionsRef = useRef<HTMLDivElement>(null)++ return (+ <div className="flex items-center w-full">+ {saved_segments ? (+ <>+ <div+ className="flex items-center gap-x-4 shrink-0"+ ref={leftActionsRef}+ ><SiteSwitchersite={site}loggedIn={user.loggedIn}currentUserRole={user.role}/>{showCurrentVisitors && (- <CurrentVisitors tooltipBoundary={tooltipBoundary.current} />+ <CurrentVisitors tooltipBoundaryRef={leftActionsRef} />)}- {saved_segments ? <FilterMenu /> : <Filters />}</div>- <QueryPeriodPicker />- </div>- {!!saved_segments && !!extraBar && extraBar}- </div>- </>+ <div className="flex w-full">+ <FiltersBar+ accessors={{+ topBar: (filtersBarElement) =>+ filtersBarElement?.parentElement?.parentElement,+ leftSection: (filtersBarElement) =>+ filtersBarElement?.parentElement?.parentElement+ ?.firstElementChild as HTMLElement,+ rightSection: (filtersBarElement) =>+ filtersBarElement?.parentElement?.parentElement+ ?.lastElementChild as HTMLElement+ }}+ />+ </div>+ <div className="flex gap-x-4 shrink-0">+ <FilterMenu />+ <QueryPeriodsPicker />+ </div>+ </>+ ) : (+ <>+ <div className="flex items-center w-full" ref={leftActionsRef}>+ <SiteSwitcher+ className="mr-2 sm:mr-4"+ site={site}+ loggedIn={user.loggedIn}+ currentUserRole={user.role}+ />+ {showCurrentVisitors && (+ <CurrentVisitors+ className="ml-1 mr-auto"+ tooltipBoundaryRef={leftActionsRef}+ />+ )}+ <Filters />+ </div>+ <QueryPeriodsPicker className="ml-auto pl-2" />+ </>+ )}+ </div>)}diff --git a/assets/js/dashboard/query-time-periods.ts b/assets/js/dashboard/query-time-periods.tsindex ea59be8fe4..d362df6474 100644--- a/assets/js/dashboard/query-time-periods.ts+++ b/assets/js/dashboard/query-time-periods.ts@@ -5,7 +5,7 @@ import {clearedDateSearch,DashboardQuery} from './query'-import { PlausibleSite, useSiteContext } from './site-context'+import { PlausibleSite } from './site-context'import {formatDateRange,formatDay,@@ -24,7 +24,6 @@ import {} from './util/date'import { AppNavigationTarget } from './navigation/use-app-navigate'import { getDomainScopedStorageKey, getItem, setItem } from './util/storage'-import { useQueryContext } from './query-context'export enum QueryPeriod {'realtime' = 'realtime',@@ -244,142 +243,167 @@ export type LinkItem = [site: PlausibleSitequery: DashboardQuery}) => boolean- onClick?: () => void+ onEvent?: (event: Pick<Event, 'preventDefault' | 'stopPropagation'>) => void}]-export const getDatePeriodGroups = (+/**+ * This function gets menu items with their respective navigation logic.+ * Used to render both menu items and keybind listeners.+ * `onEvent` is passed to all default items, but not extra items.+ */+export const getDatePeriodGroups = ({+ site,+ onEvent,+ extraItemsInLastGroup = [],+ extraGroups = []+}: {site: PlausibleSite-): Array<Array<LinkItem>> => [- [+ onEvent?: LinkItem[1]['onEvent']+ extraItemsInLastGroup?: LinkItem[]+ extraGroups?: LinkItem[][]+}): LinkItem[][] => {+ const groups: LinkItem[][] = [[- ['Today', 'D'],- {- search: (s) => ({- ...s,- ...clearedDateSearch,- period: QueryPeriod.day,- date: formatISO(nowForSite(site)),- keybindHint: 'D'- }),- isActive: ({ query }) =>- query.period === QueryPeriod.day &&- isSameDate(query.date, nowForSite(site))- }+ [+ ['Today', 'D'],+ {+ search: (s) => ({+ ...s,+ ...clearedDateSearch,+ period: QueryPeriod.day,+ date: formatISO(nowForSite(site)),+ keybindHint: 'D'+ }),+ isActive: ({ query }) =>+ query.period === QueryPeriod.day &&+ isSameDate(query.date, nowForSite(site)),+ onEvent+ }+ ],+ [+ ['Yesterday', 'E'],+ {+ search: (s) => ({+ ...s,+ ...clearedDateSearch,+ period: QueryPeriod.day,+ date: formatISO(yesterday(site)),+ keybindHint: 'E'+ }),+ isActive: ({ query }) =>+ query.period === QueryPeriod.day &&+ isSameDate(query.date, yesterday(site)),+ onEvent+ }+ ],+ [+ ['Realtime', 'R'],+ {+ search: (s) => ({+ ...s,+ ...clearedDateSearch,+ period: QueryPeriod.realtime,+ keybindHint: 'R'+ }),+ isActive: ({ query }) => query.period === QueryPeriod.realtime,+ onEvent+ }+ ]],[- ['Yesterday', 'E'],- {- search: (s) => ({- ...s,- ...clearedDateSearch,- period: QueryPeriod.day,- date: formatISO(yesterday(site)),- keybindHint: 'E'- }),- isActive: ({ query }) =>- query.period === QueryPeriod.day &&- isSameDate(query.date, yesterday(site))- }+ [+ ['Last 7 Days', 'W'],+ {+ search: (s) => ({+ ...s,+ ...clearedDateSearch,+ period: QueryPeriod['7d'],+ keybindHint: 'W'+ }),+ isActive: ({ query }) => query.period === QueryPeriod['7d'],+ onEvent+ }+ ],+ [+ ['Last 30 Days', 'T'],+ {+ search: (s) => ({+ ...s,+ ...clearedDateSearch,+ period: QueryPeriod['30d'],+ keybindHint: 'T'+ }),+ isActive: ({ query }) => query.period === QueryPeriod['30d'],+ onEvent+ }+ ]],[- ['Realtime', 'R'],- {- search: (s) => ({- ...s,- ...clearedDateSearch,- period: QueryPeriod.realtime,- keybindHint: 'R'- }),- isActive: ({ query }) => query.period === QueryPeriod.realtime- }- ]- ],- [- [- ['Last 7 Days', 'W'],- {- search: (s) => ({- ...s,- ...clearedDateSearch,- period: QueryPeriod['7d'],- keybindHint: 'W'- }),- isActive: ({ query }) => query.period === QueryPeriod['7d']- }+ [+ ['Month to Date', 'M'],+ {+ search: (s) => ({+ ...s,+ ...clearedDateSearch,+ period: QueryPeriod.month,+ keybindHint: 'M'+ }),+ isActive: ({ query }) =>+ query.period === QueryPeriod.month &&+ isSameMonth(query.date, nowForSite(site)),+ onEvent+ }+ ],+ [+ ['Last Month'],+ {+ search: (s) => ({+ ...s,+ ...clearedDateSearch,+ period: QueryPeriod.month,+ date: formatISO(lastMonth(site)),+ keybindHint: null+ }),+ isActive: ({ query }) =>+ query.period === QueryPeriod.month &&+ isSameMonth(query.date, lastMonth(site)),+ onEvent+ }+ ]],[- ['Last 30 Days', 'T'],- {- search: (s) => ({- ...s,- ...clearedDateSearch,- period: QueryPeriod['30d'],- keybindHint: 'T'- }),- isActive: ({ query }) => query.period === QueryPeriod['30d']- }+ [+ ['Year to Date', 'Y'],+ {+ search: (s) => ({+ ...s,+ ...clearedDateSearch,+ period: QueryPeriod.year,+ keybindHint: 'Y'+ }),+ isActive: ({ query }) =>+ query.period === QueryPeriod.year && isThisYear(site, query.date),+ onEvent+ }+ ],+ [+ ['Last 12 Months', 'L'],+ {+ search: (s) => ({+ ...s,+ ...clearedDateSearch,+ period: QueryPeriod['12mo'],+ keybindHint: 'L'+ }),+ isActive: ({ query }) => query.period === QueryPeriod['12mo'],+ onEvent+ }+ ]]- ],- [- [- ['Month to Date', 'M'],- {- search: (s) => ({- ...s,- ...clearedDateSearch,- period: QueryPeriod.month,- keybindHint: 'M'- }),- isActive: ({ query }) =>- query.period === QueryPeriod.month &&- isSameMonth(query.date, nowForSite(site))- }- ],- [- ['Last Month'],- {- search: (s) => ({- ...s,- ...clearedDateSearch,- period: QueryPeriod.month,- date: formatISO(lastMonth(site)),- keybindHint: null- }),- isActive: ({ query }) =>- query.period === QueryPeriod.month &&- isSameMonth(query.date, lastMonth(site))- }- ]- ],- [- [- ['Year to Date', 'Y'],- {- search: (s) => ({- ...s,- ...clearedDateSearch,- period: QueryPeriod.year,- keybindHint: 'Y'- }),- isActive: ({ query }) =>- query.period === QueryPeriod.year && isThisYear(site, query.date)- }- ],- [- ['Last 12 Months', 'L'],- {- search: (s) => ({- ...s,- ...clearedDateSearch,- period: QueryPeriod['12mo'],- keybindHint: 'L'- }),- isActive: ({ query }) => query.period === QueryPeriod['12mo']- }- ]- ],- [+ ]++ const lastGroup: LinkItem[] = [[['All time', 'A'],{@@ -389,11 +413,16 @@ export const getDatePeriodGroups = (period: QueryPeriod.all,keybindHint: 'A'}),- isActive: ({ query }) => query.period === QueryPeriod.all+ isActive: ({ query }) => query.period === QueryPeriod.all,+ onEvent}]]-]++ return groups+ .concat([lastGroup.concat(extraItemsInLastGroup)])+ .concat(extraGroups)+}export const last6MonthsLinkItem: LinkItem = [['Last 6 months', 'S'],@@ -519,9 +548,13 @@ export function getDashboardTimeSettings({}}-export function DisplaySelectedPeriod() {- const { query } = useQueryContext()- const site = useSiteContext()+export function getCurrentPeriodDisplayName({+ query,+ site+}: {+ query: DashboardQuery+ site: PlausibleSite+}) {if (query.period === 'day') {if (isToday(site, query.date)) {return 'Today'@@ -560,3 +593,20 @@ export function DisplaySelectedPeriod() {}return 'Realtime'}++export function getCurrentComparisonPeriodDisplayName({+ query,+ site+}: {+ query: DashboardQuery+ site: PlausibleSite+}) {+ if (!query.comparison) {+ return null+ }+ return query.comparison === ComparisonMode.custom &&+ query.compare_from &&+ query.compare_to+ ? formatDateRange(site, query.compare_from, query.compare_to)+ : COMPARISON_MODES[query.comparison]+}diff --git a/assets/js/dashboard/site-switcher.js b/assets/js/dashboard/site-switcher.jsindex aee5a0b8fd..4919265dfd 100644--- a/assets/js/dashboard/site-switcher.js+++ b/assets/js/dashboard/site-switcher.js@@ -4,6 +4,7 @@import React from 'react'import { Transition } from '@headlessui/react'import { Cog8ToothIcon, ChevronDownIcon } from '@heroicons/react/20/solid'+import classNames from 'classnames'function Favicon({ domain, className }) {return (@@ -236,7 +237,12 @@ export default class SiteSwitcher extends React.Component {: 'cursor-default'return (- <div className="relative inline-block text-left mr-2 sm:mr-4">+ <div+ className={classNames(+ 'relative inline-block text-left shrink-0',+ this.props.className+ )}+ ><buttonref={this.siteSwitcherButton}className={`inline-flex items-center rounded-md h-9 leading-5 font-bold text-gray-700 dark:text-gray-300 focus:outline-none transition ease-in-out duration-150 ${hoverClass}`}@@ -263,7 +269,7 @@ export default class SiteSwitcher extends React.Component {leaveTo="opacity-0 scale-95"><div- className="origin-top-left absolute left-0 mt-2 w-64 rounded-md shadow-lg"+ className="origin-top-left absolute left-0 mt-2 w-64 rounded-md shadow-lg z-10"ref={(node) => (this.dropDownNode = node)}><div className="rounded-md bg-white dark:bg-gray-800 ring-1 ring-black ring-opacity-5">diff --git a/assets/js/dashboard/stats/behaviours/index.js b/assets/js/dashboard/stats/behaviours/index.jsindex 62634d8130..72d7cccd9f 100644--- a/assets/js/dashboard/stats/behaviours/index.js+++ b/assets/js/dashboard/stats/behaviours/index.js@@ -1,4 +1,4 @@-import React, { Fragment, useState, useEffect, useCallback } from 'react'+import React, { Fragment, useState, useEffect, useCallback, useRef } from 'react'import { Menu, Transition } from '@headlessui/react'import { ChevronDownIcon } from '@heroicons/react/20/solid'import classNames from 'classnames'@@ -11,6 +11,7 @@ import { hasConversionGoalFilter } from '../../util/filters'import { useSiteContext } from '../../site-context'import { useQueryContext } from '../../query-context'import { useUserContext } from '../../user-context'+import { BlurMenuButtonOnEscape } from '../../keybinding'/*global BUILD_EXTRA*//*global require*/@@ -42,7 +43,7 @@ export default function Behaviours({ importedDataInView }) {const { query } = useQueryContext();const site = useSiteContext();const user = useUserContext();-+ const buttonRef = useRef();const adminAccess = ['owner', 'admin', 'editor', 'super_admin'].includes(user.role)const tabKey = storage.getDomainScopedStorageKey('behavioursTab', site.domain)const funnelKey = storage.getDomainScopedStorageKey('behavioursTabFunnel', site.domain)@@ -118,8 +119,9 @@ export default function Behaviours({ importedDataInView }) {function tabFunnelPicker() {return <Menu as="div" className="relative inline-block text-left">+ <BlurMenuButtonOnEscape targetRef={buttonRef}/><div>- <Menu.Button className="inline-flex justify-between focus:outline-none">+ <Menu.Button ref={buttonRef} className="inline-flex justify-between focus:outline-none"><span className={(mode == FUNNELS) ? ACTIVE_CLASS : DEFAULT_CLASS}>Funnels</span><ChevronDownIcon className="-mr-1 ml-1 h-4 w-4" aria-hidden="true" /></Menu.Button>diff --git a/assets/js/dashboard/stats/current-visitors.js b/assets/js/dashboard/stats/current-visitors.jsindex 66d5735a25..e6c8985411 100644--- a/assets/js/dashboard/stats/current-visitors.js+++ b/assets/js/dashboard/stats/current-visitors.js@@ -8,8 +8,12 @@ import { SecondsSinceLastLoad } from '../util/seconds-since-last-load'import { useQueryContext } from '../query-context'import { useSiteContext } from '../site-context'import { useLastLoadContext } from '../last-load-context'+import classNames from 'classnames'-export default function CurrentVisitors({ tooltipBoundary }) {+export default function CurrentVisitors({+ className = '',+ tooltipBoundaryRef+}) {const { query } = useQueryContext()const lastLoadTimestamp = useLastLoadContext()const site = useSiteContext()@@ -33,11 +37,7 @@ export default function CurrentVisitors({ tooltipBoundary }) {updateCount()}, [query, updateCount])- if (- site.flags.saved_segments- ? currentVisitors !== null- : currentVisitors !== null && query.filters.length === 0- ) {+ if (currentVisitors !== null && query.filters.length === 0) {return (<Tooltipinfo={@@ -52,11 +52,14 @@ export default function CurrentVisitors({ tooltipBoundary }) {</p></div>}- boundary={tooltipBoundary}+ boundary={tooltipBoundaryRef.current}><AppNavigationLinksearch={(prev) => ({ ...prev, period: 'realtime' })}- className="h-9 flex items-center ml-1 mr-auto text-xs md:text-sm font-bold text-gray-500 dark:text-gray-300"+ className={classNames(+ 'h-9 flex items-center text-xs md:text-sm font-bold text-gray-500 dark:text-gray-300',+ className+ )}><svgclassName="inline-block w-2 mr-1 text-green-500 fill-current"diff --git a/assets/js/dashboard/stats/graph/interval-picker.js b/assets/js/dashboard/stats/graph/interval-picker.jsindex 1da51c4711..c1a07e0007 100644--- a/assets/js/dashboard/stats/graph/interval-picker.js+++ b/assets/js/dashboard/stats/graph/interval-picker.js@@ -1,11 +1,14 @@-import React, { Fragment, useCallback, useEffect, useRef } from 'react';+import React, { Fragment, useRef } from 'react';import { Menu, Transition } from '@headlessui/react';import { ChevronDownIcon } from '@heroicons/react/20/solid';import classNames from 'classnames';import * as storage from '../../util/storage';-import { isKeyPressed, isModifierPressed, isTyping } from '../../keybinding';+import { BlurMenuButtonOnEscape, isModifierPressed, isTyping, Keybind } from '../../keybinding';import { useQueryContext } from '../../query-context';import { useSiteContext } from '../../site-context';+import { useMatch } from 'react-router-dom';+import { rootRoute } from '../../router';+import { popover } from '../../components/popover';const INTERVAL_LABELS = {'minute': 'Minutes',@@ -71,19 +74,6 @@ function storeInterval(period, domain, interval) {storage.setItem(`interval__${period}__${domain}`, interval)}-function useIKeybinding(ref) {- const handleKeyPress = useCallback((event) => {- if (isKeyPressed(event, { keyboardKey: "i", shouldIgnoreWhen: [isTyping, isModifierPressed] })) {- ref.current?.click()- }- }, [ref])-- useEffect(() => {- document.addEventListener('keydown', handleKeyPress)- return () => document.removeEventListener('keydown', handleKeyPress)- }, [handleKeyPress])-}-export const getCurrentInterval = function(site, query) {const options = validIntervals(site, query)@@ -101,7 +91,7 @@ export function IntervalPicker({ onIntervalUpdate }) {const menuElement = useRef(null)const {query} = useQueryContext();const site = useSiteContext();- useIKeybinding(menuElement)+ const dashboardRouteMatch = useMatch(rootRoute.path)if (query.period == 'realtime') return null@@ -134,7 +124,22 @@ export function IntervalPicker({ onIntervalUpdate }) {<Menu as="div" className="relative inline-block pl-2">{({ open }) => (<>- <Menu.Button ref={menuElement} className="text-sm inline-flex focus:outline-none text-gray-700 dark:text-gray-300 hover:text-indigo-600 dark:hover:text-indigo-600 items-center">+ {!!dashboardRouteMatch && (+ <Keybind+ targetRef="document"+ type="keydown"+ keyboardKey="i"+ handler={() => {+ menuElement.current?.click()+ }}+ shouldIgnoreWhen={[isModifierPressed, isTyping]}+ />+ )}+ <BlurMenuButtonOnEscape targetRef={menuElement} />+ <Menu.Button+ ref={menuElement}+ className="text-sm inline-flex focus:outline-none text-gray-700 dark:text-gray-300 hover:text-indigo-600 dark:hover:text-indigo-600 items-center"+ >{INTERVAL_LABELS[currentInterval]}<ChevronDownIcon className="ml-1 h-4 w-4" aria-hidden="true" /></Menu.Button>@@ -142,13 +147,12 @@ export function IntervalPicker({ onIntervalUpdate }) {<Transitionas={Fragment}show={open}- enter="transition ease-out duration-100"- enterFrom="opacity-0 scale-95"- enterTo="opacity-100 scale-100"- leave="transition ease-in duration-75"- leaveFrom="opacity-100 scale-100"- leaveTo="opacity-0 scale-95">- <Menu.Items className="py-1 text-left origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg bg-white dark:bg-gray-800 ring-1 ring-black ring-opacity-5 focus:outline-none z-10" static>+ {...popover.transition.props}+ >+ <Menu.Items+ className="py-1 text-left origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg bg-white dark:bg-gray-800 ring-1 ring-black ring-opacity-5 focus:outline-none z-10"+ static+ >{options.map(renderDropdownItem)}</Menu.Items></Transition>diff --git a/assets/js/dashboard/stats/modals/modal.js b/assets/js/dashboard/stats/modals/modal.jsindex 020c05517e..ec911983f4 100644--- a/assets/js/dashboard/stats/modals/modal.js+++ b/assets/js/dashboard/stats/modals/modal.js@@ -1,4 +1,4 @@-import React from "react";+import React, { useEffect } from "react";import { createPortal } from "react-dom";import { isModifierPressed, isTyping, Keybind } from "../../keybinding"import { rootRoute } from "../../router";@@ -70,15 +70,18 @@ class Modal extends React.Component {render() {return createPortal(<>- <Keybind keyboardKey="Escape" type="keyup" handler={this.props.onClose} target={document} shouldIgnoreWhen={[isModifierPressed, isTyping]} />+ <Keybind keyboardKey="Escape" type="keyup" handler={this.props.onClose} targetRef="document" shouldIgnoreWhen={[isModifierPressed, isTyping]} /><div className="modal is-open" onClick={this.props.onClick}><div className="modal__overlay"><button className="modal__close"></button><divref={this.node}- className="modal__container dark:bg-gray-800"+ className="modal__container dark:bg-gray-800 focus:outline-none"style={this.getStyle()}+ // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex+ tabIndex={0}>+ <FocusOnMount focusableRef={this.node} />{this.props.children}</div></div>@@ -95,3 +98,12 @@ export default function ModalWithRouting(props) {const onClose = props.onClose ?? (() => navigate({ path: rootRoute.path, search: (s) => s }))return <Modal {...props} onClose={onClose} />}++const FocusOnMount = ({focusableRef}) => {+ useEffect(() => {+ if (typeof focusableRef.current?.focus === 'function') {+ focusableRef.current.focus()+ }+ }, [focusableRef])+ return null+}diff --git a/assets/js/dashboard/stats/sources/source-list.js b/assets/js/dashboard/stats/sources/source-list.jsindex 2f0cfd55d9..ebca07f235 100644--- a/assets/js/dashboard/stats/sources/source-list.js+++ b/assets/js/dashboard/stats/sources/source-list.js@@ -1,4 +1,4 @@-import React, { Fragment, useEffect, useState } from 'react';+import React, { Fragment, useEffect, useRef, useState } from 'react';import * as storage from '../../util/storage';import * as url from '../../util/url';@@ -14,6 +14,7 @@ import ImportedQueryUnsupportedWarning from '../imported-query-unsupported-warniimport { useQueryContext } from '../../query-context';import { useSiteContext } from '../../site-context';import { sourcesRoute, channelsRoute, utmCampaignsRoute, utmContentsRoute, utmMediumsRoute, utmSourcesRoute, utmTermsRoute } from '../../router';+import { BlurMenuButtonOnEscape } from '../../keybinding';const UTM_TAGS = {utm_medium: { title: 'UTM Mediums', label: 'Medium', endpoint: '/utm_mediums' },@@ -166,6 +167,7 @@ export default function SourceList() {const [loading, setLoading] = useState(true)const [skipImportedReason, setSkipImportedReason] = useState(null)const previousQuery = usePrevious(query);+ const dropdownButtonRef = useRef(null)useEffect(() => setLoading(true), [query, currentTab])@@ -203,8 +205,9 @@ export default function SourceList() {<div className={currentTab === 'all' ? activeClass : defaultClass} onClick={setTab('all')}>Sources</div><Menu as="div" className="relative inline-block text-left">+ <BlurMenuButtonOnEscape targetRef={dropdownButtonRef}/><div>- <Menu.Button className="inline-flex justify-between focus:outline-none">+ <Menu.Button className="inline-flex justify-between focus:outline-none" ref={dropdownButtonRef}><span className={currentTab.startsWith('utm_') ? activeClass : defaultClass}>{buttonText}</span><ChevronDownIcon className="-mr-1 ml-1 h-4 w-4" aria-hidden="true" /></Menu.Button>diff --git a/assets/js/dashboard/util/use-on-click-outside.ts b/assets/js/dashboard/util/use-on-click-outside.tsdeleted file mode 100644index dd2cd02f68..0000000000--- a/assets/js/dashboard/util/use-on-click-outside.ts+++ /dev/null@@ -1,40 +0,0 @@-/** @format */--import { RefObject, useCallback, useEffect } from 'react'--export function useOnClickOutside({- ref,- active,- handler-}: {- ref: RefObject<HTMLElement>- active: boolean- handler: () => void-}) {- const onClickOutsideClose = useCallback(- (e: MouseEvent) => {- const eventTarget = e.target as Element | null-- if (ref.current && eventTarget && ref.current.contains(eventTarget)) {- return- }- handler()- },- [ref, handler]- )-- useEffect(() => {- const register = () =>- document.addEventListener('mousedown', onClickOutsideClose)- const deregister = () =>- document.removeEventListener('mousedown', onClickOutsideClose)-- if (active) {- register()- } else {- deregister()- }-- return deregister- }, [active, onClickOutsideClose])-}