From c9484a5658d32c3e858a056979bd468f5fba9592 Mon Sep 17 00:00:00 2001 From: Sam Becker Date: Thu, 10 Jul 2025 10:00:18 -0500 Subject: [PATCH] Revert FieldSetWithStatus case change --- app/admin/baseline/page.tsx | 6 +++--- app/admin/components/page.tsx | 4 ++-- src/admin/AdminBatchUploadActions.tsx | 4 ++-- src/admin/AdminRecipeForm.tsx | 4 ++-- src/admin/AdminTagForm.tsx | 4 ++-- src/admin/AdminUploadsTableRow.tsx | 4 ++-- src/admin/PhotoTagFieldset.tsx | 6 +++--- src/auth/SignInForm.tsx | 6 +++--- src/components/FieldSetWithStatus.tsx | 2 +- src/photo/form/ApplyRecipesGloballyCheckbox.tsx | 6 +++--- src/photo/form/FieldsetFavs.tsx | 6 +++--- src/photo/form/PhotoForm.tsx | 8 ++++---- src/photo/visibility/FieldsetVisibility.tsx | 6 +++--- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/app/admin/baseline/page.tsx b/app/admin/baseline/page.tsx index 631c15b1..d24e12ef 100644 --- a/app/admin/baseline/page.tsx +++ b/app/admin/baseline/page.tsx @@ -3,7 +3,7 @@ import PhotoCamera from '@/camera/PhotoCamera'; import Badge from '@/components/Badge'; import DivDebugBaselineGrid from '@/components/DivDebugBaselineGrid'; -import FieldsetWithStatus from '@/components/FieldsetWithStatus'; +import FieldSetWithStatus from '@/components/FieldsetWithStatus'; import AppGrid from '@/components/AppGrid'; import EntityLink from '@/components/entity/EntityLink'; import LabeledIcon from '@/components/primitives/LabeledIcon'; @@ -45,13 +45,13 @@ export default function ComponentsPage() { 'flex gap-1', '*:inline-flex *:gap-1 [&_input]:-translate-y-0.5', )}> - setShouldShowBaselineGrid?.(e === 'true')} /> -
- - - -
- diff --git a/src/admin/PhotoTagFieldset.tsx b/src/admin/PhotoTagFieldset.tsx index 5c72a409..66973848 100644 --- a/src/admin/PhotoTagFieldset.tsx +++ b/src/admin/PhotoTagFieldset.tsx @@ -1,6 +1,6 @@ 'use client'; -import FieldsetWithStatus from '@/components/FieldsetWithStatus'; +import FieldSetWithStatus from '@/components/FieldsetWithStatus'; import { useAppText } from '@/i18n/state/client'; import { convertTagsForForm, getValidationMessageForTags, Tags } from '@/tag'; import { ComponentProps, useEffect, useRef, useState } from 'react'; @@ -12,7 +12,7 @@ export default function PhotoTagFieldset(props: { onError?: (error: string) => void openOnLoad?: boolean } & Partial, + ComponentProps, 'tagOptions' >>) { const { @@ -41,7 +41,7 @@ export default function PhotoTagFieldset(props: { return (
- }
- - & { +}: ComponentProps & { photoId?: string recipeTitle?: string hasRecipeTitleChanged?: boolean @@ -40,7 +40,7 @@ export default function ApplyRecipeTitleGloballyCheckbox({ return ( shouldShowFieldSet - ? , + ComponentProps, 'label' | 'icon' | 'type' >) { return ( - { if (!isFieldHidden(key, hideIfEmpty, shouldHide)) { - const fieldProps: ComponentProps = { + const fieldProps: ComponentProps = { id: key, label: label + ( key === 'blurData' && shouldDebugImageFallbacks @@ -424,7 +424,7 @@ export default function PhotoForm({ switch (key) { case 'film': - return ; default: - return ; diff --git a/src/photo/visibility/FieldsetVisibility.tsx b/src/photo/visibility/FieldsetVisibility.tsx index 91836743..8e794d4e 100644 --- a/src/photo/visibility/FieldsetVisibility.tsx +++ b/src/photo/visibility/FieldsetVisibility.tsx @@ -1,4 +1,4 @@ -import FieldsetWithStatus from '@/components/FieldsetWithStatus'; +import FieldSetWithStatus from '@/components/FieldsetWithStatus'; import { ComponentProps, Dispatch, SetStateAction } from 'react'; import { getVisibilityValue, @@ -16,9 +16,9 @@ export default function FieldsetVisibility({ label?: string formData: Partial setFormData: Dispatch>> -} & Omit, 'label' | 'value'>) { +} & Omit, 'label' | 'value'>) { return ( -