Finish merging main into static

src/components/Badge.tsx

@@ -8,7 +8,6 @@ export default function Badge({
   highContrast,
   uppercase,
   interactive,
-  className,
 }: {
   children: React.ReactNode
   className?: string
@@ -17,7 +16,6 @@ export default function Badge({
   highContrast?: boolean
   uppercase?: boolean
   interactive?: boolean
-  className?: string
 }) {
   const stylesForType = () => {
     switch (type) {

src/components/ChecklistRow.tsx

@@ -29,12 +29,12 @@ export default function ChecklistRow({
       />
       <div className="flex flex-col min-w-0">
         <div className={clsx(
-          'flex flex-wrap items-center gap-2',
+          'flex flex-wrap items-center gap-2 pb-1',
           'font-bold dark:text-gray-300',
         )}>
           {title}
           {experimental &&
-            <ExperimentalBadge className="translate-y-[0.5px]" />}
+            <ExperimentalBadge className="translate-y-[-0.5px]" />}
         </div>
         <div>
           {children}

src/photo/actions.tsx

@@ -37,7 +37,11 @@ import { TAG_FAVS, isTagFavs } from '@/tag';
 import { TbPhoto } from 'react-icons/tb';
 import PhotoTiny from './PhotoTiny';
 import { formatDate } from '@/utility/date';
-import { convertPhotoToPhotoDbInsert, titleForPhoto } from '.';
+import {
+  convertPhotoToPhotoDbInsert,
+  getKeywordsForPhoto,
+  titleForPhoto,
+} from '.';
 import { safelyRunAdminServerAction } from '@/auth';
 import { AI_IMAGE_QUERIES, AiImageQuery } from './ai';
 import { streamOpenAiImageQuery } from '@/services/openai';
@@ -205,8 +209,8 @@ export async function getPhotoItemsAction(query: string) {
       heading: 'Photos',
       accessory: <TbPhoto size={14} />,
       items: photos.map(photo => ({
-        accessory: <PhotoTiny photo={photo} />,
         label: titleForPhoto(photo),
+        keywords: getKeywordsForPhoto(photo),
         annotation: <>
           <span className="hidden sm:inline-block">
             {formatDate(photo.takenAt)}
@@ -215,6 +219,7 @@ export async function getPhotoItemsAction(query: string) {
             {formatDate(photo.takenAt, true)}
           </span>
         </>,
+        accessory: <PhotoTiny photo={photo} />,
         path: pathForPhoto(photo),
       })),
     }]

src/site/SiteChecklistClient.tsx

@@ -338,8 +338,8 @@ export default function SiteChecklistClient({
           optional
           experimental
         >
-          Set environment variable to {'"1"'} to enable
-          PPR and static optimization, i.e., building pages ahead of time:
+          Set environment variable to {'"1"'} to enable PPR
+          and static optimization, i.e., build pages ahead of time:
           {renderEnvVars(['NEXT_PUBLIC_STATICALLY_OPTIMIZE'])}
         </ChecklistRow>
         <ChecklistRow