diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index 1d5c975c..759e0ccf 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -355,6 +355,7 @@ header.vff-header svg.f-logo {
 .vff input[type=email],
 .vff input[type=url],
 .vff input[type=password],
+.vff input[type=date],
 .vff textarea {
   -webkit-appearance: none;
   -moz-appearance: none;
@@ -384,6 +385,7 @@ header.vff-header svg.f-logo {
 .vff .f-full-width input[type=email],
 .vff .f-full-width input[type=url],
 .vff .f-full-width input[type=password],
+.vff .f-full-width input[type=date],
 .vff .f-full-width textarea,
 .vff .f-full-width span.faux-form{
   width: 100%;
@@ -437,6 +439,27 @@ header.vff-header svg.f-logo {
   height: auto;
 }
 
+/* ios datepicker */
+.vff.vff-is-ios  .field-datetype:not(.f-has-value) .f-answer > span {
+  position: relative;
+  top: 0;
+  left: 0;
+}
+
+.vff.vff-is-ios  .field-datetype:not(.f-has-value) .f-answer > span::before {
+  position: absolute;
+  content: attr(data-placeholder);
+  display: block;
+  pointer-events: none;
+  padding: 0.12em .2em;
+}
+
+.vff.vff-is-ios input[type=date] {
+  height: 32px;
+  display: block;
+}
+
+
 /*
   links
 */
@@ -825,6 +848,7 @@ header.vff-header svg.f-logo {
   .vff input[type=email],
   .vff input[type=url],
   .vff input[type=password],
+  .vff input[type=date],
   .vff textarea{
     font-size: .78em;
 }
@@ -870,6 +894,7 @@ header.vff-header svg.f-logo {
   .vff input[type=email],
   .vff input[type=url],
   .vff input[type=password],
+  .vff input[type=date],
   .vff textarea {
     line-height: 1.4;
     padding: .16em .2em;
diff --git a/src/assets/css/themes/theme-green.css b/src/assets/css/themes/theme-green.css
index 7ffcc936..5e170943 100644
--- a/src/assets/css/themes/theme-green.css
+++ b/src/assets/css/themes/theme-green.css
@@ -69,6 +69,7 @@ header.vff-header svg.f-logo {
 .vff input[type=email],
 .vff input[type=url],
 .vff input[type=password],
+.vff input[type=date],
 .vff textarea,
 .vff span.faux-form {
   border-bottom-color: var(--vff-secondary-text-color);
@@ -104,6 +105,14 @@ header.vff-header svg.f-logo {
   font-weight: 300;
 }
 
+
+/*faux input type date placeholder for iOS*/
+.vff.vff-is-ios .field-datetype:not(.f-has-value) .f-answer > span::before{
+  color: var(--vff-secondary-text-color);
+  font-weight: 300;
+  font-size: .72em;
+}
+
 /*field-multiplechoicetype*/
 .vff ul.f-radios li {
   border: 1px solid var(--vff-secondary-text-color);
diff --git a/src/assets/css/themes/theme-minimal.css b/src/assets/css/themes/theme-minimal.css
index 3ad22cd1..c2c79d93 100644
--- a/src/assets/css/themes/theme-minimal.css
+++ b/src/assets/css/themes/theme-minimal.css
@@ -57,6 +57,7 @@ header.vff-header svg.f-logo{
 .vff input[type=email],
 .vff input[type=url],
 .vff input[type=password],
+.vff input[type=date],
 .vff textarea,
 .vff span.faux-form {
   border-bottom-color: var(--vff-secondary-text-color);
@@ -98,6 +99,13 @@ header.vff-header svg.f-logo{
   font-weight: 300;
 }
 
+/*faux input type date placeholder for iOS*/
+.vff.vff-is-ios .field-datetype:not(.f-has-value) .f-answer > span::before{
+  color: var(--vff-secondary-text-color);
+  font-weight: 300;
+  font-size: .72em;
+}
+
 /*field-multiplechoicetype*/
 .vff ul.f-radios li {
   border: 1px solid var(--vff-secondary-text-color);
diff --git a/src/assets/css/themes/theme-purple.css b/src/assets/css/themes/theme-purple.css
index 26969929..6960d096 100644
--- a/src/assets/css/themes/theme-purple.css
+++ b/src/assets/css/themes/theme-purple.css
@@ -73,6 +73,7 @@ header.vff-header svg.f-logo{
 .vff input[type=email],
 .vff input[type=url],
 .vff input[type=password],
+.vff input[type=date],
 .vff textarea,
 .vff span.faux-form {
   border-bottom-color: var(--vff-secondary-text-color);
@@ -114,6 +115,13 @@ header.vff-header svg.f-logo{
   font-weight: 300;
 }
 
+/*faux input type date placeholder for iOS*/
+.vff.vff-is-ios .field-datetype:not(.f-has-value) .f-answer > span::before{
+  color: var(--vff-secondary-text-color);
+  font-weight: 300;
+  font-size: .72em;
+}
+
 /*field-multiplechoicetype*/
 .vff ul.f-radios li {
   border: 1px solid var(--vff-secondary-form-bg-color);
diff --git a/src/components/FlowForm.vue b/src/components/FlowForm.vue
index 83cc99c0..8e857c98 100644
--- a/src/components/FlowForm.vue
+++ b/src/components/FlowForm.vue
@@ -1,7 +1,7 @@
 // Form template and logic
 
 <template>
-  <div class="vff" :class="{'vff-not-standalone': !standalone}">
+  <div class="vff" :class="{'vff-not-standalone': !standalone, 'vff-is-mobile': isMobile, 'vff-is-ios': isIos}">
     <div class="f-container">
       <div class="f-form-wrap">
         <flow-form-question
@@ -126,6 +126,7 @@
 
   import FlowFormQuestion from './Question.vue'
   import LanguageModel from '../models/LanguageModel'
+  import { IsMobile } from '../mixins/IsMobile'
 
   export default {
     name: 'FlowForm',
@@ -147,6 +148,9 @@
         default: true
       }
     },
+    mixins: [
+      IsMobile,
+    ],
     data() {
       return {
         completed: false,
diff --git a/src/components/Question.vue b/src/components/Question.vue
index 9a99c4f9..bb8f08c3 100644
--- a/src/components/Question.vue
+++ b/src/components/Question.vue
@@ -106,6 +106,7 @@
   import FlowFormSectionBreakType from './QuestionTypes/SectionBreakType.vue'
   import FlowFormTextType from './QuestionTypes/TextType.vue'
   import FlowFormUrlType from './QuestionTypes/UrlType.vue'
+  import FlowFormDateType from './QuestionTypes/DateType.vue'
   import { IsMobile } from '../mixins/IsMobile'
   
 
@@ -121,7 +122,8 @@
       FlowFormPhoneType,
       FlowFormSectionBreakType,
       FlowFormTextType,
-      FlowFormUrlType
+      FlowFormUrlType,
+      FlowFormDateType
     },
     props: {
       question: QuestionModel,
@@ -239,17 +241,22 @@
       }
     },
     computed: {
-      mainClasses() {
-        const classes = {
-          'q-is-active': this.active,
-          'q-is-inactive': !this.active,
-          'f-fade-in-down': this.reverse,
-          'f-fade-in-up': !this.reverse
-        }
+      mainClasses: {
+        cache: false,
+        get() {
+          const classes = {
+            'q-is-active': this.active,
+            'q-is-inactive': !this.active,
+            'f-fade-in-down': this.reverse,
+            'f-fade-in-up': !this.reverse,
+            'f-focused': this.$refs.questionComponent && this.$refs.questionComponent.focused,
+            'f-has-value': this.$refs.questionComponent && this.$refs.questionComponent.hasValue
+          }
 
-        classes['field-' + this.question.type.toLowerCase().substring(8)] = true
+          classes['field-' + this.question.type.toLowerCase().substring(8)] = true
 
-        return classes
+          return classes
+        }
       },
 
       showHelperText() {
diff --git a/src/components/QuestionTypes/DateType.vue b/src/components/QuestionTypes/DateType.vue
new file mode 100644
index 00000000..8d36b8f8
--- /dev/null
+++ b/src/components/QuestionTypes/DateType.vue
@@ -0,0 +1,35 @@
+<script>
+  /*
+    Copyright (c) 2020 - present, DITDOT Ltd. - MIT Licence
+    https://github.com/ditdot-dev/vue-flow-form
+    https://www.ditdot.hr/en
+  */
+
+  import TextType from './TextType.vue'
+  import { QuestionType } from '../../models/QuestionModel'
+  import LanguageModel from '../../models/LanguageModel'
+
+  export default {
+    extends: TextType,
+    name: QuestionType.Date,
+    data() {
+      return {
+        inputType: 'date', 
+        canReceiveFocus: true
+      }
+    }, 
+    methods: {
+      validate() {
+        if (this.question.min && this.dataValue < this.question.min) {
+            return false
+        }
+
+        if (this.question.max && this.dataValue > this.question.max) {
+            return false
+        }
+
+        return !this.question.required || this.hasValue
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/components/QuestionTypes/TextType.vue b/src/components/QuestionTypes/TextType.vue
index 7c0c7a7f..4a71134e 100644
--- a/src/components/QuestionTypes/TextType.vue
+++ b/src/components/QuestionTypes/TextType.vue
@@ -1,5 +1,5 @@
 <template>
-  <span>
+  <span v-bind:data-placeholder="inputType === 'date' ? placeholder : null">
     <the-mask
       v-if="question.mask"
       ref="input"
@@ -15,6 +15,10 @@
       v-on:keyup.native.enter.prevent="onEnter"
       v-on:keyup.native.tab.prevent="onEnter"
       v-bind:placeholder="placeholder"
+      v-bind:min="question.min"
+      v-bind:max="question.max"
+      v-on:change="onChange"
+      v-bind:tokens="tokens" 
     />
     <input
       v-else
@@ -28,6 +32,9 @@
       v-on:keyup.tab.prevent="onEnter"
       v-on:focus="setFocus"
       v-on:blur="unsetFocus"
+      v-bind:min="question.min"
+      v-bind:max="question.max"
+      v-on:change="onChange"
       v-bind:placeholder="placeholder"
     />
   </span>
@@ -51,12 +58,14 @@
     components: {
       TheMask
     },
+
     data() {
       return {
         inputType: 'text', 
         canReceiveFocus: true
       }
     }, 
+
     methods: {
       validate() {
         if (this.question.mask && this.dataValue.length !== this.question.mask.length) {
diff --git a/src/main.js b/src/main.js
index a3517273..72dd2f65 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,6 +1,6 @@
 // Import vue component
 import FlowForm from './components/FlowForm.vue'
-import QuestionModel, { QuestionType, ChoiceOption, LinkOption } from './models/QuestionModel'
+import QuestionModel, { QuestionType, ChoiceOption, LinkOption, MaskPresets } from './models/QuestionModel'
 import LanguageModel from './models/LanguageModel'
 
 // IE11 Object.assign polyfill
@@ -37,5 +37,6 @@ export {
   QuestionType,
   ChoiceOption,
   LinkOption,
-  LanguageModel
+  LanguageModel,
+  MaskPresets
 }
\ No newline at end of file
diff --git a/src/mixins/IsMobile.js b/src/mixins/IsMobile.js
index de289924..ac7b277d 100644
--- a/src/mixins/IsMobile.js
+++ b/src/mixins/IsMobile.js
@@ -5,12 +5,14 @@
 */
 
 // Simple mobile device/tablet detection
-const isMobile = !!(typeof navigator !== 'undefined' && navigator.userAgent.match(/android|iphone|ipad|ipod/i))
+const isIos = navigator.userAgent.match(/iphone|ipad|ipod/i) || (navigator.userAgent.indexOf("Mac") !== -1 && "ontouchend" in document)
+const isMobile = !!(typeof navigator !== 'undefined' && (isIos || navigator.userAgent.match(/android/i)))
 
 // Mixin that adds an `isMobile` data variable
 export const IsMobile = {
   data() {
     return {
+      isIos,
       isMobile
     }
   }
diff --git a/src/models/QuestionModel.js b/src/models/QuestionModel.js
index 83c8a056..26e88920 100644
--- a/src/models/QuestionModel.js
+++ b/src/models/QuestionModel.js
@@ -7,6 +7,7 @@
 // Global data store
 
 export const QuestionType = Object.freeze({
+  Date: 'FlowFormDateType',
   Dropdown: 'FlowFormDropdownType',
   Email: 'FlowFormEmailType',
   LongText: 'FlowFormLongTextType',
@@ -25,6 +26,12 @@ export const DropdownOptionBlank = Object.freeze({
   disabled: true
 })
 
+export const MaskPresets = Object.freeze({
+  Date: '##/##/####',
+  DateIso: '####-##-##',
+  PhoneUs: '(###) ###-####'
+})
+
 export class ChoiceOption {
   constructor(options) {
     this.label = ''
@@ -84,23 +91,29 @@ export default class QuestionModel {
     this.helpText = null
     this.helpTextShow = true
     this.descriptionLink = []
+    this.min = null
+    this.max = null
 
     Object.assign(this, options)
 
     // Sets default mask and placeholder value on PhoneType question
     if (this.type === QuestionType.Phone) {
       if (!this.mask) {
-        this.mask = '(###) ###-####'
+        this.mask = MaskPresets.Phone
       }
       if (!this.placeholder) {
         this.placeholder = this.mask
       }
-    }
+    } 
 
     if (this.type === QuestionType.Url) {
       this.mask = null
     }
 
+    if (this.type === QuestionType.Date && !this.placeholder) {
+      this.placeholder = 'yyyy-mm-dd'
+    }
+
     if (this.multiple) {
       this.answer = []
     }