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

[9.x] Allow @class() for component tags #43140

Merged
merged 3 commits into from Aug 4, 2022
Merged

[9.x] Allow @class() for component tags #43140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f06f1ac
Allow class directive inside tag components
aguingand Jun 30, 2022
f8fb153
Merge branch '9.x' into component-tag-directives
aguingand Jul 12, 2022
58982e1
formatting
taylorotwell Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 34 additions & 1 deletion src/Illuminate/View/Compilers/ComponentTagCompiler.php
View file
Open in desktop
Expand Up @@ -111,6 +111,10 @@ protected function compileOpeningTags(string $value)
(?:
\s+
(?:
(?:
@(?:class)(\( (?: (?>[^()]+) | (?-1) )* \))
)
|
(?:
\{\{\s*\\\$attributes(?:[^}]+?)?\s*\}\}
)
Expand Down Expand Up @@ -164,6 +168,10 @@ protected function compileSelfClosingTags(string $value)
(?:
\s+
(?:
(?:
@(?:class)(\( (?: (?>[^()]+) | (?-1) )* \))
)
|
(?:
\{\{\s*\\\$attributes(?:[^}]+?)?\s*\}\}
)
Expand Down Expand Up @@ -432,6 +440,10 @@ public function compileSlots(string $value)
(?:
\s+
(?:
(?:
@(?:class)(\( (?: (?>[^()]+) | (?-1) )* \))
)
|
(?:
\{\{\s*\\\$attributes(?:[^}]+?)?\s*\}\}
)
Expand Down Expand Up @@ -487,7 +499,7 @@ public function compileSlots(string $value)
protected function getAttributesFromAttributeString(string $attributeString)
{
$attributeString = $this->parseAttributeBag($attributeString);

$attributeString = $this->parseComponentTagClassStatements($attributeString);
$attributeString = $this->parseBindAttributes($attributeString);

$pattern = '/
Expand Down Expand Up @@ -554,6 +566,27 @@ protected function parseAttributeBag(string $attributeString)
return preg_replace($pattern, ' :attributes="$1"', $attributeString);
}

/**
* Parse @class statements in a given attribute string into their fully-qualified syntax.
*
* @param string $attributeString
* @return string
*/
protected function parseComponentTagClassStatements(string $attributeString)
{
return preg_replace_callback(
'/@(class)(\( ( (?>[^()]+) | (?2) )* \))/x', function ($match) {
if ($match[1] === 'class') {
$match[2] = str_replace('"', "'", $match[2]);

return ":class=\"\Illuminate\Support\Arr::toCssClasses{$match[2]}\"";
}

return $match[0];
}, $attributeString
);
}

/**
* Parse the "bind" attributes in a given attribute string into their fully-qualified syntax.
*
Expand Down
20 changes: 20 additions & 0 deletions tests/View/Blade/BladeComponentTagCompilerTest.php
View file
Open in desktop
Expand Up @@ -76,6 +76,14 @@ public function testSlotsWithDynamicAttributesCanBeCompiled()
$this->assertSame("@slot('foo', null, ['class' => \Illuminate\View\Compilers\BladeCompiler::sanitizeComponentAttribute(\$classes)]) \n".' @endslot', trim($result));
}

public function testSlotsWithClassDirectiveCanBeCompiled()
{
$result = $this->compiler()->compileSlots('<x-slot name="foo" @class($classes)>
</x-slot>');

$this->assertSame("@slot('foo', null, ['class' => \Illuminate\View\Compilers\BladeCompiler::sanitizeComponentAttribute(\Illuminate\Support\Arr::toCssClasses(\$classes))]) \n".' @endslot', trim($result));
}

public function testBasicComponentParsing()
{
$this->mockViewFactory();
Expand Down Expand Up @@ -151,6 +159,18 @@ public function testColonAttributesIsEscapedIfStrings()
<?php \$component->withAttributes(['src' => \Illuminate\View\Compilers\BladeCompiler::sanitizeComponentAttribute('foo')]); ?> @endComponentClass##END-COMPONENT-CLASS##", trim($result));
}

public function testClassDirective()
{
$this->mockViewFactory();
$result = $this->compiler(['profile' => TestProfileComponent::class])->compileTags('<x-profile @class(["bar"=>true])></x-profile>');

$this->assertSame("##BEGIN-COMPONENT-CLASS##@component('Illuminate\Tests\View\Blade\TestProfileComponent', 'profile', [])
<?php if (isset(\$attributes) && \$constructor = (new ReflectionClass(Illuminate\Tests\View\Blade\TestProfileComponent::class))->getConstructor()): ?>
<?php \$attributes = \$attributes->except(collect(\$constructor->getParameters())->map->getName()->all()); ?>
<?php endif; ?>
<?php \$component->withAttributes(['class' => \Illuminate\View\Compilers\BladeCompiler::sanitizeComponentAttribute(\Illuminate\Support\Arr::toCssClasses(['bar'=>true]))]); ?> @endComponentClass##END-COMPONENT-CLASS##", trim($result));
}

public function testColonNestedComponentParsing()
{
$result = $this->compiler(['foo:alert' => TestAlertComponent::class])->compileTags('<x-foo:alert></x-foo:alert>');
Expand Down