-
Notifications
You must be signed in to change notification settings - Fork 11.2k
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.
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
New @attributes blade directive. #52783
Closed
danmatthews
wants to merge
7
commits into
laravel:11.x
from
danmatthews:feature/new-attributes-helper
Closed
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
1a74123
New @attributes directive/helper.
danmatthews 5ab08ed
Syntax fix.
danmatthews c795114
Enables @attributes on custom components.
danmatthews 22aa33d
New array toHtmlAttributes helper on the Arr class.
danmatthews a4411ec
WIP - compiles @attributes for components.
danmatthews 216fcd1
Tests for Arr:: helper and refactor to use key => val structure.
danmatthews 2e1c3a5
Parsing and tests for processing string based arrays back into php ba…
danmatthews File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
src/Illuminate/View/Compilers/Concerns/CompilesAttributes.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
<?php | ||
|
||
namespace Illuminate\View\Compilers\Concerns; | ||
|
||
trait CompilesAttributes | ||
{ | ||
/** | ||
* Compile the conditional class statement into valid PHP. | ||
* | ||
* @param string $expression | ||
* @return string | ||
*/ | ||
protected function compileAttributes($expression) | ||
{ | ||
$expression = is_null($expression) ? '([])' : $expression; | ||
return "<?php echo \Illuminate\Support\Arr::toHtmlAttributes{$expression}; ?>"; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
<?php | ||
|
||
namespace Illuminate\Tests\View\Blade; | ||
|
||
class BladeAttributesTest extends AbstractBladeTestCase | ||
{ | ||
public function testAttributesAreConditionallyCompiledFromArray() | ||
{ | ||
$string = "<span @attributes(['class' => \"mt-1\", 'disabled' => false, 'role' => null, 'wire:poll' => fn () => true])></span>"; | ||
$expected = "<span <?php echo \Illuminate\Support\Arr::toHtmlAttributes(['class' => \"mt-1\", 'disabled' => false, 'role' => null, 'wire:poll' => fn () => true]); ?>></span>"; | ||
|
||
$this->assertEquals($expected, $this->compiler->compileString($string)); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@timacdonald could use some pointers here if you don't mind?
For any
@attributes
call on a normal HTML element i'm just doing this - which is fairly simple.For
@attributes
calls on slots and custom components, it's tough, because we can't compile into an existing attribute and prefix with:
in the same way we can with@class
, the attributes need to be parsed before compile time, so that they're fully parsed and passed down into the component.BUT, this doesn't work when functions and
I'd ended up with this, which is taking the
@attributes
expression, parsing it using a regex, and turning it back into an array so it can be parsed properly by the newtoHtmlAttributes
method, but this isn't going to support things like calls towhen
or$variables
properly.Am i on the right track, or should i look at taking another approach? I'm trying to get my head around blade's compilation order, and the expectations of the output.
Cheers!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey, Dan, I don't know a heap about the Blade compiler unfortunately.
I don't imagine that the regex is gonna be the answer...but then again blade is entirely regex so maybe it is?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No worries man, i'll keep plucking at the problem, it feels like this is over-engineered to me, but will keep digging. 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good. Don't take my feedback as anything you must do. Just sharing an opinion.