diff --git a/packages/ui/src/tooltip/tooltip.tsx b/packages/ui/src/tooltip/tooltip.tsx index 75e302577bb..c81048ae938 100644 --- a/packages/ui/src/tooltip/tooltip.tsx +++ b/packages/ui/src/tooltip/tooltip.tsx @@ -43,7 +43,7 @@ export const Tooltip: React.FC = ({ openDelay = 200, closeDelay, isMobile = false, - renderByDefault = true, + renderByDefault = true, //FIXME: tooltip should always render on hover and not by default, this is a temporary fix }) => { const toolTipRef = useRef(null); diff --git a/web/core/components/dropdowns/buttons.tsx b/web/core/components/dropdowns/buttons.tsx index 125e264c161..4a49fb47a84 100644 --- a/web/core/components/dropdowns/buttons.tsx +++ b/web/core/components/dropdowns/buttons.tsx @@ -16,6 +16,7 @@ export type DropdownButtonProps = { tooltipHeading: string; showTooltip: boolean; variant: TButtonVariants; + renderToolTipByDefault?: boolean; }; type ButtonProps = { @@ -25,10 +26,20 @@ type ButtonProps = { tooltipContent: string | React.ReactNode; tooltipHeading: string; showTooltip: boolean; + renderToolTipByDefault?: boolean; }; export const DropdownButton: React.FC = (props) => { - const { children, className, isActive, tooltipContent, tooltipHeading, showTooltip, variant } = props; + const { + children, + className, + isActive, + tooltipContent, + renderToolTipByDefault = true, + tooltipHeading, + showTooltip, + variant, + } = props; const ButtonToRender: React.FC = BORDER_BUTTON_VARIANTS.includes(variant) ? BorderButton : BACKGROUND_BUTTON_VARIANTS.includes(variant) @@ -42,6 +53,7 @@ export const DropdownButton: React.FC = (props) => { tooltipContent={tooltipContent} tooltipHeading={tooltipHeading} showTooltip={showTooltip} + renderToolTipByDefault={renderToolTipByDefault} > {children} @@ -49,7 +61,7 @@ export const DropdownButton: React.FC = (props) => { }; const BorderButton: React.FC = (props) => { - const { children, className, isActive, tooltipContent, tooltipHeading, showTooltip } = props; + const { children, className, isActive, tooltipContent, renderToolTipByDefault, tooltipHeading, showTooltip } = props; const { isMobile } = usePlatformOS(); return ( @@ -58,7 +70,7 @@ const BorderButton: React.FC = (props) => { tooltipContent={tooltipContent} disabled={!showTooltip} isMobile={isMobile} - renderByDefault={false} + renderByDefault={renderToolTipByDefault} >
= (props) => { }; const BackgroundButton: React.FC = (props) => { - const { children, className, tooltipContent, tooltipHeading, showTooltip } = props; + const { children, className, tooltipContent, tooltipHeading, renderToolTipByDefault, showTooltip } = props; const { isMobile } = usePlatformOS(); return ( = (props) => { tooltipContent={tooltipContent} disabled={!showTooltip} isMobile={isMobile} - renderByDefault={false} + renderByDefault={renderToolTipByDefault} >
= (props) => { }; const TransparentButton: React.FC = (props) => { - const { children, className, isActive, tooltipContent, tooltipHeading, showTooltip } = props; + const { children, className, isActive, tooltipContent, tooltipHeading, renderToolTipByDefault, showTooltip } = props; const { isMobile } = usePlatformOS(); return ( = (props) => { tooltipContent={tooltipContent} disabled={!showTooltip} isMobile={isMobile} - renderByDefault={false} + renderByDefault={renderToolTipByDefault} >
= observer((props) => { tooltipContent={selectedName ?? placeholder} showTooltip={showTooltip} variant={buttonVariant} + renderToolTipByDefault={renderByDefault} > {!hideIcon && } {BUTTON_VARIANTS_WITH_TEXT.includes(buttonVariant) && (!!selectedName || !!placeholder) && ( diff --git a/web/core/components/dropdowns/date-range.tsx b/web/core/components/dropdowns/date-range.tsx index c9e04fcfebc..453215e9947 100644 --- a/web/core/components/dropdowns/date-range.tsx +++ b/web/core/components/dropdowns/date-range.tsx @@ -161,6 +161,7 @@ export const DateRangeDropdown: React.FC = (props) => { } showTooltip={showTooltip} variant={buttonVariant} + renderToolTipByDefault={renderByDefault} > = (props) => { tooltipContent={value ? renderFormattedDate(value, formatToken) : "None"} showTooltip={showTooltip} variant={buttonVariant} + renderToolTipByDefault={renderByDefault} > {!hideIcon && icon} {BUTTON_VARIANTS_WITH_TEXT.includes(buttonVariant) && ( diff --git a/web/core/components/dropdowns/estimate.tsx b/web/core/components/dropdowns/estimate.tsx index 7428e67d709..f049adf74c5 100644 --- a/web/core/components/dropdowns/estimate.tsx +++ b/web/core/components/dropdowns/estimate.tsx @@ -180,6 +180,7 @@ export const EstimateDropdown: React.FC = observer((props) => { tooltipContent={selectedEstimate ? selectedEstimate?.value : placeholder} showTooltip={showTooltip} variant={buttonVariant} + renderToolTipByDefault={renderByDefault} > {!hideIcon && } {(selectedEstimate || placeholder) && BUTTON_VARIANTS_WITH_TEXT.includes(buttonVariant) && ( diff --git a/web/core/components/dropdowns/member/index.tsx b/web/core/components/dropdowns/member/index.tsx index 3e9cd0d8a7a..f905bc27b2a 100644 --- a/web/core/components/dropdowns/member/index.tsx +++ b/web/core/components/dropdowns/member/index.tsx @@ -22,7 +22,7 @@ type Props = { icon?: LucideIcon; onClose?: () => void; renderByDefault?: boolean; - optionsClassName? : string; + optionsClassName?: string; } & MemberDropdownProps; export const MemberDropdown: React.FC = observer((props) => { @@ -134,6 +134,7 @@ export const MemberDropdown: React.FC = observer((props) => { tooltipContent={tooltipContent ?? `${value?.length ?? 0} assignee${value?.length !== 1 ? "s" : ""}`} showTooltip={showTooltip} variant={buttonVariant} + renderToolTipByDefault={renderByDefault} > {!hideIcon && } {BUTTON_VARIANTS_WITH_TEXT.includes(buttonVariant) && ( diff --git a/web/core/components/dropdowns/module/index.tsx b/web/core/components/dropdowns/module/index.tsx index 9f0fa5e42a2..b4f20256bee 100644 --- a/web/core/components/dropdowns/module/index.tsx +++ b/web/core/components/dropdowns/module/index.tsx @@ -267,6 +267,7 @@ export const ModuleDropdown: React.FC = observer((props) => { } showTooltip={showTooltip} variant={buttonVariant} + renderToolTipByDefault={renderByDefault} > { @@ -56,6 +57,7 @@ const BorderButton = (props: ButtonProps) => { placeholder, priority, showTooltip, + renderToolTipByDefault = true, } = props; const priorityDetails = ISSUE_PRIORITIES.find((p) => p.key === priority); @@ -76,7 +78,7 @@ const BorderButton = (props: ButtonProps) => { tooltipContent={priorityDetails?.title ?? "None"} disabled={!showTooltip} isMobile={isMobile} - renderByDefault={false} + renderByDefault={renderToolTipByDefault} >
{ placeholder, priority, showTooltip, + renderToolTipByDefault = true, } = props; const priorityDetails = ISSUE_PRIORITIES.find((p) => p.key === priority); @@ -157,7 +160,7 @@ const BackgroundButton = (props: ButtonProps) => { tooltipContent={priorityDetails?.title ?? "None"} disabled={!showTooltip} isMobile={isMobile} - renderByDefault={false} + renderByDefault={renderToolTipByDefault} >
{ placeholder, priority, showTooltip, + renderToolTipByDefault = true, } = props; const priorityDetails = ISSUE_PRIORITIES.find((p) => p.key === priority); @@ -239,7 +243,7 @@ const TransparentButton = (props: ButtonProps) => { tooltipContent={priorityDetails?.title ?? "None"} disabled={!showTooltip} isMobile={isMobile} - renderByDefault={false} + renderByDefault={renderToolTipByDefault} >
= (props) => { placeholder={placeholder} showTooltip={showTooltip} hideText={BUTTON_VARIANTS_WITHOUT_TEXT.includes(buttonVariant)} + renderToolTipByDefault={renderByDefault} /> )} diff --git a/web/core/components/dropdowns/project.tsx b/web/core/components/dropdowns/project.tsx index 55fb94e4654..3156fb396e4 100644 --- a/web/core/components/dropdowns/project.tsx +++ b/web/core/components/dropdowns/project.tsx @@ -150,6 +150,7 @@ export const ProjectDropdown: React.FC = observer((props) => { tooltipContent={selectedProject?.name ?? placeholder} showTooltip={showTooltip} variant={buttonVariant} + renderToolTipByDefault={renderByDefault} > {!hideIcon && selectedProject && ( diff --git a/web/core/components/dropdowns/state.tsx b/web/core/components/dropdowns/state.tsx index b77b5d5cad1..c139d23c904 100644 --- a/web/core/components/dropdowns/state.tsx +++ b/web/core/components/dropdowns/state.tsx @@ -161,6 +161,7 @@ export const StateDropdown: React.FC = observer((props) => { tooltipContent={selectedState?.name ?? "State"} showTooltip={showTooltip} variant={buttonVariant} + renderToolTipByDefault={renderByDefault} > {stateLoader ? ( diff --git a/web/core/components/issues/issue-layouts/properties/labels.tsx b/web/core/components/issues/issue-layouts/properties/labels.tsx index 29cd54926d4..e6afae94972 100644 --- a/web/core/components/issues/issue-layouts/properties/labels.tsx +++ b/web/core/components/issues/issue-layouts/properties/labels.tsx @@ -165,7 +165,7 @@ export const IssuePropertyLabels: React.FC = observer((pro tooltipHeading="Labels" tooltipContent={label?.name ?? ""} isMobile={isMobile} - renderByDefault={false} + renderByDefault={renderByDefault} >