Merge pull request gpbl#646 from gpbl/fix-630

Fix error with focusing outside nodes
kimamula · Mar 5, 2018 · 8f1be54 · 8f1be54
2 parents 6ae71cc + 973a5f5
commit 8f1be54
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/DayPicker.js b/src/DayPicker.js
@@ -300,7 +300,7 @@ export default class DayPicker extends Component {
   focusPreviousDay(dayNode) {
     const dayNodes = Helpers.getDayNodes(this.dayPicker, this.props.classNames);
     const dayNodeIndex = Helpers.nodeListToArray(dayNodes).indexOf(dayNode);
-
+    if (dayNodeIndex === -1) return;
     if (dayNodeIndex === 0) {
       this.showPreviousMonth(() => this.focusLastDayOfMonth());
     } else {
@@ -311,7 +311,7 @@ export default class DayPicker extends Component {
   focusNextDay(dayNode) {
     const dayNodes = Helpers.getDayNodes(this.dayPicker, this.props.classNames);
     const dayNodeIndex = Helpers.nodeListToArray(dayNodes).indexOf(dayNode);
-
+    if (dayNodeIndex === -1) return;
     if (dayNodeIndex === dayNodes.length - 1) {
       this.showNextMonth(() => this.focusFirstDayOfMonth());
     } else {

diff --git a/test/daypicker/methods.js b/test/daypicker/methods.js
@@ -258,6 +258,11 @@ describe('DayPicker’s methods', () => {
         expect(document.activeElement.innerHTML).toBe('31');
         expect(instance.state.currentMonth.getMonth()).toBe(4);
       });
+      it('should not throw an error when the node is not found', () => {
+        expect(() =>
+          instance.focusPreviousDay(document.createElement('div'))
+        ).not.toThrow();
+      });
     });
 
     describe('focusNextDay()', () => {
@@ -301,6 +306,11 @@ describe('DayPicker’s methods', () => {
         expect(document.activeElement.innerHTML).toBe('1');
         expect(instance.state.currentMonth.getMonth()).toBe(2);
       });
+      it('should not throw an error when the node is not found', () => {
+        expect(() =>
+          instance.focusNextDay(document.createElement('div'))
+        ).not.toThrow();
+      });
     });
 
     describe('focusNextWeek()', () => {