From 6fcc1f225c0b2f0095d8d4106b1ed92ba6b37a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Sat, 3 Jun 2023 23:27:23 +0200
Subject: [PATCH 01/13] Allow radio form control to be unchecked

---
 src/Form/Control/Radio.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Form/Control/Radio.php b/src/Form/Control/Radio.php
index 7fa02a7746..ad15838eb3 100644
--- a/src/Form/Control/Radio.php
+++ b/src/Form/Control/Radio.php
@@ -48,6 +48,10 @@ protected function renderView(): void
             $lister->tRow->dangerouslySetHtml('checked', $value === (string) $lister->model->getId() ? 'checked="checked"' : '');
         });
 
+        $this->js(true, null, '.ui.checkbox.radio')->checkbox([
+            'uncheckable' => !$this->entityField || ($this->entityField->getField()->nullable || !$this->entityField->getField()->required),
+        ]);
+
         parent::renderView();
     }
 

From a7f8054680c6b8f5f654649076704ead869e319b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Sun, 4 Jun 2023 17:53:56 +0200
Subject: [PATCH 02/13] simplify input/textarea control templates

---
 src/Form/Control.php                | 6 ++----
 src/Form/Control/Input.php          | 2 +-
 src/Form/Control/Textarea.php       | 2 +-
 template/form/control/dropdown.html | 2 +-
 template/form/control/dropdown.pug  | 2 +-
 template/form/control/input.html    | 2 +-
 template/form/control/input.pug     | 2 +-
 template/form/control/lookup.html   | 2 +-
 template/form/control/lookup.pug    | 2 +-
 tests/FormTest.php                  | 8 +++++++-
 10 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/Form/Control.php b/src/Form/Control.php
index 76520944f1..0807a5fa79 100644
--- a/src/Form/Control.php
+++ b/src/Form/Control.php
@@ -64,14 +64,12 @@ class Control extends View
     public $hint;
 
     /**
-     * Is input field disabled?
-     * Disabled input fields are not editable and will not be submitted.
+     * Disabled field is not editable and will not be submitted.
      */
     public bool $disabled = false;
 
     /**
-     * Is input field read only?
-     * Read only input fields are not editable, but will be submitted.
+     * Read-only field is not editable, but will be submitted.
      */
     public bool $readOnly = false;
 
diff --git a/src/Form/Control/Input.php b/src/Form/Control/Input.php
index 9bb1aec90d..fd905b64f1 100644
--- a/src/Form/Control/Input.php
+++ b/src/Form/Control/Input.php
@@ -110,8 +110,8 @@ public function getInput()
             'placeholder' => $this->inputType !== 'hidden' ? $this->placeholder : false,
             'id' => $this->name . '_input',
             'value' => $this->getValue(),
-            'readonly' => $this->readOnly && $this->inputType !== 'hidden',
             'disabled' => $this->disabled && $this->inputType !== 'hidden',
+            'readonly' => $this->readOnly && $this->inputType !== 'hidden' && !$this->disabled,
         ], $this->inputAttr));
     }
 
diff --git a/src/Form/Control/Textarea.php b/src/Form/Control/Textarea.php
index 9414f52967..1c5c54f638 100644
--- a/src/Form/Control/Textarea.php
+++ b/src/Form/Control/Textarea.php
@@ -16,8 +16,8 @@ public function getInput()
             'rows' => $this->rows,
             'placeholder' => $this->placeholder,
             'id' => $this->name . '_input',
-            'readonly' => $this->readOnly,
             'disabled' => $this->disabled,
+            'readonly' => $this->readOnly && !$this->disabled,
         ], $this->inputAttr), $this->getValue() ?? '');
     }
 }
diff --git a/template/form/control/dropdown.html b/template/form/control/dropdown.html
index 7a5a7ce50b..c1cd5388c0 100644
--- a/template/form/control/dropdown.html
+++ b/template/form/control/dropdown.html
@@ -1,7 +1,7 @@
 
 <div {$attributes}>
 {$BeforeInput}{$AfterBeforeInput}
-{Input}<input type="{inputType}text{/}" {$inputAttributes}>{/}
+{$Input}
 <i class="{DropIcon}dropdown{/} icon"></i>
 <div class="default text">{DefaultText}...{/}</div>
 <div class="menu">
diff --git a/template/form/control/dropdown.pug b/template/form/control/dropdown.pug
index 7c032bcd26..56801b3897 100644
--- a/template/form/control/dropdown.pug
+++ b/template/form/control/dropdown.pug
@@ -1,6 +1,6 @@
 | <div {$attributes}>
 | {$BeforeInput}{$AfterBeforeInput}
-| {Input}<input type="{inputType}text{/}" {$inputAttributes}>{/}
+| {$Input}
 | <i class="{DropIcon}dropdown{/} icon"></i>
 | <div class="default text">{DefaultText}...{/}</div>
 | <div class="menu">
diff --git a/template/form/control/input.html b/template/form/control/input.html
index 264ed94077..26fd56141a 100644
--- a/template/form/control/input.html
+++ b/template/form/control/input.html
@@ -1,4 +1,4 @@
 
 <div {$attributes}>
-{$BeforeInput}{$AfterBeforeInput}{Input}<input type="{inputType}text{/}" {$inputAttributes}>{/}{$AfterInput}{$AfterAfterInput}
+{$BeforeInput}{$AfterBeforeInput}{$Input}{$AfterInput}{$AfterAfterInput}
 </div>
diff --git a/template/form/control/input.pug b/template/form/control/input.pug
index c3fab13310..7e9626df61 100644
--- a/template/form/control/input.pug
+++ b/template/form/control/input.pug
@@ -1,4 +1,4 @@
 | <div {$attributes}>
-| {$BeforeInput}{$AfterBeforeInput}{Input}<input type="{inputType}text{/}" {$inputAttributes}>{/}{$AfterInput}{$AfterAfterInput}
+| {$BeforeInput}{$AfterBeforeInput}{$Input}{$AfterInput}{$AfterAfterInput}
 | </div>
 = "\n"
diff --git a/template/form/control/lookup.html b/template/form/control/lookup.html
index 23e90a0710..152492d411 100644
--- a/template/form/control/lookup.html
+++ b/template/form/control/lookup.html
@@ -2,7 +2,7 @@
 <div {$attributes}>
 {$BeforeInput}{$AfterBeforeInput}
 <div id="{$inputId}" class="ui {$multipleClass} search selection dropdown {$disabledClass}" style="width: 100%;">
-{Input}<input class={$inputClass} type="{inputType}text{/}" {$inputAttributes}>{/}
+{$Input}
 <i class="dropdown icon"></i>
 <div class="default text">{$placeholder}</div>
 <input class="search" value="{$value}" {$readonly} {$disabled} style="width: 100%;">
diff --git a/template/form/control/lookup.pug b/template/form/control/lookup.pug
index 57725c7f08..00b3649441 100644
--- a/template/form/control/lookup.pug
+++ b/template/form/control/lookup.pug
@@ -1,7 +1,7 @@
 | <div {$attributes}>
 | {$BeforeInput}{$AfterBeforeInput}
 | <div id="{$inputId}" class="ui {$multipleClass} search selection dropdown {$disabledClass}" style="width: 100%;">
-| {Input}<input class={$inputClass} type="{inputType}text{/}" {$inputAttributes}>{/}
+| {$Input}
 | <i class="dropdown icon"></i>
 | <div class="default text">{$placeholder}</div>
 | <input class="search" value="{$value}" {$readonly} {$disabled} style="width: 100%;">
