From 38f54827a8d67cde89b279ceca6a153c67dfd8a0 Mon Sep 17 00:00:00 2001
From: Tatiana Tkachenko <tkachenko.tatiana16@gmail.com>
Date: Sun, 1 Apr 2018 10:29:37 +0300
Subject: [PATCH 1/6] Added today button handler

---
 lib/src/_shared/ModalDialog.d.ts   |  1 +
 lib/src/_shared/ModalDialog.jsx    | 26 +++++++++++++++++++++++++-
 lib/src/_shared/PickerBase.jsx     |  4 ++++
 lib/src/wrappers/ModalWrapper.d.ts |  1 +
 lib/src/wrappers/ModalWrapper.jsx  | 24 +++++++++++++++++++++++-
 5 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/lib/src/_shared/ModalDialog.d.ts b/lib/src/_shared/ModalDialog.d.ts
index 0ed1d9a4e..09744390b 100644
--- a/lib/src/_shared/ModalDialog.d.ts
+++ b/lib/src/_shared/ModalDialog.d.ts
@@ -8,6 +8,7 @@ export interface DateTextFieldProps extends DialogProps {
   onAccept: ButtonProps['onClick'];
   onDismiss: ButtonProps['onClick'];
   onClear: ButtonProps['onClick'];
+  onSetToday: ButtonProps['onClick'];
   dialogContentClassName?: string;
   invalidLabel?: string;
   okLabel?: ReactNode;
diff --git a/lib/src/_shared/ModalDialog.jsx b/lib/src/_shared/ModalDialog.jsx
index fdcb4783a..92ab5a854 100644
--- a/lib/src/_shared/ModalDialog.jsx
+++ b/lib/src/_shared/ModalDialog.jsx
@@ -29,6 +29,11 @@ const styles = {
       marginRight: 'auto',
     },
   },
+  todayDialogAction: {
+    '&:first-child': {
+      marginRight: 'auto',
+    },
+  },
   dialogAction: {
     // empty but may be needed for override
   },
