From 933b4bb4cb64f19f5fde0e4551ab23e2068bd297 Mon Sep 17 00:00:00 2001
From: Djordje Vlaisavljevic <dzvlais@gmail.com>
Date: Wed, 17 May 2023 13:58:13 +0100
Subject: [PATCH] Removed autofocus from inline feedback forms

refs https://github.com/TryGhost/Team/issues/3231
---
 ghost/admin/app/components/feedback-lexical/editor-dropdown.hbs | 1 +
 ghost/admin/app/components/feedback-lexical/labs-form.hbs       | 1 +
 .../app/components/feedback-lexical/post-complete-form.hbs      | 1 +
 ghost/admin/app/components/feedback-lexical/textarea.hbs        | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ghost/admin/app/components/feedback-lexical/editor-dropdown.hbs b/ghost/admin/app/components/feedback-lexical/editor-dropdown.hbs
index ebab4a4e0b..4c17567c89 100644
--- a/ghost/admin/app/components/feedback-lexical/editor-dropdown.hbs
+++ b/ghost/admin/app/components/feedback-lexical/editor-dropdown.hbs
@@ -26,6 +26,7 @@
                     <FeedbackLexical::Textarea
                         @feedbackMessage={{this.feedbackMessage}}
                         @updateFeedbackMessage={{this.updateFeedbackMessage}}
+                        @shouldFocus={{true}}
                     />
                 </div>
 
diff --git a/ghost/admin/app/components/feedback-lexical/labs-form.hbs b/ghost/admin/app/components/feedback-lexical/labs-form.hbs
index 757bfe48ad..1ad54a35f3 100644
--- a/ghost/admin/app/components/feedback-lexical/labs-form.hbs
+++ b/ghost/admin/app/components/feedback-lexical/labs-form.hbs
@@ -2,6 +2,7 @@
     @feedbackMessage={{this.feedbackMessage}}
     @updateFeedbackMessage={{this.updateFeedbackMessage}}
     @label="Have any issues? Feedback? Let us know below!"
+    @shouldFocus={{false}}
 />
 
 <FeedbackLexical::SendButton
diff --git a/ghost/admin/app/components/feedback-lexical/post-complete-form.hbs b/ghost/admin/app/components/feedback-lexical/post-complete-form.hbs
index abf672f93d..5b6d15bda6 100644
--- a/ghost/admin/app/components/feedback-lexical/post-complete-form.hbs
+++ b/ghost/admin/app/components/feedback-lexical/post-complete-form.hbs
@@ -5,6 +5,7 @@
         @feedbackMessage={{this.feedbackMessage}}
         @updateFeedbackMessage={{this.updateFeedbackMessage}}
         @label="Feedback"
+        @shouldFocus={{false}}
     />
     <FeedbackLexical::SendButton
         @feedbackMessage={{this.feedbackMessage}}
diff --git a/ghost/admin/app/components/feedback-lexical/textarea.hbs b/ghost/admin/app/components/feedback-lexical/textarea.hbs
index 5d1e56a0fb..f089238e88 100644
--- a/ghost/admin/app/components/feedback-lexical/textarea.hbs
+++ b/ghost/admin/app/components/feedback-lexical/textarea.hbs
@@ -8,7 +8,7 @@
             @name="feedback-lexical"
             @value={{@feedbackMessage}}
             @placeholder="I've noticed that..."
-            @shouldFocus={{true}}
+            @shouldFocus={{@shouldFocus}}
             data-test-lexical-feedback-textarea
             {{on "input" @updateFeedbackMessage}}
         />