wip

lara-zeus · Feb 9, 2024 · e8b73c1 · e8b73c1
1 parent e409b9a
commit e8b73c1
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 25 deletions.
diff --git a/public/css/filament/filament/app.css b/public/css/filament/filament/app.css
diff --git a/public/js/filament/forms/components/file-upload.js b/public/js/filament/forms/components/file-upload.js
diff --git a/resources/views/vendor/filament-forms/components/file-upload.blade.php b/resources/views/vendor/filament-forms/components/file-upload.blade.php
@@ -62,6 +62,7 @@
                     isOpenable: @js($isOpenable()),
                     isPreviewable: @js($isPreviewable()),
                     isReorderable: @js($isReorderable()),
+                    itemPanelAspectRatio: @js($getItemPanelAspectRatio()),
                     loadingIndicatorPosition: @js($getLoadingIndicatorPosition()),
                     locale: @js(app()->getLocale()),
                     panelAspectRatio: @js($getPanelAspectRatio()),

diff --git a/resources/views/vendor/filament-infolists/components/text-entry.blade.php b/resources/views/vendor/filament-infolists/components/text-entry.blade.php
@@ -114,6 +114,7 @@
                                 $icon = $getIcon($state);
                                 $iconColor = $getIconColor($state);
                                 $itemIsCopyable = $isCopyable($state);
+                                $lineClamp = $getLineClamp($state);
                                 $size = $getSize($state);
                                 $weight = $getWeight($state);
 
@@ -200,6 +201,7 @@
                                             @class([
                                                 'group-hover/item:underline group-focus-visible/item:underline' => $url,
                                                 $proseClasses => $isProse || $isMarkdown,
+                                                'line-clamp-[--line-clamp]' => $lineClamp,
                                                 match ($size) {
                                                     TextEntrySize::ExtraSmall, 'xs' => 'text-xs',
                                                     TextEntrySize::Small, 'sm', null => 'text-sm leading-6',
@@ -236,6 +238,7 @@
                                                     shades: [400, 600],
                                                     alias: 'infolists::components.text-entry.item.label',
                                                 ) => ! in_array($color, [null, 'gray']),
+                                                "--line-clamp: {$lineClamp}" => $lineClamp,
                                             ])
                                         >
                                             {{ $formattedState }}

diff --git a/resources/views/vendor/filament-tables/columns/text-column.blade.php b/resources/views/vendor/filament-tables/columns/text-column.blade.php
@@ -123,6 +123,7 @@
                         $icon = $getIcon($state);
                         $iconColor = $getIconColor($state) ?? $color;
                         $itemIsCopyable = $isCopyable($state);
+                        $lineClamp = $getLineClamp($state);
                         $size = $getSize($state);
                         $weight = $getWeight($state);
 
@@ -197,6 +198,7 @@
                                     @class([
                                         'fi-ta-text-item-label',
                                         'group-hover/item:underline group-focus-visible/item:underline' => $url,
+                                        'line-clamp-[--line-clamp]' => $lineClamp,
                                         match ($size) {
                                             TextColumnSize::ExtraSmall, 'xs' => 'text-xs',
                                             TextColumnSize::Small, 'sm', null => 'text-sm leading-6',
@@ -233,6 +235,7 @@
                                             shades: [400, 600],
                                             alias: 'tables::columns.text-column.item.label',
                                         ) => ! in_array($color, [null, 'gray']),
+                                        "--line-clamp: {$lineClamp}" => $lineClamp,
                                     ])
                                 >
                                     {{ $formattedState }}

diff --git a/resources/views/vendor/filament/components/modal/index.blade.php b/resources/views/vendor/filament/components/modal/index.blade.php
@@ -87,7 +87,7 @@
     }"
     @if ($id)
         x-on:{{ $closeEventName }}.window="if ($event.detail.id === '{{ $id }}') close()"
-    x-on:{{ $openEventName }}.window="if ($event.detail.id === '{{ $id }}') open()"
+        x-on:{{ $openEventName }}.window="if ($event.detail.id === '{{ $id }}') open()"
     @endif
     x-trap.noscroll="isOpen"
     x-bind:class="{
@@ -108,13 +108,7 @@
         </div>
     @endif
 
-    <div
-        x-cloak
-        x-show="isOpen"
-        @if ($closeByClickingAway)
-            x-on:click="{{ $closeEventHandler }}"
-        @endif
-    >
+    <div x-cloak x-show="isOpen">
         <div
             aria-hidden="true"
             x-show="isOpen"
@@ -133,6 +127,9 @@
         >
             <div
                 x-ref="modalContainer"
+                @if ($closeByClickingAway)
+                    x-on:click.self="{{ $closeEventHandler }}"
+                @endif
                 {{
                     $attributes->class([
                         'relative grid min-h-full grid-rows-[1fr_auto_1fr] justify-items-center sm:grid-rows-[1fr_auto_3fr]',
@@ -148,24 +145,21 @@
                             $watch('isOpen', () => (isShown = isOpen))
                         })
                     "
-                    @if ($closeByClickingAway)
-                        x-on:click.stop
-                    @endif
                     x-on:keydown.window.escape="{{ $closeEventHandler }}"
                     x-show="isShown"
                     x-transition:enter="duration-300"
                     x-transition:leave="duration-300"
                     @if ($width === MaxWidth::Screen)
                     @elseif ($slideOver)
                         x-transition:enter-start="translate-x-full rtl:-translate-x-full"
-                    x-transition:enter-end="translate-x-0"
-                    x-transition:leave-start="translate-x-0"
-                    x-transition:leave-end="translate-x-full rtl:-translate-x-full"
+                        x-transition:enter-end="translate-x-0"
+                        x-transition:leave-start="translate-x-0"
+                        x-transition:leave-end="translate-x-full rtl:-translate-x-full"
                     @else
                         x-transition:enter-start="scale-95 opacity-0"
-                    x-transition:enter-end="scale-100 opacity-100"
-                    x-transition:leave-start="scale-100 opacity-100"
-                    x-transition:leave-end="scale-95 opacity-0"
+                        x-transition:enter-end="scale-100 opacity-100"
+                        x-transition:leave-start="scale-100 opacity-100"
+                        x-transition:leave-end="scale-95 opacity-0"
                     @endif
                     @class([
                         'fi-modal-window pointer-events-auto relative row-start-2 flex w-full cursor-default flex-col bg-white shadow-xl ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10',