Change function’s arguments signature (#256)

gpbl · Feb 14, 2017 · 500d7d2 · 500d7d2
1 parent 45d5e5e
commit 500d7d2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/src/Day.js b/src/Day.js
@@ -8,7 +8,7 @@ function handleEvent(handler, day, modifiers) {
   }
   return (e) => {
     e.persist();
-    handler(e, day, modifiers);
+    handler(day, modifiers, e);
   };
 }
 export default function Day({

diff --git a/src/DayPicker.js b/src/DayPicker.js
@@ -296,7 +296,7 @@ export default class DayPicker extends Component {
     }
   }
 
-  handleDayKeyDown(e, day, modifiers) {
+  handleDayKeyDown(day, modifiers, e) {
     e.persist();
     switch (e.keyCode) {
       case keys.LEFT:
@@ -319,23 +319,23 @@ export default class DayPicker extends Component {
       case keys.SPACE:
         Helpers.cancelEvent(e);
         if (this.props.onDayClick) {
-          this.handleDayClick(e, day, modifiers);
+          this.handleDayClick(day, modifiers, e);
         }
         break;
       default:
         break;
     }
     if (this.props.onDayKeyDown) {
-      this.props.onDayKeyDown(e, day, modifiers);
+      this.props.onDayKeyDown(day, modifiers, e);
     }
   }
 
-  handleDayClick(e, day, modifiers) {
+  handleDayClick(day, modifiers, e) {
     e.persist();
     if (modifiers.outside) {
       this.handleOutsideDayClick(day);
     }
-    this.props.onDayClick(e, day, modifiers);
+    this.props.onDayClick(day, modifiers, e);
   }
 
   handleOutsideDayClick(day) {

diff --git a/src/Month.js b/src/Month.js
@@ -25,7 +25,7 @@ export default function Month({
     months,
     localeUtils,
     locale,
-    onClick: onCaptionClick ? e => onCaptionClick(e, month) : undefined,
+    onClick: onCaptionClick ? e => onCaptionClick(month, e) : undefined,
   };
   const weeks = getWeekArray(month, firstDayOfWeek, fixedWeeks);
   return (

diff --git a/test/DayPicker.js b/test/DayPicker.js
@@ -559,8 +559,11 @@ describe('<DayPicker />', () => {
       const wrapper = mount(<DayPicker onCaptionClick={ handleCaptionClick } />);
       wrapper.find('.DayPicker-Caption').simulate('click');
       expect(handleCaptionClick).to.have.been.calledWith(
+        sinon.match(date =>
+          date.getFullYear() === (new Date()).getFullYear() && date.getMonth() === (new Date()).getMonth(),
+          'currentMonth',
+        ),
         sinon.match(e => e instanceof SyntheticEvent && e.target !== null, 'e'),
-        sinon.match(date => date.getFullYear() === (new Date()).getFullYear() && date.getMonth() === (new Date()).getMonth(), 'currentMonth'),
       );
     });
     it('should call the day\'s cell event handlers', () => {
@@ -585,9 +588,9 @@ describe('<DayPicker />', () => {
       );
 
       const eventArgs = [
-        sinon.match(e => e instanceof SyntheticEvent && e.target !== null, 'e'),
         sinon.match(date => date.getFullYear() === (new Date()).getFullYear() && date.getMonth() === (new Date()).getMonth(), 'currentMonth'),
         sinon.match(mods => mods.foo, 'modifiers'),
+        sinon.match(e => e instanceof SyntheticEvent && e.target !== null, 'e'),
       ];
 
       wrapper.find('.DayPicker-Day--foo').simulate('click');
@@ -640,9 +643,9 @@ describe('<DayPicker />', () => {
         />,
       );
       const eventArgs = [
-        sinon.match(e => e instanceof SyntheticEvent && e.target !== null, 'e'),
         sinon.match(date => date.getFullYear() === (new Date()).getFullYear() && date.getMonth() === (new Date()).getMonth(), 'currentMonth'),
         sinon.match(mods => mods.foo && !mods.bar, 'modifiers'),
+        sinon.match(e => e instanceof SyntheticEvent && e.target !== null, 'e'),
       ];
       wrapper.find('.DayPicker-Day--foo').simulate('keyDown', { keyCode: keys.ENTER });
       expect(handleDayClick).to.have.been.calledWith(...eventArgs);
@@ -657,9 +660,9 @@ describe('<DayPicker />', () => {
         />,
       );
       const eventArgs = [
-        sinon.match(e => e instanceof SyntheticEvent && e.target !== null, 'e'),
         sinon.match(date => date.getFullYear() === (new Date()).getFullYear() && date.getMonth() === (new Date()).getMonth(), 'currentMonth'),
         sinon.match(mods => mods.foo, 'modifiers'),
+        sinon.match(e => e instanceof SyntheticEvent && e.target !== null, 'e'),
       ];
       wrapper.find('.DayPicker-Day--foo').simulate('keyDown', { keyCode: keys.SPACE });
       expect(handleDayClick).to.have.been.calledWith(...eventArgs);