From 1a8fcdedfaa41b4478342d3f7aa49f58a85c07dd Mon Sep 17 00:00:00 2001 From: Sarah Higley Date: Mon, 24 Jul 2023 12:13:48 -0700 Subject: [PATCH] fix: Datepicker renders input description if inputProps.onRenderDescription is set (#27784) --- ...luentui-react-75983ba2-b5ea-4e4e-9578-6fc0293ce309.json | 7 +++++++ .../react/src/components/DatePicker/DatePicker.base.tsx | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 change/@fluentui-react-75983ba2-b5ea-4e4e-9578-6fc0293ce309.json diff --git a/change/@fluentui-react-75983ba2-b5ea-4e4e-9578-6fc0293ce309.json b/change/@fluentui-react-75983ba2-b5ea-4e4e-9578-6fc0293ce309.json new file mode 100644 index 00000000000000..712b59243816da --- /dev/null +++ b/change/@fluentui-react-75983ba2-b5ea-4e4e-9578-6fc0293ce309.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "fix: Datepicker renders input description if onRenderDescription is passed in", + "packageName": "@fluentui/react", + "email": "sarah.higley@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/packages/react/src/components/DatePicker/DatePicker.base.tsx b/packages/react/src/components/DatePicker/DatePicker.base.tsx index 5547cb160aa12d..e71be0e550c673 100644 --- a/packages/react/src/components/DatePicker/DatePicker.base.tsx +++ b/packages/react/src/components/DatePicker/DatePicker.base.tsx @@ -410,7 +410,7 @@ export const DatePickerBase: React.FunctionComponent = React.f const renderTextfieldDescription = (inputProps: ITextFieldProps, defaultRender: IRenderFunction) => { return ( <> - {inputProps.description ? defaultRender(inputProps) : null} + {inputProps.description || inputProps.onRenderDescription ? defaultRender(inputProps) : null}
{statusMessage}