WIP

atk4 · May 21, 2022 · 5ef237a · 5ef237a
1 parent 039b126
commit 5ef237a
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 46 deletions.
diff --git a/demos/basic/button.php b/demos/basic/button.php
@@ -61,7 +61,7 @@ public function __construct($n)
     {
         Icon::addTo(Button::addTo($this, ['Forks', 'blue']), ['fork']);
         Label::addTo($this, [number_format($n), 'basic blue left pointing']);
-        parent::__construct(null, 'labeled');
+        parent::__construct(['class.labeled' => true]);
     }
 });
 

diff --git a/demos/basic/header.php b/demos/basic/header.php
@@ -44,4 +44,4 @@
 \Atk4\Ui\Header::addTo($seg, ['Center-aligned', 'aligned' => 'center', 'image' => $img, 'subHeader' => 'header with image']);
 
 $seg = \Atk4\Ui\View::addTo($app, ['ui' => 'segment']);
-\Atk4\Ui\Header::addTo($seg, ['Center-aligned', 'aligned' => 'center', 'image' => [$img, 'disabled'], 'subHeader' => 'header with image']);
+\Atk4\Ui\Header::addTo($seg, ['Center-aligned', 'aligned' => 'center', 'image' => [$img, 'class.disabled' => true], 'subHeader' => 'header with image']);
diff --git a/demos/basic/menu.php b/demos/basic/menu.php
@@ -29,12 +29,12 @@
 $submenu->addItem('two');
 
 $menu = \Atk4\Ui\Menu::addTo($app, ['vertical pointing']);
-$menu->addItem(['Inbox', 'label' => ['123', 'teal left pointing']]);
+$menu->addItem(['Inbox', 'label' => ['123', 'class.teal left pointing' => true]]);
 $menu->addItem('Spam');
 \Atk4\Ui\Form\Control\Input::addTo($menu->addItem(), ['placeholder' => 'Search', 'icon' => 'search'])->addClass('transparent');
 
 $menu = \Atk4\Ui\Menu::addTo($app, ['secondary vertical pointing']);
-$menu->addItem(['Inbox', 'label' => ['123', 'teal left pointing']]);
+$menu->addItem(['Inbox', 'label' => ['123', 'class.teal left pointing' => true]]);
 $menu->addItem('Spam');
 \Atk4\Ui\Form\Control\Input::addTo($menu->addItem(), ['placeholder' => 'Search', 'icon' => 'search'])->addClass('transparent');
 $menu = \Atk4\Ui\Menu::addTo($app, ['vertical']);

diff --git a/demos/collection/crud.php b/demos/collection/crud.php
@@ -57,7 +57,7 @@
 $crud->setModel($model);
 
 // Because Crud inherits Grid, you can also define custom actions
-$crud->addModalAction(['icon' => [\Atk4\Ui\Icon::class, 'cogs']], 'Details', function ($p, $id) use ($crud) {
+$crud->addModalAction(['icon' => 'cogs'], 'Details', function ($p, $id) use ($crud) {
     $model = Country::assertInstanceOf($crud->model);
     \Atk4\Ui\Message::addTo($p, ['Details for: ' . $model->load($id)->name . ' (id: ' . $id . ')']);
 });

diff --git a/demos/collection/grid.php b/demos/collection/grid.php
@@ -43,7 +43,7 @@
     return 'Loaded "' . $model->load($id)->name . '" from ID=' . $id;
 });
 
-$grid->addModalAction(['icon' => [\Atk4\Ui\Icon::class, 'external']], 'Modal Test', function ($p, $id) {
+$grid->addModalAction(['icon' => 'external'], 'Modal Test', function ($p, $id) {
     \Atk4\Ui\Message::addTo($p, ['Clicked on ID=' . $id]);
 });
 

diff --git a/demos/form-control/input.php b/demos/form-control/input.php
@@ -38,12 +38,12 @@
     'labelRight' => $dd,
 ]);
 
-Form\Control\Line::addTo($app, ['placeholder' => 'Weight', 'labelRight' => new \Atk4\Ui\Label(['kg', 'basic'])]);
-Form\Control\Line::addTo($app, ['label' => '$', 'labelRight' => new \Atk4\Ui\Label(['.00', 'basic'])]);
+Form\Control\Line::addTo($app, ['placeholder' => 'Weight', 'labelRight' => new \Atk4\Ui\Label(['kg', 'class.basic' => true])]);
+Form\Control\Line::addTo($app, ['label' => '$', 'labelRight' => new \Atk4\Ui\Label(['.00', 'class.basic' => true])]);
 
 Form\Control\Line::addTo($app, [
     'iconLeft' => 'tags',
-    'labelRight' => new \Atk4\Ui\Label(['Add Tag', 'tag']),
+    'labelRight' => new \Atk4\Ui\Label(['Add Tag', 'class.tag' => true]),
 ]);
 
 // left/right corner is not supported, but here is work-around:
