Hotfix/livewire route binding (#20)

* Get route prefix instead of the first segment

* Fix tests for nullable locale

* Fix tests

* Fix route locale binding for livewire routes

* Fix styling

* If routename is null, do nothing

* Require fixed patch version of laravel-locale-collection

---------

Co-authored-by: Sander Van Damme <[email protected]>
Co-authored-by: Sander Van Damme <[email protected]>
Co-authored-by: jyrkidn <[email protected]>

Author: jyrkidn

composer.json

@@ -10,7 +10,7 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
-        "codedor/laravel-locale-collection": "^1.2",
+        "codedor/laravel-locale-collection": "^1.2.1",
         "illuminate/contracts": "^10.0|^11.0|^12.0",
         "spatie/laravel-package-tools": "^1.12"
     },

src/Http/Middleware/SetLocale.php

@@ -4,7 +4,9 @@
 
 use Closure;
 use Codedor\LocaleCollection\Facades\LocaleCollection;
+use Codedor\LocaleCollection\Locale;
 use Illuminate\Http\Request;
+use Illuminate\Support\Str;
 
 class SetLocale
 {
@@ -20,19 +22,19 @@ public function handle(Request $request, Closure $next)
             return $next($request);
         }
 
-        $locale = $request->segment(1);
+        $locale = Str::after($request->route()?->getPrefix(), '/');
 
         if (is_livewire_route($request)) {
             $snapshot = json_decode($request->json('components.0.snapshot', ''), true);
+            $locale = $snapshot['memo']['locale'] ?? null;
 
-            if (isset($snapshot['memo']['locale'])) {
-                $locale = $snapshot['memo']['locale'];
-            } else {
-                $locale = null;
+            if ($locale) {
+                $locale = LocaleCollection::firstWhere(fn (Locale $l) => $l->locale() === $locale)
+                    ?->urlLocale();
             }
         }
 
-        if (! $locale) {
+        if (is_null($locale)) {
             return $next($request);
         }
 

src/TranslateRoute.php

@@ -39,7 +39,8 @@ public static function getAllForNameOrCurrent(?string $routeName = null, array $
             $routeName = request()->route()?->getName();
 
             $locale = LocaleCollection::firstLocale(app()->getLocale());
-            if (Str::startsWith($routeName, $locale->routePrefix() . '.')) {
+
+            if ($routeName && Str::startsWith($routeName, $locale->routePrefix() . '.')) {
                 $routeName = (string) Str::of($routeName)->after($locale->routePrefix() . '.');
             }
         }

tests/Feature/SetLocaleTest.php

@@ -4,6 +4,7 @@
 use Codedor\LocaleCollection\Locale;
 use Codedor\TranslatableRoutes\Http\Middleware\SetLocale;
 use Illuminate\Http\Request as HttpRequest;
+use Illuminate\Support\Facades\Route;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -14,7 +15,13 @@
 });
 
 it('sets the correct locale', function () {
-    createRequestAndHandleMiddleware('/en');
+    LocaleCollection::registerRoutes(function () {
+        Route::get('', function () {
+            return translated_routes();
+        })->name('home');
+    });
+
+    createRequestAndHandleMiddleware('/en', true);
 
     expect(LocaleCollection::getCurrent())
         ->locale()->toBe('en-GB');
@@ -34,10 +41,14 @@
         ->toBeNull();
 });
 
-function createRequestAndHandleMiddleware($url)
+function createRequestAndHandleMiddleware(string $url, bool $setRouteResolver = false)
 {
     $request = Request::create($url);
     $request = HttpRequest::createFromBase($request);
 
+    if ($setRouteResolver) {
+        $request->setRouteResolver(fn () => Route::getRoutes()->match($request));
+    }
+
     return (new SetLocale)->handle($request, fn () => new Response);
 }