Analytics: Fix advanced filtering date selection in WordPress 6.1. (w…

…oocommerce#35644) * Fixed date filter date selection in WordPress 6.1. * Move fix deeper into DatePicker itself.
wpexplorer · Nov 22, 2022 · 995b587 · 995b587
1 parent 6ac092e
commit 995b587
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/packages/js/components/changelog/fix-datepicker-moment b/packages/js/components/changelog/fix-datepicker-moment
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fixed DatePicker to work in WordPress 6.1 when currentDate is set to a moment instance.
diff --git a/packages/js/components/src/calendar/date-picker.js b/packages/js/components/src/calendar/date-picker.js
@@ -116,7 +116,11 @@ class DatePicker extends Component {
 						</H>
 						<div className="woocommerce-calendar__react-dates is-core-datepicker">
 							<WpDatePicker
-								currentDate={ date }
+								currentDate={
+									date instanceof moment
+										? date.toDate()
+										: date
+								}
 								onChange={ partial(
 									this.onDateChange,
 									onToggle