Sex
diff --git a/src/Field/Color.php b/src/Field/Color.php
new file mode 100644
index 00000000..65b6f0d8
--- /dev/null
+++ b/src/Field/Color.php
@@ -0,0 +1,171 @@
+` element of type "color" that allows the user to select a color.
+ *
+ * @link https://html.spec.whatwg.org/multipage/input.html#color-state-(type=color)
+ * @link https://developer.mozilla.org/docs/Web/HTML/Element/input/color
+ */
+final class Color extends InputField implements EnrichFromValidationRulesInterface, ValidationClassInterface
+{
+ use EnrichFromValidationRulesTrait;
+ use ValidationClassTrait;
+
+ /**
+ * @link https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fe-disabled
+ */
+ public function disabled(bool $disabled = true): self
+ {
+ $new = clone $this;
+ $new->inputAttributes['disabled'] = $disabled;
+ return $new;
+ }
+
+ /**
+ * A boolean attribute that controls whether or not the user can edit the form control.
+ *
+ * @param bool $value Whether to allow the value to be edited by the user.
+ *
+ * @link https://html.spec.whatwg.org/multipage/input.html#attr-input-readonly
+ */
+ public function readonly(bool $value = true): self
+ {
+ $new = clone $this;
+ $new->inputAttributes['readonly'] = $value;
+ return $new;
+ }
+
+ /**
+ * A boolean attribute. When specified, the element is required.
+ *
+ * @param bool $value Whether the control is required for form submission.
+ *
+ * @link https://html.spec.whatwg.org/multipage/input.html#attr-input-required
+ */
+ public function required(bool $value = true): self
+ {
+ $new = clone $this;
+ $new->inputAttributes['required'] = $value;
+ return $new;
+ }
+
+ /**
+ * Identifies the element (or elements) that describes the object.
+ *
+ * @link https://w3c.github.io/aria/#aria-describedby
+ */
+ public function ariaDescribedBy(?string ...$value): self
+ {
+ $new = clone $this;
+ $new->inputAttributes['aria-describedby'] = array_filter($value, static fn (?string $v): bool => $v !== null);
+ return $new;
+ }
+
+ /**
+ * Defines a string value that labels the current element.
+ *
+ * @link https://w3c.github.io/aria/#aria-label
+ */
+ public function ariaLabel(?string $value): self
+ {
+ $new = clone $this;
+ $new->inputAttributes['aria-label'] = $value;
+ return $new;
+ }
+
+ /**
+ * Focus on the control (put cursor into it) when the page loads. Only one form element could be in focus
+ * at the same time.
+ *
+ * @link https://html.spec.whatwg.org/multipage/interaction.html#attr-fe-autofocus
+ */
+ public function autofocus(bool $value = true): self
+ {
+ $new = clone $this;
+ $new->inputAttributes['autofocus'] = $value;
+ return $new;
+ }
+
+ /**
+ * The `tabindex` attribute indicates that its element can be focused, and where it participates in sequential
+ * keyboard navigation (usually with the Tab key, hence the name).
+ *
+ * It accepts an integer as a value, with different results depending on the integer's value:
+ *
+ * - A negative value (usually `tabindex="-1"`) means that the element is not reachable via sequential keyboard
+ * navigation, but could be focused with Javascript or visually. It's mostly useful to create accessible widgets
+ * with JavaScript.
+ * - `tabindex="0"` means that the element should be focusable in sequential keyboard navigation, but its order is
+ * defined by the document's source order.
+ * - A positive value means the element should be focusable in sequential keyboard navigation, with its order
+ * defined by the value of the number. That is, `tabindex="4"` is focused before `tabindex="5"`, but after
+ * `tabindex="3"`.
+ *
+ * @link https://html.spec.whatwg.org/multipage/interaction.html#attr-tabindex
+ */
+ public function tabIndex(?int $value): self
+ {
+ $new = clone $this;
+ $new->inputAttributes['tabindex'] = $value;
+ return $new;
+ }
+
+ protected function beforeRender(): void
+ {
+ if ($this->enrichFromValidationRules) {
+ $this->enrichment = $this
+ ->validationRulesEnricher
+ ?->process($this, $this->getInputData()->getValidationRules())
+ ?? [];
+ }
+ }
+
+ protected function generateInput(): string
+ {
+ $value = $this->getValue();
+
+ if (!is_string($value) && $value !== null) {
+ throw new InvalidArgumentException('Color field requires a string or null value.');
+ }
+
+ /** @psalm-suppress MixedArgument We guess that enrichment contain correct values. */
+ $inputAttributes = array_merge(
+ $this->enrichment['inputAttributes'] ?? [],
+ $this->getInputAttributes()
+ );
+
+ return Html::input('color', $this->getName(), $value, $inputAttributes)->render();
+ }
+
+ protected function prepareContainerAttributes(array &$attributes): void
+ {
+ $this->addValidationClassToAttributes(
+ $attributes,
+ $this->getInputData(),
+ $this->hasCustomError() ? true : null,
+ );
+ }
+
+ protected function prepareInputAttributes(array &$attributes): void
+ {
+ $this->addInputValidationClassToAttributes(
+ $attributes,
+ $this->getInputData(),
+ $this->hasCustomError() ? true : null,
+ );
+ }
+}
diff --git a/src/PureField/Field.php b/src/PureField/Field.php
index 96dbd8a7..1110286f 100644
--- a/src/PureField/Field.php
+++ b/src/PureField/Field.php
@@ -8,6 +8,7 @@
use Yiisoft\Form\Field\ButtonGroup;
use Yiisoft\Form\Field\Checkbox;
use Yiisoft\Form\Field\CheckboxList;
+use Yiisoft\Form\Field\Color;
use Yiisoft\Form\Field\Date;
use Yiisoft\Form\Field\DateTimeLocal;
use Yiisoft\Form\Field\Email;
@@ -81,6 +82,16 @@ final public static function checkboxList(
->inputData(new InputData($name, $value));
}
+ final public static function color(
+ ?string $name = null,
+ mixed $value = null,
+ array $config = [],
+ ?string $theme = null,
+ ): Color {
+ return Color::widget(config: $config, theme: $theme ?? static::DEFAULT_THEME)
+ ->inputData(new InputData($name, $value));
+ }
+
final public static function date(
?string $name = null,
mixed $value = null,
diff --git a/src/PureField/FieldFactory.php b/src/PureField/FieldFactory.php
index aeab8762..b43e8c93 100644
--- a/src/PureField/FieldFactory.php
+++ b/src/PureField/FieldFactory.php
@@ -8,6 +8,7 @@
use Yiisoft\Form\Field\ButtonGroup;
use Yiisoft\Form\Field\Checkbox;
use Yiisoft\Form\Field\CheckboxList;
+use Yiisoft\Form\Field\Color;
use Yiisoft\Form\Field\Date;
use Yiisoft\Form\Field\DateTimeLocal;
use Yiisoft\Form\Field\Email;
@@ -80,6 +81,16 @@ final public function checkboxList(
->inputData(new InputData($name, $value));
}
+ final public function color(
+ ?string $name = null,
+ mixed $value = null,
+ array $config = [],
+ ?string $theme = null,
+ ): Color {
+ return Color::widget(config: $config, theme: $theme ?? $this->defaultTheme)
+ ->inputData(new InputData($name, $value));
+ }
+
final public function date(
?string $name = null,
mixed $value = null,
diff --git a/tests/Field/ColorTest.php b/tests/Field/ColorTest.php
new file mode 100644
index 00000000..e8e3768a
--- /dev/null
+++ b/tests/Field/ColorTest.php
@@ -0,0 +1,754 @@
+ [
+ <<
+ Background Color
+ Select a background color.
+
+ HTML,
+ new InputData(
+ name: 'ColorForm[bgcolor]',
+ value: null,
+ label: 'Background Color',
+ hint: 'Select a background color.',
+ id: 'colorform-bgcolor',
+ ),
+ ],
+ 'input-valid-class' => [
+ <<
+ Value cannot be blank.
+
+HTML;
+
+ $this->assertSame($expected, $result);
+ }
+
+ public function testValidClassesFromContainer(): void
+ {
+ $inputData = new InputData('color', validationErrors: []);
+
+ $result = Color::widget()
+ ->validClass('valid')
+ ->invalidClass('invalid')
+ ->inputData($inputData)
+ ->hideLabel()
+ ->render();
+
+ $expected = <<
+ Value cannot be blank.
+
+HTML;
+
+ $this->assertSame($expected, $result);
+ }
+
+ public function testValidClassesFromInput(): void
+ {
+ $inputData = new InputData('color', validationErrors: []);
+
+ $result = Color::widget()
+ ->inputValidClass('valid')
+ ->inputInvalidClass('invalid')
+ ->inputData($inputData)
+ ->hideLabel()
+ ->render();
+
+ $expected = <<
+