diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js index 66e3de4f5..8c89c9202 100644 --- a/src/boot/qformMixin.js +++ b/src/boot/qformMixin.js @@ -1,5 +1,9 @@ import { getCurrentInstance } from 'vue'; +const filterAvailableInput = element => element.classList.contains('q-field__native') && !element.disabled +const filterAvailableText = element => element.__vueParentComponent.type.name === 'QInput' && element.__vueParentComponent?.attrs?.class !== 'vn-input-date'; + + export default { mounted: function () { const vm = getCurrentInstance(); @@ -7,7 +11,7 @@ export default { if (!['searchbarForm','filterPanelForm'].includes(this.$el?.id)) { // AUTOFOCUS const elementsArray = Array.from(this.$el.elements); - const firstInputElement = elementsArray.find(element => element.classList.contains('q-field__native')); + const firstInputElement = elementsArray.filter(filterAvailableInput).find(filterAvailableText); if (firstInputElement) { firstInputElement.focus();