From 60913d8290a6e2cd402d2173920fdbf959594f63 Mon Sep 17 00:00:00 2001
From: Omar Alnabris <thaqebon@gmail.com>
Date: Sat, 8 Feb 2025 04:43:50 +0300
Subject: [PATCH 1/2] Set title attribute only when tooltip is not present

---
 .../resources/views/components/icon-button.blade.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/support/resources/views/components/icon-button.blade.php b/packages/support/resources/views/components/icon-button.blade.php
index 6ddfa2782a..f1ec8b0a91 100644
--- a/packages/support/resources/views/components/icon-button.blade.php
+++ b/packages/support/resources/views/components/icon-button.blade.php
@@ -147,9 +147,9 @@
                     'wire:loading.attr' => 'disabled',
                     'wire:target' => ($hasLoadingIndicator && $loadingIndicatorTarget) ? $loadingIndicatorTarget : null,
                 ], escape: false)
-                ->merge([
-                    'title' => $label,
-                ], escape: true)
+                ->when(! $hasTooltip, function ($attributes) use ($label) {
+                    $attributes->merge(['title' => $label], escape: true);
+                })
                 ->class([$buttonClasses])
                 ->style([$buttonStyles])
         }}
@@ -212,9 +212,9 @@
         @endif
         {{
             $attributes
-                ->merge([
-                    'title' => $label,
-                ], escape: true)
+                ->when(! $hasTooltip, function ($attributes) use ($label) {
+                    $attributes->merge(['title' => $label], escape: true);
+                })
                 ->class([$buttonClasses])
                 ->style([$buttonStyles])
         }}

From 306dd635a186ac864487d0c2528c4d35978dba42 Mon Sep 17 00:00:00 2001
From: Omar Alnabris <thaqebon@gmail.com>
Date: Sat, 8 Feb 2025 05:25:53 +0300
Subject: [PATCH 2/2] Return attributes after merging title

---
 .../support/resources/views/components/icon-button.blade.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/support/resources/views/components/icon-button.blade.php b/packages/support/resources/views/components/icon-button.blade.php
index f1ec8b0a91..7a57170c0b 100644
--- a/packages/support/resources/views/components/icon-button.blade.php
+++ b/packages/support/resources/views/components/icon-button.blade.php
@@ -148,7 +148,7 @@
                     'wire:target' => ($hasLoadingIndicator && $loadingIndicatorTarget) ? $loadingIndicatorTarget : null,
                 ], escape: false)
                 ->when(! $hasTooltip, function ($attributes) use ($label) {
-                    $attributes->merge(['title' => $label], escape: true);
+                    return $attributes->merge(['title' => $label], escape: true);
                 })
                 ->class([$buttonClasses])
                 ->style([$buttonStyles])
@@ -213,7 +213,7 @@
         {{
             $attributes
                 ->when(! $hasTooltip, function ($attributes) use ($label) {
-                    $attributes->merge(['title' => $label], escape: true);
+                    return $attributes->merge(['title' => $label], escape: true);
                 })
                 ->class([$buttonClasses])
                 ->style([$buttonStyles])