Fix unlimited user actions support in Card

src/Card.php

@@ -71,15 +71,6 @@ class Card extends View
     /** @var string Default executor class. */
     public $executor = UserAction\ModalExecutor::class;
 
-    /** @var array Columns CSS wide classes */
-    protected $words = [
-        '', 'fluid', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve',
-        'thirteen', 'fourteen', 'fifteen', 'sixteen',
-    ];
-
-    /** @var int The number of buttons */
-    private $btnCount = 0;
-
     protected function init(): void
     {
         parent::init();
@@ -153,6 +144,10 @@ public function getButtonContainer()
     {
         if (!$this->btnContainer) {
             $this->btnContainer = $this->addExtraContent(new View(['ui' => 'buttons']));
+            $this->getButtonContainer()->addClass('wrapping');
+            if ($this->hasFluidButton) {
+                $this->getButtonContainer()->addClass('fluid');
+            }
         }
 
         return $this->btnContainer;
@@ -317,20 +312,11 @@ public function addImage($img)
      */
     public function addButton($seed)
     {
-        if ($this->hasFluidButton && $this->btnCount > 0) {
-            $this->getButtonContainer()->removeClass($this->words[$this->btnCount]);
-        }
-
         if (!is_object($seed)) {
             $seed = Factory::factory([Button::class], $seed);
         }
 
         $btn = $this->getButtonContainer()->add($seed);
-        ++$this->btnCount;
-
-        if ($this->hasFluidButton && $this->btnCount > 0) {
-            $this->getButtonContainer()->addClass($this->words[$this->btnCount]);
-        }
 
         return $btn;
     }

src/Columns.php

@@ -22,10 +22,10 @@ class Columns extends View
     /** @var int|false Sum of all column widths added so far. */
     protected $calculatedWidth = 0;
 
-    /** @var array Allows Grid to calculate widths automatically. */
-    public $sizes = [
-        '', 'one', 'two', 'three', 'four', 'five', 'six', 'seven',
-        'eight', 'nine', 'ten', 'eleven', 'twelve', 'thirteen', 'fourteen', 'fifteen', 'sixteen',
+    /** @var array<int, string> */
+    protected $cssWideClasses = [
+        1 => 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine',
+        'ten', 'eleven', 'twelve', 'thirteen', 'fourteen', 'fifteen', 'sixteen',
     ];
 
     /**
@@ -46,8 +46,8 @@ public function addColumn($defaults = [])
 
         $column = View::addTo($this, $defaults);
 
-        if ($size && isset($this->sizes[$size])) {
-            $column->addClass($this->sizes[$size] . ' wide');
+        if ($size && isset($this->cssWideClasses[$size])) {
+            $column->addClass($this->cssWideClasses[$size] . ' wide');
             $this->calculatedWidth = false;
         } elseif ($this->calculatedWidth !== false) {
             ++$this->calculatedWidth;
@@ -78,8 +78,8 @@ protected function renderView(): void
             $this->content = null;
         }
 
-        if (isset($this->sizes[$width])) {
-            $this->addClass($this->sizes[$width] . ' column');
+        if (isset($this->cssWideClasses[$width])) {
+            $this->addClass($this->cssWideClasses[$width] . ' column');
         }
 
         parent::renderView();

src/Form.php

@@ -84,6 +84,7 @@ class Form extends View
      * success() to replace form contents.
      *
      * WARNING: may be removed in the future as we refactor into using Message class
+     *          and remove the form-success.html template then.
      *
      * @var string
      */

src/Form/Control/Input.php

@@ -66,28 +66,28 @@ class Input extends Form\Control
      *
      * Use setInputAttr() to fill this array
      *
-     * @var array
+     * @var array<string, string>
      */
-    public $inputAttr = [];
+    public array $inputAttr = [];
 
     /**
      * Set attribute which is added directly to the <input> tag, not the surrounding <div>.
      *
-     * @param string|array $attr  Attribute name or hash
-     * @param string       $value Attribute value
+     * @param string|int|array<string, string|int> $name
+     * @param ($name is array ? never : string|int) $value
      *
      * @return $this
      */
-    public function setInputAttr($attr, $value = null)
+    public function setInputAttr($name, $value = null)
     {
-        if (is_array($attr)) {
-            $this->inputAttr = array_merge($this->inputAttr, $attr);
-
-            return $this;
+        if (is_array($name)) {
+            foreach ($name as $k => $v) {
+                $this->setInputAttr($k, $v);
+            }
+        } else {
+            $this->inputAttr[$name] = $value;
         }
 
-        $this->inputAttr[$attr] = $value;
-
         return $this;
     }
 

src/GridLayout.php

@@ -9,13 +9,13 @@ class GridLayout extends View
     /** @var int Number of rows */
     protected $rows = 1;
 
-    /** @var int Number of columns */
+    /** @var int<1, 16> Number of columns */
     protected $columns = 2;
 
-    /** @var array columns CSS wide classes */
-    protected $words = [
-        '', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve',
-        'thirteen', 'fourteen', 'fifteen', 'sixteen',
+    /** @var array<int, string> */
+    protected $cssWideClasses = [
+        1 => 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine',
+        'ten', 'eleven', 'twelve', 'thirteen', 'fourteen', 'fifteen', 'sixteen',
     ];
 
     /** @var HtmlTemplate */
@@ -97,6 +97,6 @@ protected function buildTemplate(): void
         // $template->rebuildTagsIndex();
         }, null, HtmlTemplate::class)();
 
-        $this->addClass($this->words[$this->columns] . ' column');
+        $this->addClass($this->cssWideClasses[$this->columns] . ' column');
     }
 }

src/View.php

@@ -45,13 +45,13 @@ class View extends AbstractView
      */
     public $ui = false;
 
-    /** List of classes that needs to be added. */
+    /** @var array<int, string> List of element CSS classes. */
     public array $class = [];
 
-    /** List of custom CSS attributes. */
+    /** @var array<string, string> Map of element CSS styles. */
     public array $style = [];
 
-    /** List of custom attributes. */
+    /** @var array<string, string|int> Map of element attributes. */
     public array $attr = [];
 
     /**
@@ -379,22 +379,24 @@ public function set($arg1 = null, $arg2 = null)
      * Multiple CSS classes can also be added if passed as space separated
      * string or array of class names.
      *
-     * @param string|array $class CSS class name or array of class names
+     * @param string|array<int, string> $class
      *
      * @return $this
      */
     public function addClass($class)
     {
-        $classArr = explode(' ', is_array($class) ? implode(' ', $class) : $class);
-        $this->class = array_merge($this->class, $classArr);
+        if ($class !== []) {
+            $classArr = explode(' ', is_array($class) ? implode(' ', $class) : $class);
+            $this->class = array_merge($this->class, $classArr);
+        }
 
         return $this;
     }
 
     /**
      * Remove one or several CSS classes from the element.
      *
-     * @param string|array $class CSS class name or array of class names
+     * @param string|array<int, string> $class
      *
      * @return $this
      */
@@ -410,41 +412,44 @@ public function removeClass($class)
      * Add inline CSS style to element.
      * Multiple CSS styles can also be set if passed as array.
      *
-     * @param string|array $property CSS Property or hash
-     * @param string       $style    CSS Style definition
+     * @param string|array<string, string> $property
+     * @param ($property is array ? never : string) $value
      *
      * @return $this
      *
      * @todo Think about difference between setStyle and addStyle
      */
-    public function setStyle($property, string $style = null)
+    public function setStyle($property, string $value = null)
     {
-        $this->style = array_merge(
-            $this->style,
-            is_array($property) ? $property : [$property => $style]
-        );
+        if (is_array($property)) {
+            foreach ($property as $k => $v) {
+                $this->setStyle($k, $v);
+            }
+        } else {
+            $this->style[$property] = $value;
+        }
 
         return $this;
     }
 
     /**
-     * @param string|array $property CSS Property or hash
-     * @param string       $style    CSS Style definition
+     * @param string|array<string, string> $property
+     * @param ($property is array ? never : string) $value
      *
      * @return $this
      *
      * @see setStyle()
      */
-    public function addStyle($property, string $style = null)
+    public function addStyle($property, string $value = null)
     {
-        return $this->setStyle($property, $style);
+        return $this->setStyle($property, $value);
     }
 
     /**
      * Remove inline CSS style from element, if it was added with setStyle
      * or addStyle.
      *
-     * @param string $property CSS Property to remove
+     * @param string $property
      *
      * @return $this
      */
@@ -458,43 +463,41 @@ public function removeStyle($property)
     /**
      * Set attribute.
      *
-     * @param string|array $attr  Attribute name or hash
-     * @param string       $value Attribute value
+     * @param string|int|array<string, string|int> $name
+     * @param ($name is array ? never : string|int) $value
      *
      * @return $this
      */
-    public function setAttr($attr, $value = null)
+    public function setAttr($name, $value = null)
     {
-        if (is_array($attr)) {
-            $this->attr = array_merge($this->attr, $attr);
-
-            return $this;
+        if (is_array($name)) {
+            foreach ($name as $k => $v) {
+                $this->setAttr($k, $v);
+            }
+        } else {
+            $this->attr[$name] = $value;
         }
 
-        $this->attr[$attr] = $value;
-
         return $this;
     }
 
     /**
      * Remove attribute.
      *
-     * @param string|array $property Attribute name or hash
+     * @param string|array<int, string> $name
      *
      * @return $this
      */
-    public function removeAttr($property)
+    public function removeAttr($name)
     {
-        if (is_array($property)) {
-            foreach ($property as $v) {
-                unset($this->attr[$v]);
+        if (is_array($name)) {
+            foreach ($name as $v) {
+                $this->removeAttr($v);
             }
-
-            return $this;
+        } else {
+            unset($this->attr[$name]);
         }
 
-        unset($this->attr[$property]);
-
         return $this;
     }
 
@@ -569,11 +572,11 @@ public function stickyGet(string $name, string $newValue = null): ?string
      */
     protected function renderView(): void
     {
-        if ($this->class) {
+        if ($this->class !== []) {
             $this->template->append('class', implode(' ', $this->class));
         }
 
-        if ($this->style) {
+        if ($this->style !== []) {
             $styles = [];
             foreach ($this->style as $k => $v) {
                 $styles[] = $k . ': ' . $v . ';';
@@ -603,12 +606,12 @@ protected function renderView(): void
             $this->template->tryDangerouslySetHtml('_element_end_html', '</' . $this->element . '>');
         }
 
-        if ($this->attr) {
-            $tmp = [];
-            foreach ($this->attr as $attr => $val) {
-                $tmp[] = $attr . '="' . $this->getApp()->encodeHtml((string) $val) . '"';
+        if ($this->attr !== []) {
+            $attrs = [];
+            foreach ($this->attr as $k => $v) {
+                $attrs[] = $k . '="' . $this->getApp()->encodeHtml((string) $v) . '"';
             }
-            $this->template->dangerouslySetHtml('attributes', implode(' ', $tmp));
+            $this->template->dangerouslySetHtml('attributes', implode(' ', $attrs));
         }
     }
 

template/form/control/radio.html

@@ -2,8 +2,8 @@
 <div id="{$_id}" class="{$class} grouped fields" style="{$style}" {$attributes}>
 {Radio}{rows}{row}
 <div class="field"><div class="ui radio checkbox">
-<input id="{$_name}_{$id}" type="radio" name="{$_name}" value="{$id}" {$checked} {$disabled}>
-<label for="{$_name}_{$id}">{$name}</label>
+<input id="{$_id}_{$id}" type="radio" name="{$_name}" value="{$id}" {$checked} {$disabled}>
+<label for="{$_id}_{$id}">{$name}</label>
 </div></div>
 {/row}{/rows}{/}
 <label>{$Content}</label></div>

template/form/control/radio.pug

@@ -1,8 +1,8 @@
 | <div id="{$_id}" class="{$class} grouped fields" style="{$style}" {$attributes}>
 | {Radio}{rows}{row}
 | <div class="field"><div class="ui radio checkbox">
-| <input id="{$_name}_{$id}" type="radio" name="{$_name}" value="{$id}" {$checked} {$disabled}>
-| <label for="{$_name}_{$id}">{$name}</label>
+| <input id="{$_id}_{$id}" type="radio" name="{$_name}" value="{$id}" {$checked} {$disabled}>
+| <label for="{$_id}_{$id}">{$name}</label>
 | </div></div>
 | {/row}{/rows}{/}
 label {$Content}