Merge branch '4.x' of https://github.com/filamentphp/filament into 4.x

packages/forms/resources/views/components/markdown-editor.blade.php

@@ -10,7 +10,7 @@
         <div
             class="fi-fo-markdown-editor fi-disabled prose dark:prose-invert block w-full max-w-none rounded-lg bg-gray-50 px-3 py-3 text-gray-500 ring-1 shadow-xs ring-gray-950/10 sm:text-sm dark:bg-transparent dark:text-gray-400 dark:ring-white/10"
         >
-            {!! str($getState())->markdown()->sanitizeHtml() !!}
+            {!! str($getState())->sanitizeHtml()->markdown($getCommonMarkOptions(), $getCommonMarkExtensions()) !!}
         </div>
     @else
         <x-filament::input.wrapper

packages/forms/src/Components/MarkdownEditor.php

@@ -3,10 +3,12 @@
 namespace Filament\Forms\Components;
 
 use Closure;
+use Filament\Support\Concerns\CanConfigureCommonMark;
 use Filament\Support\Concerns\HasExtraAlpineAttributes;
 
 class MarkdownEditor extends Field implements Contracts\CanBeLengthConstrained, Contracts\HasFileAttachments
 {
+    use CanConfigureCommonMark;
     use Concerns\CanBeLengthConstrained;
     use Concerns\HasFileAttachments;
     use Concerns\HasMaxHeight;

packages/infolists/docs/02-entries/02-text.md

@@ -47,6 +47,15 @@ TextEntry::make('created_at')
     ->dateTime()
 ```
 
+You may use also the `isoDate()` and `isoDateTime()` methods to format the entry's state using [PHP date formatting macro-formats](https://carbon.nesbot.com/docs/#available-macro-formats):
+
+```php
+use Filament\Infolists\Components\TextEntry;
+
+TextEntry::make('created_at')
+    ->isoDateTime()
+```
+
 You may use the `since()` method to format the entry's state using [Carbon's `diffForHumans()`](https://carbon.nesbot.com/docs/#api-humandiff):
 
 ```php
@@ -56,7 +65,7 @@ TextEntry::make('created_at')
     ->since()
 ```
 
-Additionally, you can use the `dateTooltip()`, `dateTimeTooltip()` or `timeTooltip()` method to display a formatted date in a tooltip, often to provide extra information:
+Additionally, you can use the `dateTooltip()`, `dateTimeTooltip()`, `timeTooltip()`, `isoDateTooltip()`, `isoDateTimeTooltip()`, `isoTime()` or `isoTimeTooltip()` method to display a formatted date in a tooltip, often to provide extra information:
 
 ```php
 use Filament\Infolists\Components\TextEntry;

packages/infolists/src/Components/Concerns/CanFormatState.php

@@ -5,6 +5,7 @@
 use Closure;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Schemas\Schema;
+use Filament\Support\Concerns\CanConfigureCommonMark;
 use Filament\Support\Contracts\HasLabel as LabelInterface;
 use Filament\Support\Enums\ArgumentValue;
 use Illuminate\Contracts\Support\Htmlable;
@@ -15,6 +16,8 @@
 
 trait CanFormatState
 {
+    use CanConfigureCommonMark;
+
     protected ?Closure $formatStateUsing = null;
 
     protected int | Closure | null $characterLimit = null;
@@ -82,6 +85,35 @@ public function dateTime(string | Closure | null $format = null, ?string $timezo
         return $this;
     }
 
+    public function isoDate(?string $format = null): static
+    {
+        $this->isDate = true;
+
+        $format ??= Schema::$defaultIsoDateDisplayFormat;
+
+        $this->formatStateUsing(static function (TextEntry $component, $state) use ($format): ?string {
+            if (blank($state)) {
+                return null;
+            }
+
+            return Carbon::parse($state)
+                ->isoFormat($format);
+        });
+
+        return $this;
+    }
+
+    public function isoDateTime(?string $format = null): static
+    {
+        $this->isDateTime = true;
+
+        $format ??= Schema::$defaultIsoDateTimeDisplayFormat;
+
+        $this->isoDate($format);
+
+        return $this;
+    }
+
     public function since(?string $timezone = null): static
     {
         $this->isDateTime = true;
@@ -149,6 +181,40 @@ public function sinceTooltip(?string $timezone = null): static
         return $this;
     }
 
+    public function isoDateTooltip(?string $format = null): static
+    {
+        $format ??= Schema::$defaultIsoDateDisplayFormat;
+
+        $this->tooltip(static function (TextEntry $component, mixed $state) use ($format): ?string {
+            if (blank($state)) {
+                return null;
+            }
+
+            return Carbon::parse($state)
+                ->isoFormat($format);
+        });
+
+        return $this;
+    }
+
+    public function isoDateTimeTooltip(?string $format = null): static
+    {
+        $format ??= Schema::$defaultIsoDateTimeDisplayFormat;
+
+        $this->isoDateTooltip($format);
+
+        return $this;
+    }
+
+    public function isoTimeTooltip(?string $format = null): static
+    {
+        $format ??= Schema::$defaultIsoTimeDisplayFormat;
+
+        $this->isoDateTooltip($format);
+
+        return $this;
+    }
+
     public function money(string | Closure | null $currency = null, int $divideBy = 0, string | Closure | null $locale = null): static
     {
         $this->isMoney = true;
@@ -223,6 +289,17 @@ public function time(string | Closure | null $format = null, ?string $timezone =
         return $this;
     }
 
+    public function isoTime(?string $format = null): static
+    {
+        $this->isTime = true;
+
+        $format ??= Schema::$defaultIsoTimeDisplayFormat;
+
+        $this->isoDate($format);
+
+        return $this;
+    }
+
     public function timezone(string | Closure | null $timezone): static
     {
         $this->timezone = $timezone;
@@ -304,7 +381,7 @@ public function formatState(mixed $state): mixed
         }
 
         if ($isHtml && $this->isMarkdown()) {
-            $state = Str::markdown($state);
+            $state = Str::markdown($state, $this->getCommonMarkOptions(), $this->getCommonMarkExtensions());
         }
 
         $prefix = $this->getPrefix();

packages/schemas/src/Schema.php

@@ -48,12 +48,18 @@ class Schema extends ViewComponent
 
     public static string $defaultDateDisplayFormat = 'M j, Y';
 
+    public static string $defaultIsoDateDisplayFormat = 'L';
+
     public static string $defaultDateTimeDisplayFormat = 'M j, Y H:i:s';
 
+    public static string $defaultIsoDateTimeDisplayFormat = 'LLL';
+
     public static ?string $defaultNumberLocale = null;
 
     public static string $defaultTimeDisplayFormat = 'H:i:s';
 
+    public static string $defaultIsoTimeDisplayFormat = 'LT';
+
     final public function __construct((Component & HasSchemas) | null $livewire = null)
     {
         $this->livewire($livewire);

packages/support/src/Concerns/CanConfigureCommonMark.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Filament\Support\Concerns;
+
+use Closure;
+use League\CommonMark\Extension\ExtensionInterface;
+
+trait CanConfigureCommonMark
+{
+    /**
+     * @var array<string, mixed> | Closure | null
+     */
+    protected array | Closure | null $commonMarkOptions = null;
+
+    /**
+     * @var array<array-key, ExtensionInterface> | Closure | null
+     */
+    protected array | Closure | null $commonMarkExtensions = null;
+
+    /**
+     * @param  array<string, mixed> | Closure | null  $commonMarkOptions
+     */
+    public function commonMarkOptions(array | Closure | null $commonMarkOptions): static
+    {
+        $this->commonMarkOptions = $commonMarkOptions;
+
+        return $this;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function getCommonMarkOptions(): array
+    {
+        return $this->evaluate($this->commonMarkOptions) ?? [];
+    }
+
+    /**
+     * @param  array<array-key, ExtensionInterface> | Closure | null  $commonMarkExtensions
+     */
+    public function commonMarkExtensions(array | Closure | null $commonMarkExtensions): static
+    {
+        $this->commonMarkExtensions = $commonMarkExtensions;
+
+        return $this;
+    }
+
+    /**
+     * @return array<array-key, ExtensionInterface>
+     */
+    public function getCommonMarkExtensions(): array
+    {
+        return $this->evaluate($this->commonMarkExtensions) ?? [];
+    }
+}

packages/support/src/Concerns/EvaluatesClosures.php

@@ -4,6 +4,7 @@
 
 use Closure;
 use Illuminate\Contracts\Container\BindingResolutionException;
+use Illuminate\Database\Eloquent\Model;
 use ReflectionFunction;
 use ReflectionNamedType;
 use ReflectionParameter;
@@ -81,7 +82,10 @@ protected function resolveClosureDependencyForEvaluation(ReflectionParameter $pa
             return $this;
         }
 
-        if (filled($typedParameterClassName)) {
+        if (
+            filled($typedParameterClassName)
+            && (! is_subclass_of($typedParameterClassName, Model::class) || app()->bound($typedParameterClassName))
+        ) {
             return app()->make($typedParameterClassName);
         }
 

packages/tables/docs/02-columns/02-text.md

@@ -73,6 +73,15 @@ TextColumn::make('created_at')
     ->dateTime()
 ```
 
+You may use also the `isoDate()` and `isoDateTime()` methods to format the column's state using [PHP date formatting macro-formats](https://carbon.nesbot.com/docs/#available-macro-formats):
+
+```php
+use Filament\Tables\Columns\TextColumn;
+
+TextColumn::make('created_at')
+    ->isoDateTime()
+```
+
 You may use the `since()` method to format the column's state using [Carbon's `diffForHumans()`](https://carbon.nesbot.com/docs/#api-humandiff):
 
 ```php
@@ -82,7 +91,7 @@ TextColumn::make('created_at')
     ->since()
 ```
 
-Additionally, you can use the `dateTooltip()`, `dateTimeTooltip()` or `timeTooltip()` method to display a formatted date in a tooltip, often to provide extra information:
+Additionally, you can use the `dateTooltip()`, `dateTimeTooltip()`, `timeTooltip()`, `isoDateTooltip()`, `isoDateTimeTooltip()`, `isoTime()` or `isoTimeTooltip()` method to display a formatted date in a tooltip, often to provide extra information:
 
 ```php
 use Filament\Tables\Columns\TextColumn;