added addColor()

Author: dg

src/Forms/Container.php

@@ -522,6 +522,16 @@ public function addMultiSelect(
 	}
 
 
+	/**
+	 * Adds color picker.
+	 * @param  string|object|null  $label
+	 */
+	public function addColor(string $name, $label = null): Controls\ColorPicker
+	{
+		return $this[$name] = new Controls\ColorPicker($label);
+	}
+
+
 	/**
 	 * Adds button used to submit form.
 	 * @param  string|object|null  $caption

src/Forms/Controls/ColorPicker.php

@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Nette\Forms\Controls;
+
+use Nette;
+
+
+/**
+ * Color picker.
+ */
+class ColorPicker extends BaseControl
+{
+	public function __construct($label = null)
+	{
+		parent::__construct($label);
+		$this->setOption('type', 'color');
+	}
+
+
+	/**
+	 * @param  ?string $value
+	 * @return static
+	 */
+	public function setValue($value)
+	{
+		if ($value === null) {
+			$this->value = '#000000';
+		} elseif (is_string($value) && preg_match('~#?[0-9a-f]{6}~DAi', $value)) {
+			$this->value = '#' . strtolower(ltrim($value, '#'));
+		} else {
+			throw new Nette\InvalidArgumentException('Color must have #rrggbb format.');
+		}
+		return $this;
+	}
+
+
+	public function loadHttpData(): void
+	{
+		try {
+			parent::loadHttpData();
+		} catch (Nette\InvalidArgumentException $e) {
+			$this->setValue(null);
+		}
+	}
+
+
+	public function getControl(): Nette\Utils\Html
+	{
+		return parent::getControl()->addAttributes([
+			'type' => 'color',
+			'value' => $this->value,
+		]);
+	}
+}

tests/Forms/Controls.ColorPicker.loadData.phpt

@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Test: Nette\Forms\Controls\ColorPicker.
+ */
+
+declare(strict_types=1);
+
+use Nette\Forms\Form;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+before(function () {
+	$_SERVER['REQUEST_METHOD'] = 'POST';
+	$_POST = $_FILES = [];
+	$_COOKIE[Nette\Http\Helpers::STRICT_COOKIE_NAME] = '1';
+	Form::initialize(true);
+});
+
+
+test('loadData empty string', function () {
+	$_POST = ['color' => ''];
+
+	$form = new Form;
+	$input = $form->addColor('color');
+
+	Assert::same('#000000', $input->getValue());
+	Assert::true($input->isFilled());
+});
+
+
+test('loadData invalid string', function () {
+	$_POST = ['color' => '#abc'];
+
+	$form = new Form;
+	$input = $form->addColor('color');
+
+	Assert::same('#000000', $input->getValue());
+	Assert::true($input->isFilled());
+});
+
+
+test('loadData valid string', function () {
+	$_POST = ['color' => '#1020aa'];
+
+	$form = new Form;
+	$input = $form->addColor('color');
+
+	Assert::same('#1020aa', $input->getValue());
+	Assert::true($input->isFilled());
+});

tests/Forms/Controls.ColorPicker.render.phpt

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Test: Nette\Forms\Controls\ColorPicker.
+ */
+
+declare(strict_types=1);
+
+use Nette\Forms\Form;
+use Nette\Utils\Html;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+test('', function () {
+	$form = new Form;
+	$input = $form->addColor('color')
+		->setValue('1020AB');
+
+	Assert::type(Html::class, $input->getControl());
+	Assert::same('<input type="color" name="color" id="frm-color" value="#1020ab">', (string) $input->getControl());
+});