Fixed disabled attribute

infinityloop-dev · Jul 22, 2020 · d2ed7c9 · d2ed7c9
1 parent 10ca286
commit d2ed7c9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/src/Form/ResultObject.php b/src/Form/ResultObject.php
@@ -19,9 +19,9 @@ class ResultObject implements \JsonSerializable
     private int $id;
     private string $text;
     private ?string $title = null;
-    private ?bool $disabled = null;
+    private bool $disabled;
 
-    public function __construct(int $id, string $text, ?string $title = null, ?bool $disabled = null)
+    public function __construct(int $id, string $text, ?string $title = null, bool $disabled = false)
     {
         $this->id = $id;
         $this->text = $text;
@@ -39,6 +39,11 @@ public function getText() : string
         return $this->text;
     }
 
+    public function isDisabled() : bool
+    {
+        return $this->disabled;
+    }
+
     public function jsonSerialize()
     {
         $toReturn = [
@@ -50,7 +55,7 @@ public function jsonSerialize()
             $toReturn['title'] = $this->title;
         }
 
-        if ($this->disabled !== null) {
+        if ($this->disabled === true) {
             $toReturn['disabled'] = $this->disabled;
         }
 

diff --git a/src/Form/ResultObjectSet.php b/src/Form/ResultObjectSet.php
@@ -57,6 +57,19 @@ public function getRawData() : array
         return $toReturn;
     }
 
+    public function getDisabled() : array
+    {
+        $toReturn = [];
+
+        foreach ($this as $object) {
+            if ($object->isDisabled()) {
+                $toReturn[] = $object->getId();
+            }
+        }
+
+        return $toReturn;
+    }
+
     public function current() : \Nepttune\Form\ResultObject
     {
         return parent::current();

diff --git a/src/Form/TAjaxSelect.php b/src/Form/TAjaxSelect.php
@@ -28,7 +28,6 @@ trait TAjaxSelect
     /** @var \Nette\Caching\Cache */
     private $storage;
 
-    /** @var array */
     private $optionsRaw;
 
     public function setCallback(callable $callback): self
@@ -100,7 +99,7 @@ public function signalReceived(string $signal): void
     /**
      * @param string $query
      * @param array|int|null $default
-     * @return \Nepttune\Form\ResultObjectSet
+     * @return array
      */
     private function getData(string $query = '', $default = null) : \Nepttune\Form\ResultObjectSet
     {
@@ -150,6 +149,7 @@ private function initiateItems($value = null): void
         }
 
         parent::setItems($data->getRawData());
+        parent::setDisabled($data->getDisabled());
     }
 
     private function fireOnchange($selected = null) : void