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.

Sign up for GitHub

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

Jump to bottom

Fix dynamic components #708

Merged
merged 2 commits into from
Jun 27, 2024
Merged

Fix dynamic components #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
213af78
Add failing snapshot test for dynamic component resolution
bakerkretzmar Jun 25, 2024
6850835
Add custom DynamicComponent class to use our ComponentTagCompiler ins…
bakerkretzmar Jun 25, 2024
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
2 changes: 1 addition & 1 deletion src/Providers/ViewServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace TightenCo\Jigsaw\Providers;

use Illuminate\View\DynamicComponent;
use Illuminate\View\Engines\CompilerEngine;
use Illuminate\View\Engines\EngineResolver;
use Illuminate\View\Engines\FileEngine;
Expand All @@ -16,6 +15,7 @@
use TightenCo\Jigsaw\Support\ServiceProvider;
use TightenCo\Jigsaw\View\BladeCompiler;
use TightenCo\Jigsaw\View\BladeMarkdownEngine;
use TightenCo\Jigsaw\View\DynamicComponent;
use TightenCo\Jigsaw\View\MarkdownEngine;
use TightenCo\Jigsaw\View\ViewRenderer;

Expand Down
22 changes: 22 additions & 0 deletions src/View/DynamicComponent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

namespace TightenCo\Jigsaw\View;

use Illuminate\Container\Container;
use Illuminate\View\DynamicComponent as BaseDynamnicComponent;

class DynamicComponent extends BaseDynamnicComponent
{
protected function compiler()
{
if (! static::$compiler) {
static::$compiler = new ComponentTagCompiler(
Container::getInstance()->make('blade.compiler')->getClassComponentAliases(),
Container::getInstance()->make('blade.compiler')->getClassComponentNamespaces(),
Container::getInstance()->make('blade.compiler')
);
}

return static::$compiler;
}
}
7 changes: 7 additions & 0 deletions tests/snapshots/dynamic-component/source/_components/alert.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<div class="alert alert-danger">
<h3>This is the component</h3>
<h4>Named title slot: {{ $title }}</h4>
<hr>
{{ $slot }}
<hr>
</div>
6 changes: 6 additions & 0 deletions tests/snapshots/dynamic-component/source/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@php
$dynamic = 'alert';
@endphp
<x-dynamic-component :component="$dynamic" title="Title">
Slot
</x-dynamic-component>
7 changes: 7 additions & 0 deletions tests/snapshots/dynamic-component_snapshot/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<div class="alert alert-danger">
<h3>This is the component</h3>
<h4>Named title slot: Title</h4>
<hr>
Slot
<hr>
</div>
Loading