-
@yield('code')
@@ -71,10 +71,10 @@ @hasSection('actions') @yield('actions') @else -
@if ($paginator->onFirstPage())
-
diff --git a/resources/views/pagination/livewire/simple-tailwind.blade.php b/resources/views/pagination/livewire/simple-tailwind.blade.php
index 7c61ac6f..ba512284 100644
--- a/resources/views/pagination/livewire/simple-tailwind.blade.php
+++ b/resources/views/pagination/livewire/simple-tailwind.blade.php
@@ -19,21 +19,21 @@
@if ($paginator->hasPages())
@endif
diff --git a/resources/views/pagination/livewire/tailwind.blade.php b/resources/views/pagination/livewire/tailwind.blade.php
index bb83ef03..2bc9b59a 100644
--- a/resources/views/pagination/livewire/tailwind.blade.php
+++ b/resources/views/pagination/livewire/tailwind.blade.php
@@ -35,11 +35,11 @@
@if ($paginator->onFirstPage())
-
diff --git a/resources/views/showcase/components/example.blade.php b/resources/views/showcase/components/example.blade.php
index ed189269..6d9d9e9d 100644
--- a/resources/views/showcase/components/example.blade.php
+++ b/resources/views/showcase/components/example.blade.php
@@ -3,6 +3,21 @@
@props(['title' => null, 'code', 'stack' => false])
+@php
+ // Written as an application without a prefix writes it; under a configured prefix the tags are
+ // rewritten to it, so what renders and what is shown is what this application would write.
+ $prefix = config('livewire-material.prefix');
+
+ if (filled($prefix)) {
+ $names = collect(glob(\NoNameWeb\LivewireMaterial\LivewireMaterialServiceProvider::componentPath().'/*.blade.php'))
+ ->map(fn (string $path): string => preg_quote(basename($path, '.blade.php'), '/'))
+ ->sortByDesc(fn (string $name): int => strlen($name))
+ ->implode('|');
+
+ $code = preg_replace('/<(\/?)x-('.$names.')(?=[\s\/>])/', '<$1x-'.$prefix.'::$2', $code);
+ }
+@endphp
+
@if ($title)
@yield('title', 'Livewire Material')
- )' => <<<'BLADE'
+ 'A choice as a connected group' => <<<'BLADE'
diff --git a/resources/views/showcase/sections/pages.blade.php b/resources/views/showcase/sections/pages.blade.php
index 268ce068..7a2159ee 100644
--- a/resources/views/showcase/sections/pages.blade.php
+++ b/resources/views/showcase/sections/pages.blade.php
@@ -8,9 +8,9 @@
{{ $title }}
diff --git a/resources/views/showcase/layout.blade.php b/resources/views/showcase/layout.blade.php index eff1578d..93e73bd7 100644 --- a/resources/views/showcase/layout.blade.php +++ b/resources/views/showcase/layout.blade.php @@ -7,7 +7,7 @@
@foreach (['401', '402', '403', '404', '419', '429', '500', '503'] as $code)
-
diff --git a/resources/views/showcase/sections/shape.blade.php b/resources/views/showcase/sections/shape.blade.php
index 1ff59260..8f76cc4f 100644
--- a/resources/views/showcase/sections/shape.blade.php
+++ b/resources/views/showcase/sections/shape.blade.php
@@ -17,7 +17,7 @@
@foreach (\NoNameWeb\LivewireMaterial\Support\SvgFile::shapeNames() as $shape)
{{ $current['title'] }} · App shell · Livewire Material
-
+
Livewire Material
-
-
-
-
+
@foreach (range(1, 14) as $index)
-
+
-
+
@livewireScripts
diff --git a/src/LivewireMaterialServiceProvider.php b/src/LivewireMaterialServiceProvider.php
index 15757cf1..414d877a 100644
--- a/src/LivewireMaterialServiceProvider.php
+++ b/src/LivewireMaterialServiceProvider.php
@@ -47,6 +47,15 @@ class LivewireMaterialServiceProvider extends ServiceProvider
}
}
+ /**
+ * The anonymous components. Blade names their view namespace after a hash of this string, and
+ * compiled views keep that name, so it stays written the way it always was.
+ */
+ public static function componentPath(): string
+ {
+ return __DIR__.'/../resources/views/components';
+ }
+
/**
* The error-view root: a folder holding only `errors/`.
*/
@@ -105,11 +114,15 @@ class LivewireMaterialServiceProvider extends ServiceProvider
/**
* Register the components as anonymous Blade components under the configured prefix.
+ *
+ * The package's own views never go through this registration: they write
+ * ``, which resolves through the view namespace whatever the
+ * prefix, and which an application's own `` cannot shadow.
*/
protected function registerComponents(): void
{
Blade::anonymousComponentPath(
- __DIR__.'/../resources/views/components',
+ static::componentPath(),
filled(config('livewire-material.prefix')) ? config('livewire-material.prefix') : null,
);
}
diff --git a/tests/Browser/NavigationTest.php b/tests/Browser/NavigationTest.php
index 74f26b8d..8c313179 100644
--- a/tests/Browser/NavigationTest.php
+++ b/tests/Browser/NavigationTest.php
@@ -15,7 +15,10 @@ function navigationReady(mixed $page): mixed
function shellPage(int $width = 1280, int $height = 900, string $path = '/material/shell'): mixed
{
- return navigationReady(visit($path)->resize($width, $height));
+ // The window is resized after the page starts loading, and an adaptive rail hears of the new
+ // width from a media query's change event, which can arrive after the first key press.
+ return navigationReady(visit($path)->resize($width, $height))
+ ->assertScript("window.eval(\"(() => { const rail = document.querySelector('[data-navigation-rail]'); return ! rail || rail.dataset.navigationRail !== 'adaptive' || Alpine.\$data(rail).wide === window.matchMedia('(min-width: 64rem)').matches; })()\")");
}
/**
diff --git a/tests/Feature/InternalComponentsTest.php b/tests/Feature/InternalComponentsTest.php
new file mode 100644
index 00000000..6d919efd
--- /dev/null
+++ b/tests/Feature/InternalComponentsTest.php
@@ -0,0 +1,74 @@
+
+ */
+function packageComponentNames(): array
+{
+ return collect(File::files(LivewireMaterialServiceProvider::componentPath()))
+ ->map(fn (SplFileInfo $file): string => $file->getBasename('.blade.php'))
+ ->sortByDesc(fn (string $name): int => strlen($name))
+ ->values()
+ ->all();
+}
+
+it('refers to its own components through its namespace, which no prefix or app component changes', function () {
+ $names = implode('|', array_map(fn (string $name): string => preg_quote($name, '/'), packageComponentNames()));
+
+ $unqualified = collect(File::allFiles(__DIR__.'/../../resources/views'))
+ ->filter(fn (SplFileInfo $file): bool => str_ends_with($file->getFilename(), '.blade.php'))
+ ->flatMap(function (SplFileInfo $file) use ($names): array {
+ // Comments document usage as an application writes it, and the showcase's examples
+ // are that usage; neither is compiled as the package's own markup.
+ $source = preg_replace(['/\{\{--.*?--\}\}/s', "/<<<'BLADE'.*?^\\s*BLADE,/sm"], '', $file->getContents());
+
+ preg_match_all('/<\/?x-('.$names.')(?=[\s\/>])/', $source, $matches);
+
+ return array_map(fn (string $tag): string => $file->getRelativePathname().': '.$tag, $matches[0]);
+ })
+ ->values();
+
+ expect($unqualified->all())->toBe([]);
+});
+
+it('renders components that use others under a prefix', function () {
+ config(['livewire-material.prefix' => 'm']);
+
+ Blade::anonymousComponentPath(LivewireMaterialServiceProvider::componentPath(), 'm');
+
+ expect(Blade::render(' that would shadow ours', function () {
-
@endforeach
diff --git a/resources/views/showcase/shell.blade.php b/resources/views/showcase/shell.blade.php
index 5a39e20d..96d04553 100644
--- a/resources/views/showcase/shell.blade.php
+++ b/resources/views/showcase/shell.blade.php
@@ -33,54 +33,54 @@
{{ $shape }}
{{ $current['title'] }}
-This is the {{ strtolower($current['title']) }} page.
-
-