fix: prevent date inside field from receiving click on focus (fix qua…

…sarframework#16948)
alexkunin · Mar 12, 2024 · f4b7218 · f4b7218
1 parent 072482b
commit f4b7218
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/ui/src/components/date/QDate.js b/ui/src/components/date/QDate.js
@@ -1,4 +1,4 @@
-import { h, ref, computed, watch, Transition, nextTick, getCurrentInstance } from 'vue'
+import { h, ref, computed, watch, Transition, nextTick, getCurrentInstance, inject } from 'vue'
 
 import QBtn from '../btn/QBtn.js'
 
@@ -1442,6 +1442,11 @@ export default createComponent({
       setToday, setView, offsetCalendar, setCalendarTo, setEditingRange
     })
 
+    const qFieldContainer = inject('q-field-container')
+    if (qFieldContainer) {
+      qFieldContainer.swallowClick(true)
+    }
+
     return () => {
       const content = [
         h('div', {

diff --git a/ui/src/composables/private/use-field.js b/ui/src/composables/private/use-field.js
@@ -1,4 +1,4 @@
-import { h, ref, computed, Transition, nextTick, onActivated, onDeactivated, onBeforeUnmount, onMounted, getCurrentInstance } from 'vue'
+import { h, ref, computed, Transition, nextTick, onActivated, onDeactivated, onBeforeUnmount, onMounted, getCurrentInstance, provide } from 'vue'
 
 import QIcon from '../../components/icon/QIcon.js'
 import QSpinner from '../../components/spinner/QSpinner.js'
@@ -549,6 +549,10 @@ export default function (state) {
   // expose public methods
   Object.assign(proxy, { focus, blur })
 
+  let shouldSwallowClick = false
+
+  provide('q-field-container', { swallowClick (flag) { shouldSwallowClick = flag } })
+
   return function renderField () {
     const labelAttrs = state.getControl === void 0 && slots.control === void 0
       ? {
@@ -565,6 +569,11 @@ export default function (state) {
         attrs.class
       ],
       style: attrs.style,
+      onClick: function (e) {
+        if (shouldSwallowClick) {
+          prevent(e)
+        }
+      },
       ...labelAttrs
     }, [
       slots.before !== void 0