Merge branch 'task001/add-labels' of bitbucket.org:studiotem/jandl-taskmanager-app

app/src/plugins/tm@modal/task/z-task-modal.vue

@@ -57,16 +57,14 @@
 
           <div class="splitted-inputs">
             <!-- TODO: Bialko validacie -->
-            <div
-              class="datepicker-wrapper"
-              @click="openDatepicker('datepicker-01')"
-            >
-              <Datepicker
+            <div class="w-100 modal-input">
+              <Z-datepicker
                 ref="datepicker-01"
                 v-model="subtask.deadline"
+                label="Deadline"
                 :auto-apply="true"
                 :min-date="new Date()"
-                class="modal-input left datepicker-input"
+                class="modal-input"
                 format="dd.MM.yyyy"
                 locale="sk"
                 select-text="Vybrať"
@@ -378,7 +376,7 @@
 </template>
 
 <script>
-import Datepicker from '@vuepic/vue-datepicker';
+import ZDatepicker from '@/plugins/tm@_components/z-datepicker.vue';
 import ZFilesUpload from '@/plugins/tm@_components/z-files-upload.vue';
 import useVuelidate from '@vuelidate/core';
 import { required } from '@vuelidate/validators';
@@ -401,7 +399,7 @@ export default {
     ZTaskReadonlyInfo,
     ATimeblock,
     ZFilesUpload,
-    Datepicker,
+    ZDatepicker,
     // ATaskTimeblocks,
     QuillEditor,
   },
@@ -533,6 +531,29 @@ export default {
   },
 
   methods: {
+    // Override onDateOpen from VuetifyFixFocusMixin to add logging
+    onDateOpen($event) {
+      // Call the parent mixin's onDateOpen method
+      if (
+        VuetifyFixFocusMixin.methods &&
+        VuetifyFixFocusMixin.methods.onDateOpen
+      ) {
+        VuetifyFixFocusMixin.methods.onDateOpen.call(this, $event);
+      }
+    },
+
+    // Override onInputFocus from VuetifyFixFocusMixin to add logging
+    onInputFocus($event) {
+      const target = $event?.target;
+      // Call the parent mixin's onInputFocus method
+      if (
+        VuetifyFixFocusMixin.methods &&
+        VuetifyFixFocusMixin.methods.onInputFocus
+      ) {
+        VuetifyFixFocusMixin.methods.onInputFocus.call(this, $event);
+      }
+    },
+
     toggleEditMode() {
       if (this.subtask.type == 'office365')
         return this.$events.emit('show-unable-to-edit-office-task-modal', {
@@ -588,6 +609,10 @@ export default {
     async showModal({ subtask, editMode = false, mastertask = {} }) {
       this.isSaving = false;
       this.subtask = null;
+
+      // CRITICAL: Prevent v-dialog autofocus BEFORE modal opens
+      this.preventInputFocus = true;
+
       this.visible = true;
       this.timeblocks = [
         {
@@ -599,6 +624,11 @@ export default {
       this.$nextTick(() => {
         this.v$.$reset();
         this.setFocusEvent();
+
+        // Reset after modal is fully rendered and v-dialog autofocus has been blocked
+        setTimeout(() => {
+          this.preventInputFocus = false;
+        }, 300);
       });
 
       try {