Support for disabled and title attributes

Author: vossik

src/Form/ResultObject.php

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * This file is part of Nepttune (https://www.peldax.com)
+ *
+ * Copyright (c) 2018 Václav Pelíšek (info@peldax.com)
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <https://www.peldax.com>.
+ */
+
+declare(strict_types = 1);
+
+namespace Nepttune\Form;
+
+class ResultObject implements \JsonSerializable
+{
+    private int $id;
+    private string $text;
+    private ?string $title = null;
+    private ?bool $disabled = null;
+
+    public function __construct(int $id, string $text, ?string $title = null, ?bool $disabled = null)
+    {
+        $this->id = $id;
+        $this->text = $text;
+        $this->title = $title;
+        $this->disabled = $disabled;
+    }
+
+    public function getId() : int
+    {
+        return $this->id;
+    }
+
+    public function getText() : string
+    {
+        return $this->text;
+    }
+
+    public function jsonSerialize()
+    {
+        $toReturn = [
+            'id' => $this->id,
+            'text' => $this->text,
+        ];
+
+        if ($this->title !== null) {
+            $toReturn['title'] = $this->title;
+        }
+
+        if ($this->disabled !== null) {
+            $toReturn['disabled'] = $this->disabled;
+        }
+
+        return $toReturn;
+    }
+}

src/Form/ResultObjectSet.php

@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * This file is part of Nepttune (https://www.peldax.com)
+ *
+ * Copyright (c) 2018 Václav Pelíšek (info@peldax.com)
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <https://www.peldax.com>.
+ */
+
+declare(strict_types = 1);
+
+namespace Nepttune\Form;
+
+class ResultObjectSet extends \Infinityloop\Utils\ObjectSet implements \JsonSerializable
+{
+    protected const INNER_CLASS = ResultObject::class;
+
+    public static function fromArray(array $data) : \Nepttune\Form\ResultObjectSet
+    {
+        $objectSet = [];
+
+        foreach ($data as $key => $value) {
+            if ($value instanceof \Nepttune\Form\ResultObject) {
+                $objectSet[] = $value;
+
+                continue;
+            }
+
+            $objectSet[] = new \Nepttune\Form\ResultObject($key, $value);
+        }
+
+        return new self($objectSet);
+    }
+
+    public function jsonSerialize()
+    {
+        $toReturn = [];
+
+        foreach ($this as $object) {
+            $toReturn[] = $object->jsonSerialize();
+        }
+
+        return $toReturn;
+    }
+
+    public function getRawData() : array
+    {
+        $toReturn = [];
+
+        foreach ($this as $object) {
+            $toReturn[$object->getId()] = $object->getText();
+        }
+
+        return $toReturn;
+    }
+
+    public function current() : \Nepttune\Form\ResultObject
+    {
+        return parent::current();
+    }
+
+    public function offsetGet($offset) : \Nepttune\Form\ResultObject
+    {
+        return parent::offsetGet($offset);
+    }
+}

src/Form/TAjaxSelect.php

@@ -28,6 +28,9 @@ trait TAjaxSelect
     /** @var \Nette\Caching\Cache */
     private $storage;
 
+    /** @var array */
+    private $optionsRaw;
+
     public function setCallback(callable $callback): self
     {
         $this->callback = $callback;
@@ -86,17 +89,7 @@ public function signalReceived(string $signal): void
 
         switch ($signal) {
             case self::CALLBACK_SIGNAL_NAME:
-                $data = $this->getData($presenter->getParameter('q'));
-                $toJson = [];
-
-                foreach ($data as $key => $value) {
-                     $toJson[] = [
-                         'id' => $key,
-                         'text' => $value,
-                     ];
-                }
-
-                $presenter->sendJson($toJson);
+                $presenter->sendJson($this->getData($presenter->getParameter('q')));
                 break;
             case self::ONCHANGE_SIGNAL_NAME:
                 $this->fireOnchange($presenter->getParameter('s'));
@@ -107,9 +100,9 @@ public function signalReceived(string $signal): void
     /**
      * @param string $query
      * @param array|int|null $default
-     * @return array
+     * @return \Nepttune\Form\ResultObjectSet
      */
-    private function getData(string $query = '', $default = null): array
+    private function getData(string $query = '', $default = null) : \Nepttune\Form\ResultObjectSet
     {
         if ($this->callback === null) {
             throw new \Nette\InvalidStateException('Callback for "' . $this->getHtmlId() . '" is not set.');
@@ -126,7 +119,11 @@ private function getData(string $query = '', $default = null): array
 
         $data = \call_user_func($this->callback, $query, $default);
 
-        if (!\is_array($data)) {
+        if (\is_array($data)) {
+            $data = \Nepttune\Form\ResultObjectSet::fromArray($data);
+        }
+
+        if (!$data instanceof \Nepttune\Form\ResultObjectSet) {
             throw new \Nette\InvalidStateException('Callback for "' . $this->getHtmlId() . '" must return array.');
         }
 
@@ -140,16 +137,19 @@ private function getData(string $query = '', $default = null): array
     private function initiateItems($value = null): void
     {
         $value = $value ?? $this->value;
+        $data = [];
 
         if (\in_array($value, [null, '', []], true)) {
             if (\count($this->items) > 0) {
                 return;
             }
 
-            parent::setItems($this->getData());
+            $data = $this->getData();
         } else {
-            parent::setItems($this->getData('', $value));
+            $data = $this->getData('', $value);
         }
+
+        parent::setItems($data->getRawData());
     }
 
     private function fireOnchange($selected = null) : void