tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Profile editing: Fix regression with adding tags

Browse Source 
Port 85fb9218a79955cc3d17229329a6b3ff9f6608ac to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Echo 2026-04-07 14:05:06 +02:00 committed by Claire
parent bd18207c65
commit 631ec59f9c
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/features/account_edit/components/tag_search.tsx
View File

@ -65,7 +65,7 @@ export const AccountEditTagSearch: FC = () => {
value={query} value={query}
onChange={handleSearchChange} onChange={handleSearchChange}
placeholder={inputLabel} placeholder={inputLabel}
items={suggestedTags as TagSearchResult[]} items={suggestedTags}
isLoading={isLoading} isLoading={isLoading}
renderItem={renderItem} renderItem={renderItem}
onSelectItem={handleSelect} onSelectItem={handleSelect}

15
app/javascript/flavours/glitch/features/account_timeline/v2/tags_suggestions.tsx
View File

@ -14,20 +14,27 @@ import {
fetchSuggestedTags, fetchSuggestedTags,
addFeaturedTags, addFeaturedTags,
} from '@/flavours/glitch/reducers/slices/profile_edit'; } from '@/flavours/glitch/reducers/slices/profile_edit';
import { useAppSelector, useAppDispatch } from '@/flavours/glitch/store'; import {
useAppSelector,
useAppDispatch,
createAppSelector,
} from '@/flavours/glitch/store';
import classes from './styles.module.scss'; import classes from './styles.module.scss';
const MAX_SUGGESTED_TAGS = 3; const MAX_SUGGESTED_TAGS = 3;
const selectSuggestedTags = createAppSelector(
[(state) => state.profileEdit.tagSuggestions],
(tagSuggestions) => tagSuggestions?.slice(0, MAX_SUGGESTED_TAGS),
);
export const TagSuggestions: FC = () => { export const TagSuggestions: FC = () => {
const { dismiss, wasDismissed } = useDismissible( const { dismiss, wasDismissed } = useDismissible(
'profile/featured_tag_suggestions', 'profile/featured_tag_suggestions',
); );
const suggestedTags = useAppSelector((state) => const suggestedTags = useAppSelector(selectSuggestedTags);
state.profileEdit.tagSuggestions?.slice(0, MAX_SUGGESTED_TAGS),
);
const existingTagCount = useAppSelector( const existingTagCount = useAppSelector(
(state) => state.profileEdit.profile?.featuredTags.length, (state) => state.profileEdit.profile?.featuredTags.length,
); );

4
app/javascript/flavours/glitch/hooks/useSearchTags.ts
View File

@ -91,8 +91,8 @@ export function useSearchTags({
// Add dedicated item for adding the current query // Add dedicated item for adding the current query
const tags = useMemo(() => { const tags = useMemo(() => {
const trimmedQuery = query ? trimHashFromStart(query.trim()) : ''; const trimmedQuery = query ? trimHashFromStart(query.trim()) : '';
if (!trimmedQuery || !fetchedTags.length) { if (!trimmedQuery) {
return fetchedTags; return fetchedTags as TagSearchResult[];
} }
const results: TagSearchResult[] = [...fetchedTags]; // Make array mutable const results: TagSearchResult[] = [...fetchedTags]; // Make array mutable