From 4dff042659dde870acc878c90c884c91cec915d3 Mon Sep 17 00:00:00 2001
From: Stephen Lee <stephen.lee@mongodb.com>
Date: Wed, 24 Apr 2024 11:18:46 -0700
Subject: [PATCH] FormFieldFeedback takes optional baseFontSize prop

---
 packages/form-field/src/FormField/FormField.tsx            | 1 +
 .../form-field/src/FormFieldFeedback/FormFieldFeedback.tsx | 3 ++-
 .../src/FormFieldFeedback/FormFieldFeedback.types.ts       | 7 ++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/form-field/src/FormField/FormField.tsx b/packages/form-field/src/FormField/FormField.tsx
index fc7784a52c..2e89d6abea 100644
--- a/packages/form-field/src/FormField/FormField.tsx
+++ b/packages/form-field/src/FormField/FormField.tsx
@@ -56,6 +56,7 @@ export const FormField = forwardRef<HTMLDivElement, FormFieldProps>(
       useFormFieldProps({ label, description, state, id, disabled, ...rest });
 
     const formFieldFeedbackProps = {
+      baseFontSize,
       disabled,
       errorMessage,
       id: feedbackId,
diff --git a/packages/form-field/src/FormFieldFeedback/FormFieldFeedback.tsx b/packages/form-field/src/FormFieldFeedback/FormFieldFeedback.tsx
index 9ce41872fa..4eb3b65645 100644
--- a/packages/form-field/src/FormFieldFeedback/FormFieldFeedback.tsx
+++ b/packages/form-field/src/FormFieldFeedback/FormFieldFeedback.tsx
@@ -23,6 +23,7 @@ import {
 import { FormFieldFeedbackProps } from './FormFieldFeedback.types';
 
 export const FormFieldFeedback = ({
+  baseFontSize: baseFontSizeProp,
   disabled,
   errorMessage,
   hideFeedback = false,
@@ -33,7 +34,7 @@ export const FormFieldFeedback = ({
   ...rest
 }: FormFieldFeedbackProps) => {
   const { theme } = useDarkMode();
-  const baseFontSize = useUpdatedBaseFontSize();
+  const baseFontSize = useUpdatedBaseFontSize(baseFontSizeProp);
   const fontStyles = getFontSizeStyles({ baseFontSize, size });
 
   const isErrorState = state === FormFieldState.Error;
diff --git a/packages/form-field/src/FormFieldFeedback/FormFieldFeedback.types.ts b/packages/form-field/src/FormFieldFeedback/FormFieldFeedback.types.ts
index 10825ef228..4f55c37327 100644
--- a/packages/form-field/src/FormFieldFeedback/FormFieldFeedback.types.ts
+++ b/packages/form-field/src/FormFieldFeedback/FormFieldFeedback.types.ts
@@ -1,9 +1,14 @@
 import { HTMLElementProps } from '@leafygreen-ui/lib';
-import { Size } from '@leafygreen-ui/tokens';
+import { BaseFontSize, Size } from '@leafygreen-ui/tokens';
 
 import { FormFieldState } from '../FormField/FormField.types';
 
 export interface FormFieldFeedbackProps extends HTMLElementProps<'div'> {
+  /**
+   * Base font size of the component. Only effective when `size == 'default'`
+   */
+  baseFontSize?: BaseFontSize;
+
   /**
    * Defines whether the component is disabled
    */