Skip to content

Improvements to the TypeaheadSelect template #11153

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

Merged
tlabaj merged 3 commits into from
Nov 14, 2024
Merged

Improvements to the TypeaheadSelect template #11153

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b143a6a
Avoid "any" type in TypeaheadSelect template
mvollmer Oct 30, 2024
03f86e5
Don't show "Clear" button without onClearSelection function
mvollmer Oct 30, 2024
cbeb8ab
Fix TypeScript error in TypeaheadSelect
mvollmer Oct 30, 2024
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
8 changes: 4 additions & 4 deletions packages/react-templates/src/components/Select/TypeaheadSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export interface TypeaheadSelectOption extends Omit<SelectOptionProps, 'content'

export interface TypeaheadSelectProps extends Omit<SelectProps, 'toggle' | 'onSelect'> {
/** @hide Forwarded ref */
innerRef?: React.Ref<any>;
innerRef?: React.Ref<HTMLDivElement>;
/** Options of the select */
selectOptions: TypeaheadSelectOption[];
/** Callback triggered on selection. */
Expand Down Expand Up @@ -325,7 +325,7 @@ export const TypeaheadSelectBase: React.FunctionComponent<TypeaheadSelectProps>
aria-label="Typeahead menu toggle"
onClick={onToggleClick}
isExpanded={isOpen}
isDisabled={isDisabled}
isDisabled={isDisabled || false}
isFullWidth
style={
{
Expand All @@ -349,7 +349,7 @@ export const TypeaheadSelectBase: React.FunctionComponent<TypeaheadSelectProps>
aria-controls="select-typeahead-listbox"
/>
<TextInputGroupUtilities
{...(!(isFiltering && filterValue) && !selected ? { style: { display: 'none' } } : {})}
{...(!(isFiltering && filterValue) && !(selected && onClearSelection) ? { style: { display: 'none' } } : {})}
>
<Button variant="plain" onClick={onClearButtonClick} aria-label="Clear input value">
<TimesIcon aria-hidden />
Expand Down Expand Up @@ -386,7 +386,7 @@ export const TypeaheadSelectBase: React.FunctionComponent<TypeaheadSelectProps>
};
TypeaheadSelectBase.displayName = 'TypeaheadSelectBase';

export const TypeaheadSelect = React.forwardRef((props: TypeaheadSelectProps, ref: React.Ref<any>) => (
export const TypeaheadSelect = React.forwardRef((props: TypeaheadSelectProps, ref: React.Ref<HTMLDivElement>) => (
<TypeaheadSelectBase {...props} innerRef={ref} />
));

Expand Down
Loading