resloved bug:16837

Author: VishalS-Microsoft

src/frontend/src/components/ChatHistory/ChatHistoryListItem.tsx

@@ -225,8 +225,14 @@ export const ChatHistoryListItemCell: React.FC<ChatHistoryListItemCellProps> = (
       tabIndex={0}
       aria-label="chat history item"
       className={styles.itemCell}
-      onClick={() => handleSelectItem()}
-      onKeyDown={e => (e.key === 'Enter' || e.key === ' ' ? handleSelectItem() : null)}
+      onClick={() => {if (!edit) handleSelectItem()}}
+      onKeyDown={e => {
+        if (!edit && (e.key === 'Enter' || e.key === ' ')) {
+          handleSelectItem();
+        } else {
+          e.stopPropagation(); // stop from reaching here when editing
+        }
+      }}
       verticalAlign="center"
       // horizontal
       onMouseEnter={() => setIsHovered(true)}
@@ -258,7 +264,7 @@ export const ChatHistoryListItemCell: React.FC<ChatHistoryListItemCellProps> = (
                     <Stack aria-label="action button group" horizontal verticalAlign={'center'}>
                       <IconButton
                         role="button"
-                        disabled={errorRename !== undefined}
+                        disabled={errorRename !== undefined || editTitle == item.title}
                         onKeyDown={e => (e.key === ' ' || e.key === 'Enter' ? handleSaveEdit(e) : null)}
                         onClick={e => handleSaveEdit(e)}
                         aria-label="confirm new title"
@@ -311,13 +317,21 @@ export const ChatHistoryListItemCell: React.FC<ChatHistoryListItemCellProps> = (
                   disabled={isButtonDisabled}
                   onKeyDown={e => (e.key === ' ' ? toggleDeleteDialog() : null)}
                 />
-                <IconButton
+               <IconButton
                   className={styles.itemButton}
                   iconProps={{ iconName: 'Edit' }}
                   title="Edit"
-                  onClick={onEdit}
+                  onClick={(e) => {
+                    e.stopPropagation(); // Prevent triggering parent click
+                    onEdit();
+                  }}
                   disabled={isButtonDisabled}
-                  onKeyDown={e => (e.key === ' ' ? onEdit() : null)}
+                  onKeyDown={(e) => {
+                    if (e.key === ' ') {
+                      e.stopPropagation(); // Prevent triggering parent keydown
+                      onEdit();
+                    }
+                  }}
                 />
               </Stack>
             )}

src/frontend/src/components/ChatHistory/chatHistoryListItem.test.tsx

@@ -487,10 +487,6 @@ describe('ChatHistoryListItemCell', () => {
     // Simulate clicking the confirm button
     userEvent.click(screen.getByRole('button', { name: 'confirm new title' }))
 
-    // Wait for the error message to appear
-    await waitFor(() => {
-      expect(screen.getByText(/Error: Enter a new title to proceed./i)).toBeInTheDocument()
-    })
 
     // Wait for the error message to disappear after 5 seconds
     await waitFor(() => expect(screen.queryByText('Error: Enter a new title to proceed.')).not.toBeInTheDocument(), {
@@ -550,18 +546,11 @@ describe('ChatHistoryListItemCell', () => {
       await userEvent.type(inputItem, 'update Chat')
     })
 
-    userEvent.click(screen.getByRole('button', { name: 'confirm new title' }))
-
-    await waitFor(() => {
-      expect(screen.getByText(/Error: Enter a new title to proceed./i)).toBeInTheDocument()
-    })
 
     // Wait for the error to be hidden after 5 seconds
     await waitFor(() => expect(screen.queryByText('Error: could not rename item')).not.toBeInTheDocument(), {
       timeout: 6000
     })
-    const input = screen.getByLabelText('chat history item')
-    expect(input).toHaveFocus()
   }, 10000)
 
   test('shows error when trying to rename to an existing title', async () => {