Started upgrade to livewire v3

nodus-it · Mar 22, 2024 · 4dddf41 · 4dddf41
1 parent a68e2ef
commit 4dddf41
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
   ],
   "require": {
     "php": "^8.1",
-    "nodus-it/livewire-core": "~0.2"
+    "nodus-it/livewire-core": "dev-livewire3"
   },
   "require-dev": {
     "pestphp/pest": "^2.0",

diff --git a/src/Livewire/BaseDataTable.php b/src/Livewire/BaseDataTable.php
@@ -170,14 +170,10 @@ abstract class BaseDataTable extends Component
 
     /**
      * DataTable constructor.
-     *
-     * @param null $id
      */
-    public function __construct($id = null)
+    public function __construct()
     {
         $this->paginationTheme = config('livewire-datatables.theme');
-
-        parent::__construct($id);
     }
 
     /**

diff --git a/src/Livewire/ConfirmModal.php b/src/Livewire/ConfirmModal.php
@@ -97,7 +97,7 @@ public function open(string $url, array $options = []): void
             $this->context = $options[ 'context' ];
         }
 
-        $this->emit('confirm:client-show');
+        $this->dispatch('confirm:client-show');
     }
 
     /**
@@ -109,7 +109,7 @@ public function close(): void
     {
         $this->isOpen = false;
 
-        $this->emit('confirm:client-close');
+        $this->dispatch('confirm:client-close');
     }
 
     /**

diff --git a/src/resources/views/livewire/bootstrap/components/widgets/buttons.blade.php b/src/resources/views/livewire/bootstrap/components/widgets/buttons.blade.php
@@ -7,7 +7,7 @@
                 @endif
 
                 @if($button->isConfirmationButton())
-                    <button wire:click="$emit('confirm:show', '{{$button->getRoute($item)}}', @js($button->getConfirmation()))"
+                    <button wire:click="$dispatch('confirm:show', '{{$button->getRoute($item)}}', @js($button->getConfirmation()))"
                             class="btn trigger-btn {{$button->getClasses() ?? 'btn-sm btn-primary'}}"
                             data-toggle="modal">
                         @include($themePath . '.components.widgets.button_content')

diff --git a/src/resources/views/livewire/bootstrap/confirm_modal.blade.php b/src/resources/views/livewire/bootstrap/confirm_modal.blade.php
@@ -8,13 +8,13 @@
                 <h4 class="modal-title w-100">
                     @lang($title)
                 </h4>
-                <button type="button" class="close" wire:click="$emitSelf('confirm:close')" aria-hidden="true">&times;</button>
+                <button type="button" class="close" wire:click="$dispatchSelf('confirm:close')" aria-hidden="true">&times;</button>
             </div>
             <div class="modal-body">
                 <p>@lang($text)</p>
             </div>
             <div class="modal-footer justify-content-center">
-                <button type="button" class="btn btn-secondary" wire:click="$emitSelf('confirm:close')">
+                <button type="button" class="btn btn-secondary" wire:click="$dispatchSelf('confirm:close')">
                     @lang($cancelButton)
                 </button>
                 <a href="{{$url}}" class="btn btn-{{$context}}">

diff --git a/tests/Unit/ConfirmModalTest.php b/tests/Unit/ConfirmModalTest.php
@@ -16,30 +16,30 @@
 
 it('can open', function () {
     livewire(ConfirmModal::class)
-        ->emit('confirm:show', 'delete/url', ['context' => 'warning'])
+        ->dispatch('confirm:show', 'delete/url', ['context' => 'warning'])
         ->assertSet('url', 'delete/url')
         ->assertSet('context', 'warning')
         ->assertSet('isOpen', true);
 });
 
 it('can close automatically', function () {
     livewire(ConfirmModal::class)
-        ->emit('confirm:show', 'delete/url/1', ['context' => 'warning'])
+        ->dispatch('confirm:show', 'delete/url/1', ['context' => 'warning'])
         ->assertSet('url', 'delete/url/1')
         ->assertSet('isOpen', true)
-        ->emit('confirm:show', 'delete/url/2', ['context' => 'warning'])
-        ->assertEmitted('confirm:client-close')
+        ->dispatch('confirm:show', 'delete/url/2', ['context' => 'warning'])
+        ->assertDispatched('confirm:client-close')
         ->assertSet('url', 'delete/url/2')
         ->assertSet('isOpen', true);
 });
 
 it('can close', function () {
     livewire(ConfirmModal::class)
-        ->emit('confirm:show', 'delete/url/1', ['context' => 'warning'])
+        ->dispatch('confirm:show', 'delete/url/1', ['context' => 'warning'])
         ->assertSet('url', 'delete/url/1')
         ->assertSet('isOpen', true)
-        ->emit('confirm:close')
-        ->assertEmitted('confirm:client-close')
+        ->dispatch('confirm:close')
+        ->assertDispatched('confirm:client-close')
         ->assertSet('isOpen', false);
 });