strtus/Vercel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply tag count limits to cmdk menu

Browse Source
This commit is contained in:
Sam Becker 2025-06-25 17:17:05 -05:00
parent 21d465c1ec
commit 434d3bcb8f
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/cmdk/CommandKClient.tsx
View File

@ -49,12 +49,19 @@ import { getKeywordsForPhoto, titleForPhoto } from '@/photo';
import PhotoDate from '@/photo/PhotoDate'; import PhotoDate from '@/photo/PhotoDate';
import PhotoSmall from '@/photo/PhotoSmall'; import PhotoSmall from '@/photo/PhotoSmall';
import { FaCheck } from 'react-icons/fa6'; import { FaCheck } from 'react-icons/fa6';
import { addHiddenToTags, formatTag, isTagFavs, isTagHidden } from '@/tag'; import {
addHiddenToTags,
formatTag,
isTagFavs,
isTagHidden,
limitTagsByCount,
} from '@/tag';
import { formatCount, formatCountDescriptive } from '@/utility/string'; import { formatCount, formatCountDescriptive } from '@/utility/string';
import CommandKItem from './CommandKItem'; import CommandKItem from './CommandKItem';
import { import {
CATEGORY_VISIBILITY, CATEGORY_VISIBILITY,
GRID_HOMEPAGE_ENABLED, GRID_HOMEPAGE_ENABLED,
HIDE_TAGS_WITH_ONE_PHOTO,
} from '@/app/config'; } from '@/app/config';
import { DialogDescription, DialogTitle } from '@radix-ui/react-dialog'; import { DialogDescription, DialogTitle } from '@radix-ui/react-dialog';
import * as VisuallyHidden from '@radix-ui/react-visually-hidden'; import * as VisuallyHidden from '@radix-ui/react-visually-hidden';
@ -118,7 +125,7 @@ const renderToggle = (
export default function CommandKClient({ export default function CommandKClient({
cameras, cameras,
lenses, lenses,
tags, tags: _tags,
recipes, recipes,
films, films,
focalLengths, focalLengths,
@ -134,7 +141,7 @@ export default function CommandKClient({
isCommandKOpen: isOpen, isCommandKOpen: isOpen,
startUpload, startUpload,
photosCountTotal, photosCountTotal,
photosCountHidden, photosCountHidden = 0,
uploadsCount, uploadsCount,
tagsCount, tagsCount,
recipesCount, recipesCount,
@ -282,9 +289,14 @@ export default function CommandKClient({
} }
}, [isOpen]); }, [isOpen]);
const tagsIncludingHidden = useMemo(() => const tags = useMemo(() => {
addHiddenToTags(tags, photosCountHidden) const tagsIncludingHidden = photosCountHidden > 0
, [tags, photosCountHidden]); ? addHiddenToTags(_tags, photosCountHidden)
: _tags;
return HIDE_TAGS_WITH_ONE_PHOTO
? limitTagsByCount(tagsIncludingHidden, 2, queryLive)
: tagsIncludingHidden;
}, [_tags, photosCountHidden, queryLive]);
const categorySections: CommandKSection[] = useMemo(() => const categorySections: CommandKSection[] = useMemo(() =>
CATEGORY_VISIBILITY CATEGORY_VISIBILITY
@ -317,7 +329,7 @@ export default function CommandKClient({
size={13} size={13}
className="translate-x-[1px] translate-y-[0.75px]" className="translate-x-[1px] translate-y-[0.75px]"
/>, />,
items: tagsIncludingHidden.map(({ tag, count }) => ({ items: tags.map(({ tag, count }) => ({
explicitKey: formatTag(tag), explicitKey: formatTag(tag),
label: <span className="flex items-center gap-[7px]"> label: <span className="flex items-center gap-[7px]">
{formatTag(tag)} {formatTag(tag)}
@ -376,7 +388,7 @@ export default function CommandKClient({
.filter(Boolean) as CommandKSection[] .filter(Boolean) as CommandKSection[]
, [ , [
appText, appText,
tagsIncludingHidden, tags,
cameras, cameras,
lenses, lenses,
recipes, recipes,

11
src/tag/index.ts
View File

@ -168,9 +168,16 @@ export const convertTagsForForm = (
formatCountDescriptive(count, appText.category.taggedPhotos), formatCountDescriptive(count, appText.category.taggedPhotos),
})); }));
export const limitTagsByCount = (tags: Tags, minimumCount: number) => export const limitTagsByCount = (
tags: Tags,
minimumCount: number,
queryToInclude?: string,
) =>
tags.filter(({ tag, count }) => ( tags.filter(({ tag, count }) => (
count >= minimumCount || count >= minimumCount ||
isTagFavs(tag) || isTagFavs(tag) ||
isTagHidden(tag) isTagHidden(tag) ||
(queryToInclude && tag
.toLocaleLowerCase()
.includes(queryToInclude.toLocaleLowerCase()))
)); ));