From 586f9cfbb9854f4df70bc70d8b87da1ac15ba9f9 Mon Sep 17 00:00:00 2001
From: Matei Oprea <eu@opreamatei.ro>
Date: Wed, 15 Dec 2021 21:00:45 +0200
Subject: [PATCH] [MM-11997] - Date picker should re-open on previously
 selected date (#5634)

---
 .../autocomplete/date_suggestion/date_suggestion.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/components/autocomplete/date_suggestion/date_suggestion.js b/app/components/autocomplete/date_suggestion/date_suggestion.js
index ed74bab5a..a4581dcf9 100644
--- a/app/components/autocomplete/date_suggestion/date_suggestion.js
+++ b/app/components/autocomplete/date_suggestion/date_suggestion.js
@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import moment from 'moment-timezone';
 import PropTypes from 'prop-types';
 import React, {PureComponent} from 'react';
 import {intlShape} from 'react-intl';
@@ -36,6 +37,8 @@ export default class DateSuggestion extends PureComponent {
 
         this.state = {
             mentionComplete: false,
+            initialVisibleMonth: (new Date()).toISOString(),
+            futureScrollRange: 0,
             active: false,
             sections: [],
         };
@@ -98,7 +101,11 @@ export default class DateSuggestion extends PureComponent {
 
         onChangeText(completedDraft, true);
         this.props.onResultCountChange(1);
-        this.setState({mentionComplete: true});
+
+        const initialVisibleMonth = (new Date(day.dateString)).toISOString();
+        const futureScrollRange = moment().diff(moment(day.dateString), 'month');
+
+        this.setState({mentionComplete: true, initialVisibleMonth, futureScrollRange});
     };
 
     resetComponent() {
@@ -158,10 +165,10 @@ export default class DateSuggestion extends PureComponent {
                 {Boolean(calendarWidth) &&
                 <CalendarList
                     testID='autocomplete.date_suggestion'
-                    current={currentDate}
+                    current={this.state.initialVisibleMonth}
                     maxDate={currentDate}
                     pastScrollRange={24}
-                    futureScrollRange={0}
+                    futureScrollRange={this.state.futureScrollRange}
                     scrollingEnabled={true}
                     calendarWidth={calendarWidth}
                     pagingEnabled={true}