From 4a2bb5eda8edc798ba873cfff38a45cad7d9af91 Mon Sep 17 00:00:00 2001
From: Pavlo Vinnyk <3381873+ur300@users.noreply.github.com>
Date: Thu, 4 Dec 2025 18:12:05 +0100
Subject: [PATCH] #1833 - Toolbar buttons are stuck to the main comment form
 (#1948)

* 1833 - Toolbar buttons are stuck to the main comment form

* Add readonly and JSDoc to CommentForm textareaId properties

Improve code quality based on review feedback: mark textareaId as
readonly since it should never change after construction, and add
JSDoc to static textareaCounter explaining its purpose.

---------

Co-authored-by: Dmitry Verkhoturov <paskal.07@gmail.com>
---
 .../components/comment-form/comment-form.spec.tsx   |  2 +-
 .../app/components/comment-form/comment-form.tsx    | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/frontend/apps/remark42/app/components/comment-form/comment-form.spec.tsx b/frontend/apps/remark42/app/components/comment-form/comment-form.spec.tsx
index 1214025a..5ff7c37d 100644
--- a/frontend/apps/remark42/app/components/comment-form/comment-form.spec.tsx
+++ b/frontend/apps/remark42/app/components/comment-form/comment-form.spec.tsx
@@ -40,7 +40,7 @@ function setup(overrideProps: Partial<Props> = {}, overrideConfig: Partial<typeo
 describe('<CommentForm />', () => {
   afterEach(() => {
     // reset textarea id in order to have `textarea_1` for every test
-    CommentForm.textareaId = 0;
+    CommentForm.textareaCounter = 0;
     localStorage.clear();
   });
 
diff --git a/frontend/apps/remark42/app/components/comment-form/comment-form.tsx b/frontend/apps/remark42/app/components/comment-form/comment-form.tsx
index 494e0ebc..5e774032 100644
--- a/frontend/apps/remark42/app/components/comment-form/comment-form.tsx
+++ b/frontend/apps/remark42/app/components/comment-form/comment-form.tsx
@@ -58,7 +58,10 @@ const ImageMimeRegex = /image\//i;
 export class CommentForm extends Component<Props, State> {
   /** reference to textarea element */
   textareaRef = createRef<HTMLTextAreaElement>();
-  static textareaId = 0;
+  /** global counter for generating unique textarea IDs across all instances */
+  static textareaCounter = 0;
+  /** unique textarea ID for this instance */
+  readonly textareaId: string;
 
   state = {
     preview: null,
@@ -75,7 +78,8 @@ export class CommentForm extends Component<Props, State> {
 
     const savedComment = getPersistedComment(props.id);
     this.state.text = props.value ?? savedComment ?? '';
-    CommentForm.textareaId += 1;
+    CommentForm.textareaCounter += 1;
+    this.textareaId = `textarea_${CommentForm.textareaCounter}`;
   }
 
   componentWillReceiveProps(nextProps: Props) {
@@ -416,7 +420,6 @@ export class CommentForm extends Component<Props, State> {
       edit: <FormattedMessage id="commentForm.save" defaultMessage="Save" />,
       reply: <FormattedMessage id="commentForm.reply" defaultMessage="Reply" />,
     };
-    const textareaId = `textarea_${CommentForm.textareaId}`;
     const label = buttonText || Labels[mode || 'main'];
     const placeholderMessage = intl.formatMessage(messages.placeholder);
     const isSimpleView = StaticStore.config.simple_view;
@@ -443,14 +446,14 @@ export class CommentForm extends Component<Props, State> {
               intl={intl}
               allowUpload={Boolean(uploadImage)}
               uploadImages={this.uploadImages}
-              textareaId={textareaId}
+              textareaId={this.textareaId}
             />
           </div>
         )}
         <div className="comment-form__field-wrapper">
           <TextExpander>
             <TextareaAutosize
-              id={textareaId}
+              id={this.textareaId}
               ref={this.textareaRef}
               onPaste={this.onPaste}
               className="comment-form__field"