Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Remove x-ignore around nested Alpine components #15062

Merged
merged 1 commit into from
Dec 11, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 61 additions & 60 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs-assets/app/public/css/filament/filament/app.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs-assets/app/public/css/filament/forms/forms.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs-assets/app/public/js/filament/filament/echo.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

112 changes: 59 additions & 53 deletions docs-assets/app/public/js/filament/forms/components/rich-editor.js

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions docs-assets/app/public/js/filament/support/support.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs-assets/app/public/js/filament/tables/tables.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package-lock.json
2 changes: 1 addition & 1 deletion packages/support/composer.json
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
"illuminate/support": "^10.45|^11.0",
"illuminate/view": "^10.45|^11.0",
"kirschbaum-development/eloquent-power-joins": "^3.0|^4.0",
"livewire/livewire": "3.5.12",
"livewire/livewire": "^3.5",
"ryangjchandler/blade-capture-directive": "^0.2|^0.3|^1.0",
"spatie/color": "^1.5",
"spatie/invade": "^1.0|^2.0",
2 changes: 1 addition & 1 deletion packages/tables/dist/index.js
5 changes: 5 additions & 0 deletions packages/tables/resources/js/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import TableComponentAlpinePlugin from './components/table'

document.addEventListener('alpine:init', () => {
window.Alpine.data('tableComponent', TableComponentAlpinePlugin)
})
9 changes: 1 addition & 8 deletions packages/tables/resources/views/index.blade.php
Original file line number Diff line number Diff line change
@@ -113,14 +113,7 @@
@if (! $isLoaded)
wire:init="loadTable"
@endif
x-ignore
@if (FilamentView::hasSpaMode())
ax-load="visible"
@else
ax-load
@endif
ax-load-src="{{ \Filament\Support\Facades\FilamentAsset::getAlpineComponentSrc('table', 'filament/tables') }}"
x-data="table"
x-data="tableComponent"
@class([
'fi-ta',
'animate-pulse' => $records === null,
3 changes: 2 additions & 1 deletion packages/tables/src/TablesServiceProvider.php
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
namespace Filament\Tables;

use Filament\Support\Assets\AlpineComponent;
use Filament\Support\Assets\Js;
use Filament\Support\Facades\FilamentAsset;
use Filament\Tables\Testing\TestsActions;
use Filament\Tables\Testing\TestsBulkActions;
@@ -29,7 +30,7 @@ public function configurePackage(Package $package): void
public function packageBooted(): void
{
FilamentAsset::register([
AlpineComponent::make('table', __DIR__ . '/../dist/components/table.js'),
Js::make('tables', __DIR__ . '/../dist/index.js'),
], 'filament/tables');

if ($this->app->runningInConsole()) {