Removed "partials" which cause bugs in a Livewire context

forxer · Dec 3, 2024 · f1813ae · f1813ae
1 parent 58e9975
commit f1813ae
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+0.24.1 (2024-12-03)
+-------------------
+
+- Removed "partials" which cause bugs in a Livewire context
+
+
 0.24.0 (2024-10-26)
 -------------------
 

diff --git a/resources/views/bootstrap-4/components/buttons/form-button.blade.php b/resources/views/bootstrap-4/components/buttons/form-button.blade.php
@@ -2,7 +2,15 @@
     {{ $attributes->merge(['class' => 'btn btn-'.$variant.($size !== null ? ' btn-'.$size : '')]) }}
     type="{{ $type }}"
     form="{!! $formId !!}"
-    @include('blade-ui-kit-bootstrap::bootstrap-4.components.buttons.partials.attributes')
+    @if ($title !== null)
+        data-toggle="tooltip"
+        title="{!! $title !!}"
+    @endif
+    @if ($confirm !== null)
+        data-buk-confirm="{!! $confirm !!}"
+        data-buk-confirm-modal="confirm-modal-{!! $confirmId !!}"
+        <x-confirm-modal :id="'confirm-modal-'.$confirmId" :title="$confirmTitle" :confirmVariant="$confirmVariant" />
+    @endif
     @disabled($disabled)
 >
 @include('blade-ui-kit-bootstrap::bootstrap-4.components.buttons.partials.content')

diff --git a/resources/views/bootstrap-4/components/buttons/link-button.blade.php b/resources/views/bootstrap-4/components/buttons/link-button.blade.php
@@ -7,7 +7,15 @@
     @else
         {{ $attributes->merge(['role' => 'button', 'class' => 'disabled btn btn-'.$variant.($size !== null ? ' btn-'.$size : ''), 'aria-disabled' => 'true', 'tabindex' => '-1']) }}
     @endif
-    @include('blade-ui-kit-bootstrap::bootstrap-4.components.buttons.partials.attributes')
+    @if ($title !== null)
+        data-toggle="tooltip"
+        title="{!! $title !!}"
+    @endif
+    @if ($confirm !== null)
+        data-buk-confirm="{!! $confirm !!}"
+        data-buk-confirm-modal="confirm-modal-{!! $confirmId !!}"
+        <x-confirm-modal :id="'confirm-modal-'.$confirmId" :title="$confirmTitle" :confirmVariant="$confirmVariant" />
+    @endif
 >
 @include('blade-ui-kit-bootstrap::bootstrap-4.components.buttons.partials.content')
 </a>
diff --git a/resources/views/bootstrap-4/components/buttons/partials/attributes.blade.php b/resources/views/bootstrap-4/components/buttons/partials/attributes.blade.php
diff --git a/resources/views/bootstrap-4/components/buttons/simple-button.blade.php b/resources/views/bootstrap-4/components/buttons/simple-button.blade.php
@@ -4,7 +4,15 @@
     @if ($formId !== null)
         form="{!! $formId !!}"
     @endif
-    @include('blade-ui-kit-bootstrap::bootstrap-4.components.buttons.partials.attributes')
+    @if ($title !== null)
+        data-toggle="tooltip"
+        title="{!! $title !!}"
+    @endif
+    @if ($confirm !== null)
+        data-buk-confirm="{!! $confirm !!}"
+        data-buk-confirm-modal="confirm-modal-{!! $confirmId !!}"
+        <x-confirm-modal :id="'confirm-modal-'.$confirmId" :title="$confirmTitle" :confirmVariant="$confirmVariant" />
+    @endif
     @disabled($disabled)
 >
 @include('blade-ui-kit-bootstrap::bootstrap-4.components.buttons.partials.content')

diff --git a/resources/views/bootstrap-5/components/buttons/form-button.blade.php b/resources/views/bootstrap-5/components/buttons/form-button.blade.php
@@ -2,7 +2,15 @@
     {{ $attributes->merge(['class' => 'btn btn-'.$variant.($size !== null ? ' btn-'.$size : '')]) }}
     type="{{ $type }}"
     form="{!! $formId !!}"
-    @include('blade-ui-kit-bootstrap::bootstrap-5.components.buttons.partials.attributes')
+    @if ($title !== null)
+        data-bs-toggle="tooltip"
+        title="{!! $title !!}"
+    @endif
+    @if ($confirm !== null)
+        data-buk-confirm="{!! $confirm !!}"
+        data-buk-confirm-modal="confirm-modal-{!! $confirmId !!}"
+        <x-confirm-modal :id="'confirm-modal-'.$confirmId" :title="$confirmTitle" :confirmVariant="$confirmVariant" />
+    @endif
     @disabled($disabled)
 >
 @include('blade-ui-kit-bootstrap::bootstrap-5.components.buttons.partials.content')

diff --git a/resources/views/bootstrap-5/components/buttons/link-button.blade.php b/resources/views/bootstrap-5/components/buttons/link-button.blade.php
@@ -7,7 +7,15 @@
     @else
         {{ $attributes->merge(['class' => 'disabled btn btn-'.$variant.($size !== null ? ' btn-'.$size : ''), 'role' => 'button', 'aria-disabled' => 'true', 'tabindex' => '-1']) }}
     @endif
-    @include('blade-ui-kit-bootstrap::bootstrap-5.components.buttons.partials.attributes')
+    @if ($title !== null)
+        data-bs-toggle="tooltip"
+        title="{!! $title !!}"
+    @endif
+    @if ($confirm !== null)
+        data-buk-confirm="{!! $confirm !!}"
+        data-buk-confirm-modal="confirm-modal-{!! $confirmId !!}"
+        <x-confirm-modal :id="'confirm-modal-'.$confirmId" :title="$confirmTitle" :confirmVariant="$confirmVariant" />
+    @endif
 >
 @include('blade-ui-kit-bootstrap::bootstrap-5.components.buttons.partials.content')
 </a>
diff --git a/resources/views/bootstrap-5/components/buttons/partials/attributes.blade.php b/resources/views/bootstrap-5/components/buttons/partials/attributes.blade.php
diff --git a/resources/views/bootstrap-5/components/buttons/simple-button.blade.php b/resources/views/bootstrap-5/components/buttons/simple-button.blade.php
@@ -4,7 +4,15 @@
     @if ($formId !== null)
         form="{!! $formId !!}"
     @endif
-    @include('blade-ui-kit-bootstrap::bootstrap-5.components.buttons.partials.attributes')
+    @if ($title !== null)
+        data-bs-toggle="tooltip"
+        title="{!! $title !!}"
+    @endif
+    @if ($confirm !== null)
+        data-buk-confirm="{!! $confirm !!}"
+        data-buk-confirm-modal="confirm-modal-{!! $confirmId !!}"
+        <x-confirm-modal :id="'confirm-modal-'.$confirmId" :title="$confirmTitle" :confirmVariant="$confirmVariant" />
+    @endif
     @disabled($disabled)
 >
 @include('blade-ui-kit-bootstrap::bootstrap-5.components.buttons.partials.content')