unify upload control template

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();

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([

src/Form/Control/UploadImage.php

@@ -48,22 +48,22 @@ 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);
     }
 
     /**
      * Clear the thumbnail src.
      */
     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);
     }
 }

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>

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>