Validate input manually before creating date out of it

wojtekmaj · Nov 20, 2020 · 07b5c0f · 07b5c0f
1 parent a3d257f
commit 07b5c0f
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/src/DateInput.jsx b/src/DateInput.jsx
@@ -98,6 +98,28 @@ function findInput(element, property) {
   return nextElement;
 }
 
+function isInputValid(input) {
+  if (!input.validity.valid) {
+    return false;
+  }
+
+  const { value } = input;
+
+  if (!value) {
+    return false;
+  }
+
+  const rawValue = Number(value);
+  const min = Number(input.getAttribute('min'));
+  const max = Number(input.getAttribute('max'));
+
+  if (rawValue < min || rawValue > max) {
+    return false;
+  }
+
+  return true;
+}
+
 function focus(element) {
   if (element) {
     element.focus();
@@ -420,9 +442,7 @@ export default class DateInput extends PureComponent {
 
     if (formElements.every((formElement) => !formElement.value)) {
       onChange(null, false);
-    } else if (
-      formElements.every((formElement) => formElement.value && formElement.validity.valid)
-    ) {
+    } else if (formElements.every(isInputValid)) {
       const year = Number(values.year);
       const monthIndex = Number(values.month) - 1 || 0;
       const day = Number(values.day || 1);