wip

src/Support/Html/Mixins/BaseElementMixin.php

@@ -9,7 +9,8 @@ class BaseElementMixin
 {
     public function wireKey(): mixed
     {
-        return function (?string $value = null) {
+        return function (?string $value = null): BaseElement
+        {
             /** @var BaseElement $this */
 
             return $this->attribute('wire:key', $value);
@@ -18,7 +19,8 @@ public function wireKey(): mixed
 
     public function wireIgnore(): mixed
     {
-        return function (?bool $self = false) {
+        return function (?bool $self = false): BaseElement
+        {
             /** @var BaseElement $this */
 
             return $self
@@ -29,7 +31,8 @@ public function wireIgnore(): mixed
 
     public function wireNavigate(): mixed
     {
-        return function () {
+        return function (): BaseElement
+        {
             /** @var BaseElement $this */
 
             return $this->attribute('wire:navigate');
@@ -38,7 +41,8 @@ public function wireNavigate(): mixed
 
     public function wireSubmit(): mixed
     {
-        return function (?string $action = null) {
+        return function (?string $action = null): BaseElement
+        {
             /** @var BaseElement $this */
 
             return $this->attribute('wire:submit', $action);
@@ -47,8 +51,10 @@ public function wireSubmit(): mixed
 
     public function wireModel(): mixed
     {
-        return function (string $key, ?string $modifiers = null) {
+        return function (string $key, ?string $modifiers = null): BaseElement
+        {
             /** @var BaseElement $this */
+
             $directive = str('wire:model')
                 ->when($modifiers, fn (Stringable $str) => $str->append(".{$modifiers}"))
                 ->squish();

src/Support/Html/Mixins/HtmlExtendedMixin.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Foxws\WireUse\Support\Html\Mixins;
+
+use Livewire\Form;
+use Spatie\Html\Elements\Div;
+
+class HtmlExtendedMixin
+{
+    protected ?Form $form = null;
+
+    public function wireForm(): mixed
+    {
+        return function (?Form $value = null): static
+        {
+            $this->form = $value;
+
+            return $this;
+        };
+    }
+
+    public function icon(): mixed
+    {
+        return function (string $name, ?string $class = null, ?array $attributes = []): Div
+        {
+            /** @var Div $this */
+
+            return $this->div(svg($name, $class, $attributes));
+        };
+    }
+}

src/WireUseServiceProvider.php

@@ -3,8 +3,8 @@
 namespace Foxws\WireUse;
 
 use Foxws\WireUse\Support\Blade\Bladeable;
-use Foxws\WireUse\Support\Html\HtmlExtended;
 use Foxws\WireUse\Support\Html\Mixins\BaseElementMixin;
+use Foxws\WireUse\Support\Html\Mixins\HtmlExtendedMixin;
 use Foxws\WireUse\Support\Html\Mixins\LinkElementMixin;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\View\ComponentAttributeBag;
@@ -175,8 +175,7 @@ protected function registerLivewire(): static
 
     protected function registerHtml(): static
     {
-        $this->app->singleton(Html::class, HtmlExtended::class);
-
+        Html::mixin(new HtmlExtendedMixin);
         BaseElement::mixin(new BaseElementMixin);
         A::mixin(new LinkElementMixin);