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!

using combobox for funnel steps

Blue Mouse3b931463db73
diff --git a/app/modals/NewFunnel.tsx b/app/modals/NewFunnel.tsx
index 8c42ca8af..96ebb6391 100644
--- a/app/modals/NewFunnel.tsx
+++ b/app/modals/NewFunnel.tsx
@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next'
import Modal from 'ui/Modal'
import Input from 'ui/Input'
-import Select from 'ui/Select'
+import Combobox from 'ui/Combobox'
import { MIN_FUNNEL_STEPS, MAX_FUNNEL_STEPS } from 'redux/constants'
import { getFilters } from 'api'
import { IFunnel } from 'redux/models/IProject'
@@ -104,7 +104,7 @@ const NewFunnel = ({
</p>
{_map(steps, (step, index) => (
<div key={index} className='flex items-center space-x-2 mt-1'>
- <Select
+ <Combobox
className='w-full !ml-0'
buttonClassName={cx({
'h-9': !step,
diff --git a/app/ui/Combobox.tsx b/app/ui/Combobox.tsx
new file mode 100644
index 000000000..672e3cc3c
--- /dev/null
+++ b/app/ui/Combobox.tsx
@@ -0,0 +1,125 @@
+import React, { Fragment, memo, useState } from 'react'
+import cx from 'clsx'
+import PropTypes from 'prop-types'
+import { Combobox as HeadlessCombobox, Transition } from '@headlessui/react'
+import { CheckIcon, ChevronUpDownIcon } from '@heroicons/react/24/solid'
+import { useTranslation } from 'react-i18next'
+import _isEmpty from 'lodash/isEmpty'
+import _map from 'lodash/map'
+import _filter from 'lodash/filter'
+import _toLower from 'lodash/toLower'
+import _includes from 'lodash/includes'
+
+interface ISelect {
+ title?: string,
+ className?: string,
+ buttonClassName?: string,
+ items: any[],
+ labelExtractor?: (item: any, index: number) => string,
+ keyExtractor?: (item: any, index: number) => string,
+ onSelect: (item: any) => void,
+}
+
+const Combobox = ({
+ title, className, items, labelExtractor, keyExtractor, onSelect,
+ buttonClassName,
+}: ISelect): JSX.Element => {
+ const { t } = useTranslation('common')
+ const [query, setQuery] = useState('')
+
+ const filteredItems =
+ _isEmpty(items)
+ ? items
+ : _filter(items, (item, index) => {
+ const label = labelExtractor ? labelExtractor(item, index) : item
+
+ return _includes(_toLower(label), _toLower(query))
+ })
+
+ return (
+ <HeadlessCombobox value={title} onChange={onSelect}>
+ <div className={cx('relative mt-1', className)}>
+ <div className='relative w-full cursor-default overflow-hidden rounded-lg'>
+ <HeadlessCombobox.Input
+ className={cx('relative w-full bg-white border border-gray-300 dark:text-gray-50 dark:border-gray-800 dark:bg-slate-800 rounded-md shadow-sm pl-3 pr-10 py-2 text-left cursor-default focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm', buttonClassName)}
+ // @ts-ignore
+ displayValue={(item) => labelExtractor ? labelExtractor(item, 0) : item}
+ onChange={(event) => setQuery(event.target.value)}
+ />
+ <HeadlessCombobox.Button className='absolute inset-y-0 right-0 flex items-center pr-2'>
+ <ChevronUpDownIcon
+ className='h-5 w-5 text-gray-400'
+ aria-hidden='true'
+ />
+ </HeadlessCombobox.Button>
+ </div>
+ <Transition
+ as={Fragment}
+ leave='transition ease-in duration-100'
+ leaveFrom='opacity-100'
+ leaveTo='opacity-0'
+ afterLeave={() => setQuery('')}
+ >
+ <HeadlessCombobox.Options className='absolute z-10 mt-1 w-full bg-white dark:bg-slate-800 shadow-lg max-h-60 rounded-md py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm'>
+ {_isEmpty(filteredItems) && !_isEmpty(query) ? (
+ <div className='relative cursor-default select-none py-2 px-4 dark:text-white text-gray-900'>
+ {t('common.nothingFound')}
+ </div>
+ ) : (
+ _map(filteredItems, (item, index) => (
+ <HeadlessCombobox.Option
+ key={keyExtractor ? keyExtractor(item, index) : item}
+ className={({ active }) => cx('dark:text-white cursor-default select-none relative py-2 pl-8 pr-4', {
+ 'text-white bg-indigo-600': active,
+ 'text-gray-900': !active,
+ })}
+ value={labelExtractor ? labelExtractor(item, index) : item}
+ >
+ {({ selected, active }) => (
+ <>
+ <span
+ className={`block truncate ${selected ? 'font-medium' : 'font-normal'}`}
+ >
+ {labelExtractor ? labelExtractor(item, index) : item}
+ </span>
+ {selected ? (
+ <span
+ className={cx('absolute inset-y-0 left-0 flex items-center pl-1.5', {
+ 'text-white': active,
+ 'text-indigo-600': !active,
+ })}
+ >
+ <CheckIcon className='h-5 w-5' aria-hidden='true' />
+ </span>
+ ) : null}
+ </>
+ )}
+ </HeadlessCombobox.Option>
+ ))
+ )}
+ </HeadlessCombobox.Options>
+ </Transition>
+ </div>
+ </HeadlessCombobox>
+ )
+}
+
+Combobox.propTypes = {
+ title: PropTypes.string,
+ className: PropTypes.string,
+ buttonClassName: PropTypes.string,
+ items: PropTypes.array.isRequired,
+ labelExtractor: PropTypes.func,
+ keyExtractor: PropTypes.func,
+ onSelect: PropTypes.func.isRequired,
+}
+
+Combobox.defaultProps = {
+ title: '',
+ className: '',
+ buttonClassName: '',
+ labelExtractor: null,
+ keyExtractor: null,
+}
+
+export default memo(Combobox)
diff --git a/app/ui/Select.tsx b/app/ui/Select.tsx
index c3ef56d11..3f88ec465 100644
--- a/app/ui/Select.tsx
+++ b/app/ui/Select.tsx
@@ -20,7 +20,8 @@ interface ISelect {
}
const Select = ({
- title, label, className, items, labelExtractor, keyExtractor, iconExtractor, onSelect, id, buttonClassName, capitalise,
+ title, label, className, items, labelExtractor, keyExtractor, iconExtractor, onSelect, id,
+ buttonClassName, capitalise,
}: ISelect): JSX.Element => (
// @ts-ignore
<Listbox id={id || ''} value={title} onChange={onSelect}>
diff --git a/public/locales/en.json b/public/locales/en.json
index a3584e49d..cf0df5b5b 100644
--- a/public/locales/en.json
+++ b/public/locales/en.json
@@ -87,7 +87,8 @@
"account": "Account",
"transferring": "Transferring",
"link": "Link",
- "unlink": "Unlink"
+ "unlink": "Unlink",
+ "nothingFound": "Nothing found"
},
"main": {
"ukrSupport": "Support the Ukrainian army to fight Russian invasion.",