📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
Use Dropdown component for Panel tabs
Blue Mouse60e348f4cb6f
diff --git a/web/app/pages/Project/View/Panels.tsx b/web/app/pages/Project/View/Panels.tsxindex 1bf00014a..f7ea68305 100644--- a/web/app/pages/Project/View/Panels.tsx+++ b/web/app/pages/Project/View/Panels.tsx@@ -817,6 +817,7 @@ const CustomEvents = ({if (_isEmpty(customs)) {return (<PanelContainer+ // @ts-expect-error - onSelect not typedname={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} />}type='ce'setActiveFragment={setActiveFragment}@@ -832,6 +833,7 @@ const CustomEvents = ({if (activeFragment === 1 && !_isEmpty(chartData)) {return (<PanelContainer+ // @ts-expect-error - onSelect not typedname={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} />}type='ce'setActiveFragment={setActiveFragment}@@ -861,6 +863,7 @@ const CustomEvents = ({return (<PanelContainer+ // @ts-expect-error - onSelect not typedname={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} />}type='ce'activeFragment={activeFragment}@@ -878,6 +881,7 @@ const CustomEvents = ({return (<PanelContainercustomTabs={customTabs}+ // @ts-expect-error - onSelect not typedname={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} />}type='ce'setActiveFragment={setActiveFragment}@@ -1267,6 +1271,7 @@ const PageProperties = ({if (_isEmpty(properties)) {return (<PanelContainer+ // @ts-expect-error - onSelect not typedname={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.properties')} />}type='props'setActiveFragment={setActiveFragment}@@ -1280,6 +1285,7 @@ const PageProperties = ({return (<PanelContainer+ // @ts-expect-error - onSelect not typedname={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.properties')} />}type='props'setActiveFragment={setActiveFragment}diff --git a/web/app/pages/Project/View/components/BrowserDropdown.tsx b/web/app/pages/Project/View/components/BrowserDropdown.tsxindex 99d77df2e..839c653f7 100644--- a/web/app/pages/Project/View/components/BrowserDropdown.tsx+++ b/web/app/pages/Project/View/components/BrowserDropdown.tsx@@ -1,8 +1,4 @@-import { ChevronDownIcon, ChevronUpIcon, XMarkIcon } from '@heroicons/react/24/outline'-import _map from 'lodash/map'-import { useState } from 'react'-import { useTranslation } from 'react-i18next'-import OutsideClickHandler from 'react-outside-click-handler'+import ProjectDropdown from './ProjectDropdown'const OPTIONS = [{@@ -21,41 +17,7 @@ interface BrowserDropdownProps {}const BrowserDropdown = ({ onSelect, title }: BrowserDropdownProps) => {- const { t } = useTranslation()- const [show, setShow] = useState(false)-- const _onSelect = (value: (typeof OPTIONS)[number]['value']) => {- onSelect(value)- setShow(false)- }-- return (- <OutsideClickHandler onOutsideClick={() => setShow(false)}>- <span className='cursor-pointer' onClick={() => setShow(!show)}>- {title} {show ? <ChevronUpIcon className='inline size-4' /> : <ChevronDownIcon className='inline size-4' />}- </span>- {show ? (- <div className='absolute top-12 left-5 z-10 mt-2 max-h-[200px] min-w-[250px] overflow-auto rounded-md border border-gray-200 bg-white text-gray-900 dark:border-slate-700/50 dark:bg-slate-900'>- <div className='flex w-full flex-col p-2'>- <p className='px-1 text-sm font-semibold text-gray-900 dark:text-gray-50'>{t('project.browserInfo')}</p>- {_map(OPTIONS, ({ label, value }) => (- <div- key={label}- onClick={() => _onSelect(value)}- className='flex w-full cursor-pointer flex-row items-center justify-between px-1 py-2 text-sm text-gray-700 hover:bg-gray-200 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-800'- >- <p>{t(label)}</p>- </div>- ))}- </div>- <XMarkIcon- className='absolute top-2 right-2 h-5 w-5 cursor-pointer text-gray-900 dark:text-gray-50'- onClick={() => setShow(!show)}- />- </div>- ) : null}- </OutsideClickHandler>- )+ return <ProjectDropdown title={title} options={OPTIONS} onSelect={onSelect} headerKey='project.browserInfo' />}export default BrowserDropdowndiff --git a/web/app/pages/Project/View/components/CountryDropdown.tsx b/web/app/pages/Project/View/components/CountryDropdown.tsxindex 3bbd64abb..3e7092f07 100644--- a/web/app/pages/Project/View/components/CountryDropdown.tsx+++ b/web/app/pages/Project/View/components/CountryDropdown.tsx@@ -1,11 +1,7 @@-import { ChevronDownIcon, ChevronUpIcon, XMarkIcon } from '@heroicons/react/24/outline'-import _map from 'lodash/map'-import { useState } from 'react'-import { useTranslation } from 'react-i18next'-import OutsideClickHandler from 'react-outside-click-handler'+import ProjectDropdown from './ProjectDropdown'interface CountryDropdownProps {- onSelect: any+ onSelect: (value: string) => voidtitle: string}@@ -25,41 +21,7 @@ const OPTIONS = []const CountryDropdown = ({ onSelect, title }: CountryDropdownProps) => {- const { t } = useTranslation()- const [show, setShow] = useState(false)-- const _onSelect = (value: string) => {- onSelect(value)- setShow(false)- }-- return (- <OutsideClickHandler onOutsideClick={() => setShow(false)}>- <span className='cursor-pointer' onClick={() => setShow(!show)}>- {title} {show ? <ChevronUpIcon className='inline h-4 w-4' /> : <ChevronDownIcon className='inline h-4 w-4' />}- </span>- {show ? (- <div className='absolute top-12 left-5 z-10 mt-2 max-h-[200px] min-w-[250px] overflow-auto rounded-md border border-gray-200 bg-white text-gray-900 dark:border-slate-700/50 dark:bg-slate-900'>- <div className='flex w-full flex-col p-2'>- <p className='px-1 text-sm font-semibold text-gray-900 dark:text-gray-50'>{t('project.geo')}</p>- {_map(OPTIONS, ({ label, value }) => (- <div- key={label}- onClick={() => _onSelect(value)}- className='flex w-full cursor-pointer flex-row items-center justify-between px-1 py-2 text-sm text-gray-700 hover:bg-gray-200 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-800'- >- <p>{t(label)}</p>- </div>- ))}- </div>- <XMarkIcon- className='absolute top-2 right-2 h-5 w-5 cursor-pointer text-gray-900 dark:text-gray-50'- onClick={() => setShow(!show)}- />- </div>- ) : null}- </OutsideClickHandler>- )+ return <ProjectDropdown title={title} options={OPTIONS} onSelect={onSelect} headerKey='project.geo' />}export default CountryDropdowndiff --git a/web/app/pages/Project/View/components/CustomEventsDropdown.tsx b/web/app/pages/Project/View/components/CustomEventsDropdown.tsxindex 564c606d8..f4a377622 100644--- a/web/app/pages/Project/View/components/CustomEventsDropdown.tsx+++ b/web/app/pages/Project/View/components/CustomEventsDropdown.tsx@@ -1,11 +1,7 @@-import { ChevronDownIcon, ChevronUpIcon, XMarkIcon } from '@heroicons/react/24/outline'-import _map from 'lodash/map'-import { useState } from 'react'-import { useTranslation } from 'react-i18next'-import OutsideClickHandler from 'react-outside-click-handler'+import ProjectDropdown from './ProjectDropdown'interface CustomEventsDropdownProps {- onSelect: any+ onSelect: (value: string) => voidtitle: string}@@ -21,41 +17,7 @@ const OPTIONS = []const CustomEventsDropdown = ({ onSelect, title }: CustomEventsDropdownProps) => {- const { t } = useTranslation()- const [show, setShow] = useState(false)-- const _onSelect = (value: string) => {- onSelect(value)- setShow(false)- }-- return (- <OutsideClickHandler onOutsideClick={() => setShow(false)}>- <span className='cursor-pointer' onClick={() => setShow(!show)}>- {title} {show ? <ChevronUpIcon className='inline h-4 w-4' /> : <ChevronDownIcon className='inline h-4 w-4' />}- </span>- {show ? (- <div className='absolute top-12 left-5 z-10 mt-2 max-h-[200px] min-w-[250px] overflow-auto rounded-md border border-gray-200 bg-white text-gray-900 dark:border-slate-700/50 dark:bg-slate-900'>- <div className='flex w-full flex-col p-2'>- <p className='px-1 text-sm font-semibold text-gray-900 dark:text-gray-50'>{t('project.metadata')}</p>- {_map(OPTIONS, ({ label, value }) => (- <div- key={label}- onClick={() => _onSelect(value)}- className='flex w-full cursor-pointer flex-row items-center justify-between px-1 py-2 text-sm text-gray-700 hover:bg-gray-200 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-800'- >- <p>{t(label)}</p>- </div>- ))}- </div>- <XMarkIcon- className='absolute top-2 right-2 h-5 w-5 cursor-pointer text-gray-900 dark:text-gray-50'- onClick={() => setShow(!show)}- />- </div>- ) : null}- </OutsideClickHandler>- )+ return <ProjectDropdown title={title} options={OPTIONS} onSelect={onSelect} headerKey='project.metadata' />}export default CustomEventsDropdowndiff --git a/web/app/pages/Project/View/components/OSDropdown.tsx b/web/app/pages/Project/View/components/OSDropdown.tsxindex 925ba32cc..07a575f09 100644--- a/web/app/pages/Project/View/components/OSDropdown.tsx+++ b/web/app/pages/Project/View/components/OSDropdown.tsx@@ -1,8 +1,4 @@-import { ChevronDownIcon, ChevronUpIcon, XMarkIcon } from '@heroicons/react/24/outline'-import _map from 'lodash/map'-import { useState } from 'react'-import { useTranslation } from 'react-i18next'-import OutsideClickHandler from 'react-outside-click-handler'+import ProjectDropdown from './ProjectDropdown'const OPTIONS = [{@@ -21,41 +17,7 @@ interface OSDropdownProps {}const OSDropdown = ({ onSelect, title }: OSDropdownProps) => {- const { t } = useTranslation()- const [show, setShow] = useState(false)-- const _onSelect = (value: (typeof OPTIONS)[number]['value']) => {- onSelect(value)- setShow(false)- }-- return (- <OutsideClickHandler onOutsideClick={() => setShow(false)}>- <span className='cursor-pointer' onClick={() => setShow(!show)}>- {title} {show ? <ChevronUpIcon className='inline size-4' /> : <ChevronDownIcon className='inline size-4' />}- </span>- {show ? (- <div className='absolute top-4 left-5 z-10 mt-2 max-h-[200px] min-w-[250px] overflow-auto rounded-md border border-black/10 bg-white text-gray-900 dark:border-slate-700/50 dark:bg-slate-900'>- <div className='flex w-full flex-col p-2'>- <p className='px-1 text-sm font-semibold text-gray-900 dark:text-gray-50'>{t('project.osInfo')}</p>- {_map(OPTIONS, ({ label, value }) => (- <div- key={label}- onClick={() => _onSelect(value)}- className='flex w-full cursor-pointer flex-row items-center justify-between px-1 py-2 text-sm text-gray-700 hover:bg-gray-200 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-800'- >- <p>{t(label)}</p>- </div>- ))}- </div>- <XMarkIcon- className='absolute top-2 right-2 h-5 w-5 cursor-pointer text-gray-900 dark:text-gray-50'- onClick={() => setShow(!show)}- />- </div>- ) : null}- </OutsideClickHandler>- )+ return <ProjectDropdown title={title} options={OPTIONS} onSelect={onSelect} headerKey='project.osInfo' />}export default OSDropdowndiff --git a/web/app/pages/Project/View/components/PageDropdown.tsx b/web/app/pages/Project/View/components/PageDropdown.tsxindex ea580a91b..ab1657b33 100644--- a/web/app/pages/Project/View/components/PageDropdown.tsx+++ b/web/app/pages/Project/View/components/PageDropdown.tsx@@ -1,8 +1,4 @@-import { ChevronDownIcon, ChevronUpIcon, XMarkIcon } from '@heroicons/react/24/outline'-import _map from 'lodash/map'-import { useState } from 'react'-import { useTranslation } from 'react-i18next'-import OutsideClickHandler from 'react-outside-click-handler'+import ProjectDropdown from './ProjectDropdown'const OPTIONS = [{@@ -21,41 +17,7 @@ interface PageDropdownProps {}const PageDropdown = ({ onSelect, title }: PageDropdownProps) => {- const { t } = useTranslation()- const [show, setShow] = useState(false)-- const _onSelect = (value: (typeof OPTIONS)[number]['value']) => {- onSelect(value)- setShow(false)- }-- return (- <OutsideClickHandler onOutsideClick={() => setShow(false)}>- <span className='cursor-pointer' onClick={() => setShow(!show)}>- {title} {show ? <ChevronUpIcon className='inline size-4' /> : <ChevronDownIcon className='inline size-4' />}- </span>- {show ? (- <div className='absolute top-4 left-5 z-10 mt-2 max-h-[200px] min-w-[250px] overflow-auto rounded-md border border-black/10 bg-white text-gray-900 dark:border-slate-700/50 dark:bg-slate-900'>- <div className='flex w-full flex-col p-2'>- <p className='px-1 text-sm font-semibold text-gray-900 dark:text-gray-50'>{t('project.urlInfo')}</p>- {_map(OPTIONS, ({ label, value }) => (- <div- key={label}- onClick={() => _onSelect(value)}- className='flex w-full cursor-pointer flex-row items-center justify-between px-1 py-2 text-sm text-gray-700 hover:bg-gray-200 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-800'- >- <p>{t(label)}</p>- </div>- ))}- </div>- <XMarkIcon- className='absolute top-2 right-2 h-5 w-5 cursor-pointer text-gray-900 dark:text-gray-50'- onClick={() => setShow(!show)}- />- </div>- ) : null}- </OutsideClickHandler>- )+ return <ProjectDropdown title={title} options={OPTIONS} onSelect={onSelect} headerKey='project.urlInfo' />}export default PageDropdowndiff --git a/web/app/pages/Project/View/components/ProjectDropdown.tsx b/web/app/pages/Project/View/components/ProjectDropdown.tsxnew file mode 100644index 000000000..69116ebd5--- /dev/null+++ b/web/app/pages/Project/View/components/ProjectDropdown.tsx@@ -0,0 +1,45 @@+import { useTranslation } from 'react-i18next'++import Dropdown from '~/ui/Dropdown'++interface ProjectDropdownOption {+ readonly label: string+ readonly value: string+}++interface ProjectDropdownProps<T extends string = string> {+ onSelect: (value: T) => void+ title: string+ options: readonly ProjectDropdownOption[]+ headerKey: string+}++const ProjectDropdown = <T extends string = string>({+ onSelect,+ title,+ options,+ headerKey,+}: ProjectDropdownProps<T>) => {+ const { t } = useTranslation()++ return (+ <Dropdown+ title={title}+ items={options as ProjectDropdownOption[]}+ onSelect={(item, _e, close) => {+ onSelect(item.value as T)+ close()+ }}+ labelExtractor={(item) => t(item.label)}+ keyExtractor={(item) => item.value}+ header={t(headerKey)}+ headless+ buttonClassName='cursor-pointer !p-0 text-lg font-semibold flex items-center'+ className='relative inline-block'+ menuItemsClassName='absolute top-4 left-5 z-10 mt-2 max-h-[200px] min-w-[250px] overflow-auto'+ chevron='mini'+ />+ )+}++export default ProjectDropdowndiff --git a/web/app/pages/Project/View/components/UTMDropdown.tsx b/web/app/pages/Project/View/components/UTMDropdown.tsxindex 040e4364e..5c4fb40ba 100644--- a/web/app/pages/Project/View/components/UTMDropdown.tsx+++ b/web/app/pages/Project/View/components/UTMDropdown.tsx@@ -1,11 +1,7 @@-import { ChevronDownIcon, ChevronUpIcon, XMarkIcon } from '@heroicons/react/24/outline'-import _map from 'lodash/map'-import { useState } from 'react'-import { useTranslation } from 'react-i18next'-import OutsideClickHandler from 'react-outside-click-handler'+import ProjectDropdown from './ProjectDropdown'interface UTMDropdownProps {- onSelect: any+ onSelect: (value: string) => voidtitle: string}@@ -33,41 +29,7 @@ const OPTIONS = []const UTMDropdown = ({ onSelect, title }: UTMDropdownProps) => {- const { t } = useTranslation()- const [show, setShow] = useState(false)-- const _onSelect = (value: string) => {- onSelect(value)- setShow(false)- }-- return (- <OutsideClickHandler onOutsideClick={() => setShow(false)}>- <span className='cursor-pointer' onClick={() => setShow(!show)}>- {title} {show ? <ChevronUpIcon className='inline h-4 w-4' /> : <ChevronDownIcon className='inline h-4 w-4' />}- </span>- {show ? (- <div className='absolute top-4 left-5 z-10 mt-2 max-h-[200px] min-w-[250px] overflow-auto rounded-md border border-black/10 bg-white text-gray-900 dark:border-slate-700/50 dark:bg-slate-900'>- <div className='flex w-full flex-col p-2'>- <p className='px-1 text-sm font-semibold text-gray-900 dark:text-gray-50'>{t('project.campaigns')}</p>- {_map(OPTIONS, ({ label, value }) => (- <div- key={label}- onClick={() => _onSelect(value)}- className='flex w-full cursor-pointer flex-row items-center justify-between px-1 py-2 text-sm text-gray-700 hover:bg-gray-200 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-800'- >- <p>{t(label)}</p>- </div>- ))}- </div>- <XMarkIcon- className='absolute top-2 right-2 h-5 w-5 cursor-pointer text-gray-900 dark:text-gray-50'- onClick={() => setShow(!show)}- />- </div>- ) : null}- </OutsideClickHandler>- )+ return <ProjectDropdown title={title} options={OPTIONS} onSelect={onSelect} headerKey='project.campaigns' />}export default UTMDropdowndiff --git a/web/app/ui/Dropdown.tsx b/web/app/ui/Dropdown.tsxindex c1782ad37..deb767174 100644--- a/web/app/ui/Dropdown.tsx+++ b/web/app/ui/Dropdown.tsx@@ -57,21 +57,24 @@ function Dropdown<T>({<MenuButtononClick={onClick}disabled={disabled}- className={cx(buttonClassName, {- 'justify-between': aside,- 'justify-center': !aside,- 'inline-flex w-full rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium hover:bg-gray-50 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:ring-offset-gray-100 focus:outline-hidden md:px-4 dark:border-gray-800 dark:bg-slate-800 dark:hover:bg-slate-700':- !headless,- 'group inline-flex w-full px-3 py-2 text-sm font-medium outline-hidden md:px-4': headless,- 'text-gray-700 dark:text-gray-50': !disabled,- 'cursor-not-allowed text-gray-500 dark:text-gray-400': disabled,- })}+ className={cn(+ {+ 'justify-between': aside,+ 'justify-center': !aside,+ 'inline-flex w-full rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium hover:bg-gray-50 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:ring-offset-gray-100 focus:outline-hidden md:px-4 dark:border-gray-800 dark:bg-slate-800 dark:hover:bg-slate-700':+ !headless,+ 'group inline-flex w-full px-3 py-2 text-sm font-medium outline-hidden md:px-4': headless,+ 'text-gray-700 dark:text-gray-50': !disabled,+ 'cursor-not-allowed text-gray-500 dark:text-gray-400': disabled,+ },+ buttonClassName,+ )}>- {title}+ <span>{title}</span>{chevron === 'regular' ? (<ChevronDownIconclassName={cx('-mr-1 ml-2 h-5 w-5 transform-gpu transition-transform', {- 'group-hover:text-gray-500': headless,+ 'group-hover:text-slate-500 dark:group-hover:text-slate-400': headless,'rotate-180': open,})}aria-hidden='true'@@ -80,7 +83,7 @@ function Dropdown<T>({{chevron === 'mini' ? (<ChevronDownIconMiniclassName={cx('-mr-1 ml-1 h-5 w-5 transform-gpu transition-transform', {- 'group-hover:text-gray-500': headless,+ 'group-hover:text-slate-500 dark:group-hover:text-slate-400': headless,'rotate-180': open,})}aria-hidden='true'