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!

Update design to be inline with the Dropdown component

Blue Mousecbdb00fbc650
diff --git a/web/app/pages/Project/Settings/ProjectSettings.tsx b/web/app/pages/Project/Settings/ProjectSettings.tsx
index 5c54a8dbb..908e9284c 100644
--- a/web/app/pages/Project/Settings/ProjectSettings.tsx
+++ b/web/app/pages/Project/Settings/ProjectSettings.tsx
@@ -184,7 +184,7 @@ const ModalMessage = ({
<div className='h-2' />
{filterType && !_isEmpty(filterList) ? (
<MultiSelect
- className='max-w-max'
+ className='max-w-96'
items={searchList}
labelExtractor={(item) => {
if (filterType === 'cc') {
diff --git a/web/app/ui/MultiSelect.tsx b/web/app/ui/MultiSelect.tsx
index e532b618f..ffe1a666e 100644
--- a/web/app/ui/MultiSelect.tsx
+++ b/web/app/ui/MultiSelect.tsx
@@ -1,9 +1,10 @@
import { MagnifyingGlassIcon } from '@heroicons/react/24/outline'
+import { ChevronDownIcon } from '@heroicons/react/24/solid'
import cx from 'clsx'
import _includes from 'lodash/includes'
import _isEmpty from 'lodash/isEmpty'
import _map from 'lodash/map'
-import { useState } from 'react'
+import { useState, useEffect, useRef } from 'react'
interface MultiSelectProps {
className?: string
@@ -35,9 +36,26 @@ const MultiSelect = ({
onSearch,
}: MultiSelectProps) => {
const [selected, setSelected] = useState(false)
+ const dropdownRef = useRef<HTMLDivElement>(null)
+
+ useEffect(() => {
+ const handleClickOutside = (event: MouseEvent) => {
+ if (dropdownRef.current && !dropdownRef.current.contains(event.target as Node)) {
+ setSelected(false)
+ }
+ }
+
+ if (selected) {
+ document.addEventListener('mousedown', handleClickOutside)
+ }
+
+ return () => {
+ document.removeEventListener('mousedown', handleClickOutside)
+ }
+ }, [selected])
return (
- <div className={cx('keypress-multiselect flex w-full flex-col items-center', className)}>
+ <div ref={dropdownRef} className={cx('relative flex w-full flex-col items-center', className)}>
<div className='w-full'>
<div className='relative flex flex-col items-center'>
<div
@@ -46,79 +64,54 @@ const MultiSelect = ({
setSelected(!selected)
}}
>
- <div className='w-ful my-2 flex rounded-sm border bg-white p-1 text-sm font-medium text-gray-700 hover:bg-gray-50 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:ring-offset-gray-100 focus:outline-hidden dark:border-gray-800 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'>
- <div className='flex flex-auto flex-wrap'>
+ <div className='relative w-full rounded-md border border-gray-300 bg-white py-2 pr-10 pl-3 text-left 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 sm:text-sm dark:border-gray-800 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'>
+ <div className='flex flex-auto flex-wrap gap-1'>
{!_isEmpty(label) ? (
_map(label, (item) => (
<div
key={keyExtractor ? keyExtractor(item) : item}
- className='m-1 flex items-center justify-center rounded-full border border-indigo-300 bg-indigo-100 px-2 py-1 font-medium text-indigo-700 dark:border-slate-500 dark:bg-slate-800 dark:text-gray-50'
+ className='inline-flex items-center gap-1 rounded-md bg-indigo-100 px-2 py-1 text-xs font-medium text-indigo-700 dark:bg-slate-600 dark:text-gray-50'
>
- <div className='flex max-w-full flex-initial text-xs leading-none font-normal break-words'>
+ <div className='flex items-center gap-1 whitespace-nowrap'>
{labelExtractor ? labelExtractor(item) : item}
</div>
- <div className='flex flex-auto flex-row-reverse'>
- <div
- onClick={(e) => {
- e.preventDefault()
- e.stopPropagation()
- onRemove(item)
- }}
- >
- <svg
- xmlns='http://www.w3.org/2000/svg'
- width='100%'
- height='100%'
- fill='none'
- viewBox='0 0 24 24'
- stroke='currentColor'
- strokeWidth='2'
- strokeLinecap='round'
- strokeLinejoin='round'
- className='feather feather-x ml-2 h-4 w-4 cursor-pointer rounded-full hover:text-indigo-400'
- >
- <line x1='18' y1='6' x2='6' y2='18' />
- <line x1='6' y1='6' x2='18' y2='18' />
- </svg>
- </div>
- </div>
+ <button
+ type='button'
+ onClick={(e) => {
+ e.preventDefault()
+ e.stopPropagation()
+ onRemove(item)
+ }}
+ className='inline-flex h-4 w-4 flex-shrink-0 items-center justify-center rounded-full text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:bg-indigo-500 focus:text-white focus:outline-hidden dark:text-gray-300 dark:hover:bg-slate-500 dark:hover:text-gray-100'
+ >
+ <span className='sr-only'>Remove</span>
+ <svg className='h-2 w-2' stroke='currentColor' fill='none' viewBox='0 0 8 8'>
+ <path strokeLinecap='round' strokeWidth='1.5' d='m1 1 6 6m0-6-6 6' />
+ </svg>
+ </button>
</div>
))
) : (
- <p className='flex items-center justify-center px-2 text-gray-300 dark:text-gray-50'>{placholder}</p>
+ <span className='block truncate text-gray-500 dark:text-gray-400'>{placholder}</span>
)}
</div>
- <div className='flex w-8 items-center border-l border-gray-200 py-1 pr-1 pl-2 text-gray-300'>
- <button
- type='button'
- onClick={() => setSelected(!selected)}
- className='h-6 w-6 cursor-pointer text-gray-600 outline-hidden focus:outline-hidden dark:text-gray-300'
- >
- <svg
- xmlns='http://www.w3.org/2000/svg'
- width='100%'
- height='100%'
- fill='none'
- viewBox='0 0 24 24'
- stroke='currentColor'
- strokeWidth='2'
- strokeLinecap='round'
- strokeLinejoin='round'
- className='h-4 w-4 rotate-180'
- >
- <polyline points='18 15 12 9 6 15' />
- </svg>
- </button>
+ <div className='pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2'>
+ <ChevronDownIcon
+ className={cx('h-5 w-5 transform-gpu text-gray-400 transition-transform', {
+ 'rotate-180': selected,
+ })}
+ aria-hidden='true'
+ />
</div>
</div>
</div>
{selected ? (
- <div className='lef-0 max-h-select top-100 z-40 max-h-[200px] w-full overflow-x-hidden overflow-y-auto rounded-sm bg-white dark:bg-slate-800'>
+ <div className='absolute z-50 mt-1 max-h-60 w-full min-w-max 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'>
<div className='flex w-full flex-col'>
{onSearch ? (
- <div className='relative w-full cursor-pointer rounded-t border-b border-gray-100 hover:bg-indigo-100 dark:border-slate-700 dark:hover:bg-slate-700'>
+ <div className='relative mx-1 mb-1'>
<input
- className='relative flex w-full items-center overflow-x-auto border-l-2 border-transparent bg-white p-2 pl-2 hover:border-b-indigo-100 focus:border-transparent focus:ring-0 focus:outline-hidden dark:bg-slate-800 dark:hover:border-b-slate-700'
+ className='w-full rounded-md border border-gray-300 bg-white py-2 pr-10 pl-3 text-sm focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden dark:border-gray-600 dark:bg-slate-700 dark:text-gray-50'
placeholder={searchPlaseholder}
onChange={(e) => {
e.preventDefault()
@@ -127,29 +120,29 @@ const MultiSelect = ({
}}
type='text'
/>
- <MagnifyingGlassIcon
- className='absolute top-[0.7rem] right-2 h-5 w-5 text-gray-400 dark:text-gray-300'
- aria-hidden='true'
- />
+ <div className='pointer-events-none absolute inset-y-0 right-0 flex items-center pr-3'>
+ <MagnifyingGlassIcon className='h-4 w-4 text-gray-400' aria-hidden='true' />
+ </div>
</div>
) : null}
{_map(items, (item) => (
<div
key={keyExtractor ? `${keyExtractor(item)}select` : `${item}select`}
onClick={() => onSelect(item)}
- className='w-full cursor-pointer rounded-t border-b border-gray-100 hover:bg-indigo-100 dark:border-slate-500 dark:hover:bg-slate-700'
+ className={cx('relative mx-1 cursor-pointer rounded-md py-2 pr-4 pl-3 text-sm select-none', {
+ 'bg-gray-300 dark:bg-slate-600': _includes(label, item),
+ 'hover:bg-gray-200 dark:hover:bg-slate-700': !_includes(label, item),
+ 'text-gray-900 dark:text-white': _includes(label, item),
+ 'text-gray-700 dark:text-gray-50': !_includes(label, item),
+ })}
>
- <div
- className={cx(
- 'relative flex w-full items-center overflow-x-auto border-l-2 border-transparent p-2 pl-2 hover:border-indigo-100 dark:hover:border-slate-700',
- {
- 'border-l-2 !border-indigo-500 dark:!border-slate-400': _includes(label, item),
- },
- )}
- >
- <div className='flex w-full items-center break-words'>
- <div className='mx-2 flex leading-6'>{itemExtractor ? itemExtractor(item) : item}</div>
+ <div className='flex w-full items-center gap-2 whitespace-nowrap'>
+ <div className='flex min-w-0 flex-1 items-center gap-2'>
+ {itemExtractor ? itemExtractor(item) : item}
</div>
+ {_includes(label, item) ? (
+ <span className='h-2 w-2 flex-shrink-0 rounded-full bg-indigo-600 dark:bg-indigo-400' />
+ ) : null}
</div>
</div>
))}