From 5e45b0ca2fcf4b197b8b47ca9cdd9ee9db938020 Mon Sep 17 00:00:00 2001 From: Ali Sasani Date: Sat, 18 Dec 2021 20:32:21 +0330 Subject: [PATCH 1/3] change showToolbar default value to false --- packages/mui-lab/src/DateTimePicker/shared.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mui-lab/src/DateTimePicker/shared.ts b/packages/mui-lab/src/DateTimePicker/shared.ts index 2aab3150d1c921..f5041031a704b4 100644 --- a/packages/mui-lab/src/DateTimePicker/shared.ts +++ b/packages/mui-lab/src/DateTimePicker/shared.ts @@ -108,7 +108,7 @@ export function useDateTimePickerDefaultizedProps Date: Sat, 18 Dec 2021 20:32:59 +0330 Subject: [PATCH 2/3] update previous tests by passing showToolbar as a prop --- .../src/DesktopDateTimePicker/DesktopDateTimePicker.test.tsx | 1 + .../src/MobileDateTimePicker/MobileDateTimePicker.test.tsx | 3 +++ 2 files changed, 4 insertions(+) diff --git a/packages/mui-lab/src/DesktopDateTimePicker/DesktopDateTimePicker.test.tsx b/packages/mui-lab/src/DesktopDateTimePicker/DesktopDateTimePicker.test.tsx index d8f01dcec50fad..97fe6dcac31ae9 100644 --- a/packages/mui-lab/src/DesktopDateTimePicker/DesktopDateTimePicker.test.tsx +++ b/packages/mui-lab/src/DesktopDateTimePicker/DesktopDateTimePicker.test.tsx @@ -89,6 +89,7 @@ describe('', () => { renderInput={(params) => } value={null} open + showToolbar onClose={handleClose} />, ); diff --git a/packages/mui-lab/src/MobileDateTimePicker/MobileDateTimePicker.test.tsx b/packages/mui-lab/src/MobileDateTimePicker/MobileDateTimePicker.test.tsx index 182826c3dde2f6..173a035912188b 100644 --- a/packages/mui-lab/src/MobileDateTimePicker/MobileDateTimePicker.test.tsx +++ b/packages/mui-lab/src/MobileDateTimePicker/MobileDateTimePicker.test.tsx @@ -51,6 +51,7 @@ describe('', () => { setDate(newDate); onChangeMock(newDate); }} + showToolbar renderInput={(params) => } /> ); @@ -128,6 +129,7 @@ describe('', () => { renderInput={(params) => } onChange={() => {}} open + showToolbar value={adapterToUse.date('2021-11-20T10:01:22.000')} />, ); @@ -145,6 +147,7 @@ describe('', () => { renderInput={(params) => } onChange={() => {}} open + showToolbar views={['seconds']} value={adapterToUse.date('2021-11-20T10:01:22.000')} />, From e2be163af85bf0c14cb588c1d08bf1a9e95cf760 Mon Sep 17 00:00:00 2001 From: Ali Sasani Date: Sat, 18 Dec 2021 20:37:58 +0330 Subject: [PATCH 3/3] adding new tests to check toolbar is rendered properly when showToolbar prop is passed --- .../src/DateTimePicker/DateTimePicker.test.tsx | 15 +++++++++++++++ .../MobileDateTimePicker.test.tsx | 14 ++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/packages/mui-lab/src/DateTimePicker/DateTimePicker.test.tsx b/packages/mui-lab/src/DateTimePicker/DateTimePicker.test.tsx index 882e7149d70016..608bd7c897701f 100644 --- a/packages/mui-lab/src/DateTimePicker/DateTimePicker.test.tsx +++ b/packages/mui-lab/src/DateTimePicker/DateTimePicker.test.tsx @@ -1,6 +1,8 @@ import * as React from 'react'; import TextField from '@mui/material/TextField'; import DateTimePicker from '@mui/lab/DateTimePicker'; +import { expect } from 'chai'; +import { screen } from 'test/utils'; import { createPickerRenderer } from '../internal/pickers/test-utils'; describe('', () => { @@ -16,4 +18,17 @@ describe('', () => { />, ); }); + it('prop `showToolbar` – renders toolbar in DateTimePicker', () => { + render( + {}} + value={null} + renderInput={(params) => } + />, + ); + + expect(screen.getByMuiTest('picker-toolbar')).toBeVisible(); + }); }); diff --git a/packages/mui-lab/src/MobileDateTimePicker/MobileDateTimePicker.test.tsx b/packages/mui-lab/src/MobileDateTimePicker/MobileDateTimePicker.test.tsx index 173a035912188b..e8cb26a141dede 100644 --- a/packages/mui-lab/src/MobileDateTimePicker/MobileDateTimePicker.test.tsx +++ b/packages/mui-lab/src/MobileDateTimePicker/MobileDateTimePicker.test.tsx @@ -141,6 +141,20 @@ describe('', () => { expect(screen.getByMuiTest('datetimepicker-toolbar-day')).to.have.text('Nov 20'); }); + it('prop `showToolbar` – renders toolbar in MobileDateTimePicker', () => { + render( + {}} + value={adapterToUse.date('2021-11-20T10:01:22.000')} + renderInput={(params) => } + />, + ); + + expect(screen.getByMuiTest('picker-toolbar')).toBeVisible(); + }); + it('can render seconds on view', () => { render(