diff --git a/src/digital-components/phonenumber-question/phonenumber-question.vue b/src/digital-components/phonenumber-question/phonenumber-question.vue index 29f3aa4f2..0a17d2ea7 100644 --- a/src/digital-components/phonenumber-question/phonenumber-question.vue +++ b/src/digital-components/phonenumber-question/phonenumber-question.vue @@ -1,40 +1,14 @@ @@ -98,11 +72,6 @@ export default { errors, }; }, - data() { - return { - phoneNumberMaxLength: 12, - }; - }, computed: { phoneNumberQuestionWidget() { return this.getCmsContent(this.cmsWidgetName, "QuestionText"); @@ -116,6 +85,13 @@ export default { this.$emit("update:modelValue", formattedNumber); }, }, + validationRuleForTextBoxQuestion() { + if (!this.validationRules || this.validationRules.length === 0) { + return "phone-number-format"; + } else { + return this.validationRules + "|phone-number-format"; + } + }, }, methods: { formatPhoneNumber(value) { @@ -134,11 +110,14 @@ export default { return formattedNumber; }, onKeyDown(event) { - if (this.selectedValue.length === 0 && event.key === "1") { + if ( + (this.selectedValue.length === 0 && event.key === "1") || + (event.keyCode >= 65 && event.keyCode <= 90) + ) { event.preventDefault(); } this.formatPhoneNumber(event.target.value + event.key); - } + }, }, watch: { async value(newValue) { @@ -149,8 +128,8 @@ export default { }, }, components: { - textboxQuestion - } + textboxQuestion, + }, }; diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue index a6866a999..19f35715c 100644 --- a/src/digital-components/textbox-question/textbox-question.vue +++ b/src/digital-components/textbox-question/textbox-question.vue @@ -45,7 +45,7 @@ @blur="handleChange" :maxlength="maxLength ? maxLength : '999'" @focus="$emit('focus', $event.target.value)" - @keydown="keyDownHandler"/> + @keydown="keyDownHandler" />