From cc6c125b967918703aff8ff94721175344dc8794 Mon Sep 17 00:00:00 2001
From: Antonio Almeida <promatik@gmail.com>
Date: Sat, 30 Dec 2023 03:17:53 +0000
Subject: [PATCH 1/2] Wrapper will not print false attributes

---
 src/macros.php                                              | 6 +++++-
 .../views/crud/columns/inc/wrapper_start.blade.php          | 2 ++
 src/resources/views/crud/fields/inc/wrapper_start.blade.php | 4 +++-
 src/resources/views/ui/widgets/inc/wrapper_start.blade.php  | 2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/macros.php b/src/macros.php
index 59de1c0032..e6072d81d3 100644
--- a/src/macros.php
+++ b/src/macros.php
@@ -108,7 +108,11 @@
             // if the parameter is callable, we'll call it
             $parameters = collect($parameters)->map(fn ($item) => is_callable($item) ? $item($entry, $related_key, $column, $crud) : $item)->toArray();
 
-            return route($route, $parameters);
+            try {
+                return route($route, $parameters);
+            } catch (\Exception $e) {
+                return false;
+            }
         };
 
         $this->wrapper($wrapper);
diff --git a/src/resources/views/crud/columns/inc/wrapper_start.blade.php b/src/resources/views/crud/columns/inc/wrapper_start.blade.php
index 69270e95ef..46f1b57e87 100644
--- a/src/resources/views/crud/columns/inc/wrapper_start.blade.php
+++ b/src/resources/views/crud/columns/inc/wrapper_start.blade.php
@@ -11,6 +11,8 @@
 
 <{{ $column['wrapper']['element'] ?? 'a' }}
 @foreach(Arr::except($column['wrapper'], 'element') as $element => $value)
+    @if($value !== false)
     {{$element}}="{{$value}}"
+    @endif
 @endforeach
 >
\ No newline at end of file
diff --git a/src/resources/views/crud/fields/inc/wrapper_start.blade.php b/src/resources/views/crud/fields/inc/wrapper_start.blade.php
index 7f477c8d79..75905fbf49 100644
--- a/src/resources/views/crud/fields/inc/wrapper_start.blade.php
+++ b/src/resources/views/crud/fields/inc/wrapper_start.blade.php
@@ -36,6 +36,8 @@
 
 <{{ $field['wrapper']['element'] }}
 	@foreach($field['wrapper'] as $attribute => $value)
-	    {{ $attribute }}="{{ $value }}"
+		@if($value !== false)
+		{{ $attribute }}="{{ $value }}"
+		@endif
 	@endforeach
 >
diff --git a/src/resources/views/ui/widgets/inc/wrapper_start.blade.php b/src/resources/views/ui/widgets/inc/wrapper_start.blade.php
index 19fe366789..01d076c9ce 100644
--- a/src/resources/views/ui/widgets/inc/wrapper_start.blade.php
+++ b/src/resources/views/ui/widgets/inc/wrapper_start.blade.php
@@ -11,6 +11,8 @@
 
 <{{ $widget['wrapper']['element'] ?? 'div' }}
 @foreach(Arr::where($widget['wrapper'],function($value, $key) { return $key != 'element'; }) as $element => $value)
+    @if($value !== false)
     {{$element}}="{{$value}}"
+    @endif
 @endforeach
 >
\ No newline at end of file

From 9f500eb44b93439d07d1adffc38d50933acef275 Mon Sep 17 00:00:00 2001
From: Antonio Almeida <promatik@gmail.com>
Date: Sun, 7 Jan 2024 21:19:16 +0000
Subject: [PATCH 2/2] Fix conditional statement in wrapper_start.blade.php
 files

---
 src/resources/views/crud/columns/inc/wrapper_start.blade.php | 2 +-
 src/resources/views/crud/fields/inc/wrapper_start.blade.php  | 2 +-
 src/resources/views/ui/widgets/inc/wrapper_start.blade.php   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/resources/views/crud/columns/inc/wrapper_start.blade.php b/src/resources/views/crud/columns/inc/wrapper_start.blade.php
index 46f1b57e87..55f8dbd938 100644
--- a/src/resources/views/crud/columns/inc/wrapper_start.blade.php
+++ b/src/resources/views/crud/columns/inc/wrapper_start.blade.php
@@ -11,7 +11,7 @@
 
 <{{ $column['wrapper']['element'] ?? 'a' }}
 @foreach(Arr::except($column['wrapper'], 'element') as $element => $value)
-    @if($value !== false)
+    @if($value !== false && $element === 'href')
     {{$element}}="{{$value}}"
     @endif
 @endforeach
diff --git a/src/resources/views/crud/fields/inc/wrapper_start.blade.php b/src/resources/views/crud/fields/inc/wrapper_start.blade.php
index 75905fbf49..6a6a66563e 100644
--- a/src/resources/views/crud/fields/inc/wrapper_start.blade.php
+++ b/src/resources/views/crud/fields/inc/wrapper_start.blade.php
@@ -36,7 +36,7 @@
 
 <{{ $field['wrapper']['element'] }}
 	@foreach($field['wrapper'] as $attribute => $value)
-		@if($value !== false)
+		@if($value !== false && $element === 'href')
 		{{ $attribute }}="{{ $value }}"
 		@endif
 	@endforeach
diff --git a/src/resources/views/ui/widgets/inc/wrapper_start.blade.php b/src/resources/views/ui/widgets/inc/wrapper_start.blade.php
index 01d076c9ce..980ca63a5b 100644
--- a/src/resources/views/ui/widgets/inc/wrapper_start.blade.php
+++ b/src/resources/views/ui/widgets/inc/wrapper_start.blade.php
@@ -11,7 +11,7 @@
 
 <{{ $widget['wrapper']['element'] ?? 'div' }}
 @foreach(Arr::where($widget['wrapper'],function($value, $key) { return $key != 'element'; }) as $element => $value)
-    @if($value !== false)
+    @if($value !== false && $element === 'href')
     {{$element}}="{{$value}}"
     @endif
 @endforeach