Make set today button works properly with autoOk (mui#1555)

* Make set today button works properly with autoOk

* Add tests

* Fix autoOK behavior when several views shown

lib/src/__tests__/e2e/DatePickerProps.test.tsx

@@ -57,4 +57,24 @@ describe('DatePicker - different props', () => {
 
     expect(component.find('h4[data-mui-test="datepicker-toolbar-date"]').text()).toBe('January');
   });
+
+  it('showTodayLabel – accept current date when "today" button is clicked', () => {
+    const onCloseMock = jest.fn();
+    const onChangeMock = jest.fn();
+    const component = mount(
+      <MobileDatePicker
+        autoOk
+        showTodayButton
+        onClose={onCloseMock}
+        onChange={onChangeMock}
+        value={utilsToUse.date('2018-01-01T00:00:00.000Z')}
+      />
+    );
+
+    component.find('input').simulate('click');
+    component.find('button[data-mui-test="today-action-button"]').simulate('click');
+
+    expect(onCloseMock).toHaveBeenCalled();
+    expect(onChangeMock).toHaveBeenCalled();
+  });
 });

lib/src/_shared/ModalDialog.tsx

@@ -92,13 +92,13 @@ export const ModalDialog: React.FC<ModalDialogProps> = ({
         })}
       >
         {clearable && (
-          <Button color="primary" onClick={onClear}>
+          <Button data-mui-test="clear-action-button" color="primary" onClick={onClear}>
             {clearLabel}
           </Button>
         )}
 
         {showTodayButton && (
-          <Button color="primary" onClick={onSetToday}>
+          <Button data-mui-test="today-action-button" color="primary" onClick={onSetToday}>
             {todayLabel}
           </Button>
         )}

lib/src/_shared/hooks/usePickerState.ts

@@ -35,6 +35,7 @@ export function usePickerState(props: BasePickerProps) {
   const { autoOk, disabled, readOnly, onAccept, onChange, onError, value } = props;
 
   const utils = useUtils();
+  const now = useNow();
   const { date, inputFormat } = useDateValues(props);
   const [pickerDate, setPickerDate] = useState(date);
 
@@ -67,14 +68,17 @@ export function usePickerState(props: BasePickerProps) {
 
   const wrapperProps = useMemo(
     () => ({
-      format: inputFormat,
       open: isOpen,
+      format: inputFormat,
       onClear: () => acceptDate(null, true),
       onAccept: () => acceptDate(pickerDate, true),
-      onSetToday: () => setPickerDate(utils.date()),
       onDismiss: () => setIsOpen(false),
+      onSetToday: () => {
+        setPickerDate(now);
+        acceptDate(now, Boolean(autoOk));
+      },
     }),
-    [acceptDate, inputFormat, isOpen, pickerDate, setIsOpen, utils]
+    [acceptDate, autoOk, inputFormat, isOpen, now, pickerDate, setIsOpen]
   );
 
   const pickerProps = useMemo(

lib/src/_shared/hooks/useViews.tsx

@@ -42,14 +42,14 @@ export function useViews({
   }, [nextView, setOpenView]);
 
   const handleChangeAndOpenNext = React.useCallback(
-    (date: MaterialUiPickersDate, isFinish?: boolean | symbol) => {
-      onChange(date, isFinish);
+    (date: MaterialUiPickersDate, isFinishedSelectionInCurrentView?: boolean | symbol) => {
+      onChange(date, Boolean(nextView) ? false : isFinishedSelectionInCurrentView);
 
-      if (isFinish) {
+      if (isFinishedSelectionInCurrentView) {
         openNext();
       }
     },
-    [onChange, openNext]
+    [nextView, onChange, openNext]
   );
 
   return {