@@ -40,11 +45,14 @@ const ModalDialog = ({
   onAccept,
   onDismiss,
   onClear,
+  onSetToday,
   okLabel,
   cancelLabel,
   clearLabel,
+  todayLabel,
   dialogContentClassName,
   clearable,
+  showTodayButton,
   ...other
 }) => (
   <Dialog onClose={onDismiss} classes={{ paper: classes.dialogRoot }} {...other}>
@@ -55,7 +63,10 @@ const ModalDialog = ({
     <DialogActions
       classes={{
         root: clearable && classes.dialogActions,
-        action: classnames(classes.dialogAction, { [classes.clearableDialogAction]: clearable }),
+        action: classnames(classes.dialogAction, {
+          [classes.clearableDialogAction]: clearable,
+          [classes.todayDialogAction]: !clearable && showTodayButton,
+        }),
       }}
     >
       { clearable &&
@@ -68,6 +79,16 @@ const ModalDialog = ({
         </Button>
       }
 
+      { !clearable && showTodayButton &&
+        <Button
+          color="primary"
+          onClick={onSetToday}
+          aria-label={todayLabel}
+        >
+          { todayLabel }
+        </Button>
+      }
+
       <Button
         color="primary"
         onClick={onDismiss}
@@ -99,6 +120,9 @@ ModalDialog.propTypes = {
   cancelLabel: PropTypes.string.isRequired,
   clearLabel: PropTypes.string.isRequired,
   clearable: PropTypes.bool.isRequired,
+  todayLabel: PropTypes.string.isRequired,
+  showTodayButton: PropTypes.bool.isRequired,
+  onSetToday: PropTypes.func.isRequired,
 };
 
 ModalDialog.defaultProps = {
diff --git a/lib/src/_shared/PickerBase.jsx b/lib/src/_shared/PickerBase.jsx
index 0c10017a9..37180eb11 100644
--- a/lib/src/_shared/PickerBase.jsx
+++ b/lib/src/_shared/PickerBase.jsx
@@ -72,4 +72,8 @@ export default class PickerBase extends PureComponent {
       this.setState({ date }, this.handleAccept);
     }
   }
+
+  handleSetTodayDate = () => {
+    this.props.onChange(this.props.utils.date());
+  }
 }
diff --git a/lib/src/wrappers/ModalWrapper.d.ts b/lib/src/wrappers/ModalWrapper.d.ts
index c741fc677..615203227 100644
--- a/lib/src/wrappers/ModalWrapper.d.ts
+++ b/lib/src/wrappers/ModalWrapper.d.ts
@@ -5,6 +5,7 @@ export interface ModalWrapperProps extends Partial<DateTextFieldProps> {
     onAccept?: () => void;
     onDismiss?: () => void;
     onClear?: () => void;
+    onSetToday?: () => void;
     onOpen?: () => void;
     onClose?: () => void;
     dialogContentClassName?: string;
diff --git a/lib/src/wrappers/ModalWrapper.jsx b/lib/src/wrappers/ModalWrapper.jsx
index 3da9f70fd..f8d414401 100644
--- a/lib/src/wrappers/ModalWrapper.jsx
+++ b/lib/src/wrappers/ModalWrapper.jsx
@@ -20,6 +20,12 @@ export default class ModalWrapper extends PureComponent {
     clearLabel: PropTypes.string,
     /** If true clear button will be displayed */
     clearable: PropTypes.bool,
+    /** "Today" label message */
+    todayLabel: PropTypes.string,
+    /** If true today button will be displayed
+     * <b>Note*</b> that clear button has higher priority
+     */
+    showTodayButton: PropTypes.bool,
     /** On open callback */
     onOpen: PropTypes.func,
     /** On close callback */
@@ -29,6 +35,7 @@ export default class ModalWrapper extends PureComponent {
     onAccept: PropTypes.func,
     onDismiss: PropTypes.func,
     onClear: PropTypes.func,
+    onSetToday: PropTypes.func,
     children: PropTypes.node.isRequired,
     dialogContentClassName: PropTypes.string,
   }
@@ -41,19 +48,28 @@ export default class ModalWrapper extends PureComponent {
     okLabel: 'OK',
     cancelLabel: 'Cancel',
     clearLabel: 'Clear',
+    todayLabel: 'Today',
+    clearable: false,
+    showTodayButton: false,
     format: undefined,
     onAccept: undefined,
     onDismiss: undefined,
     onClear: undefined,
-    clearable: false,
     onOpen: undefined,
     onClose: undefined,
+    onSetToday: undefined,
   }
 
   state = {
     open: false,
   }
 
+  handleSetTodayDate = () => {
+    if (this.props.onSetToday) {
+      this.props.onSetToday();
+    }
+  }
+
   open = () => {
     this.setState({ open: true });
     if (this.props.onOpen) {
@@ -103,8 +119,11 @@ export default class ModalWrapper extends PureComponent {
       cancelLabel,
       clearLabel,
       clearable,
+      todayLabel,
+      showTodayButton,
       onOpen,
       onClose,
+      onSetToday,
       ...other
     } = this.props;
 
@@ -126,11 +145,14 @@ export default class ModalWrapper extends PureComponent {
           onClear={this.handleClear}
           onAccept={this.handleAccept}
           onDismiss={this.handleDismiss}
+          onSetToday={this.handleSetTodayDate}
           dialogContentClassName={dialogContentClassName}
           clearLabel={clearLabel}
+          todayLabel={todayLabel}
           okLabel={okLabel}
           cancelLabel={cancelLabel}
           clearable={clearable}
+          showTodayButton={showTodayButton}
         >
           {children}
         </ModalDialog>

From 52e27b9933e23abef7243aec097c92be0fcaec20 Mon Sep 17 00:00:00 2001
From: Tatiana Tkachenko <tkachenko.tatiana16@gmail.com>
Date: Sun, 1 Apr 2018 10:31:33 +0300
Subject: [PATCH 2/6] Add today button for DatePicker + example

---
 docs/src/Examples/Demo/BasicDatePicker.jsx | 12 ++++++++++++
 lib/src/DatePicker/DatePickerWrapper.jsx   |  1 +
 2 files changed, 13 insertions(+)

diff --git a/docs/src/Examples/Demo/BasicDatePicker.jsx b/docs/src/Examples/Demo/BasicDatePicker.jsx
index 700a1b9d0..642f53e32 100644
--- a/docs/src/Examples/Demo/BasicDatePicker.jsx
+++ b/docs/src/Examples/Demo/BasicDatePicker.jsx
@@ -35,6 +35,18 @@ export default class BasicDatePicker extends PureComponent {
             animateYearScrolling={false}
           />
         </div>
+
+        <div className="picker">
+          <DatePicker
+            label="With today button"
+            showTodayButton
+            disableFuture
+            maxDateMessage="Date must be less than today"
+            value={selectedDate}
+            onChange={this.handleDateChange}
+            animateYearScrolling={false}
+          />
+        </div>
       </Fragment>
     );
   }
diff --git a/lib/src/DatePicker/DatePickerWrapper.jsx b/lib/src/DatePicker/DatePickerWrapper.jsx
index dd3cdb017..a6f05c473 100644
--- a/lib/src/DatePicker/DatePickerWrapper.jsx
+++ b/lib/src/DatePicker/DatePickerWrapper.jsx
@@ -92,6 +92,7 @@ export class DatePickerWrapper extends PickerBase {
         onAccept={this.handleAccept}
         onChange={this.handleTextFieldChange}
         onDismiss={this.handleDismiss}
+        onSetToday={this.handleSetTodayDate}
         labelFunc={labelFunc}
         minDate={minDate}
         maxDate={maxDate}

From a66d22e532b86feb96e51c47d192dbd4714fc3ed Mon Sep 17 00:00:00 2001
From: Tatiana Tkachenko <tkachenko.tatiana16@gmail.com>
Date: Sun, 1 Apr 2018 10:32:16 +0300
Subject: [PATCH 3/6] Add today button for DateTimePicker + example

---
 docs/src/Examples/Demo/BasicDateTimePicker.jsx   | 10 ++++++++++
 lib/src/DateTimePicker/DateTimePickerWrapper.jsx |  1 +
 2 files changed, 11 insertions(+)

diff --git a/docs/src/Examples/Demo/BasicDateTimePicker.jsx b/docs/src/Examples/Demo/BasicDateTimePicker.jsx
index 28a968f00..23600d2c1 100644
--- a/docs/src/Examples/Demo/BasicDateTimePicker.jsx
+++ b/docs/src/Examples/Demo/BasicDateTimePicker.jsx
@@ -34,6 +34,16 @@ export default class BasicDateTimePicker extends PureComponent {
             label="24h clock"
           />
         </div>
+
+        <div className="picker">
+          <DateTimePicker
+            value={selectedDate}
+            disablePast
+            onChange={this.handleDateChange}
+            label="With Today Button"
+            showTodayButton
+          />
+        </div>
       </Fragment>
     );
   }
diff --git a/lib/src/DateTimePicker/DateTimePickerWrapper.jsx b/lib/src/DateTimePicker/DateTimePickerWrapper.jsx
index ec5840e1d..faa676887 100644
--- a/lib/src/DateTimePicker/DateTimePickerWrapper.jsx
+++ b/lib/src/DateTimePicker/DateTimePickerWrapper.jsx
@@ -116,6 +116,7 @@ export class DateTimePickerWrapper extends PickerBase {
         onChange={this.handleTextFieldChange}
         onDismiss={this.handleDismiss}
         onClear={this.handleClear}
+        onSetToday={this.handleSetTodayDate}
         dialogContentClassName={classes.dialogContent}
         minDate={minDate}
         maxDate={maxDate}

From 2bec19a1bcb2955ff24f2b2d769108a557f7a090 Mon Sep 17 00:00:00 2001
From: Tatiana Tkachenko <tkachenko.tatiana16@gmail.com>
Date: Sun, 1 Apr 2018 10:32:43 +0300
Subject: [PATCH 4/6] Add today button for TimePicker + example

---
 docs/src/Examples/Demo/TimePickerBasic.jsx | 10 ++++++++++
 lib/src/TimePicker/TimePickerWrapper.jsx   |  1 +
 2 files changed, 11 insertions(+)

diff --git a/docs/src/Examples/Demo/TimePickerBasic.jsx b/docs/src/Examples/Demo/TimePickerBasic.jsx
index 8935c2865..0a502dd71 100644
--- a/docs/src/Examples/Demo/TimePickerBasic.jsx
+++ b/docs/src/Examples/Demo/TimePickerBasic.jsx
@@ -32,6 +32,16 @@ export default class BasicUsage extends PureComponent {
             onChange={this.handleDateChange}
           />
         </div>
+
+        <div className="picker">
+          <TimePicker
+            showTodayButton
+            todayLabel="now"
+            label="With today button"
+            value={selectedDate}
+            onChange={this.handleDateChange}
+          />
+        </div>
       </Fragment>
     );
   }
diff --git a/lib/src/TimePicker/TimePickerWrapper.jsx b/lib/src/TimePicker/TimePickerWrapper.jsx
index 28a6b84eb..c89c0c713 100644
--- a/lib/src/TimePicker/TimePickerWrapper.jsx
+++ b/lib/src/TimePicker/TimePickerWrapper.jsx
@@ -50,6 +50,7 @@ export class TimePickerWrapper extends PickerBase {
         onAccept={this.handleAccept}
         onChange={this.handleTextFieldChange}
         onDismiss={this.handleDismiss}
+        onSetToday={this.handleSetTodayDate}
         {...other}
       >
         <TimePicker

From c967727ef34fa976b33fee0707f980fa5c915246 Mon Sep 17 00:00:00 2001
From: Tatiana Tkachenko <tkachenko.tatiana16@gmail.com>
Date: Sun, 1 Apr 2018 10:33:19 +0300
Subject: [PATCH 5/6] Generete props for docs

---
 docs/prop-types.json | 61 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/docs/prop-types.json b/docs/prop-types.json
index ecc05836f..5d9d811fb 100644
--- a/docs/prop-types.json
+++ b/docs/prop-types.json
@@ -2859,6 +2859,27 @@
           },
           "required": true,
           "description": ""
+        },
+        "todayLabel": {
+          "type": {
+            "name": "string"
+          },
+          "required": true,
+          "description": ""
+        },
+        "showTodayButton": {
+          "type": {
+            "name": "bool"
+          },
+          "required": true,
+          "description": ""
+        },
+        "onSetToday": {
+          "type": {
+            "name": "func"
+          },
+          "required": true,
+          "description": ""
         }
       }
     }
@@ -2999,6 +3020,13 @@
       "description": "",
       "displayName": "ModalWrapper",
       "methods": [
+        {
+          "name": "handleSetTodayDate",
+          "docblock": null,
+          "modifiers": [],
+          "params": [],
+          "returns": null
+        },
         {
           "name": "open",
           "docblock": null,
@@ -3114,6 +3142,28 @@
             "computed": false
           }
         },
+        "todayLabel": {
+          "type": {
+            "name": "string"
+          },
+          "required": false,
+          "description": "\"Today\" label message",
+          "defaultValue": {
+            "value": "'Today'",
+            "computed": false
+          }
+        },
+        "showTodayButton": {
+          "type": {
+            "name": "bool"
+          },
+          "required": false,
+          "description": "If true today button will be displayed\n<b>Note*</b> that clear button has higher priority",
+          "defaultValue": {
+            "value": "false",
+            "computed": false
+          }
+        },
         "onOpen": {
           "type": {
             "name": "func"
@@ -3180,6 +3230,17 @@
             "computed": true
           }
         },
+        "onSetToday": {
+          "type": {
+            "name": "func"
+          },
+          "required": false,
+          "description": "",
+          "defaultValue": {
+            "value": "undefined",
+            "computed": true
+          }
+        },
         "children": {
           "type": {
             "name": "node"

From d255785acd523c3b7606012e9708ab3402a091cc Mon Sep 17 00:00:00 2001
From: Tatiana Tkachenko <tkachenko.tatiana16@gmail.com>
Date: Sun, 1 Apr 2018 11:47:17 +0300
Subject: [PATCH 6/6] Added tests for Modal Dialog

---
 lib/__tests__/_shared/ModalDialog.test.js | 74 ++++++++++++++++++++++-
 lib/src/_shared/ModalDialog.jsx           |  2 +-
 2 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/lib/__tests__/_shared/ModalDialog.test.js b/lib/__tests__/_shared/ModalDialog.test.js
index 563ca39f4..bf2e679de 100644
--- a/lib/__tests__/_shared/ModalDialog.test.js
+++ b/lib/__tests__/_shared/ModalDialog.test.js
@@ -1,16 +1,86 @@
 import React from 'react';
 import { shallow } from '../test-utils';
-import ModalDialog from '../../src/_shared/ModalDialog';
+import { ModalDialog } from '../../src/_shared/ModalDialog';
+
+const initialProps = {
+  onAccept: jest.fn(),
+  onDismiss: jest.fn(),
+  onClear: jest.fn(),
+  okLabel: 'OK',
+  cancelLabel: 'Cancel',
+  clearLabel: 'Clear',
+  clearable: false,
+  todayLabel: 'Today',
+  showTodayButton: false,
+  onSetToday: jest.fn(),
+  classes: {},
+  children: 'Test',
+};
 
 describe('ModalDialog', () => {
   let component;
+  const props = { ...initialProps };
 
   beforeEach(() => {
-    component = shallow(<ModalDialog />);
+    component = shallow(<ModalDialog {...props} />);
   });
 
   it('Should renders', () => {
     // console.log(component.debug());
     expect(component).toBeTruthy();
   });
+
+  it('Should render dialog content', () => {
+    expect(component.find('WithStyles(DialogContent)').props().children).toBe(props.children);
+  });
+
+  it('Should render dialog actions with 2 buttons', () => {
+    expect(component.find('WithStyles(DialogActions)').length).toBe(1);
+    expect(component.find('WithStyles(Button)').at(0).props().children).toBe('Cancel');
+    expect(component.find('WithStyles(Button)').at(1).props().children).toBe('OK');
+  });
+
+  it('Should handle on OK button click', () => {
+    component.find('WithStyles(Button)').at(1).simulate('click');
+    expect(props.onAccept).toHaveBeenCalled();
+  });
+
+  it('Should handle on Cancel button click', () => {
+    component.find('WithStyles(Button)').at(0).simulate('click');
+    expect(props.onDismiss).toHaveBeenCalled();
+  });
+});
+
+describe('ModalDialog with Clear Button', () => {
+  let component;
+  const props = {
+    ...initialProps,
+    clearable: true,
+  };
+
+  beforeEach(() => {
+    component = shallow(<ModalDialog {...props} />);
+  });
+
+  it('Should handle on Clear button click', () => {
+    component.find('WithStyles(Button)').at(0).simulate('click');
+    expect(props.onClear).toHaveBeenCalled();
+  });
+});
+
+describe('ModalDialog with Today Button', () => {
+  let component;
+  const props = {
+    ...initialProps,
+    showTodayButton: true,
+  };
+
+  beforeEach(() => {
+    component = shallow(<ModalDialog {...props} />);
+  });
+
+  it('Should handle on Clear button click', () => {
+    component.find('WithStyles(Button)').at(0).simulate('click');
+    expect(props.onSetToday).toHaveBeenCalled();
+  });
 });
diff --git a/lib/src/_shared/ModalDialog.jsx b/lib/src/_shared/ModalDialog.jsx
index 92ab5a854..e3b8894d7 100644
--- a/lib/src/_shared/ModalDialog.jsx
+++ b/lib/src/_shared/ModalDialog.jsx
@@ -39,7 +39,7 @@ const styles = {
   },
 };
 
-const ModalDialog = ({
+export const ModalDialog = ({
   children,
   classes,
   onAccept,