Skip to content

Commit 4dc2a89

Browse files
committed
Change @isActive() Pattern
1 parent 12d7cfa commit 4dc2a89

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/Directives/isActiveDirective.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace EasyBlade\Directives;
44

55
use Illuminate\Support\Facades\Route;
6+
use Illuminate\Support\Str;
67

78
class isActiveDirective implements Directive
89
{
@@ -17,7 +18,7 @@ public static function render($list, $type = 'active', $else = '')
1718
return (in_array(Route::getCurrentRoute()->getName(), $list)) ? $type : $else;
1819
}
1920

20-
return (Route::getCurrentRoute()->getName() == $list) ? $type : $else;
21+
return Str::is($list, Route::getCurrentRoute()->getName()) ? $type : $else;
2122
}
2223

2324
}

tests/DirectivesTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function testisActiveDirective()
2626
{
2727
$this->assertEquals("<?php echo \\EasyBlade\\Directives\\isActiveDirective::render('foo') ?>", $this->compiler->compileString("@isActive('foo')"));
2828
$this->assertEquals("<?php echo \\EasyBlade\\Directives\\isActiveDirective::render(['foo'], 'active') ?>", $this->compiler->compileString("@isActive(['foo'], 'active')"));
29-
$this->assertEquals("<?php echo \\EasyBlade\\Directives\\isActiveDirective::render(['foo'], 'active', null) ?>", $this->compiler->compileString("@isActive(['foo'], 'active', null)"));
29+
$this->assertEquals("<?php echo \\EasyBlade\\Directives\\isActiveDirective::render('foo.*', 'active') ?>", $this->compiler->compileString("@isActive('foo.*', 'active')"));
3030
}
3131

3232
public function testCountDirective()

0 commit comments

Comments
 (0)