Merge pull request #728 from Thoth2023/develop

Develop

Author: diegocomis

app/Livewire/Conducting/StudySelection/PaperModal.php

@@ -328,9 +328,6 @@ public function nextPaper()
             ->first();
 
         if ($nextPaper) {
-            // Fecha o modal atual
-            $this->dispatch('close-paper');
-
             // Mostra o próximo
             $this->showPaper($nextPaper, $this->criterias);
         } else {
@@ -347,7 +344,6 @@ public function previousPaper()
             ->first();
 
         if ($previousPaper) {
-            $this->dispatch('close-paper');
             $this->showPaper($previousPaper, $this->criterias);
         } else {
             session()->flash('errorMessage', 'This is the first paper.');

resources/views/livewire/conducting/study-selection/paper-modal.blade.php

@@ -1,5 +1,5 @@
 <div>
-    <div wire:ignore.self class="modal fade" id="paperModal" tabindex="-1" role="dialog" aria-labelledby="paperModalLabel"
+    <div wire:ignore.self class="modal fade" id="paperModal" tabindex="-1" role="dialog" aria-labelledby="paperModalLabel" wire:key="paperModal"
         aria-hidden="true">
         <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
             <div class="modal-content">
@@ -169,6 +169,11 @@
 
 @script
 <script>
+    // --- Corrige o warning de aria-hidden / focus retido em modais ---
+    document.addEventListener('hidden.bs.modal', function (event) {
+        document.activeElement?.blur();
+    });
+
     document.addEventListener('livewire:initialized', () => {
 
         // --- Abrir modal principal ---
@@ -219,3 +224,4 @@
 
 
 
+