diff --git a/tests/FormTest.php b/tests/FormTest.php
index ac21ae8349..85a6a42d50 100644
--- a/tests/FormTest.php
+++ b/tests/FormTest.php
@@ -224,12 +224,18 @@ public function testSubmitNonFormFieldError(): void
 
     public function testNoDisabledAttrWithHiddenType(): void
     {
+        $input = new Form\Control\Line();
+        $input->readOnly = true;
+        $input->setApp($this->createApp());
+        self::assertStringContainsString(' readonly="readonly"', $input->render());
+        self::assertStringNotContainsString('disabled', $input->render());
+
         $input = new Form\Control\Line();
         $input->disabled = true;
         $input->readOnly = true;
         $input->setApp($this->createApp());
         self::assertStringContainsString(' disabled="disabled"', $input->render());
-        self::assertStringContainsString(' readonly="readonly"', $input->render());
+        self::assertStringNotContainsString('readonly', $input->render());
 
         $input = new Form\Control\Hidden();
         $input->disabled = true;

From 2493805ccfb144674535b0a01ff4e236857d7b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Sun, 4 Jun 2023 14:36:05 +0200
Subject: [PATCH 03/13] unify checkbox/radio control templates

---
 src/Form/Control/Checkbox.php       |  7 +++----
 src/Form/Control/Radio.php          | 10 ++++++----
 template/form/control/checkbox.html |  2 +-
 template/form/control/checkbox.pug  |  2 +-
 template/form/control/radio.html    |  2 +-
 template/form/control/radio.pug     |  2 +-
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/Form/Control/Checkbox.php b/src/Form/Control/Checkbox.php
index 2aeff32e08..53c554877a 100644
--- a/src/Form/Control/Checkbox.php
+++ b/src/Form/Control/Checkbox.php
@@ -63,13 +63,12 @@ protected function renderView(): void
 
         $this->content = null;
 
-        if ($this->readOnly) {
-            $this->addClass('read-only');
-        }
-
         if ($this->disabled) {
             $this->addClass('disabled');
             $this->template->dangerouslySetHtml('disabled', 'disabled="disabled"');
+        } elseif ($this->readOnly) {
+            $this->addClass('read-only');
+            $this->template->dangerouslySetHtml('disabled', 'readonly="readonly"');
         }
 
         $this->js(true)->checkbox();
diff --git a/src/Form/Control/Radio.php b/src/Form/Control/Radio.php
index ad15838eb3..869c8c170e 100644
--- a/src/Form/Control/Radio.php
+++ b/src/Form/Control/Radio.php
@@ -39,13 +39,15 @@ protected function renderView(): void
         $this->lister->setModel($this->model);
 
         $this->lister->onHook(Lister::HOOK_BEFORE_ROW, function (Lister $lister) use ($value) {
-            if ($this->readOnly) {
-                $lister->tRow->dangerouslySetHtml('disabled', $value !== (string) $lister->model->getId() ? 'disabled="disabled"' : '');
-            } elseif ($this->disabled) {
+            if ($this->disabled) {
+                $lister->tRow->dangerouslySetHtml('disabledClass', ' disabled');
                 $lister->tRow->dangerouslySetHtml('disabled', 'disabled="disabled"');
+            } elseif ($this->readOnly) {
+                $lister->tRow->dangerouslySetHtml('disabledClass', ' read-only');
+                $lister->tRow->dangerouslySetHtml('disabled', 'readonly="readonly"');
             }
 
-            $lister->tRow->dangerouslySetHtml('checked', $value === (string) $lister->model->getId() ? 'checked="checked"' : '');
+            $lister->tRow->dangerouslySetHtml('checked', $lister->model->compare($lister->model->idField, $value) ? 'checked="checked"' : '');
         });
 
         $this->js(true, null, '.ui.checkbox.radio')->checkbox([
diff --git a/template/form/control/checkbox.html b/template/form/control/checkbox.html
index 16d3f004e3..28c2983528 100644
--- a/template/form/control/checkbox.html
+++ b/template/form/control/checkbox.html
@@ -1,5 +1,5 @@
 
 <div {$attributes}>
-<input id="{$_id}_input" type="checkbox" class="hidden" name="{$name}" {$checked} {$disabled}>
+<input id="{$_id}_input" type="checkbox" name="{$name}" {$checked} {$disabled}>
 <label for="{$_id}_input">{$Content}</label>
 </div>
diff --git a/template/form/control/checkbox.pug b/template/form/control/checkbox.pug
index 6b738d445a..d41989fdb6 100644
--- a/template/form/control/checkbox.pug
+++ b/template/form/control/checkbox.pug
@@ -1,5 +1,5 @@
 | <div {$attributes}>
-| <input id="{$_id}_input" type="checkbox" class="hidden" name="{$name}" {$checked} {$disabled}>
+| <input id="{$_id}_input" type="checkbox" name="{$name}" {$checked} {$disabled}>
 | <label for="{$_id}_input">{$Content}</label>
 | </div>
 = "\n"
diff --git a/template/form/control/radio.html b/template/form/control/radio.html
index f985de3a98..6454b69940 100644
--- a/template/form/control/radio.html
+++ b/template/form/control/radio.html
@@ -1,7 +1,7 @@
 
 <div {$attributes}>
 {Radio}{rows}{row}
-<div class="field"><div class="ui radio checkbox">
+<div class="field"><div class="ui checkbox radio{$disabledClass}">
 <input id="{$_id}_input" type="radio" name="{$_name}" value="{$id}" {$checked} {$disabled}>
 <label for="{$_id}_input">{$name}</label>
 </div></div>
diff --git a/template/form/control/radio.pug b/template/form/control/radio.pug
index 28497c5ed8..c626021a29 100644
--- a/template/form/control/radio.pug
+++ b/template/form/control/radio.pug
@@ -1,6 +1,6 @@
 | <div {$attributes}>
 | {Radio}{rows}{row}
-| <div class="field"><div class="ui radio checkbox">
+| <div class="field"><div class="ui checkbox radio{$disabledClass}">
 | <input id="{$_id}_input" type="radio" name="{$_name}" value="{$id}" {$checked} {$disabled}>
 | <label for="{$_id}_input">{$name}</label>
 | </div></div>

From 6f4540a57ef8d68a00b4581723f7b82a636a5ef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Sun, 4 Jun 2023 18:47:04 +0200
Subject: [PATCH 04/13] simplify some comments

---
 src/Form/Control/UploadImage.php | 7 +------
 src/Grid.php                     | 4 ++--
 src/JsSearch.php                 | 2 +-
 src/Lister.php                   | 4 ++--
 src/Table.php                    | 2 +-
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/Form/Control/UploadImage.php b/src/Form/Control/UploadImage.php
index 7ea1cc1bca..bee8105bc3 100644
--- a/src/Form/Control/UploadImage.php
+++ b/src/Form/Control/UploadImage.php
@@ -11,12 +11,7 @@ class UploadImage extends Upload
     /** @var View|null The thumbnail view to add to this input. */
     public $thumbnail;
 
-    /**
-     * The template region where to add the thumbnail view.
-     * Default to AfterAfterInput.
-     *
-     * @var string
-     */
+    /** @var string The template region where to add the thumbnail view. */
     public $thumbnailRegion = 'AfterAfterInput';
 
     /** @var string|null The default thumbnail source. */
diff --git a/src/Grid.php b/src/Grid.php
index 4afaf72516..e4ec1f3481 100644
--- a/src/Grid.php
+++ b/src/Grid.php
@@ -244,7 +244,7 @@ public function addItemsPerPageSelector($items = [10, 25, 50, 100], $label = 'It
      *
      * @param int    $ipp          number of item per page to start with
      * @param array  $options      an array with JS Scroll plugin options
-     * @param View   $container    The container holding the lister for scrolling purpose. Default to view owner.
+     * @param View   $container    the container holding the lister for scrolling purpose
      * @param string $scrollRegion A specific template region to render. Render output is append to container HTML element.
      *
      * @return $this
@@ -275,7 +275,7 @@ public function addJsPaginator($ipp, $options = [], $container = null, $scrollRe
      * @param int    $ipp             number of item per page to start with
      * @param int    $containerHeight number of pixel the table container should be
      * @param array  $options         an array with JS Scroll plugin options
-     * @param View   $container       The container holding the lister for scrolling purpose. Default to view owner.
+     * @param View   $container       the container holding the lister for scrolling purpose
      * @param string $scrollRegion    A specific template region to render. Render output is append to container HTML element.
      *
      * @return $this
diff --git a/src/JsSearch.php b/src/JsSearch.php
index da60b7774a..6f3bd7c269 100644
--- a/src/JsSearch.php
+++ b/src/JsSearch.php
@@ -48,7 +48,7 @@ class JsSearch extends View
      * If search query need to be control via an URL parameter only
      * set this to false.
      *
-     * @var bool default to true
+     * @var bool
      */
     public $useAjax = true;
 
diff --git a/src/Lister.php b/src/Lister.php
index 4330ddb937..8da2a993ae 100644
--- a/src/Lister.php
+++ b/src/Lister.php
@@ -73,12 +73,12 @@ protected function initChunks(): void
 
     /**
      * Add Dynamic paginator when scrolling content via Javascript.
-     * Will output x item in lister set per ipp until user scroll content to the end of page.
+     * Will output x item in lister set per IPP until user scroll content to the end of page.
      * When this happen, content will be reload x number of items.
      *
      * @param int    $ipp          Number of item per page
      * @param array  $options      an array with JS Scroll plugin options
-     * @param View   $container    The container holding the lister for scrolling purpose. Default to view owner.
+     * @param View   $container    the container holding the lister for scrolling purpose
      * @param string $scrollRegion A specific template region to render. Render output is append to container HTML element.
      *
      * @return $this
diff --git a/src/Table.php b/src/Table.php
index 188045dbfa..c9e3714909 100644
--- a/src/Table.php
+++ b/src/Table.php
@@ -336,7 +336,7 @@ public function resizableColumn($fx = null, $widths = null, $resizerOptions = []
      *
      * @param int    $ipp          number of item per page to start with
      * @param array  $options      an array with JS Scroll plugin options
-     * @param View   $container    The container holding the lister for scrolling purpose. Default to view owner.
+     * @param View   $container    the container holding the lister for scrolling purpose
      * @param string $scrollRegion A specific template region to render. Render output is append to container HTML element.
      *
      * @return $this

From fbad84000984ee9e3155b64e92bb956e29492d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Sun, 4 Jun 2023 23:53:00 +0200
Subject: [PATCH 05/13] unify upload control template

---
 src/Form/Control/Dropdown.php     |  4 ++--
 src/Form/Control/Upload.php       | 30 ++++++++++++++++++------------
 src/Form/Control/UploadImage.php  | 14 +++++++-------
 template/form/control/upload.html |  6 +++---
 template/form/control/upload.pug  |  6 +++---
 5 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/Form/Control/Dropdown.php b/src/Form/Control/Dropdown.php
index 00a1777cfb..d0293a08e4 100644
--- a/src/Form/Control/Dropdown.php
+++ b/src/Form/Control/Dropdown.php
@@ -241,10 +241,10 @@ protected function renderView(): void
         }
 
         if ($this->dropIcon) {
-            $this->template->trySet('DropIcon', $this->dropIcon);
+            $this->template->set('DropIcon', $this->dropIcon);
         }
 
-        $this->template->trySet('DefaultText', $this->empty);
+        $this->template->set('DefaultText', $this->empty);
 
         $this->htmlRenderValue();
         $this->jsRenderDropdown();
diff --git a/src/Form/Control/Upload.php b/src/Form/Control/Upload.php
index f979cdf90d..d6d6b02213 100644
--- a/src/Form/Control/Upload.php
+++ b/src/Form/Control/Upload.php
@@ -65,8 +65,11 @@ protected function init(): void
 
         $this->cb = JsCallback::addTo($this);
 
-        if (!$this->action) {
-            $this->action = new Button(['icon' => 'upload', 'class.disabled' => $this->disabled || $this->readOnly]);
+        if ($this->action === null) {
+            $this->action = new Button([
+                'icon' => 'upload',
+                'class.disabled' => $this->disabled || $this->readOnly,
+            ]);
         }
     }
 
@@ -123,10 +126,8 @@ public function setFileId($id): void
 
     /**
      * Add a JS action to be returned to server on callback.
-     *
-     * @param JsExpressionable $action
      */
-    public function addJsAction($action): void
+    public function addJsAction(JsExpressionable $action): void
     {
         $this->jsActions[] = $action;
     }
@@ -162,7 +163,10 @@ public function onUpload(\Closure $fx): void
                     $this->setInput($fileId);
                 }
 
-                $this->addJsAction($fx(...$postFiles));
+                $jsRes = $fx(...$postFiles);
+                if ($jsRes !== null) { // @phpstan-ignore-line https://github.com/phpstan/phpstan/issues/9388
+                    $this->addJsAction($jsRes);
+                }
 
                 if (count($postFiles) > 0 && reset($postFiles)['error'] === 0) {
                     $this->addJsAction(
@@ -186,7 +190,11 @@ public function onDelete(\Closure $fx): void
         if (($_POST['fUploadAction'] ?? null) === self::DELETE_ACTION) {
             $this->cb->set(function () use ($fx) {
                 $fileId = $_POST['fUploadId'];
-                $this->addJsAction($fx($fileId));
+
+                $jsRes = $fx($fileId);
+                if ($jsRes !== null) { // @phpstan-ignore-line https://github.com/phpstan/phpstan/issues/9388
+                    $this->addJsAction($jsRes);
+                }
 
                 return new JsBlock($this->jsActions);
             });
@@ -195,10 +203,6 @@ public function onDelete(\Closure $fx): void
 
     protected function renderView(): void
     {
-        // need before parent rendering.
-        if ($this->disabled) {
-            $this->addClass('disabled');
-        }
         parent::renderView();
 
         if ($this->cb->canTerminate()) {
@@ -222,8 +226,10 @@ protected function renderView(): void
             $this->template->dangerouslySetHtml('multiple', 'multiple="multiple"');
         }
 
+        $this->template->set('placeholderReadonly', $this->disabled ? 'disabled="disabled"' : 'readonly="readonly"');
+
         if ($this->placeholder) {
-            $this->template->trySet('PlaceHolder', $this->placeholder);
+            $this->template->set('Placeholder', $this->placeholder);
         }
 
         $this->js(true)->atkFileUpload([
diff --git a/src/Form/Control/UploadImage.php b/src/Form/Control/UploadImage.php
index bee8105bc3..2a4cb8c7e7 100644
--- a/src/Form/Control/UploadImage.php
+++ b/src/Form/Control/UploadImage.php
@@ -48,9 +48,9 @@ public function getThumbnail(): View
     public function setThumbnailSrc(string $src): void
     {
         $this->thumbnail->setAttr(['src' => $src]);
-        $action = $this->thumbnail->js();
-        $action->attr('src', $src);
-        $this->addJsAction($action);
+        $js = $this->thumbnail->js();
+        $js->attr('src', $src);
+        $this->addJsAction($js);
     }
 
     /**
@@ -58,12 +58,12 @@ public function setThumbnailSrc(string $src): void
      */
     public function clearThumbnail(): void
     {
-        $action = $this->thumbnail->js();
+        $js = $this->thumbnail->js();
         if ($this->defaultSrc !== null) {
-            $action->attr('src', $this->defaultSrc);
+            $js->attr('src', $this->defaultSrc);
         } else {
-            $action->removeAttr('src');
+            $js->removeAttr('src');
         }
-        $this->addJsAction($action);
+        $this->addJsAction($js);
     }
 }
diff --git a/template/form/control/upload.html b/template/form/control/upload.html
index de76c98a6e..4a4f3eb6d6 100644
--- a/template/form/control/upload.html
+++ b/template/form/control/upload.html
@@ -4,9 +4,9 @@
 <div {$attributes}>
 {$BeforeInput}{$AfterBeforeInput}
 <div class="ui input" style="position: relative;">
-<input type="text" placeholder="{$PlaceHolder}" readonly="readonly">
-{Input}<input type="{inputType}text{/}">{/}
-<input type="file" accept="{$accept}" {$disabled} {$multiple} style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; opacity: 0;">
+<input type="text" placeholder="{$Placeholder}" {$placeholderReadonly}>
+{$Input}
+<input type="file" accept="{$accept}" {$disabled} {$multiple} style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; opacity: 0;" tabindex="-1">
 </div>
 {$AfterInput}{$AfterAfterInput}
 </div>
diff --git a/template/form/control/upload.pug b/template/form/control/upload.pug
index 36d969c473..6d9e7d1598 100644
--- a/template/form/control/upload.pug
+++ b/template/form/control/upload.pug
@@ -3,9 +3,9 @@
 | <div {$attributes}>
 | {$BeforeInput}{$AfterBeforeInput}
 | <div class="ui input" style="position: relative;">
-| <input type="text" placeholder="{$PlaceHolder}" readonly="readonly">
-| {Input}<input type="{inputType}text{/}">{/}
-| <input type="file" accept="{$accept}" {$disabled} {$multiple} style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; opacity: 0;">
+| <input type="text" placeholder="{$Placeholder}" {$placeholderReadonly}>
+| {$Input}
+| <input type="file" accept="{$accept}" {$disabled} {$multiple} style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; opacity: 0;" tabindex="-1">
 | </div>
 | {$AfterInput}{$AfterAfterInput}
 | </div>

From c4fbb8ac6b006dbad212adf90ca38256f6a48d75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Sun, 4 Jun 2023 21:40:51 +0200
Subject: [PATCH 06/13] fix upload progress bar flashing

---
 template/form/control/upload.html | 2 +-
 template/form/control/upload.pug  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/form/control/upload.html b/template/form/control/upload.html
index 4a4f3eb6d6..5db24c31d9 100644
--- a/template/form/control/upload.html
+++ b/template/form/control/upload.html
@@ -10,7 +10,7 @@
 </div>
 {$AfterInput}{$AfterAfterInput}
 </div>
-<div class="ui tiny indicating progress" data-value="1" data-total="100">
+<div class="ui tiny indicating progress" data-value="1" data-total="100" style="display: none;">
 <div class="bar"></div>
 <div class="label"></div>
 </div>
diff --git a/template/form/control/upload.pug b/template/form/control/upload.pug
index 6d9e7d1598..b4318c6edb 100644
--- a/template/form/control/upload.pug
+++ b/template/form/control/upload.pug
@@ -9,7 +9,7 @@
 | </div>
 | {$AfterInput}{$AfterAfterInput}
 | </div>
-| <div class="ui tiny indicating progress" data-value="1" data-total="100">
+| <div class="ui tiny indicating progress" data-value="1" data-total="100" style="display: none;">
 | <div class="bar"></div>
 | <div class="label"></div>
 | </div>

From a4afd29e4d8feba89b37f054f631971b2c514631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Sun, 4 Jun 2023 21:34:14 +0200
Subject: [PATCH 07/13] fix round upload corners

---
 template/form/control/upload.html | 2 +-
 template/form/control/upload.pug  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/form/control/upload.html b/template/form/control/upload.html
index 5db24c31d9..fc45fe2711 100644
--- a/template/form/control/upload.html
+++ b/template/form/control/upload.html
@@ -3,7 +3,7 @@
 {$AboveInput}
 <div {$attributes}>
 {$BeforeInput}{$AfterBeforeInput}
-<div class="ui input" style="position: relative;">
+<div class="ui input action" style="position: relative;">
 <input type="text" placeholder="{$Placeholder}" {$placeholderReadonly}>
 {$Input}
 <input type="file" accept="{$accept}" {$disabled} {$multiple} style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; opacity: 0;" tabindex="-1">
diff --git a/template/form/control/upload.pug b/template/form/control/upload.pug
index b4318c6edb..07114a47a1 100644
--- a/template/form/control/upload.pug
+++ b/template/form/control/upload.pug
@@ -2,7 +2,7 @@
 | {$AboveInput}
 | <div {$attributes}>
 | {$BeforeInput}{$AfterBeforeInput}
-| <div class="ui input" style="position: relative;">
+| <div class="ui input action" style="position: relative;">
 | <input type="text" placeholder="{$Placeholder}" {$placeholderReadonly}>
 | {$Input}
 | <input type="file" accept="{$accept}" {$disabled} {$multiple} style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; opacity: 0;" tabindex="-1">

From cf470598d75404c7c1771247585d4242ea096abe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Mon, 5 Jun 2023 00:08:02 +0200
Subject: [PATCH 08/13] unify dropdown/lookup control templates

---
 src/Form/Control/Dropdown.php       | 18 ++----------------
 src/Form/Control/Lookup.php         | 12 ++++++------
 template/form/control/dropdown.html |  4 ++--
 template/form/control/dropdown.pug  |  4 ++--
 template/form/control/lookup.html   |  4 ++--
 template/form/control/lookup.pug    |  4 ++--
 6 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/src/Form/Control/Dropdown.php b/src/Form/Control/Dropdown.php
index d0293a08e4..a33bbe9866 100644
--- a/src/Form/Control/Dropdown.php
+++ b/src/Form/Control/Dropdown.php
@@ -33,16 +33,6 @@ class Dropdown extends Input
     /** @var string The string to set as an empty values. */
     public $empty = "\u{00a0}"; // Unicode NBSP
 
-    /**
-     * The icon to display at the dropdown menu.
-     *  The template default is set to: 'dropdown'.
-     *  Note: dropdown icon is show on the right side of the menu
-     *  while other icon are usually display on the left side.
-     *
-     * @var string|null
-     */
-    public $dropIcon;
-
     /** @var array Dropdown options as per Fomantic-UI dropdown options. */
     public $dropdownOptions = [];
 
@@ -233,17 +223,13 @@ protected function renderView(): void
 
         if ($this->disabled) {
             $this->addClass('disabled');
-        }
+        } elseif ($this->readOnly) {
+            $this->addClass('read-only');
 
-        if ($this->readOnly) {
             $this->setDropdownOption('allowTab', false);
             $this->setDropdownOption('onShow', new JsFunction([], [new JsExpression('return false')]));
         }
 
-        if ($this->dropIcon) {
-            $this->template->set('DropIcon', $this->dropIcon);
-        }
-
         $this->template->set('DefaultText', $this->empty);
 
         $this->htmlRenderValue();
diff --git a/src/Form/Control/Lookup.php b/src/Form/Control/Lookup.php
index b12b13c406..dee85d487e 100644
--- a/src/Form/Control/Lookup.php
+++ b/src/Form/Control/Lookup.php
@@ -352,17 +352,17 @@ protected function renderView(): void
         }
 
         if ($this->disabled) {
-            $this->settings['allowTab'] = false;
-
+            $this->template->set('disabledClass', ' disabled');
             $this->template->dangerouslySetHtml('disabled', 'disabled="disabled"');
-            $this->template->set('disabledClass', 'disabled');
-        }
 
-        if ($this->readOnly) {
+            $this->settings['allowTab'] = false;
+        } elseif ($this->readOnly) {
+            $this->template->set('disabledClass', ' read-only');
+            $this->template->dangerouslySetHtml('disabled', 'readonly="readonly"');
+
             $this->settings['allowTab'] = false;
             $this->settings['apiSettings'] = null;
             $this->settings['onShow'] = new JsFunction([], [new JsExpression('return false')]);
-            $this->template->dangerouslySetHtml('readonly', 'readonly="readonly"');
         }
 
         if ($this->dependency) {
diff --git a/template/form/control/dropdown.html b/template/form/control/dropdown.html
index c1cd5388c0..b17475918f 100644
--- a/template/form/control/dropdown.html
+++ b/template/form/control/dropdown.html
@@ -2,8 +2,8 @@
 <div {$attributes}>
 {$BeforeInput}{$AfterBeforeInput}
 {$Input}
-<i class="{DropIcon}dropdown{/} icon"></i>
-<div class="default text">{DefaultText}...{/}</div>
+<i class="dropdown icon"></i>
+<div class="default text">{$DefaultText}</div>
 <div class="menu">
 {Item}<div class="item" data-value="{$value}">{Icon}<i class="{$iconClass}"></i>{/Icon}{$title}</div>
 {/Item}
diff --git a/template/form/control/dropdown.pug b/template/form/control/dropdown.pug
index 56801b3897..809320c542 100644
--- a/template/form/control/dropdown.pug
+++ b/template/form/control/dropdown.pug
@@ -1,8 +1,8 @@
 | <div {$attributes}>
 | {$BeforeInput}{$AfterBeforeInput}
 | {$Input}
-| <i class="{DropIcon}dropdown{/} icon"></i>
-| <div class="default text">{DefaultText}...{/}</div>
+| <i class="dropdown icon"></i>
+| <div class="default text">{$DefaultText}</div>
 | <div class="menu">
 | {Item}<div class="item" data-value="{$value}">{Icon}<i class="{$iconClass}"></i>{/Icon}{$title}</div>
 | {/Item}
diff --git a/template/form/control/lookup.html b/template/form/control/lookup.html
index 152492d411..6fadf90765 100644
--- a/template/form/control/lookup.html
+++ b/template/form/control/lookup.html
@@ -1,11 +1,11 @@
 
 <div {$attributes}>
 {$BeforeInput}{$AfterBeforeInput}
-<div id="{$inputId}" class="ui {$multipleClass} search selection dropdown {$disabledClass}" style="width: 100%;">
+<div id="{$inputId}" class="ui {$multipleClass} search selection dropdown{$disabledClass}" style="width: 100%;">
 {$Input}
 <i class="dropdown icon"></i>
 <div class="default text">{$placeholder}</div>
-<input class="search" value="{$value}" {$readonly} {$disabled} style="width: 100%;">
+<input class="search" value="{$value}" {$disabled} style="width: 100%;">
 </div>
 {$AfterInput}{$AfterAfterInput}
 </div>
diff --git a/template/form/control/lookup.pug b/template/form/control/lookup.pug
index 00b3649441..318a143280 100644
--- a/template/form/control/lookup.pug
+++ b/template/form/control/lookup.pug
@@ -1,10 +1,10 @@
 | <div {$attributes}>
 | {$BeforeInput}{$AfterBeforeInput}
-| <div id="{$inputId}" class="ui {$multipleClass} search selection dropdown {$disabledClass}" style="width: 100%;">
+| <div id="{$inputId}" class="ui {$multipleClass} search selection dropdown{$disabledClass}" style="width: 100%;">
 | {$Input}
 | <i class="dropdown icon"></i>
 | <div class="default text">{$placeholder}</div>
-| <input class="search" value="{$value}" {$readonly} {$disabled} style="width: 100%;">
+| <input class="search" value="{$value}" {$disabled} style="width: 100%;">
 | </div>
 | {$AfterInput}{$AfterAfterInput}
 | </div>

From 96c3412d4fdf3c7e1d9accb071cb3e847df380e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Sun, 4 Jun 2023 22:15:46 +0200
Subject: [PATCH 09/13] fix disabled/readonly dropdown search

---
 src/Form/Control/Dropdown.php       | 2 ++
 template/form/control/dropdown.html | 1 +
 template/form/control/dropdown.pug  | 1 +
 template/form/control/lookup.html   | 2 +-
 template/form/control/lookup.pug    | 2 +-
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Form/Control/Dropdown.php b/src/Form/Control/Dropdown.php
index a33bbe9866..4ec3b987a6 100644
--- a/src/Form/Control/Dropdown.php
+++ b/src/Form/Control/Dropdown.php
@@ -223,8 +223,10 @@ protected function renderView(): void
 
         if ($this->disabled) {
             $this->addClass('disabled');
+            $this->template->dangerouslySetHtml('disabled', 'disabled="disabled"');
         } elseif ($this->readOnly) {
             $this->addClass('read-only');
+            $this->template->dangerouslySetHtml('disabled', 'readonly="readonly"');
 
             $this->setDropdownOption('allowTab', false);
             $this->setDropdownOption('onShow', new JsFunction([], [new JsExpression('return false')]));
diff --git a/template/form/control/dropdown.html b/template/form/control/dropdown.html
index b17475918f..3ed593cbc6 100644
--- a/template/form/control/dropdown.html
+++ b/template/form/control/dropdown.html
@@ -3,6 +3,7 @@
 {$BeforeInput}{$AfterBeforeInput}
 {$Input}
 <i class="dropdown icon"></i>
+<input class="search" {$disabled} style="width: 100%;">
 <div class="default text">{$DefaultText}</div>
 <div class="menu">
 {Item}<div class="item" data-value="{$value}">{Icon}<i class="{$iconClass}"></i>{/Icon}{$title}</div>
diff --git a/template/form/control/dropdown.pug b/template/form/control/dropdown.pug
index 809320c542..ee260debe7 100644
--- a/template/form/control/dropdown.pug
+++ b/template/form/control/dropdown.pug
@@ -2,6 +2,7 @@
 | {$BeforeInput}{$AfterBeforeInput}
 | {$Input}
 | <i class="dropdown icon"></i>
+| <input class="search" {$disabled} style="width: 100%;">
 | <div class="default text">{$DefaultText}</div>
 | <div class="menu">
 | {Item}<div class="item" data-value="{$value}">{Icon}<i class="{$iconClass}"></i>{/Icon}{$title}</div>
diff --git a/template/form/control/lookup.html b/template/form/control/lookup.html
index 6fadf90765..1dad4cc939 100644
--- a/template/form/control/lookup.html
+++ b/template/form/control/lookup.html
@@ -4,8 +4,8 @@
 <div id="{$inputId}" class="ui {$multipleClass} search selection dropdown{$disabledClass}" style="width: 100%;">
 {$Input}
 <i class="dropdown icon"></i>
-<div class="default text">{$placeholder}</div>
 <input class="search" value="{$value}" {$disabled} style="width: 100%;">
+<div class="default text">{$placeholder}</div>
 </div>
 {$AfterInput}{$AfterAfterInput}
 </div>
diff --git a/template/form/control/lookup.pug b/template/form/control/lookup.pug
index 318a143280..88bc850454 100644
--- a/template/form/control/lookup.pug
+++ b/template/form/control/lookup.pug
@@ -3,8 +3,8 @@
 | <div id="{$inputId}" class="ui {$multipleClass} search selection dropdown{$disabledClass}" style="width: 100%;">
 | {$Input}
 | <i class="dropdown icon"></i>
-| <div class="default text">{$placeholder}</div>
 | <input class="search" value="{$value}" {$disabled} style="width: 100%;">
+| <div class="default text">{$placeholder}</div>
 | </div>
 | {$AfterInput}{$AfterAfterInput}
 | </div>

From f839178bef47601e31ad2c6858597f0675f5df42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Mon, 5 Jun 2023 10:59:17 +0200
Subject: [PATCH 10/13] unify dropdown with lookup and fix /w left/right action

---
 src/Form/Control/Dropdown.php        | 24 +++++++++++++++++-------
 src/Form/Control/DropdownCascade.php |  8 ++++----
 src/Form/Control/Lookup.php          | 17 ++++++++++++++---
 template/form/control/dropdown.html  |  2 ++
 template/form/control/dropdown.pug   |  2 ++
 template/form/control/lookup.html    |  2 +-
 template/form/control/lookup.pug     |  2 +-
 7 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/Form/Control/Dropdown.php b/src/Form/Control/Dropdown.php
index 4ec3b987a6..d28f13e6bf 100644
--- a/src/Form/Control/Dropdown.php
+++ b/src/Form/Control/Dropdown.php
@@ -5,13 +5,13 @@
 namespace Atk4\Ui\Form\Control;
 
 use Atk4\Ui\HtmlTemplate;
+use Atk4\Ui\Js\Jquery;
 use Atk4\Ui\Js\JsExpression;
 use Atk4\Ui\Js\JsExpressionable;
 use Atk4\Ui\Js\JsFunction;
 
 class Dropdown extends Input
 {
-    public $ui = 'dropdown fluid search selection';
     public $defaultTemplate = 'form/control/dropdown.html';
 
     public string $inputType = 'hidden';
@@ -165,12 +165,23 @@ public function setDropdownOptions($options): void
         $this->dropdownOptions = array_merge($this->dropdownOptions, $options);
     }
 
+    /**
+     * @param bool|string      $when
+     * @param JsExpressionable $action
+     *
+     * @return Jquery
+     */
+    protected function jsDropdown($when = false, $action = null): JsExpressionable
+    {
+        return $this->js($when, $action, 'div.ui.dropdown:has(> #' . $this->name . '_input)');
+    }
+
     /**
      * Render JS for dropdown.
      */
     protected function jsRenderDropdown(): JsExpressionable
     {
-        return $this->js(true)->dropdown($this->dropdownOptions);
+        return $this->jsDropdown(true)->dropdown($this->dropdownOptions);
     }
 
     /**
@@ -210,22 +221,21 @@ protected function htmlRenderValue(): void
     protected function renderView(): void
     {
         if ($this->multiple) {
-            $this->addClass('multiple');
+            $this->template->dangerouslySetHtml('multipleClass', 'multiple');
         }
 
         if ($this->readOnly || $this->disabled) {
             $this->setDropdownOption('allowTab', false);
-            $this->removeClass('search');
             if ($this->multiple) {
-                $this->js(true)->find('a i.delete.icon')->attr('class', 'disabled');
+                $this->jsDropdown(true)->find('a i.delete.icon')->attr('class', 'disabled');
             }
         }
 
         if ($this->disabled) {
-            $this->addClass('disabled');
+            $this->template->set('disabledClass', ' disabled');
             $this->template->dangerouslySetHtml('disabled', 'disabled="disabled"');
         } elseif ($this->readOnly) {
-            $this->addClass('read-only');
+            $this->template->set('disabledClass', ' read-only');
             $this->template->dangerouslySetHtml('disabled', 'readonly="readonly"');
 
             $this->setDropdownOption('allowTab', false);
diff --git a/src/Form/Control/DropdownCascade.php b/src/Form/Control/DropdownCascade.php
index 7331e9b004..9d784c6902 100644
--- a/src/Form/Control/DropdownCascade.php
+++ b/src/Form/Control/DropdownCascade.php
@@ -43,12 +43,12 @@ protected function init(): void
         $expr = [
             function (Jquery $j) use ($cascadeFromValue) {
                 return new JsBlock([
-                    $this->js()->dropdown('change values', $this->getNewValues($cascadeFromValue)),
-                    $this->js()->removeClass('loading'),
+                    $this->jsDropdown()->dropdown('change values', $this->getNewValues($cascadeFromValue)),
+                    $this->jsDropdown()->removeClass('loading'),
                 ]);
             },
-            $this->js()->dropdown('clear'),
-            $this->js()->addClass('loading'),
+            $this->jsDropdown()->dropdown('clear'),
+            $this->jsDropdown()->addClass('loading'),
         ];
 
         $this->cascadeFrom->onChange($expr, ['args' => [$this->cascadeFrom->name => $this->cascadeFrom->jsInput()->val()]]);
diff --git a/src/Form/Control/Lookup.php b/src/Form/Control/Lookup.php
index dee85d487e..646716be1c 100644
--- a/src/Form/Control/Lookup.php
+++ b/src/Form/Control/Lookup.php
@@ -13,6 +13,7 @@
 use Atk4\Ui\Js\Jquery;
 use Atk4\Ui\Js\JsBlock;
 use Atk4\Ui\Js\JsExpression;
+use Atk4\Ui\Js\JsExpressionable;
 use Atk4\Ui\Js\JsFunction;
 use Atk4\Ui\Js\JsModal;
 use Atk4\Ui\Js\JsToast;
@@ -130,7 +131,6 @@ protected function init(): void
         parent::init();
 
         $this->template->set([
-            'inputId' => $this->name . '-ac',
             'placeholder' => $this->placeholder,
         ]);
 
@@ -142,6 +142,17 @@ protected function init(): void
         });
     }
 
+    /**
+     * @param bool|string      $when
+     * @param JsExpressionable $action
+     *
+     * @return Jquery
+     */
+    protected function jsDropdown($when = false, $action = null): JsExpressionable
+    {
+        return $this->js($when, $action, 'div.ui.dropdown:has(> #' . $this->name . '_input)');
+    }
+
     /**
      * Returns URL which would respond with first 50 matching records.
      */
@@ -261,7 +272,7 @@ protected function initQuickNewRecord(): void
                 $res->addStatement((new Jquery())->closest('.atk-modal')->modal('hide'));
 
                 $row = $this->renderRow($form->model);
-                $chain = new Jquery('#' . $this->name . '-ac');
+                $chain = $this->jsDropdown();
                 $chain->dropdown('set value', $row['value'])->dropdown('set text', $row['title']);
                 $res->addStatement($chain);
 
@@ -371,7 +382,7 @@ protected function renderView(): void
             ], $this->apiConfig['data'] ?? []);
         }
 
-        $chain = new Jquery('#' . $this->name . '-ac');
+        $chain = $this->jsDropdown();
 
         $this->initDropdown($chain);
 
diff --git a/template/form/control/dropdown.html b/template/form/control/dropdown.html
index 3ed593cbc6..741ac3c9b7 100644
--- a/template/form/control/dropdown.html
+++ b/template/form/control/dropdown.html
@@ -1,6 +1,7 @@
 
 <div {$attributes}>
 {$BeforeInput}{$AfterBeforeInput}
+<div class="ui dropdown {$multipleClass} search selection{$disabledClass}" style="width: 100%;">
 {$Input}
 <i class="dropdown icon"></i>
 <input class="search" {$disabled} style="width: 100%;">
@@ -9,5 +10,6 @@
 {Item}<div class="item" data-value="{$value}">{Icon}<i class="{$iconClass}"></i>{/Icon}{$title}</div>
 {/Item}
 </div>
+</div>
 {$AfterInput}{$AfterAfterInput}
 </div>
diff --git a/template/form/control/dropdown.pug b/template/form/control/dropdown.pug
index ee260debe7..e4f8894b3f 100644
--- a/template/form/control/dropdown.pug
+++ b/template/form/control/dropdown.pug
@@ -1,5 +1,6 @@
 | <div {$attributes}>
 | {$BeforeInput}{$AfterBeforeInput}
+| <div class="ui dropdown {$multipleClass} search selection{$disabledClass}" style="width: 100%;">
 | {$Input}
 | <i class="dropdown icon"></i>
 | <input class="search" {$disabled} style="width: 100%;">
@@ -8,6 +9,7 @@
 | {Item}<div class="item" data-value="{$value}">{Icon}<i class="{$iconClass}"></i>{/Icon}{$title}</div>
 | {/Item}
 | </div>
+| </div>
 | {$AfterInput}{$AfterAfterInput}
 | </div>
 = "\n"
diff --git a/template/form/control/lookup.html b/template/form/control/lookup.html
index 1dad4cc939..13fe41db5f 100644
--- a/template/form/control/lookup.html
+++ b/template/form/control/lookup.html
@@ -1,7 +1,7 @@
 
 <div {$attributes}>
 {$BeforeInput}{$AfterBeforeInput}
-<div id="{$inputId}" class="ui {$multipleClass} search selection dropdown{$disabledClass}" style="width: 100%;">
+<div class="ui dropdown {$multipleClass} search selection{$disabledClass}" style="width: 100%;">
 {$Input}
 <i class="dropdown icon"></i>
 <input class="search" value="{$value}" {$disabled} style="width: 100%;">
diff --git a/template/form/control/lookup.pug b/template/form/control/lookup.pug
index 88bc850454..ecf7d80b77 100644
--- a/template/form/control/lookup.pug
+++ b/template/form/control/lookup.pug
@@ -1,6 +1,6 @@
 | <div {$attributes}>
 | {$BeforeInput}{$AfterBeforeInput}
-| <div id="{$inputId}" class="ui {$multipleClass} search selection dropdown{$disabledClass}" style="width: 100%;">
+| <div class="ui dropdown {$multipleClass} search selection{$disabledClass}" style="width: 100%;">
 | {$Input}
 | <i class="dropdown icon"></i>
 | <input class="search" value="{$value}" {$disabled} style="width: 100%;">

From 5345795433b8c70b04a8c24a1f27df4d3b994975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Mon, 5 Jun 2023 08:55:57 +0200
Subject: [PATCH 11/13] no separator space in template class values

---
 src/Form/Control/Dropdown.php       | 4 ++--
 src/Form/Control/Lookup.php         | 4 ++--
 src/Form/Control/Radio.php          | 4 ++--
 template/form/control/dropdown.html | 2 +-
 template/form/control/dropdown.pug  | 2 +-
 template/form/control/lookup.html   | 2 +-
 template/form/control/lookup.pug    | 2 +-
 template/form/control/radio.html    | 2 +-
 template/form/control/radio.pug     | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Form/Control/Dropdown.php b/src/Form/Control/Dropdown.php
index d28f13e6bf..ac3d41b8f1 100644
--- a/src/Form/Control/Dropdown.php
+++ b/src/Form/Control/Dropdown.php
@@ -232,10 +232,10 @@ protected function renderView(): void
         }
 
         if ($this->disabled) {
-            $this->template->set('disabledClass', ' disabled');
+            $this->template->set('disabledClass', 'disabled');
             $this->template->dangerouslySetHtml('disabled', 'disabled="disabled"');
         } elseif ($this->readOnly) {
-            $this->template->set('disabledClass', ' read-only');
+            $this->template->set('disabledClass', 'read-only');
             $this->template->dangerouslySetHtml('disabled', 'readonly="readonly"');
 
             $this->setDropdownOption('allowTab', false);
diff --git a/src/Form/Control/Lookup.php b/src/Form/Control/Lookup.php
index 646716be1c..bddf76923f 100644
--- a/src/Form/Control/Lookup.php
+++ b/src/Form/Control/Lookup.php
@@ -363,12 +363,12 @@ protected function renderView(): void
         }
 
         if ($this->disabled) {
-            $this->template->set('disabledClass', ' disabled');
+            $this->template->set('disabledClass', 'disabled');
             $this->template->dangerouslySetHtml('disabled', 'disabled="disabled"');
 
             $this->settings['allowTab'] = false;
         } elseif ($this->readOnly) {
-            $this->template->set('disabledClass', ' read-only');
+            $this->template->set('disabledClass', 'read-only');
             $this->template->dangerouslySetHtml('disabled', 'readonly="readonly"');
 
             $this->settings['allowTab'] = false;
diff --git a/src/Form/Control/Radio.php b/src/Form/Control/Radio.php
index 869c8c170e..121f71bdf3 100644
--- a/src/Form/Control/Radio.php
+++ b/src/Form/Control/Radio.php
@@ -40,10 +40,10 @@ protected function renderView(): void
 
         $this->lister->onHook(Lister::HOOK_BEFORE_ROW, function (Lister $lister) use ($value) {
             if ($this->disabled) {
-                $lister->tRow->dangerouslySetHtml('disabledClass', ' disabled');
+                $lister->tRow->dangerouslySetHtml('disabledClass', 'disabled');
                 $lister->tRow->dangerouslySetHtml('disabled', 'disabled="disabled"');
             } elseif ($this->readOnly) {
-                $lister->tRow->dangerouslySetHtml('disabledClass', ' read-only');
+                $lister->tRow->dangerouslySetHtml('disabledClass', 'read-only');
                 $lister->tRow->dangerouslySetHtml('disabled', 'readonly="readonly"');
             }
 
diff --git a/template/form/control/dropdown.html b/template/form/control/dropdown.html
index 741ac3c9b7..5264babab1 100644
--- a/template/form/control/dropdown.html
+++ b/template/form/control/dropdown.html
@@ -1,7 +1,7 @@
 
 <div {$attributes}>
 {$BeforeInput}{$AfterBeforeInput}
-<div class="ui dropdown {$multipleClass} search selection{$disabledClass}" style="width: 100%;">
+<div class="ui dropdown {$multipleClass} search selection {$disabledClass}" style="width: 100%;">
 {$Input}
 <i class="dropdown icon"></i>
 <input class="search" {$disabled} style="width: 100%;">
diff --git a/template/form/control/dropdown.pug b/template/form/control/dropdown.pug
index e4f8894b3f..f1b5f4bf5e 100644
--- a/template/form/control/dropdown.pug
+++ b/template/form/control/dropdown.pug
@@ -1,6 +1,6 @@
 | <div {$attributes}>
 | {$BeforeInput}{$AfterBeforeInput}
-| <div class="ui dropdown {$multipleClass} search selection{$disabledClass}" style="width: 100%;">
+| <div class="ui dropdown {$multipleClass} search selection {$disabledClass}" style="width: 100%;">
 | {$Input}
 | <i class="dropdown icon"></i>
 | <input class="search" {$disabled} style="width: 100%;">
diff --git a/template/form/control/lookup.html b/template/form/control/lookup.html
index 13fe41db5f..ea57f55456 100644
--- a/template/form/control/lookup.html
+++ b/template/form/control/lookup.html
@@ -1,7 +1,7 @@
 
 <div {$attributes}>
 {$BeforeInput}{$AfterBeforeInput}
-<div class="ui dropdown {$multipleClass} search selection{$disabledClass}" style="width: 100%;">
+<div class="ui dropdown {$multipleClass} search selection {$disabledClass}" style="width: 100%;">
 {$Input}
 <i class="dropdown icon"></i>
 <input class="search" value="{$value}" {$disabled} style="width: 100%;">
diff --git a/template/form/control/lookup.pug b/template/form/control/lookup.pug
index ecf7d80b77..99f2cc9c94 100644
--- a/template/form/control/lookup.pug
+++ b/template/form/control/lookup.pug
@@ -1,6 +1,6 @@
 | <div {$attributes}>
 | {$BeforeInput}{$AfterBeforeInput}
-| <div class="ui dropdown {$multipleClass} search selection{$disabledClass}" style="width: 100%;">
+| <div class="ui dropdown {$multipleClass} search selection {$disabledClass}" style="width: 100%;">
 | {$Input}
 | <i class="dropdown icon"></i>
 | <input class="search" value="{$value}" {$disabled} style="width: 100%;">
diff --git a/template/form/control/radio.html b/template/form/control/radio.html
index 6454b69940..94e4286c24 100644
--- a/template/form/control/radio.html
+++ b/template/form/control/radio.html
@@ -1,7 +1,7 @@
 
 <div {$attributes}>
 {Radio}{rows}{row}
-<div class="field"><div class="ui checkbox radio{$disabledClass}">
+<div class="field"><div class="ui checkbox radio {$disabledClass}">
 <input id="{$_id}_input" type="radio" name="{$_name}" value="{$id}" {$checked} {$disabled}>
 <label for="{$_id}_input">{$name}</label>
 </div></div>
diff --git a/template/form/control/radio.pug b/template/form/control/radio.pug
index c626021a29..b2d741e437 100644
--- a/template/form/control/radio.pug
+++ b/template/form/control/radio.pug
@@ -1,6 +1,6 @@
 | <div {$attributes}>
 | {Radio}{rows}{row}
-| <div class="field"><div class="ui checkbox radio{$disabledClass}">
+| <div class="field"><div class="ui checkbox radio {$disabledClass}">
 | <input id="{$_id}_input" type="radio" name="{$_name}" value="{$id}" {$checked} {$disabled}>
 | <label for="{$_id}_input">{$name}</label>
 | </div></div>

From 5a227ec09219bf092087a4503714f64efdf55dc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Mon, 5 Jun 2023 11:06:43 +0200
Subject: [PATCH 12/13] fix test name typo

---
 tests/{ForFieldUiTest.php => FormFieldUiTest.php} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename tests/{ForFieldUiTest.php => FormFieldUiTest.php} (97%)

diff --git a/tests/ForFieldUiTest.php b/tests/FormFieldUiTest.php
similarity index 97%
rename from tests/ForFieldUiTest.php
rename to tests/FormFieldUiTest.php
index 994f8c2940..a136e1d028 100644
--- a/tests/ForFieldUiTest.php
+++ b/tests/FormFieldUiTest.php
@@ -25,7 +25,7 @@ protected function init(): void
  * Test is designed to verify that field which is explicitly editable should appear and be editable
  * even if 'neverPersist' is set to true.
  */
-class ForFieldUiTest extends TestCase
+class FormFieldUiTest extends TestCase
 {
     use CreateAppTrait;
 

From 4e034abe27b425a461a336f4e344c0634d7670fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Mon, 5 Jun 2023 11:39:48 +0200
Subject: [PATCH 13/13] fix/adjust phpstan v1.10.16

---
 phpstan.neon.dist | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 5bc09afbe5..ce0a88d499 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -224,7 +224,7 @@ parameters:
         # TODO fix contravariance for View::set() method
         -
             path: 'src/Console.php'
-            message: '~^Parameter #1 \$fx \(Closure\(\$this\(Atk4\\Ui\\Console\)\): void\) of method Atk4\\Ui\\Console::set\(\) should be contravariant with parameter \$arg1 \(mixed\) of method Atk4\\Ui\\View::set\(\)$~'
+            message: '~^Parameter #1 \$fx \(Closure\(\$this\): void\) of method Atk4\\Ui\\Console::set\(\) should be contravariant with parameter \$arg1 \(mixed\) of method Atk4\\Ui\\View::set\(\)$~'
         -
             path: 'src/Console.php'
             message: '~^Parameter #2 \$event \(bool\|string\) of method Atk4\\Ui\\Console::set\(\) should be contravariant with parameter \$arg2 \(mixed\) of method Atk4\\Ui\\View::set\(\)$~'
@@ -233,16 +233,16 @@ parameters:
             message: '~^Parameter #2 \$ignore \(\*NEVER\*\) of method Atk4\\Ui\\Form\\Control::set\(\) should be compatible with parameter \$arg2 \(mixed\) of method Atk4\\Ui\\View::set\(\)$~'
         -
             path: 'src/Form/Control/Calendar.php'
-            message: '~^Parameter #1 \$expr \(Atk4\\Ui\\Js\\JsExpressionable\) of method Atk4\\Ui\\Form\\Control\\Calendar::onChange\(\) should be contravariant with parameter \$expr \(array{Closure\(Atk4\\Ui\\Js\\Jquery, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed\): Atk4\\Ui\\Js\\JsExpressionable\|Atk4\\Ui\\View\|string\|void}\|Atk4\\Ui\\Js\\JsExpressionable\|\(Closure\(Atk4\\Ui\\Js\\Jquery, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed\): Atk4\\Ui\\Js\\JsExpressionable\|Atk4\\Ui\\View\|string\|void\)\) of method Atk4\\Ui\\Form\\Control::onChange\(\)$~'
+            message: '~^Parameter #1 \$expr \(Atk4\\Ui\\Js\\JsExpressionable\) of method Atk4\\Ui\\Form\\Control\\Calendar::onChange\(\) should be contravariant with parameter \$expr \(array\{Closure\(Atk4\\Ui\\Js\\Jquery, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed\): \(Atk4\\Ui\\Js\\JsExpressionable\|Atk4\\Ui\\View\|string\|void\)\}\|Atk4\\Ui\\Js\\JsExpressionable\|\(Closure\(Atk4\\Ui\\Js\\Jquery, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed\): \(Atk4\\Ui\\Js\\JsExpressionable\|Atk4\\Ui\\View\|string\|void\)\)\) of method Atk4\\Ui\\Form\\Control::onChange\(\)$~'
         -
             path: 'src/Form/Control/Upload.php'
             message: '~^Parameter #1 \$fileId \(string\) of method Atk4\\Ui\\Form\\Control\\Upload::set\(\) should be contravariant with parameter \$value \(mixed\) of method Atk4\\Ui\\Form\\Control::set\(\)$~'
         -
             path: 'src/JsCallback.php'
-            message: '~^Parameter #1 \$fx \(Closure\(Atk4\\Ui\\Js\\Jquery, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed\): Atk4\\Ui\\Js\\JsExpressionable\|Atk4\\Ui\\View\|string\|void\) of method Atk4\\Ui\\JsCallback::set\(\) should be contravariant with parameter \$fx \(Closure\(mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed\): mixed\) of method Atk4\\Ui\\Callback::set\(\)$~'
+            message: '~^Parameter #1 \$fx \(Closure\(Atk4\\Ui\\Js\\Jquery, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed\): \(Atk4\\Ui\\Js\\JsExpressionable\|Atk4\\Ui\\View\|string\|void\)\) of method Atk4\\Ui\\JsCallback::set\(\) should be contravariant with parameter \$fx \(Closure\(mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed\): mixed\) of method Atk4\\Ui\\Callback::set\(\)$~'
         -
             path: 'src/Loader.php'
-            message: '~^Parameter #1 \$fx \(Closure\(\$this\(Atk4\\Ui\\Loader\)\): void\) of method Atk4\\Ui\\Loader::set\(\) should be contravariant with parameter \$arg1 \(mixed\) of method Atk4\\Ui\\View::set\(\)$~'
+            message: '~^Parameter #1 \$fx \(Closure\(\$this\): void\) of method Atk4\\Ui\\Loader::set\(\) should be contravariant with parameter \$arg1 \(mixed\) of method Atk4\\Ui\\View::set\(\)$~'
         -
             path: 'src/Loader.php'
             message: '~^Parameter #2 \$ignore \(\*NEVER\*\) of method Atk4\\Ui\\Loader::set\(\) should be compatible with parameter \$arg2 \(mixed\) of method Atk4\\Ui\\View::set\(\)$~'
@@ -260,10 +260,10 @@ parameters:
             message: '~^Parameter #2 \$ignore \(\*NEVER\*\) of method Atk4\\Ui\\Popup::set\(\) should be compatible with parameter \$arg2 \(mixed\) of method Atk4\\Ui\\View::set\(\)$~'
         -
             path: 'src/VirtualPage.php'
-            message: '~^Parameter #1 \$fx \(Closure\(\$this\(Atk4\\Ui\\VirtualPage\), mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed\): void\) of method Atk4\\Ui\\VirtualPage::set\(\) should be contravariant with parameter \$arg1 \(mixed\) of method Atk4\\Ui\\View::set\(\)$~'
+            message: '~^Parameter #1 \$fx \(Closure\(\$this, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed\): void\) of method Atk4\\Ui\\VirtualPage::set\(\) should be contravariant with parameter \$arg1 \(mixed\) of method Atk4\\Ui\\View::set\(\)$~'
         -
             path: 'src/VirtualPage.php'
-            message: '~^Parameter #1 \$fx of method Atk4\\Ui\\Callback::set\(\) expects \(Closure\(mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed\): void\)\|null, Closure\(\$this\(Atk4\\Ui\\VirtualPage\), mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed\): void given.$~'
+            message: '~^Parameter #1 \$fx of method Atk4\\Ui\\Callback::set\(\) expects \(Closure\(mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed\): void\)\|null, Closure\(\$this, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed, mixed\): void given\.$~'
         -
             path: 'src/VirtualPage.php'
             message: '~^Parameter #2 \$fxArgs \(array\) of method Atk4\\Ui\\VirtualPage::set\(\) should be contravariant with parameter \$arg2 \(mixed\) of method Atk4\\Ui\\View::set\(\)$~'