From b8fcc38cafe8efd36616abe17e0d11ed7b9da347 Mon Sep 17 00:00:00 2001 From: Fernanda Nogueira Date: Mon, 29 Aug 2022 10:37:34 -0300 Subject: [PATCH 1/9] fix(int-512): fix error in datepicker --- src/components/Datepicker/Datepicker.vue | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/components/Datepicker/Datepicker.vue b/src/components/Datepicker/Datepicker.vue index d2c7ff2b..872d7a81 100644 --- a/src/components/Datepicker/Datepicker.vue +++ b/src/components/Datepicker/Datepicker.vue @@ -257,6 +257,10 @@ export default { }, tzOffsetValue() { + if (!dayjs(this.internalValue, this.internalFormat, true).isValid()) { + return + } + if ( !this.timeZone || !this.internalValue || @@ -265,7 +269,9 @@ export default { return '' } - if (this.tzOffset) return this.tzOffset.replace('GMT', '') + if (this.tzOffset) { + return this.tzOffset.replace('GMT', '') + } return dayjs.tz(this.internalValue, this.timeZone).format('Z') }, }, @@ -275,8 +281,11 @@ export default { handler: 'syncInternalValue', immediate: true, }, - internalValue() { - if (this.internalValue.length >= 4) { + internalValueFormatted() { + if ( + this.internalValue.length >= 4 && + dayjs(this.internalValue, this.internalFormat, true).isValid() + ) { this.internalDate = this.internalValue } }, From 3f93198b33b13a9d51289f7e7d267bec991bab6e Mon Sep 17 00:00:00 2001 From: Fernanda Nogueira Date: Mon, 29 Aug 2022 10:39:07 -0300 Subject: [PATCH 2/9] fix(int-512): change v-mask for maska --- package.json | 2 +- src/components/TextField/SbTextField.vue | 6 +++--- yarn.lock | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 0400193e..ecfd1fae 100644 --- a/package.json +++ b/package.json @@ -15,9 +15,9 @@ "dependencies": { "@popperjs/core": "^2.11.5", "dayjs": "^1.11.3", + "maska": "^1.5.0", "portal-vue": "^2.1.7", "throttle-debounce": "^4.0.1", - "v-mask": "^2.3.0", "vue-fragment": "^1.6.0" }, "peerDependencies": { diff --git a/src/components/TextField/SbTextField.vue b/src/components/TextField/SbTextField.vue index 76ed0d28..edcd6385 100644 --- a/src/components/TextField/SbTextField.vue +++ b/src/components/TextField/SbTextField.vue @@ -10,7 +10,7 @@ :id="id" ref="textfield" v-model="computedValue" - v-mask="mask" + v-maska="mask" v-bind="$attrs" class="sb-textfield__input" :type="internalType" @@ -127,7 +127,7 @@