Skip to content

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

fix: Select components don't show checkmark for the selected elements

Blue Mousedbb5b2a96636
diff --git a/web/app/modals/NewFunnel.tsx b/web/app/modals/NewFunnel.tsx
index e2aebbaa8..1cb4448a4 100644
--- a/web/app/modals/NewFunnel.tsx
+++ b/web/app/modals/NewFunnel.tsx
@@ -105,6 +105,11 @@ const NewFunnel = ({ onClose, onSubmit, isOpened, funnel, loading }: NewFunnelPr
setSteps(newSteps)
}}
title={step.type === 'page' ? t('dashboard.page') : t('dashboard.event')}
+ selectedItem={
+ step.type === 'page'
+ ? { key: 'page', label: t('dashboard.page') }
+ : { key: 'event', label: t('dashboard.event') }
+ }
/>
<Input
className='!ml-0 w-full'
diff --git a/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx b/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx
index a1d2d0581..e218af3b6 100644
--- a/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx
+++ b/web/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx
@@ -420,6 +420,7 @@ const ProjectAlertsSettings = ({ isSettings }: ProjectAlertsSettingsProps) => {
}))
}}
capitalise
+ selectedItem={form.queryMetric ? queryMetricTMapping[form.queryMetric] : undefined}
/>
</div>
{form.queryMetric === QUERY_METRIC.CUSTOM_EVENTS ? (
@@ -486,6 +487,7 @@ const ProjectAlertsSettings = ({ isSettings }: ProjectAlertsSettingsProps) => {
}))
}}
capitalise
+ selectedItem={form.queryCondition ? queryConditionTMapping[form.queryCondition] : undefined}
/>
</div>
<Input
@@ -513,6 +515,7 @@ const ProjectAlertsSettings = ({ isSettings }: ProjectAlertsSettingsProps) => {
}))
}}
capitalise
+ selectedItem={form.queryTime ? queryTimeTMapping[form.queryTime] : undefined}
/>
</div>
</>
diff --git a/web/app/pages/Project/New/index.tsx b/web/app/pages/Project/New/index.tsx
index f8d8ccadc..4a6811456 100644
--- a/web/app/pages/Project/New/index.tsx
+++ b/web/app/pages/Project/New/index.tsx
@@ -172,6 +172,7 @@ const NewProject = () => {
}}
label={t('project.settings.organisation')}
title={organisations.find((org) => org.id === form.organisationId)?.name}
+ selectedItem={organisations.find((org) => org.id === form.organisationId)}
/>
</div>
) : null}
diff --git a/web/app/pages/Project/Settings/ProjectSettings.tsx b/web/app/pages/Project/Settings/ProjectSettings.tsx
index 0a7e7c7b1..2b12820af 100644
--- a/web/app/pages/Project/Settings/ProjectSettings.tsx
+++ b/web/app/pages/Project/Settings/ProjectSettings.tsx
@@ -667,6 +667,7 @@ const ProjectSettings = () => {
return <Icon className='h-4 w-4' strokeWidth={1.5} />
}}
onSelect={(item: any) => setActiveTab(item.id as typeof activeTab)}
+ selectedItem={tabs.find((tab) => tab.id === activeTab)}
/>
</div>
diff --git a/web/app/pages/Project/Settings/tabs/AccessSettings.tsx b/web/app/pages/Project/Settings/tabs/AccessSettings.tsx
index 1d395b382..c949e0176 100644
--- a/web/app/pages/Project/Settings/tabs/AccessSettings.tsx
+++ b/web/app/pages/Project/Settings/tabs/AccessSettings.tsx
@@ -105,6 +105,7 @@ const AccessSettings = ({
}}
label={t('project.settings.organisation')}
title={organisations.find((org) => org.id === form.organisationId)?.name}
+ selectedItem={organisations.find((org) => org.id === form.organisationId)}
/>
</div>
) : null}
diff --git a/web/app/pages/Project/Settings/tabs/Shields.tsx b/web/app/pages/Project/Settings/tabs/Shields.tsx
index 95af123b8..e27a642a6 100644
--- a/web/app/pages/Project/Settings/tabs/Shields.tsx
+++ b/web/app/pages/Project/Settings/tabs/Shields.tsx
@@ -54,6 +54,7 @@ const Shields = ({ form, errors, beenSubmitted, handleInput, botsProtectionLevel
labelExtractor={(item: any) => item.title}
onSelect={(item) => setBotsLevel(item.name)}
capitalise
+ selectedItem={botsProtectionLevels.find((predicate) => predicate.name === form.botsProtectionLevel)}
/>
</div>
</>
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsx
index 0eff6374f..0977b8eb9 100644
--- a/web/app/pages/Project/View/ViewProject.tsx
+++ b/web/app/pages/Project/View/ViewProject.tsx
@@ -2497,6 +2497,7 @@ const ViewProjectContent = () => {
}}
title={activeTabLabel}
capitalise
+ selectedItem={tabs.find((tab) => tab.id === activeTab)}
/>
</div>
<div className='hidden sm:block'>
diff --git a/web/app/pages/Project/View/components/AddAViewModal.tsx b/web/app/pages/Project/View/components/AddAViewModal.tsx
index b02a3e742..ebf03159b 100644
--- a/web/app/pages/Project/View/components/AddAViewModal.tsx
+++ b/web/app/pages/Project/View/components/AddAViewModal.tsx
@@ -174,6 +174,7 @@ const EditMetric = ({ metric, onChange, onDelete, errors, setErrors }: EditMetri
hint={t('project.metrics.metricType.description')}
title={activeCustomEventType}
capitalise
+ selectedItem={customEventTypes.find((item) => item.key === metric.metaValueType)}
/>
</div>
</div>
diff --git a/web/app/pages/Project/View/components/SearchFilters.tsx b/web/app/pages/Project/View/components/SearchFilters.tsx
index 4d1e54af6..65d2706eb 100644
--- a/web/app/pages/Project/View/components/SearchFilters.tsx
+++ b/web/app/pages/Project/View/components/SearchFilters.tsx
@@ -171,6 +171,7 @@ const SearchFilters = ({ showModal, setShowModal, tnMapping, filters, type }: Se
? t('project.settings.reseted.selectFilters')
: tnMapping[filterType] || t(`project.mapping.${filterType}`)
}
+ selectedItem={_isEmpty(filterType) ? undefined : filterType}
/>
{!_isEmpty(filters) ? (
<>
diff --git a/web/app/pages/UserSettings/UserSettings.tsx b/web/app/pages/UserSettings/UserSettings.tsx
index 14b6e27c6..27032ff78 100644
--- a/web/app/pages/UserSettings/UserSettings.tsx
+++ b/web/app/pages/UserSettings/UserSettings.tsx
@@ -485,6 +485,7 @@ const UserSettings = () => {
}}
title={activeTabLabel}
capitalise
+ selectedItem={tabs.find((tab) => tab.id === activeTab)}
/>
</div>
@@ -773,6 +774,9 @@ const UserSettings = () => {
}))
}
capitalise
+ selectedItem={
+ translatedTimeFormat[_findIndex(timeFormatArray, (freq) => freq === form.timeFormat)]
+ }
/>
</div>
</div>
@@ -821,6 +825,11 @@ const UserSettings = () => {
)
}
capitalise
+ selectedItem={
+ translatedFrequencies[
+ _findIndex(reportFrequencies, (freq) => freq === reportFrequency)
+ ]
+ }
/>
</div>
</div>
diff --git a/web/app/ui/Pagination.tsx b/web/app/ui/Pagination.tsx
index 4f49fe32b..6ecf0a15d 100644
--- a/web/app/ui/Pagination.tsx
+++ b/web/app/ui/Pagination.tsx
@@ -100,6 +100,7 @@ const Pagination = ({
items={processedPageSizeOptions}
onSelect={(item) => onPageSizeChange(Number(item))}
labelClassName='!overflow-visible'
+ selectedItem={pageSize.toString()}
/>
</div>
) : null}
diff --git a/web/app/ui/Select.tsx b/web/app/ui/Select.tsx
index 0a73f56d2..84fa2e9a0 100644
--- a/web/app/ui/Select.tsx
+++ b/web/app/ui/Select.tsx
@@ -28,6 +28,8 @@ interface SelectProps<T> {
keyExtractor?: (item: T, index: number) => string
iconExtractor?: (item: T, index: number) => React.ReactNode | null
onSelect: (item: T) => void
+ // The currently selected item - used for comparison to show checkmark
+ selectedItem?: T
}
function Select<T>({
@@ -45,10 +47,20 @@ function Select<T>({
capitalise,
labelClassName,
fieldLabelClassName,
+ selectedItem,
}: SelectProps<T>) {
+ const isItemSelected = (item: T): boolean => {
+ if (!selectedItem) return false
+
+ if (keyExtractor) {
+ return keyExtractor(item, 0) === keyExtractor(selectedItem, 0)
+ }
+
+ return item === selectedItem
+ }
+
return (
- // @ts-expect-error
- <Listbox as='div' id={id || ''} value={title} onChange={onSelect}>
+ <Listbox as='div' id={id || ''} value={selectedItem} onChange={onSelect}>
{({ open }) => (
<>
{label ? (
@@ -94,20 +106,21 @@ function Select<T>({
static
className='absolute z-30 mt-1 max-h-60 w-full overflow-auto rounded-md bg-gray-50 py-1 text-base ring-1 ring-black/10 focus:outline-hidden sm:text-sm dark:bg-slate-800'
>
- {_map(items, (item, index) => (
- <ListboxOption
- key={keyExtractor ? keyExtractor(item, index) : (item as Key)}
- className={({ focus, selected }) =>
- cx('relative mx-1 cursor-pointer rounded-md py-2 pr-4 pl-8 transition-colors select-none', {
- 'bg-gray-200 dark:bg-slate-700': focus && !selected,
- 'bg-gray-300 dark:bg-slate-600': selected,
- 'text-gray-700 dark:text-gray-50': !focus && !selected,
- 'text-gray-900 dark:text-white': focus || selected,
- })
- }
- value={item}
- >
- {({ selected }) => (
+ {_map(items, (item, index) => {
+ const selected = isItemSelected(item)
+ return (
+ <ListboxOption
+ key={keyExtractor ? keyExtractor(item, index) : (item as Key)}
+ className={({ focus }) =>
+ cx('relative mx-1 cursor-pointer rounded-md py-2 pr-4 pl-8 transition-colors select-none', {
+ 'bg-gray-200 dark:bg-slate-700': focus && !selected,
+ 'bg-gray-300 dark:bg-slate-600': selected,
+ 'text-gray-700 dark:text-gray-50': !focus && !selected,
+ 'text-gray-900 dark:text-white': focus || selected,
+ })
+ }
+ value={item}
+ >
<>
<span
className={cx(
@@ -129,7 +142,7 @@ function Select<T>({
</span>
) : null}
- {selected ? (
+ {selected && !iconExtractor ? (
<span
className={cx(
'absolute inset-y-0 left-0 flex items-center pl-1.5 text-gray-600 dark:text-gray-300',
@@ -139,9 +152,9 @@ function Select<T>({
</span>
) : null}
</>
- )}
- </ListboxOption>
- ))}
+ </ListboxOption>
+ )
+ })}
</ListboxOptions>
</Transition>
</div>
diff --git a/web/app/ui/TimezonePicker.tsx b/web/app/ui/TimezonePicker.tsx
index 1cc855492..9e151f0d3 100644
--- a/web/app/ui/TimezonePicker.tsx
+++ b/web/app/ui/TimezonePicker.tsx
@@ -91,6 +91,7 @@ const TimezoneSelect = ({ value, onChange }: TimezoneSelectProps) => {
keyExtractor={keyExtractor}
onSelect={handleChange}
capitalise
+ selectedItem={parseTimezone(value)}
/>
)
}