gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix nested buttons in search popout in web UI (#34871)

Browse source
This commit is contained in:
Eugen Rochko 2025-06-02 14:21:31 +02:00 • committed by GitHub
parent 9c80b16401
commit c77158c8b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/javascript/mastodon/actions/search.ts
View file

@ -121,10 +121,15 @@ export const clickSearchResult = createAppAsyncThunk(
export const forgetSearchResult = createAppAsyncThunk(
'search/forgetResult',
(q: string, { dispatch, getState }) => {
(
{ q, type }: { q: string; type?: RecentSearchType },
{ dispatch, getState },
) => {
const previous = getState().search.recent;
const me = getState().meta.get('me') as string;
const current = previous.filter((result) => result.q !== q);
const current = previous.filter(
(result) => result.q !== q || result.type !== type,
);
searchHistory.set(me, current);
dispatch(updateSearchHistory(current));

8
app/javascript/mastodon/features/compose/components/search.tsx
View file

@ -221,7 +221,7 @@ export const Search: React.FC<{
},
forget: (e) => {
e.stopPropagation();
void dispatch(forgetSearchResult(search.q));
void dispatch(forgetSearchResult(search));
},
}));
@ -497,8 +497,10 @@ export const Search: React.FC<{
<div className='search__popout__menu'>
{recentOptions.length > 0 ? (
recentOptions.map(({ label, key, action, forget }, i) => (
<button
<div
key={key}
tabIndex={0}
role='button'
onMouseDown={action}
className={classNames(
'search__popout__menu__item search__popout__menu__item--flex',
@ -509,7 +511,7 @@ export const Search: React.FC<{
<button className='icon-button' onMouseDown={forget}>
<Icon id='times' icon={CloseIcon} />
</button>
</button>
</div>
))
) : (
<div className='search__popout__menu__message'>