Skip to content

fix(view): improved attribute precedence #1168

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

Merged
brendt merged 5 commits into from
Apr 24, 2025
Merged

fix(view): improved attribute precedence #1168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c96e4e3
wip
brendt Apr 24, 2025
f272f9a
wip
brendt Apr 24, 2025
2cb6a99
wip
brendt Apr 24, 2025
628264c
wip
brendt Apr 24, 2025
083316e
wip
brendt Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions src/Tempest/View/src/Elements/IsElement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,17 @@ public function getAttributes(): array

$attributes = [...$this->attributes, ...$wrappingAttributes];

// Some attributes should always come after others,
// so that these expressions have access to the data attributes
$attributePrecedence = [
':foreach' => 1,
':if' => 2,
];
$tailingAttributes = [];

uksort($attributes, function (string $a, string $b) use ($attributePrecedence) {
$precedenceA = $attributePrecedence[$a] ?? 0;
$precedenceB = $attributePrecedence[$b] ?? 0;

return $precedenceA <=> $precedenceB;
});
foreach ($attributes as $name => $value) {
if ($name === ':foreach' || $name === ':if') {
unset($attributes[$name]);
$tailingAttributes[$name] = $value;
}
}

return $attributes;
// Tailing attributes are reversed because they need to be applied in reverse order
return [...$attributes, ...array_reverse($tailingAttributes)];
}

public function hasAttribute(string $name): bool
Expand Down
2 changes: 1 addition & 1 deletion tests/Integration/View/TempestViewRendererCombinedExpressionsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public function test_foreach_with_if_and_else_expression(): void
public function test_foreach_with_if_and_forelse_expression(): void
{
$view = <<<'HTML'
<div :foreach="$items as $item" :if="$label ?? null">
<div :if="$label ?? null" :foreach="$items as $item">
{{ $label }} {{ $item }}
</div>
<span :forelse>
Expand Down
99 changes: 99 additions & 0 deletions tests/Integration/View/TempestViewRendererTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,105 @@ public function test_loop_variable_can_be_used_within_the_looped_tag(): void
HTML, $html);
}

public function test_if_and_foreach_precedence(): void
{
$html = $this->render(
<<<'HTML'
<div :foreach="$items as $item" :if="$item->show">{{ $item->name }}</div>
HTML,
items: [
(object) ['name' => 'A', 'show' => true],
(object) ['name' => 'B', 'show' => false],
(object) ['name' => 'C', 'show' => true],
],
);

$this->assertSnippetsMatch('<div>A</div><div>C</div>', $html);

$html = $this->render(
<<<'HTML'
<div :foreach="$items as $item" :if="$show">{{ $item->name }}</div>
HTML,
show: true,
items: [
(object) ['name' => 'A', 'show' => true],
(object) ['name' => 'B', 'show' => false],
(object) ['name' => 'C', 'show' => true],
],
);

$this->assertSnippetsMatch('<div>A</div><div>B</div><div>C</div>', $html);

$html = $this->render(
<<<'HTML'
<div :if="$show" :foreach="$items as $item">{{ $item->name }}</div>
HTML,
show: true,
items: [
(object) ['name' => 'A', 'show' => true],
(object) ['name' => 'B', 'show' => false],
(object) ['name' => 'C', 'show' => true],
],
);

$this->assertSnippetsMatch('<div>A</div><div>B</div><div>C</div>', $html);

$html = $this->render(
<<<'HTML'
<div :foreach="$items as $item" :if="$show">{{ $item->name }}</div>
HTML,
show: false,
items: [
(object) ['name' => 'A', 'show' => true],
(object) ['name' => 'B', 'show' => false],
(object) ['name' => 'C', 'show' => true],
],
);

$this->assertSnippetsMatch('', $html);

$html = $this->render(
<<<'HTML'
<div :if="$show" :foreach="$items as $item">{{ $item->name }}</div>
HTML,
show: false,
items: [
(object) ['name' => 'A', 'show' => true],
(object) ['name' => 'B', 'show' => false],
(object) ['name' => 'C', 'show' => true],
],
);

$this->assertSnippetsMatch('', $html);

$html = $this->render(
<<<'HTML'
<div :if="$item->show" :foreach="$items as $item">{{ $item->name }}</div>
HTML,
item: (object) ['show' => true],
items: [
(object) ['name' => 'A', 'show' => true],
(object) ['name' => 'B', 'show' => false],
(object) ['name' => 'C', 'show' => true],
],
);

$this->assertSnippetsMatch('<div>A</div><div>B</div><div>C</div>', $html);

$html = $this->render(
<<<'HTML'
<div :if="$item->show ?? null" :foreach="$items as $item">{{ $item->name }}</div>
HTML,
items: [
(object) ['name' => 'A', 'show' => true],
(object) ['name' => 'B', 'show' => false],
(object) ['name' => 'C', 'show' => true],
],
);

$this->assertSnippetsMatch('', $html);
}

private function assertSnippetsMatch(string $expected, string $actual): void
{
$expected = str_replace([PHP_EOL, ' '], '', $expected);
Expand Down
Loading