Merge pull request #345 from appfolio/feature/date-input-event-tweak

Update DateInput.js
appfolio · Dec 11, 2017 · 48fad60 · 48fad60
2 parents f5e6d77 + b5b96c5
commit 48fad60
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/components/DateInput.js b/src/components/DateInput.js
@@ -128,9 +128,18 @@ export default class DateInput extends React.Component {
         this.setState({ open: false });
         break;
       case 13: // Enter
+        if (this.state.open) {
+          // To avoid submitting the form if DateInput is contained in a form
+          event.preventDefault();
+          this.setState({ open: false });
+        }
+        break;
       case 27: // Esc
-        event.preventDefault();
-        this.setState({ open: false });
+        if (this.state.open) {
+          // To avoid parent elements handling the ESC key (like modals closing)
+          event.stopPropagation();
+          this.setState({ open: false });
+        }
         break;
       case 37: // Left
         if (allowArrows) this.setDate(addDays(this.getCurrentDate(), -1));