Merge pull request #24 from dasim/nested-option-items

Support for option groups loaded via ajax

Author: duskohu

client-side/dependentSelectBox.js

@@ -111,7 +111,7 @@
 
 									$.each(item.value, function (objI, objItem) {
 										var option = $('<option>')
-											.attr('value', objI).text(objItem);
+											.attr('value', objI).text(objItem.value);
 										if (data.value !== null && objI == data.value) {
 											option.attr('selected', true);
 										}

src/DependentData.php

@@ -118,30 +118,66 @@ public function getPreparedItems($disabledItems = null)
 	{
 		$items = [];
 		foreach ($this->items as $key => $item) {
-			if (!($item instanceof Nette\Utils\Html)) {
-				$el = Nette\Utils\Html::el('option')->value($key)->setText($item);
-
-			} else {
-				$el = $item;
+			$elements = [];
+			if (is_array($item)) {
+				$groupItems = [];
+				foreach ($item as $innerKey => $innerItem) {
+					$el = $this->getPreparedElement($innerKey, $innerItem, $disabledItems);
+					$this->addElementToItemsList($groupItems, $el);
+
+				}
+				$items[$key] = [
+					'key' => $key,
+					'value' => $groupItems,
+				];
 			}
-
-			// disable element
-			if (is_array($disabledItems) && array_key_exists($key, $disabledItems) && $disabledItems[$key] === true) {
-				$el->disabled(true);
+			else {
+				$el = $this->getPreparedElement($key, $item, $disabledItems);
+				$this->addElementToItemsList($items, $el);
 			}
+		}
+		return $items;
+	}
 
-			$items[$key] = [
-				'key' => $el->getValue(),
-				'value' => $el->getText(),
-			];
 
-			end($items);
-			$lKey = key($items);
-			foreach ($el->attrs as $attr => $val) {
-				$items[$lKey]['attributes'][$attr] = $val;
-			}
+	/**
+	 * @param string $key
+	 * @param mixed $item
+	 * @param array|null $disabledItems
+	 * @return Nette\Utils\Html
+	 */
+	private function getPreparedElement($key, $item, $disabledItems = null)
+	{
+		if (!($item instanceof Nette\Utils\Html)) {
+			$el = Nette\Utils\Html::el('option')->value($key)->setText($item);
+
+		} else {
+			$el = $item;
 		}
 
-		return $items;
+		// disable element
+		if (is_array($disabledItems) && array_key_exists($key, $disabledItems) && $disabledItems[$key] === true) {
+			$el->disabled(true);
+		}
+
+		return $el;
+	}
+
+
+	/**
+	 * @param array &$items
+	 * @param Nette\Utils\Html $el
+	 */
+	private function addElementToItemsList(&$items, $el)
+	{
+		$items[$el->getAttribute('value')] = [
+			'key' => $el->getValue(),
+			'value' => $el->getText(),
+		];
+		end($items);
+		$lKey = key($items);
+		foreach ($el->attrs as $attr => $val) {
+			$items[$lKey]['attributes'][$attr] = $val;
+		}
 	}
 }