From 1a8fcdedfaa41b4478342d3f7aa49f58a85c07dd Mon Sep 17 00:00:00 2001 From: Sarah Higley Date: Mon, 24 Jul 2023 12:13:48 -0700 Subject: [PATCH 01/37] 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 0000000000000..712b59243816d --- /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 5547cb160aa12..e71be0e550c67 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}
From e6e662c52a7a7d9c4a9f95e01e1e2194f4e72b04 Mon Sep 17 00:00:00 2001 From: Sarah Higley Date: Mon, 24 Jul 2023 12:14:55 -0700 Subject: [PATCH 02/37] fix: do not dismiss editable comboboxes on scroll or resize immediately after opening (#28591) --- ...-f1224d11-1ccf-4845-805f-fe84e7b89377.json | 7 +++++ .../src/components/ComboBox/ComboBox.tsx | 31 +++++++++++++++++-- .../src/components/pickers/BasePicker.tsx | 23 ++++++++++++++ 3 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 change/@fluentui-react-f1224d11-1ccf-4845-805f-fe84e7b89377.json diff --git a/change/@fluentui-react-f1224d11-1ccf-4845-805f-fe84e7b89377.json b/change/@fluentui-react-f1224d11-1ccf-4845-805f-fe84e7b89377.json new file mode 100644 index 0000000000000..99c5e0234c7bb --- /dev/null +++ b/change/@fluentui-react-f1224d11-1ccf-4845-805f-fe84e7b89377.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "fix: do not dismiss editable comboboxes on scroll or resize immediately after opening", + "packageName": "@fluentui/react", + "email": "sarah.higley@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/packages/react/src/components/ComboBox/ComboBox.tsx b/packages/react/src/components/ComboBox/ComboBox.tsx index e71d282f39486..630e7ba599f96 100644 --- a/packages/react/src/components/ComboBox/ComboBox.tsx +++ b/packages/react/src/components/ComboBox/ComboBox.tsx @@ -293,6 +293,10 @@ class ComboBoxInternal extends React.Component { + this._overrideScrollDismiss = false; + }, 100); + + onMenuOpen?.(); } if (!isOpen && prevState.isOpen && onMenuDismissed) { @@ -835,6 +846,20 @@ class ComboBoxInternal extends React.Component