From 9e955a095b865097f8c07104a13924dabea45d1b Mon Sep 17 00:00:00 2001
From: Ilya Bondar <ilya_bondar@epam.com>
Date: Thu, 9 Nov 2023 16:56:49 +0100
Subject: [PATCH] fix: fix overlapping of confirmation buttons by prompt name
 when user deletes the prompt (#54)

---
 .gitattributes                                |  1 +
 .../Chatbar/components/Conversation.tsx       |  4 ++--
 .../Promptbar/components/Prompt.tsx           | 21 ++++++++++++-------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index c091529f36..339f56602e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
+* text=auto eol=lf
 *.png filter=lfs diff=lfs merge=lfs -text
\ No newline at end of file
diff --git a/src/components/Chatbar/components/Conversation.tsx b/src/components/Chatbar/components/Conversation.tsx
index 964e17703d..a58221115e 100644
--- a/src/components/Chatbar/components/Conversation.tsx
+++ b/src/components/Chatbar/components/Conversation.tsx
@@ -217,7 +217,7 @@ export const ConversationComponent = ({ item: conversation, level }: Props) => {
   return (
     <div
       className={classNames(
-        'group relative flex h-[30px] items-center rounded border-l-2 pr-0.5 hover:bg-green/15',
+        'group relative flex h-[30px] items-center rounded border-l-2 pr-3 hover:bg-green/15',
         selectedConversationIds.includes(conversation.id)
           ? 'border-l-green bg-green/15'
           : 'border-l-transparent',
@@ -299,7 +299,7 @@ export const ConversationComponent = ({ item: conversation, level }: Props) => {
           <div
             className={classNames(
               'relative max-h-5 flex-1 truncate break-all text-left',
-              isDeleting || isRenaming ? 'pr-10' : 'group-hover:pr-7',
+              isDeleting ? 'mr-12' : 'group-hover:mr-4',
             )}
           >
             {conversation.name}
diff --git a/src/components/Promptbar/components/Prompt.tsx b/src/components/Promptbar/components/Prompt.tsx
index aa9059a895..e797f23013 100644
--- a/src/components/Promptbar/components/Prompt.tsx
+++ b/src/components/Promptbar/components/Prompt.tsx
@@ -45,6 +45,7 @@ export const PromptComponent = ({ item: prompt, level }: Props) => {
   const selectedPromptId = useAppSelector(
     PromptsSelectors.selectSelectedPromptId,
   );
+  const isSelected = selectedPromptId === prompt.id;
   const showModal = useAppSelector(PromptsSelectors.selectIsEditModalOpen);
 
   const [isDeleting, setIsDeleting] = useState(false);
@@ -173,9 +174,7 @@ export const PromptComponent = ({ item: prompt, level }: Props) => {
     <div
       className={classNames(
         'group relative flex h-[30px] shrink-0 cursor-pointer items-center rounded border-l-2 pr-3 transition-colors duration-200 hover:bg-violet/15',
-        selectedPromptId === prompt.id
-          ? 'border-l-violet bg-violet/15'
-          : 'border-l-transparent',
+        isSelected ? 'border-l-violet bg-violet/15' : 'border-l-transparent',
       )}
       style={{
         paddingLeft: (level && `${0.875 + level * 1.5}rem`) || '0.875rem',
@@ -191,7 +190,15 @@ export const PromptComponent = ({ item: prompt, level }: Props) => {
       >
         <IconBulb size={18} className="text-gray-500" />
 
-        <div className="relative max-h-5 flex-1 truncate break-all pr-4 text-left">
+        <div
+          className={classNames(
+            {
+              'mr-4 xl:mr-0': !isDeleting && !isRenaming && isSelected,
+            },
+            isDeleting ? 'mr-12' : 'group-hover:mr-4',
+            'relative max-h-5 flex-1 truncate break-all text-left',
+          )}
+        >
           {prompt.name}
         </div>
       </button>
@@ -222,7 +229,7 @@ export const PromptComponent = ({ item: prompt, level }: Props) => {
         <div
           className={classNames(
             'absolute right-3 z-50 flex justify-end xl:invisible xl:group-hover:visible',
-            selectedPromptId === prompt.id ? 'visible' : 'invisible',
+            isSelected ? 'visible' : 'invisible',
           )}
           ref={wrapperRef}
           onClick={stopBubbling}
@@ -253,10 +260,10 @@ export const PromptComponent = ({ item: prompt, level }: Props) => {
         )}
       </div>
 
-      {selectedPromptId === prompt.id && showModal && (
+      {isSelected && showModal && (
         <PromptModal
           prompt={prompt}
-          isOpen={selectedPromptId === prompt.id && showModal}
+          isOpen
           onClose={handleClose}
           onUpdatePrompt={handleUpdate}
         />