handling param is enum type

koffinate · Oct 14, 2022 · 58d76b2 · 58d76b2
1 parent 7d126f3
commit 58d76b2
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/src/MenuItem.php b/src/MenuItem.php
@@ -42,7 +42,7 @@ private function activeRoute(string $route = '', array $params = []): bool
         }
 
         try {
-            if (request()->routeIs("{$route}*")) {
+            if (request()->routeIs($route, "{$route}.*")) {
                 if (empty($params)) {
                     return true;
                 }
@@ -54,15 +54,28 @@ private function activeRoute(string $route = '', array $params = []): bool
                     if (is_int($key)) {
                         $key = $paramNames[$key];
                     }
+
                     if (
                         $requestRoute->parameter($key) instanceof \Illuminate\Database\Eloquent\Model
                         && $value instanceof \Illuminate\Database\Eloquent\Model
                         && $requestRoute->parameter($key)->id != $value->id
                     ) {
                         return false;
                     }
-                    if ($requestRoute->parameter($key) != $value) {
-                        return false;
+
+                    if (is_object($requestRoute->parameter($key))) {
+                        // try to check param is enum type
+                        try {
+                            if ($requestRoute->parameter($key)->value && $requestRoute->parameter($key)->value != $value) {
+                                return false;
+                            }
+                        } catch (Exception $e) {
+                            return false;
+                        }
+                    } else {
+                        if ($requestRoute->parameter($key) != $value) {
+                            return false;
+                        }
                     }
                 }