IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

MM-52881: Fix date picker selected day (#23391)

Browse Source
This commit is contained in:
LeonardJouve 2023-06-14 18:51:37 +02:00 committed by GitHub
parent 8e13e7fffe
commit c7895c6f41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
e2e-tests/cypress/tests/integration/channels/custom_status/custom_status_expiry/custom_status_expiry_4_spec.ts
View File

@ -142,4 +142,33 @@ describe('MM-T4066 Setting manual status clear time more than 7 days away', () =
// * Correct clear time should be displayed in the status dropdown
cy.get('.status-dropdown-menu .custom_status__expiry time').should('have.text', dateToBeSelected.format('MMM DD'));
});
it('MM-52881 should show the selected date when reopening the date picker', () => {
// # clear the status
cy.get('.input-clear-x').click();
// # open the status modal
cy.get('.custom_status__row').click();
// # select the first option
cy.get('.statusSuggestion__row').first().click();
// # open the date picker
cy.get('.dateTime__calendar-icon').click();
// * Verify that DayPicker overlay is visible
cy.get('.date-picker__popper').should('be.visible');
// # Click on the date which is dateToBeSelected
for (let i = 0; i < months; i++) {
cy.get('.fa-angle-right').click();
}
cy.get('.date-picker__popper').find(`.rdp-month button[aria-label="${dateToBeSelected.format('Do MMMM (dddd)')}"]`).click();
// # reopen the date picker
cy.get('.dateTime__calendar-icon').click();
// * Verify that date selected is still selected
cy.get('.date-picker__popper').find(`.rdp-month button[aria-label="${dateToBeSelected.format('Do MMMM (dddd)')}"]`).should('have.class', 'rdp-day_selected');
});
});

3
webapp/channels/src/components/custom_status/date_time_input.tsx
View File

@ -145,7 +145,8 @@ const DateTimeInputContainer: React.FC<Props> = (props: Props) => {
const datePickerProps: DayPickerProps = {
initialFocus: isPopperOpen,
mode: 'single',
selected: currentTime,
selected: time.toDate(),
defaultMonth: time.toDate(),
onDayClick: handleDayChange,
disabled: [{
before: currentTime,