Skip to content

Commit

Permalink
FormFieldFeedback takes optional baseFontSize prop
Browse files Browse the repository at this point in the history
  • Loading branch information
stephl3 committed Apr 24, 2024
1 parent ee92e61 commit 4dff042
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
1 change: 1 addition & 0 deletions packages/form-field/src/FormField/FormField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export const FormField = forwardRef<HTMLDivElement, FormFieldProps>(
useFormFieldProps({ label, description, state, id, disabled, ...rest });

const formFieldFeedbackProps = {
baseFontSize,
disabled,
errorMessage,
id: feedbackId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
import { FormFieldFeedbackProps } from './FormFieldFeedback.types';

export const FormFieldFeedback = ({
baseFontSize: baseFontSizeProp,
disabled,
errorMessage,
hideFeedback = false,
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/
Expand Down

0 comments on commit 4dff042

Please sign in to comment.