Fix issues after rebase

Author: om-ukr

package-lock.json

@@ -70,6 +70,7 @@ describe('CommentForm', () => {
         currentUser: mockUser,
         onSave: jest.fn(),
         mentionsProvider: undefined,
+        handleEditorFocus: jest.fn(),
     };
 
     beforeEach(() => {

src/react/atlascode/common/CommentForm.test.tsx

@@ -70,6 +70,7 @@ describe('InlineRenderedTextEditor', () => {
     const defaultProps = {
         rawContent: 'Raw content text',
         htmlContent: '<p>HTML content text</p>',
+        handleEditorFocus: jest.fn(),
     };
 
     const mockMentionsProvider = {
@@ -221,7 +222,7 @@ describe('InlineRenderedTextEditor', () => {
         });
 
         it('handles empty content gracefully', () => {
-            render(<InlineRenderedTextEditor rawContent="" htmlContent="" />);
+            render(<InlineRenderedTextEditor rawContent="" htmlContent="" handleEditorFocus={jest.fn()} />);
 
             const typography = screen.getByTestId('typography');
             const htmlElement = typography.querySelector('span');
@@ -232,7 +233,11 @@ describe('InlineRenderedTextEditor', () => {
             const specialContent = '<p>&lt;script&gt;alert("test")&lt;/script&gt;</p>';
 
             render(
-                <InlineRenderedTextEditor rawContent="<script>alert('test')</script>" htmlContent={specialContent} />,
+                <InlineRenderedTextEditor
+                    rawContent="<script>alert('test')</script>"
+                    htmlContent={specialContent}
+                    handleEditorFocus={jest.fn()}
+                />,
             );
 
             const typography = screen.getByTestId('typography');

src/react/atlascode/pullrequest/InlineRenderedTextEditor.test.tsx

@@ -68,6 +68,8 @@ const InlineRenderedTextEditor: React.FC<InlineTextEditorProps> = (props: Inline
                 onCancel={exitEditMode}
                 mentionProvider={props.mentionsProvider ? Promise.resolve(props.mentionsProvider) : undefined}
                 isBitbucket={true}
+                onFocus={() => props.handleEditorFocus(true)}
+                onBlur={() => props.handleEditorFocus(false)}
             />
         </div>
     ) : (

src/react/atlascode/pullrequest/InlineRenderedTextEditor.tsx

@@ -85,6 +85,7 @@ describe('NestedCommentList', () => {
         fetchUsers: jest.fn(),
         onDelete: jest.fn(),
         pullRequestState: 'OPEN' as PullRequestState,
+        handleEditorFocus: jest.fn(),
     };
 
     const mockMentionsProvider = {