Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion src/Elements/Attributes/ClassNames.php
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,15 @@ protected function variantClassNames(): array
// Start with default always
$variants = new BaseCollection('default');

// Merge in other variants if they're set
// Apply implicit variants
$implicit = ['disabled', 'readonly', 'required'];
foreach ($implicit as $attribute) {
if ($this->element->attributes->get($attribute, false)) {
$variants->push($attribute);
}
}

// Merge in other variants if they're set (last, so that they take precedence)
if ($variant = $this->element->getViewData('variant')) {
$variants = $variants->merge((array) $variant);
}
Expand Down
72 changes: 72 additions & 0 deletions tests/Unit/VariantTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,76 @@ public function test_variants_can_be_combined_and_partially_merged(): void
'input-not-nested-variant',
]);
}

public function test_disabled_variant_is_applied_dynamically(): void
{
$this->app['config']->set('aire.variant_classes', [
'input' => [
'default' => [
'base' => 'input-default',
],
'disabled' => [
'base' => 'input-disabled',
'color' => 'input-disabled-color',
],
],
]);

$disabled = $this->aire()->input()->disabled();
$enabled = $this->aire()->input()->disabled()->disabled(false); // set then unset

$this->assertSelectorClassNames($disabled, 'input', ['input', 'input-disabled', 'input-disabled-color']);
$this->assertSelectorMissingClassNames($disabled, 'input', ['input-default']);

$this->assertSelectorClassNames($enabled, 'input', ['input', 'input-default']);
$this->assertSelectorMissingClassNames($enabled, 'input', ['input-disabled', 'input-disabled-color']);
}

public function test_readonly_variant_is_applied_dynamically(): void
{
$this->app['config']->set('aire.variant_classes', [
'input' => [
'default' => [
'base' => 'input-default',
],
'readonly' => [
'base' => 'input-readonly',
'color' => 'input-readonly-color',
],
],
]);

$read_only = $this->aire()->input()->readOnly();
$read_write = $this->aire()->input()->readOnly()->readOnly(false); // set then unset

$this->assertSelectorClassNames($read_only, 'input', ['input', 'input-readonly', 'input-readonly-color']);
$this->assertSelectorMissingClassNames($read_only, 'input', ['input-default']);

$this->assertSelectorClassNames($read_write, 'input', ['input', 'input-default']);
$this->assertSelectorMissingClassNames($read_write, 'input', ['input-readonly', 'input-readonly-color']);
}

public function test_required_variant_is_applied_dynamically(): void
{
$this->app['config']->set('aire.variant_classes', [
'input' => [
'default' => [
'base' => 'input-default',
],
'required' => [
'base' => 'input-required',
'color' => 'input-required-color',
],
],
]);

$required = $this->aire()->input()->required();
$optional = $this->aire()->input()->required()->required(false); // set then unset

$this->assertSelectorClassNames($required, 'input', ['input', 'input-required', 'input-required-color']);
$this->assertSelectorMissingClassNames($required, 'input', ['input-default']);

$this->assertSelectorClassNames($optional, 'input', ['input', 'input-default']);
$this->assertSelectorMissingClassNames($optional, 'input', ['input-required', 'input-required-color']);
}
}
Loading