Merge pull request #20 from Puralogica/dev-newfeatures

Add CanAllowHtml and CanModifyState
199ocero · Feb 28, 2024 · 5072022 · 5072022
2 parents 07addb7 + 5ff4ea5
commit 5072022
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/resources/views/infolists/components/activity-date.blade.php b/resources/views/infolists/components/activity-date.blade.php
@@ -1,3 +1,7 @@
 <span class="flex-shrink-0 text-xs font-medium text-gray-500 uppercase fi-timeline-item-date dark:text-gray-400">
-    {{ $getState() != null ? $getDate($getState()) : $getPlaceholder() }}
+    @if ($isHtmlAllowed())
+        {!! $getModifiedState() ?? (!is_array($getState()) ? $getState() ?? $getPlaceholder() : null) !!}
+    @else
+        {{ $getModifiedState() ?? (!is_array($getState()) ? $getState() ?? $getPlaceholder() : null) }}
+    @endif
 </span>
diff --git a/src/Components/ActivityDate.php b/src/Components/ActivityDate.php
@@ -2,11 +2,15 @@
 
 namespace JaOcero\ActivityTimeline\Components;
 
-use Filament\Infolists\Components\Entry;
 use Illuminate\Support\Carbon;
+use Filament\Infolists\Components\Entry;
+use Filament\Forms\Components\Concerns\CanAllowHtml;
+use JaOcero\ActivityTimeline\Concerns\CanModifyState;
 
 class ActivityDate extends Entry
 {
+    use CanAllowHtml, CanModifyState;
+
     protected string $viewIdentifier = 'activityDate';
 
     protected string $view = 'activity-timeline::infolists.components.activity-date';