Livewire fix

Author: pascalbaljet

README.md

@@ -291,7 +291,7 @@ Additionally, you can pass an optional modifier to the `@wire` directive. This f
 </x-form>
 ```
 
-It's also possible to use the `wire:model` attribute by default. You may set the `default_wire` configuration setting to `true` or a modifier like `debounce.500ms`. This way, you don't need the `@wire` and `@endwire` directives in your views. You may still override the default setting by manually adding the `wire:model` attribute to a form element.
+It's also possible to use the `wire:model` attribute by default. You may set the `default_wire` configuration setting to `true` or a modifier like `debounce.500ms`. This way, you don't need the `@wire` and `@endwire` directives in your views. You may still override the default setting by using the `@wire` directive, or by manually adding the `wire:model` attribute to a form element.
 
 ### Select elements
 

src/FormDataBinder.php

@@ -19,7 +19,7 @@ class FormDataBinder
     /**
      * Whether the default wire has been verified once.
      */
-    private $verifiedDefaultWire = false;
+    private $loadDefaultWire = true;
 
     /**
      * Bind a target to the current instance
@@ -59,8 +59,8 @@ public function pop(): void
      */
     public function isWired(): bool
     {
-        if (!$this->verifiedDefaultWire) {
-            $this->verifiedDefaultWire = true;
+        if ($this->loadDefaultWire) {
+            $this->loadDefaultWire = false;
 
             $defaultWire = config('form-components.default_wire');
 
@@ -85,12 +85,16 @@ public function getWireModifier(): ?string
     /**
      * Enable Livewire binding with an optional modifier.
      *
-     * @param string $modifier
+     * @param bool|string $modifier
      * @return void
      */
     public function wire($modifier = null): void
     {
-        $this->wire = $modifier ?: null;
+        $this->wire = $modifier !== false
+            ? ($modifier ?: null)
+            : false;
+
+        $this->loadDefaultWire = false;
     }
 
     /**
@@ -101,5 +105,7 @@ public function wire($modifier = null): void
     public function endWire(): void
     {
         $this->wire = false;
+
+        $this->loadDefaultWire = true;
     }
 }

tests/Feature/LivewireTest.php

@@ -65,6 +65,14 @@ public function render()
     }
 }
 
+class FormComponentDefaultWiredWithDirectiveOverride extends FormComponent
+{
+    public function render()
+    {
+        return view('livewire-form-default-wired-with-directive-override');
+    }
+}
+
 class LivewireTest extends TestCase
 {
     /** @test */
@@ -165,4 +173,19 @@ public function it_can_wire_by_default_but_still_override_the_value()
             ->assertSeeHtml('wire:model="checkbox"')
             ->assertSeeHtml('wire:model="radio"');
     }
+
+    /** @test */
+    public function it_can_wire_by_default_but_still_override_with_a_directive()
+    {
+        config(['form-components.default_wire' => true]);
+
+        $component = Livewire::test(FormComponentDefaultWiredWithDirectiveOverride::class);
+
+        $component->assertSeeHtml('wire:model="input"')
+            ->assertDontSeeHtml('wire:model="textarea"')
+            ->assertSeeHtml('wire:model="select"')
+            ->assertSeeHtml('wire:model.defer="multi_select"')
+            ->assertSeeHtml('wire:model.debounce.500ms="checkbox"')
+            ->assertSeeHtml('wire:model="radio"');
+    }
 }

tests/Feature/views/livewire-form-default-wired-with-directive-override.blade.php

@@ -0,0 +1,21 @@
+<x-form wire:submit.prevent="submit">
+    <x-form-input name="input" />
+
+    @wire(false)
+    <x-form-textarea name="textarea" />
+    @endwire
+
+    <x-form-select name="select" :options="['' => '', 'c' => 'c']" />
+
+    @wire('defer')
+    <x-form-select name="multi_select" multiple :options="['d' => 'd', 'e' => 'e', 'f' => 'f']" />
+    @endwire
+
+    <x-form-checkbox name="checkbox" wire:model.debounce.500ms="checkbox" />
+
+    <x-form-group name="radio">
+        <x-form-radio name="radio" />
+    </x-form-group>
+
+    <x-form-submit />
+</x-form>