fix(QDate/QTime): harden the modelValue validation

quasarframework · May 3, 2024 · 69ee36a · 69ee36a
1 parent e3e45df
commit 69ee36a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/ui/src/components/date/QDate.js b/ui/src/components/date/QDate.js
@@ -32,13 +32,19 @@ export default createComponent({
     ...useFormProps,
     ...useDarkProps,
 
+    modelValue: {
+      required: true,
+      validator: val => typeof val === 'string' || Array.isArray(val) === true || Object(val) === val || val === null
+    },
+
     multiple: Boolean,
     range: Boolean,
 
     title: String,
     subtitle: String,
 
     mask: {
+      ...useDatetimeProps.mask,
       // this mask is forced
       // when using persian calendar
       default: 'YYYY/MM/DD'

diff --git a/ui/src/components/date/use-datetime.js b/ui/src/components/date/use-datetime.js
@@ -6,9 +6,7 @@ import { pad } from '../../utils/format/format.js'
 const calendars = [ 'gregorian', 'persian' ]
 
 export const useDatetimeProps = {
-  modelValue: {
-    required: true
-  },
+  // should define modelValue in the target component
 
   mask: {
     type: String

diff --git a/ui/src/components/time/QTime.js b/ui/src/components/time/QTime.js
@@ -46,7 +46,13 @@ export default createComponent({
     ...useFormProps,
     ...useDatetimeProps,
 
+    modelValue: {
+      required: true,
+      validator: val => typeof val === 'string' || val === null
+    },
+
     mask: {
+      ...useDatetimeProps.mask,
       default: null
     },