Skip to content

fix(discover): preserve keyword filter input focus after selection #2962

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
gauthier-th merged 4 commits into from
May 21, 2026
Merged

fix(discover): preserve keyword filter input focus after selection #2962

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99bc0d1
fix(discover): preserve keyword filter input focus after selection
0xSysR3ll Apr 27, 2026
da7cfd4
refactor: remove unused defaultDataValue state
0xSysR3ll Apr 27, 2026
8997f2f
fix: remove null type
0xSysR3ll Apr 27, 2026
0fd6c5d
revert: bring back null
0xSysR3ll May 21, 2026
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
23 changes: 12 additions & 11 deletions src/components/Selector/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,13 +294,14 @@ export const KeywordSelector = ({
onChange,
}: BaseSelectorMultiProps | BaseSelectorSingleProps) => {
const intl = useIntl();
const [defaultDataValue, setDefaultDataValue] = useState<
{ label: string; value: number }[] | null
const [selectedValue, setSelectedValue] = useState<
MultiValue<SingleVal> | SingleValue<SingleVal> | null
>(null);

useEffect(() => {
const loadDefaultKeywords = async (): Promise<void> => {
if (!defaultValue) {
setSelectedValue(null);
return;
}

Expand All @@ -317,16 +318,16 @@ export const KeywordSelector = ({
(keyword): keyword is Keyword => keyword !== null
);

setDefaultDataValue(
validKeywords.map((keyword) => ({
label: keyword.name,
value: keyword.id,
}))
);
const nextValue = validKeywords.map((keyword) => ({
label: keyword.name,
value: keyword.id,
}));

setSelectedValue(isMulti ? nextValue : (nextValue[0] ?? null));
};

loadDefaultKeywords();
}, [defaultValue]);
}, [defaultValue, isMulti]);

const loadKeywordOptions = async (inputValue: string) => {
const results = await axios.get<TmdbKeywordSearchResponse>(
Expand All @@ -346,7 +347,6 @@ export const KeywordSelector = ({

return (
<AsyncSelect
key={`keyword-select-${defaultDataValue}`}
inputId="data"
isMulti={isMulti}
isDisabled={isDisabled}
Expand All @@ -357,10 +357,11 @@ export const KeywordSelector = ({
? intl.formatMessage(messages.starttyping)
: intl.formatMessage(messages.nooptions)
}
defaultValue={defaultDataValue}
value={selectedValue}
loadOptions={loadKeywordOptions}
placeholder={intl.formatMessage(messages.searchKeywords)}
onChange={(value) => {
setSelectedValue(value);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
onChange(value as any);
}}
Expand Down
Loading