mirror of
https://github.com/filamentphp/filament.git
synced 2026-10-24 23:35:30 +08:00
Merge branch '3.x' into upg3
This commit is contained in:
@@ -5,7 +5,6 @@ namespace App\Providers;
|
||||
use Illuminate\Auth\Events\Registered;
|
||||
use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
|
||||
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
|
||||
use Illuminate\Support\Facades\Event;
|
||||
|
||||
class EventServiceProvider extends ServiceProvider
|
||||
{
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
:indicator-color="$action->getIndicatorColor()"
|
||||
:size="$action->getSize()"
|
||||
:label-sr-only="$action->isLabelHidden()"
|
||||
dusk="filament.actions.action.{{ $action->getName() }}"
|
||||
:attributes="\Filament\Support\prepare_inherited_attributes($attributes)->merge($action->getExtraAttributes(), escape: false)"
|
||||
>
|
||||
{{ $slot }}
|
||||
|
||||
@@ -143,7 +143,6 @@
|
||||
$getExtraAttributeBag()
|
||||
->merge([
|
||||
'disabled' => $isDisabled,
|
||||
'dusk' => "filament.forms.{$statePath}",
|
||||
'type' => 'checkbox',
|
||||
'value' => $optionValue,
|
||||
'wire:loading.attr' => 'disabled',
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
->merge([
|
||||
'autofocus' => $isAutofocused(),
|
||||
'disabled' => $isDisabled(),
|
||||
'dusk' => "filament.forms.{$statePath}",
|
||||
'id' => $getId(),
|
||||
'required' => $isRequired() && (! $isConcealed()),
|
||||
'type' => 'checkbox',
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
->merge([
|
||||
'autocomplete' => 'off',
|
||||
'disabled' => $isDisabled,
|
||||
'dusk' => "filament.forms.{$statePath}",
|
||||
'id' => $getId(),
|
||||
'placeholder' => $getPlaceholder(),
|
||||
'required' => $isRequired() && (! $isConcealed()),
|
||||
|
||||
@@ -34,7 +34,6 @@
|
||||
->merge([
|
||||
'autofocus' => $isAutofocused(),
|
||||
'disabled' => $isDisabled,
|
||||
'dusk' => "filament.forms.{$statePath}",
|
||||
'id' => $id,
|
||||
'list' => $datalistOptions ? "{$id}-list" : null,
|
||||
'max' => (! $isConcealed) ? $getMaxDate() : null,
|
||||
@@ -107,7 +106,6 @@
|
||||
x-on:keydown.clear.stop.prevent="if (! $el.disabled) clearState()"
|
||||
x-on:keydown.delete.stop.prevent="if (! $el.disabled) clearState()"
|
||||
aria-label="{{ $getPlaceholder() }}"
|
||||
dusk="filament.forms.{{ $statePath }}.open"
|
||||
type="button"
|
||||
tabindex="-1"
|
||||
@disabled($isDisabled)
|
||||
@@ -170,7 +168,6 @@
|
||||
<select
|
||||
x-model="focusedMonth"
|
||||
class="grow cursor-pointer border-0 px-1 py-0 text-lg font-medium text-gray-800 outline-none focus:ring-0 dark:bg-gray-700 dark:text-gray-200"
|
||||
dusk="filament.forms.{{ $statePath }}.focusedMonth"
|
||||
>
|
||||
<template
|
||||
x-for="(month, index) in months"
|
||||
@@ -187,7 +184,6 @@
|
||||
inputmode="numeric"
|
||||
x-model.debounce="focusedYear"
|
||||
class="w-20 border-0 p-0 text-end text-lg outline-none focus:ring-0 dark:bg-gray-700 dark:text-gray-200"
|
||||
dusk="filament.forms.{{ $statePath }}.focusedYear"
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -237,7 +233,6 @@
|
||||
'pointer-events-none': dayIsDisabled(day),
|
||||
'opacity-50': focusedDate.date() !== day && dayIsDisabled(day),
|
||||
}"
|
||||
x-bind:dusk="'filament.forms.{{ $statePath }}' + '.focusedDate.' + day"
|
||||
class="rounded-full text-center text-sm leading-loose transition duration-100 ease-in-out"
|
||||
></div>
|
||||
</template>
|
||||
@@ -256,7 +251,6 @@
|
||||
inputmode="numeric"
|
||||
x-model.debounce="hour"
|
||||
class="w-16 border-0 bg-gray-50 p-0 pe-1 text-center text-xl text-gray-700 outline-none focus:ring-0 dark:bg-gray-800 dark:text-gray-200"
|
||||
dusk="filament.forms.{{ $statePath }}.hour"
|
||||
/>
|
||||
|
||||
<span
|
||||
@@ -273,7 +267,6 @@
|
||||
inputmode="numeric"
|
||||
x-model.debounce="minute"
|
||||
class="w-16 border-0 bg-gray-50 p-0 pe-1 text-center text-xl text-gray-700 outline-none focus:ring-0 dark:bg-gray-800 dark:text-gray-200"
|
||||
dusk="filament.forms.{{ $statePath }}.minute"
|
||||
/>
|
||||
|
||||
@if ($hasSeconds())
|
||||
@@ -290,7 +283,6 @@
|
||||
type="number"
|
||||
inputmode="numeric"
|
||||
x-model.debounce="second"
|
||||
dusk="filament.forms.{{ $statePath }}.second"
|
||||
class="w-16 border-0 bg-gray-50 p-0 pe-1 text-center text-xl text-gray-700 outline-none focus:ring-0 dark:bg-gray-800 dark:text-gray-200"
|
||||
/>
|
||||
@endif
|
||||
|
||||
@@ -102,7 +102,6 @@
|
||||
$getExtraInputAttributeBag()
|
||||
->merge([
|
||||
'disabled' => $isDisabled(),
|
||||
'dusk' => "filament.forms.{$statePath}",
|
||||
'multiple' => $isMultiple(),
|
||||
'type' => 'file',
|
||||
], escape: false)
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
{{
|
||||
$attributes
|
||||
->merge([
|
||||
'dusk' => "filament.forms.{$statePath}",
|
||||
'id' => $getId(),
|
||||
'type' => 'hidden',
|
||||
$applyStateBindingModifiers('wire:model') => $statePath,
|
||||
|
||||
@@ -41,7 +41,6 @@
|
||||
id="{{ $id }}-{{ $value }}"
|
||||
type="radio"
|
||||
value="{{ $value }}"
|
||||
dusk="filament.forms.{{ $statePath }}"
|
||||
@disabled($shouldOptionBeDisabled)
|
||||
{{ $applyStateBindingModifiers('wire:model') }}="{{ $statePath }}"
|
||||
{{
|
||||
|
||||
@@ -465,7 +465,6 @@
|
||||
placeholder="{{ $getPlaceholder() }}"
|
||||
toolbar="trix-toolbar-{{ $id }}"
|
||||
x-ref="trix"
|
||||
dusk="filament.forms.{{ $statePath }}"
|
||||
{{ $getExtraInputAttributeBag()->class(['prose block w-full max-w-none break-words rounded-lg bg-white shadow-sm outline-none transition duration-75 dark:prose-invert focus:ring-1 focus:ring-inset dark:bg-gray-700']) }}
|
||||
x-bind:class="{
|
||||
'border-gray-300 focus:border-primary-500 focus:ring-primary-500 dark:border-gray-600 dark:focus:border-primary-500':
|
||||
|
||||
@@ -29,7 +29,6 @@
|
||||
:autofocus="$isAutofocused()"
|
||||
:disabled="$isDisabled"
|
||||
:id="$getId()"
|
||||
dusk="filament.forms.{{ $statePath }}"
|
||||
:required="$isRequired() && ((bool) $isConcealed())"
|
||||
:attributes="
|
||||
\Filament\Support\prepare_inherited_attributes($getExtraInputAttributeBag()->merge([
|
||||
|
||||
@@ -37,7 +37,6 @@
|
||||
list="{{ $id }}-suggestions"
|
||||
@if ($placeholder = $getPlaceholder()) placeholder="{{ $placeholder }}" @endif
|
||||
type="text"
|
||||
dusk="filament.forms.{{ $statePath }}"
|
||||
x-on:keydown="
|
||||
() => {
|
||||
if (['Enter', ...@js($splitKeys)].includes($event.key)) {
|
||||
@@ -97,7 +96,6 @@
|
||||
x-on:click="deleteTag(tag)"
|
||||
@endunless
|
||||
type="button"
|
||||
x-bind:dusk="'filament.forms.{{ $statePath }}' + '.tag.' + tag + '.delete'"
|
||||
@class([
|
||||
'min-h-6 inline-flex items-center justify-center space-x-1 rounded-xl bg-primary-500/10 px-2 py-0.5 text-sm font-medium tracking-tight text-primary-700 rtl:space-x-reverse dark:text-primary-500',
|
||||
'cursor-default' => $isDisabled,
|
||||
|
||||
@@ -44,7 +44,6 @@
|
||||
'autocomplete' => $getAutocomplete(),
|
||||
'autofocus' => $isAutofocused(),
|
||||
'disabled' => $isDisabled(),
|
||||
'dusk' => "filament.forms.{$statePath}",
|
||||
'id' => $id,
|
||||
'inputmode' => $getInputMode(),
|
||||
'list' => $datalistOptions ? "{$id}-list" : null,
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
'autofocus' => $isAutofocused(),
|
||||
'cols' => $getCols(),
|
||||
'disabled' => $isDisabled(),
|
||||
'dusk' => "filament.forms.{$statePath}",
|
||||
'id' => $getId(),
|
||||
'maxlength' => (! $isConcealed) ? $getMaxLength() : null,
|
||||
'minlength' => (! $isConcealed) ? $getMinLength() : null,
|
||||
|
||||
@@ -38,7 +38,6 @@
|
||||
'aria-checked' => 'false',
|
||||
'autofocus' => $isAutofocused(),
|
||||
'disabled' => $isDisabled(),
|
||||
'dusk' => "filament.forms.{$statePath}",
|
||||
'id' => $getId(),
|
||||
'role' => 'switch',
|
||||
'type' => 'button',
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
{{
|
||||
$attributes
|
||||
->merge([
|
||||
'dusk' => 'filament.notifications.notification',
|
||||
'wire:key' => "{$this->getId()}.notifications.{$notification->getId()}",
|
||||
], escape: false)
|
||||
->class(['filament-notifications-notification pointer-events-auto invisible'])
|
||||
|
||||
@@ -6,7 +6,6 @@ use Filament\Http\Controllers\Auth\LogoutController;
|
||||
use Filament\Http\Controllers\RedirectToHomeController;
|
||||
use Filament\Http\Controllers\RedirectToTenantController;
|
||||
use Filament\Http\Middleware\IdentifyTenant;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
Route::name('filament.')
|
||||
|
||||
@@ -4,7 +4,6 @@ namespace Filament\Resources\Pages;
|
||||
|
||||
use Filament\Pages\Page as BasePage;
|
||||
use Filament\Panel;
|
||||
use Filament\Resources\Resource;
|
||||
use Illuminate\Routing\Route;
|
||||
use Illuminate\Support\Facades\Route as RouteFacade;
|
||||
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
:tooltip="$action->getTooltip()"
|
||||
:icon="$icon ?? $action->getIcon()"
|
||||
:size="$action->getSize()"
|
||||
dusk="filament.tables.action.{{ $action->getName() }}"
|
||||
>
|
||||
{{ $slot }}
|
||||
</x-dynamic-component>
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
namespace Filament\Tests\Upgrade;
|
||||
|
||||
use Iterator;
|
||||
use PHPUnit\Framework\Attributes\DataProvider;
|
||||
use Rector\Testing\PHPUnit\AbstractRectorTestCase;
|
||||
|
||||
class RectorTest extends AbstractRectorTestCase
|
||||
|
||||
Reference in New Issue
Block a user