Merge pull request #6929 from getkirby/v5/refactor/ui-component-attrs-2

UI component class: support non-pre-defined props

src/Panel/Ui/Button.php

@@ -35,7 +35,9 @@ public function __construct(
 		public string|array|null $title = null,
 		public string $type = 'button',
 		public string|null $variant = null,
+		...$attrs
 	) {
+		$this->attrs = $attrs;
 	}
 
 	public function props(): array

src/Panel/Ui/Buttons/ViewButton.php

@@ -46,7 +46,9 @@ public function __construct(
 		public string|array|null $title = null,
 		public string $type = 'button',
 		public string|null $variant = 'filled',
+		...$attrs
 	) {
+		$this->attrs = $attrs;
 	}
 
 	/**

src/Panel/Ui/Component.php

@@ -20,12 +20,15 @@
 abstract class Component
 {
 	protected string $key;
+	public array $attrs = [];
 
 	public function __construct(
 		public string $component,
 		public string|null $class = null,
-		public string|null $style = null
+		public string|null $style = null,
+		...$attrs
 	) {
+		$this->attrs = $attrs;
 	}
 
 	/**
@@ -70,6 +73,7 @@ public function props(): array
 		return [
 			'class' => $this->class,
 			'style' => $this->style,
+			...$this->attrs
 		];
 	}
 

tests/Panel/Ui/ButtonTest.php

@@ -10,6 +10,24 @@
  */
 class ButtonTest extends TestCase
 {
+	/**
+	 * @covers ::__construct
+	 */
+	public function testAttrs()
+	{
+		$button = new Button(
+			text: 'Attrs',
+			foo: 'bar'
+		);
+
+		$this->assertSame([
+			'foo'        => 'bar',
+			'responsive' => true,
+			'text'       => 'Attrs',
+			'type'       => 'button',
+		], array_filter($button->props()));
+	}
+
 	/**
 	 * @covers ::props
 	 */

tests/Panel/Ui/Buttons/ViewButtonTest.php

@@ -19,6 +19,26 @@ public function setUp(): void
 		$this->login();
 	}
 
+	/**
+	 * @covers ::__construct
+	 */
+	public function testAttrs()
+	{
+		$button = new ViewButton(
+			text: 'Attrs',
+			foo: 'bar'
+		);
+
+		$this->assertSame([
+			'foo'        => 'bar',
+			'responsive' => true,
+			'size'       => 'sm',
+			'text'       => 'Attrs',
+			'type'       => 'button',
+			'variant'    => 'filled'
+		], array_filter($button->props()));
+	}
+
 	/**
 	 * @covers ::factory
 	 */

tests/Panel/Ui/ComponentTest.php

@@ -15,6 +15,26 @@ class UiComponent extends Component
  */
 class ComponentTest extends TestCase
 {
+	/**
+	 * @covers ::__construct
+	 */
+	public function testAttrs()
+	{
+		$props = [
+			'component' => 'k-text',
+			'class'     => 'k-test',
+			'foo'       => 'bar'
+		];
+
+		$component = new UiComponent(...$props);
+
+		$this->assertSame([
+			'class' => 'k-test',
+			'style' => null,
+			'foo'   => 'bar',
+		], $component->props());
+	}
+
 	/**
 	 * @covers ::__call
 	 */