Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

area/ui: Enhance regex filtering in SimpleMatchers component #5288

Merged
merged 1 commit into from
Nov 12, 2024
Merged

area/ui: Enhance regex filtering in SimpleMatchers component #5288

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 42 additions & 26 deletions ui/packages/shared/profile/src/SimpleMatchers/Select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,11 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
setIsOpen(true);
} else if (focusedIndex !== -1) {
onSelection(filteredItems[focusedIndex].key);
setIsOpen(false);
if (editable) {
setSearchTerm(filteredItems[focusedIndex].key);
} else {
setIsOpen(false);
}
}
} else if (e.key === 'Escape') {
setIsOpen(false);
Expand Down Expand Up @@ -169,6 +173,16 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
}
};

const handleSelection = (value: string): void => {
onSelection(value);
if (editable) {
setSearchTerm(value);
setIsOpen(true);
} else {
setIsOpen(false);
}
};

return (
<div ref={containerRef} className="relative" onKeyDown={handleKeyDown} onClick={onButtonClick}>
<div
Expand Down Expand Up @@ -209,38 +223,41 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
>
{searchable && (
<div className="sticky z-10 top-[-5px] w-auto max-w-full">
<div className={cx('relative', editable ? 'h-full min-h-[50px]' : 'h-[45px]')}>
<div className="flex flex-col">
{editable ? (
<textarea
ref={searchInputRef as React.LegacyRef<HTMLTextAreaElement>}
className="w-full px-4 py-2 h-full text-sm border-b border-gray-200 rounded-none ring-0 outline-none bg-gray-50 dark:bg-gray-800 dark:text-white"
placeholder={editable ? 'Type a RegEx to add' : 'Search...'}
value={searchTerm}
onChange={e => setSearchTerm(e.target.value)}
/>
<>
<textarea
ref={searchInputRef as React.LegacyRef<HTMLTextAreaElement>}
className="w-full px-4 py-2 text-sm border-b border-gray-200 rounded-none ring-0 outline-none bg-gray-50 dark:bg-gray-800 dark:text-white min-h-[50px]"
placeholder="Type a RegEx to add"
value={searchTerm}
onChange={e => setSearchTerm(e.target.value)}
/>
{editable && searchTerm.length > 0 && (
<div className="p-2 border-t border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-800">
<Button
variant="primary"
className="w-full h-[30px]"
onClick={() => {
onSelection(searchTerm);
setIsOpen(false);
}}
>
Add
</Button>
</div>
)}
</>
) : (
<input
ref={searchInputRef as React.LegacyRef<HTMLInputElement>}
type="text"
className="w-full px-4 h-full text-sm border-none rounded-none ring-0 outline-none bg-gray-50 dark:bg-gray-800 dark:text-white"
placeholder={editable ? 'Type a RegEx to add' : 'Search...'}
className="w-full px-4 h-[45px] text-sm border-none rounded-none ring-0 outline-none bg-gray-50 dark:bg-gray-800 dark:text-white"
placeholder="Search..."
value={searchTerm}
onChange={e => setSearchTerm(e.target.value)}
/>
)}

{editable && searchTerm.length > 0 && (
<Button
variant="neutral"
className="absolute bottom-[10px] right-[10px] h-[30px]"
onClick={() => {
onSelection(searchTerm);
setIsOpen(false);
}}
>
Add{' '}
</Button>
)}
</div>
</div>
)}
Expand Down Expand Up @@ -269,8 +286,7 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
tabIndex={-1}
onClick={() => {
if (!(item.disabled ?? false)) {
onSelection(item.key);
setIsOpen(false);
handleSelection(item.key);
}
}}
>
Expand Down
Loading