@@ -68,22 +68,22 @@
 Form\Control\Line::addTo($app, ['action' => 'Search']);
 
 Form\Control\Line::addTo($app, ['actionLeft' => new \Atk4\Ui\Button([
-    'Checkout', 'icon' => 'cart', 'teal',
+    'Checkout', 'class.teal' => true, 'icon' => 'cart',
 ])]);
 
 Form\Control\Line::addTo($app, ['iconLeft' => 'search',  'action' => 'Search']);
 
-$dd = new \Atk4\Ui\DropdownButton(['This Page', 'basic']);
+$dd = new \Atk4\Ui\DropdownButton(['This Page', 'class.basic' => true]);
 $dd->setSource(['This Organisation', 'Entire Site']);
 Form\Control\Line::addTo($app, ['iconLeft' => 'search',  'action' => $dd]);
 
 // double actions are not supported but you can add them yourself
-$dd = new \Atk4\Ui\Dropdown(['Articles', 'compact selection']);
+$dd = new \Atk4\Ui\Dropdown(['Articles', 'class.compact selection' => true]);
 $dd->setSource(['All', 'Services', 'Products']);
 \Atk4\Ui\Button::addTo(Form\Control\Line::addTo($app, ['iconLeft' => 'search',  'action' => $dd]), ['Search'], ['AfterAfterInput']);
 
 Form\Control\Line::addTo($app, ['action' => new \Atk4\Ui\Button([
-    'Copy', 'iconRight' => 'copy', 'teal',
+    'Copy', 'class.teal' => true, 'iconRight' => 'copy',
 ])]);
 
 Form\Control\Line::addTo($app, ['action' => new \Atk4\Ui\Button([

diff --git a/demos/form-control/lookup.php b/demos/form-control/lookup.php
@@ -60,12 +60,12 @@
     ->setModel(new Country($app->db));
 
 // through constructor
-Form\Control\Lookup::addTo($app, ['placeholder' => 'Weight', 'labelRight' => new \Atk4\Ui\Label(['kg', 'basic'])]);
-Form\Control\Lookup::addTo($app, ['label' => '$', 'labelRight' => new \Atk4\Ui\Label(['.00', 'basic'])]);
+Form\Control\Lookup::addTo($app, ['placeholder' => 'Weight', 'labelRight' => new \Atk4\Ui\Label(['kg', 'class.basic' => true])]);
+Form\Control\Lookup::addTo($app, ['label' => '$', 'labelRight' => new \Atk4\Ui\Label(['.00', 'class.basic' => true])]);
 
 Form\Control\Lookup::addTo($app, [
     'iconLeft' => 'tags',
-    'labelRight' => new \Atk4\Ui\Label(['Add Tag', 'tag']),
+    'labelRight' => new \Atk4\Ui\Label(['Add Tag', 'class.tag' => true]),
 ]);
 
 // left/right corner is not supported, but here is work-around:

diff --git a/demos/interactive/modal.php b/demos/interactive/modal.php
@@ -149,7 +149,7 @@
 
 // Add buttons to modal for next and previous actions.
 $action = new \Atk4\Ui\View(['ui' => 'buttons']);
-$prevAction = new \Atk4\Ui\Button(['Prev', 'labeled', 'icon' => 'left arrow']);
+$prevAction = new \Atk4\Ui\Button(['Prev', 'class.labeled' => true, 'icon' => 'left arrow']);
 $nextAction = new \Atk4\Ui\Button(['Next', 'iconRight' => 'right arrow']);
 
 $action->add($prevAction);

diff --git a/demos/interactive/progress.php b/demos/interactive/progress.php
@@ -12,6 +12,6 @@
 
 $p = \Atk4\Ui\ProgressBar::addTo($app, [20]);
 
-$p = \Atk4\Ui\ProgressBar::addTo($app, [60, 'indicating progress', 'indicating']);
+$p = \Atk4\Ui\ProgressBar::addTo($app, [60, 'indicating progress', 'class.indicating' => true]);
 \Atk4\Ui\Button::addTo($app, ['increment'])->on('click', $p->jsIncrement());
 \Atk4\Ui\Button::addTo($app, ['set'])->on('click', $p->jsValue(20));
diff --git a/demos/interactive/scroll-grid-container.php b/demos/interactive/scroll-grid-container.php
@@ -22,7 +22,7 @@
 $g1->addQuickSearch([Country::hinting()->fieldName()->name, Country::hinting()->fieldName()->iso]);
 
 // demo for additional action buttons in Crud + JsPaginator
-$g1->addModalAction(['icon' => [\Atk4\Ui\Icon::class, 'cogs']], 'Details', function ($p, $id) use ($g1) {
+$g1->addModalAction(['icon' => 'cogs'], 'Details', function ($p, $id) use ($g1) {
     \Atk4\Ui\Card::addTo($p)->setModel($g1->model->load($id));
 });
 $g1->addActionButton('red', function ($js) {

diff --git a/docs/app.rst b/docs/app.rst
@@ -423,7 +423,7 @@ Populating the left menu object is simply a matter of adding the right menu item
 
 This is the top menu of the admin layout. You can add other item to the top menu using::
 
-    Button::addTo($layout->menu->addItem(), ['View Source', 'teal', 'icon' => 'github'])
+    Button::addTo($layout->menu->addItem(), ['View Source', 'class.teal' => true, 'icon' => 'github'])
         ->setAttr('target', '_blank')->on('click', new \Atk4\Ui\JsExpression('document.location=[];', [$url . $f]));
 
 .. php:attr:: menuRight

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1880,9 +1880,6 @@ parameters:
         -
             path: 'src/Table/Column/Link.php'
             message: '~^Property Atk4\\Ui\\Table\\Column\\Link::\$args has no type specified\.$~'
-        -
-            path: 'src/Table/Column/Link.php'
-            message: '~^Method Atk4\\Ui\\Table\\Column\\Link::__construct\(\) has parameter \$args with no type specified\.$~'
         -
             path: 'src/Table/Column/Link.php'
             message: '~^Method Atk4\\Ui\\Table\\Column\\Link::__construct\(\) has parameter \$page with no type specified\.$~'

diff --git a/src/ProgressBar.php b/src/ProgressBar.php
@@ -29,11 +29,11 @@ class ProgressBar extends View
     /** @var int Indicates a maximum value of a progress bar. */
     public $max = 100;
 
-    public function __construct($value = 0, $label = null, $class = null)
+    public function __construct($value = 0, $label = [])
     {
         $this->value = $value;
 
-        parent::__construct($label, $class);
+        parent::__construct($label);
     }
 
     protected function renderView(): void

diff --git a/src/UserAction/VpExecutor.php b/src/UserAction/VpExecutor.php
@@ -42,7 +42,7 @@ class VpExecutor extends View implements JsExecutorInterface
     public $stepListItems = ['args' => 'Fill argument(s)', 'fields' => 'Edit Record(s)', 'preview' => 'Preview', 'final' => 'Complete'];
 
     /** @var array */
-    public $cancelBtnSeed = [Button::class, ['Cancel', 'small left floated basic blue', 'icon' => 'left arrow']];
+    public $cancelBtnSeed = [Button::class, ['Cancel', 'class.small left floated basic blue' => true, 'icon' => 'left arrow']];
 
     protected function init(): void
     {

diff --git a/src/View.php b/src/View.php
@@ -87,33 +87,25 @@ class View extends AbstractView implements JsExpressionable
 
     /**
      * @param array|string $label
-     * @param array|string $class
      */
-    public function __construct($label = null, $class = null)
+    public function __construct($label = [])
     {
-        if (is_array($label)) {
-            $defaults = $label;
-            if (isset($defaults[0])) {
-                $label = $defaults[0];
-                unset($defaults[0]);
-            } else {
-                $label = null;
-            }
+        $defaults = is_array($label) ? $label : [$label];
+        unset($label);
 
-            if (isset($defaults[1])) {
-                $class = $defaults[1];
-                unset($defaults[1]);
-            }
-            $this->setDefaults($defaults);
+        if (array_key_exists(0, $defaults)) {
+            $defaults['content'] = $defaults[0];
+            unset($defaults[0]);
         }
 
-        if ($label !== null) {
-            $this->content = $label;
-        }
+        // @TODO func_num_args() > 1!!!!
+        if (func_num_args() > 2 || count(array_filter($defaults, 'is_int', \ARRAY_FILTER_USE_KEY)) > 0) { // prevent bad usage
+            var_dump(func_get_args());
 
-        if ($class) {
-            $this->addClass($class);
+            throw new \Error('Too many method arguments');
         }
+
+        $this->setDefaults($defaults);
     }
 
     /**