From 9a9ff001b63b6873ff391f17c8e30d535732be77 Mon Sep 17 00:00:00 2001 From: ariel_rodriguez Date: Thu, 20 Feb 2025 18:43:25 -0300 Subject: [PATCH 1/3] fix: change opacity tooltip --- src/components/Tabs/Tab.tsx | 1 - src/components/Tooltip/Tooltip.tsx | 12 ++---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/components/Tabs/Tab.tsx b/src/components/Tabs/Tab.tsx index ed5ccb13..1eebd1d8 100644 --- a/src/components/Tabs/Tab.tsx +++ b/src/components/Tabs/Tab.tsx @@ -140,7 +140,6 @@ const Tab = forwardRef( startAdornment={toolTipProps.startAdornment} position={toolTipProps.position ?? 'right'} content={toolTipProps.content ?? ''} - noOpacity={toolTipProps.noOpacity} > {renderTab()} diff --git a/src/components/Tooltip/Tooltip.tsx b/src/components/Tooltip/Tooltip.tsx index 6aef0fef..7887a903 100644 --- a/src/components/Tooltip/Tooltip.tsx +++ b/src/components/Tooltip/Tooltip.tsx @@ -37,12 +37,6 @@ export interface TooltipProps { * primary by default */ variant?: TooltipVariant - /** - * If true, the tooltip will use a solid color without any opacity. - * This is useful when you need a fully opaque background or text color. - * By default, this is set to false, allowing for transparency if defined in the variant styles. - */ - noOpacity?: boolean } const Tooltip: FC = ({ @@ -51,8 +45,7 @@ const Tooltip: FC = ({ endAdornment, position, startAdornment, - variant = 'primary', - noOpacity = false + variant = 'primary' }) => { const { isVisible, handleMouseEnter, handleMouseLeave, refs } = useTooltip({ placement: position @@ -68,9 +61,8 @@ const Tooltip: FC = ({ const colorVariants: { [key: string]: string } = { primary: composeClasses( - !noOpacity && 'opacity-70', fontSize.xs, - 'p-2 text-white rounded-md text-center bg-gray-900' + 'p-2 text-white rounded-md text-center bg-gray-900 opacity-90' ) } From 3a37362bf01778f6480d0a78f7ff0dafe85ceb4f Mon Sep 17 00:00:00 2001 From: ariel_rodriguez Date: Thu, 20 Feb 2025 18:54:25 -0300 Subject: [PATCH 2/3] fix: testing --- src/components/Tooltip/Tooltip.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Tooltip/Tooltip.tsx b/src/components/Tooltip/Tooltip.tsx index 7887a903..cae7d477 100644 --- a/src/components/Tooltip/Tooltip.tsx +++ b/src/components/Tooltip/Tooltip.tsx @@ -62,7 +62,7 @@ const Tooltip: FC = ({ const colorVariants: { [key: string]: string } = { primary: composeClasses( fontSize.xs, - 'p-2 text-white rounded-md text-center bg-gray-900 opacity-90' + 'p-2 text-white rounded-md text-center bg-gray-900 opacity-80' ) } From a9599489c214b260f30d21cfb79bf58fb63870bc Mon Sep 17 00:00:00 2001 From: ariel_rodriguez Date: Fri, 21 Feb 2025 14:04:26 -0300 Subject: [PATCH 3/3] fix: testing --- src/components/SideBar/SideBar.tsx | 1 + src/components/SideBar/SideBarItem.tsx | 120 +++++++++++++------------ src/components/Tooltip/Tooltip.tsx | 2 +- 3 files changed, 67 insertions(+), 56 deletions(-) diff --git a/src/components/SideBar/SideBar.tsx b/src/components/SideBar/SideBar.tsx index 91287f1f..a467c50d 100644 --- a/src/components/SideBar/SideBar.tsx +++ b/src/components/SideBar/SideBar.tsx @@ -38,6 +38,7 @@ export interface SideBarItemPropsBase { hidden?: boolean subItems?: SideBarItemPropsBase[] badge?: TBadge + toolTip?: string } export type SidebarDropdownListItem = { diff --git a/src/components/SideBar/SideBarItem.tsx b/src/components/SideBar/SideBarItem.tsx index 24bca153..b8652f24 100644 --- a/src/components/SideBar/SideBarItem.tsx +++ b/src/components/SideBar/SideBarItem.tsx @@ -94,48 +94,35 @@ const ListSubItems = ({ !isSubSubItem && 'pl-10 ml-4' )} > - {subItemsArray?.map( - (subItem, index: number) => - !subItem.hidden && ( -
- onToggleMenu(subItem, index)} - > - {subItem?.subItems && ( -
- {subItem.isOpen ? ( - - ) : ( - - )} -
- )} - {subItem?.title?.length > 25 ? ( - {subItem.title}} - > - - {subItem.title} - - - ) : ( + {subItemsArray?.map((subItem, index: number) => { + if (subItem.hidden) return null + + const renderSubItem = () => { + return ( + onToggleMenu(subItem, index)} + > + {subItem?.subItems && ( +
+ {subItem.isOpen ? ( + + ) : ( + + )} +
+ )} + {subItem?.title?.length > 25 ? ( + {subItem.title}} + > {subItem.title} - )} - {subItem?.badge && subItem?.badge} -
- {subItem.subItems && ( - + + ) : ( + + {subItem.title} + )} -
+ {subItem?.badge && subItem?.badge} + ) - )} + } + return ( +
+ {subItem.toolTip ? ( + {renderSubItem()} + ) : ( + renderSubItem() + )} + {subItem.subItems && ( + + )} +
+ ) + })} ) diff --git a/src/components/Tooltip/Tooltip.tsx b/src/components/Tooltip/Tooltip.tsx index cae7d477..3eb68a69 100644 --- a/src/components/Tooltip/Tooltip.tsx +++ b/src/components/Tooltip/Tooltip.tsx @@ -62,7 +62,7 @@ const Tooltip: FC = ({ const colorVariants: { [key: string]: string } = { primary: composeClasses( fontSize.xs, - 'p-2 text-white rounded-md text-center bg-gray-900 opacity-80' + `p-2 text-white rounded-md text-center bg-gray-900 opacity-90` ) }