From b8e61577385de7abc5a6cb77efaa04deeafe341b Mon Sep 17 00:00:00 2001
From: Michael <michaelvickers.uk@gmail.com>
Date: Sun, 4 Oct 2020 18:31:49 +0100
Subject: [PATCH] Add ARIA label to form text editor without label

---
 app/Helper/FormHelper.php             | 1 +
 app/Helper/TaskHelper.php             | 2 +-
 app/Template/comment/create.php       | 2 +-
 app/Template/comment/edit.php         | 2 +-
 app/Template/comment_list/create.php  | 2 +-
 app/Template/comment_mail/create.php  | 2 +-
 app/Template/task_comments/create.php | 2 +-
 assets/js/components/text-editor.js   | 4 ++++
 8 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/Helper/FormHelper.php b/app/Helper/FormHelper.php
index 95f9cb40d..d2c527a0e 100644
--- a/app/Helper/FormHelper.php
+++ b/app/Helper/FormHelper.php
@@ -237,6 +237,7 @@ class FormHelper extends Base
             'labelWrite' => t('Write'),
             'labelTitle' => t('Title'),
             'placeholder' => t('Write your text in Markdown'),
+            'ariaLabel' => isset($attributes['aria-label']) ? $attributes['aria-label'] : '',
             'autofocus' => isset($attributes['autofocus']) && $attributes['autofocus'],
             'suggestOptions' => array(
                 'triggers' => array(
diff --git a/app/Helper/TaskHelper.php b/app/Helper/TaskHelper.php
index 236c61959..d01ec93c0 100644
--- a/app/Helper/TaskHelper.php
+++ b/app/Helper/TaskHelper.php
@@ -60,7 +60,7 @@ class TaskHelper extends Base
 
     public function renderDescriptionField(array $values, array $errors)
     {
-        return $this->helper->form->textEditor('description', $values, $errors, array('tabindex' => 2));
+        return $this->helper->form->textEditor('description', $values, $errors, array('tabindex' => 2, 'aria-label' => t('Description')));
     }
 
     public function renderDescriptionTemplateDropdown($projectId)
diff --git a/app/Template/comment/create.php b/app/Template/comment/create.php
index 55e972dc0..95269c762 100644
--- a/app/Template/comment/create.php
+++ b/app/Template/comment/create.php
@@ -9,7 +9,7 @@
 <form method="post" action="<?= $this->url->href('CommentController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
 
-    <?= $this->form->textEditor('comment', $values, $errors, array('autofocus' => true, 'required' => true)) ?>
+    <?= $this->form->textEditor('comment', $values, $errors, array('autofocus' => true, 'required' => true, 'aria-label' => t('New comment'))) ?>
 
     <?= $this->modal->submitButtons() ?>
 </form>
diff --git a/app/Template/comment/edit.php b/app/Template/comment/edit.php
index db8d2921f..fc91dcc77 100644
--- a/app/Template/comment/edit.php
+++ b/app/Template/comment/edit.php
@@ -5,7 +5,7 @@
 <form method="post" action="<?= $this->url->href('CommentController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'comment_id' => $comment['id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
 
-    <?= $this->form->textEditor('comment', $values, $errors, array('autofocus' => true, 'required' => true)) ?>
+    <?= $this->form->textEditor('comment', $values, $errors, array('autofocus' => true, 'required' => true, 'aria-label' => t('Comment'))) ?>
 
     <?= $this->modal->submitButtons() ?>
 </form>
diff --git a/app/Template/comment_list/create.php b/app/Template/comment_list/create.php
index 4c86bc061..213b8ca99 100644
--- a/app/Template/comment_list/create.php
+++ b/app/Template/comment_list/create.php
@@ -3,6 +3,6 @@
 </div>
 <form method="post" action="<?= $this->url->href('CommentListController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
-    <?= $this->form->textEditor('comment', array('project_id' => $task['project_id']), array(), array('required' => true)) ?>
+    <?= $this->form->textEditor('comment', array('project_id' => $task['project_id']), array(), array('required' => true, 'aria-label' => t('New comment'))) ?>
     <?= $this->modal->submitButtons() ?>
 </form>
diff --git a/app/Template/comment_mail/create.php b/app/Template/comment_mail/create.php
index 84c241d37..8d5ceab7b 100644
--- a/app/Template/comment_mail/create.php
+++ b/app/Template/comment_mail/create.php
@@ -42,7 +42,7 @@
         </div>
     <?php endif ?>
 
-    <?= $this->form->textEditor('comment', $values, $errors, array('required' => true, 'tabindex' => 3)) ?>
+    <?= $this->form->textEditor('comment', $values, $errors, array('required' => true, 'tabindex' => 3, 'aria-label' => t('New comment'))) ?>
 
     <?= $this->modal->submitButtons(array(
         'submitLabel' => t('Send by email'),
diff --git a/app/Template/task_comments/create.php b/app/Template/task_comments/create.php
index 05b051200..7829cd297 100644
--- a/app/Template/task_comments/create.php
+++ b/app/Template/task_comments/create.php
@@ -3,6 +3,6 @@
     <?= $this->form->hidden('task_id', $values) ?>
     <?= $this->form->hidden('user_id', $values) ?>
 
-    <?= $this->form->textEditor('comment', $values, $errors, array('required' => true)) ?>
+    <?= $this->form->textEditor('comment', $values, $errors, array('required' => true, 'aria-label' => t('New comment'))) ?>
     <?= $this->modal->submitButtons() ?>
 </form>
diff --git a/assets/js/components/text-editor.js b/assets/js/components/text-editor.js
index b84de48d5..53de4138c 100644
--- a/assets/js/components/text-editor.js
+++ b/assets/js/components/text-editor.js
@@ -62,6 +62,10 @@ KB.component('text-editor', function (containerElement, options) {
             textareaElement.attr('required', 'required');
         }
 
+        if (options.ariaLabel) {
+            textareaElement.attr('aria-label', options.ariaLabel);
+        }
+
         // Order is important for IE11 (especially for the placeholder)
         var textWrapper = KB.dom(containerElement).find('script');
         textareaElement.html(textWrapper.innerHTML);