Merge pull request #8 from ILDaviz/main

Add filament 3.x support.

composer.json

@@ -20,9 +20,9 @@
         }
     ],
     "require": {
-        "php": "^8.0|^8.1",
+        "php": "^8.0|^8.1|^8.2",
         "anhskohbo/no-captcha": "^3.4",
-        "filament/forms": "^2.16",
+        "filament/forms": "^2.16|^3.0-stable",
         "illuminate/contracts": "^9.0|^10.0",
         "spatie/laravel-package-tools": "^1.13.0"
     },

resources/views/forms/components/g-recaptcha.blade.php

@@ -2,23 +2,23 @@
 
 <script>
     document.addEventListener('livewire:load', function () {
-        @this.
-        on('resetCaptcha', () => window.grecaptcha.reset())
+    @this.on('resetCaptcha', () => window.grecaptcha.reset())
     });
 
-    var recaptchaCallback = () => window.Livewire.find('{{$this->id}}')
+    var recaptchaCallback = () => window.Livewire.find('{{ method_exists($this, 'id') ? $this->id(): $this->id }}')
         .set('{{$getStatePath()}}', window.grecaptcha.getResponse(), true);
 
 </script>
 
 <x-dynamic-component
+    :component="$getFieldWrapperView()"
+    :field="method_exists($this, 'id')  ? $field : null"
     :component="$getFieldWrapperView()"
     :id="$getId()"
     :label="$getLabel()"
     :label-sr-only="$isLabelHidden()"
     :helper-text="$getHelperText()"
     :hint="$getHint()"
-    :hint-action="$getHintAction()"
     :hint-color="$getHintColor()"
     :hint-icon="$getHintIcon()"
     :required="$isRequired()"
@@ -38,4 +38,3 @@
         {!! NoCaptcha::display(['data-callback' => 'recaptchaCallback']) !!}
     </div>
 </x-dynamic-component>
-

src/Forms/Components/GRecaptcha.php

@@ -22,7 +22,11 @@ public function callAfterStateUpdated(): static
     {
         parent::callAfterStateUpdated();
 
-        $this->getLivewire()->emit('resetCaptcha');
+        if (method_exists($this->getLivewire(), 'dispatchFormEvent')) {
+            $this->getLivewire()->dispatchFormEvent('resetCaptcha');
+        } else {
+            $this->getLivewire()->emit('resetCaptcha');
+        }
 
         return $this;
     }