Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/lib/src/base-menu/ItemAction.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const ItemAction = memo(
const { depthLevel, selected, href, label, icon, collapseIcon, "aria-pressed": ariaPressed, ...rest } = props;

return getWrapper(
<TooltipWrapper condition={hasTooltip} label={label}>
<TooltipWrapper condition={hasTooltip} label={label} {...rest}>
<Action
ref={ref}
as={href ? "a" : "button"}
Expand Down
20 changes: 15 additions & 5 deletions packages/lib/src/tooltip/Tooltip.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from "@emotion/styled";
import { useContext } from "react";
import { cloneElement, isValidElement, useContext } from "react";
import { Root, Trigger, Portal, Arrow, Content, Provider } from "@radix-ui/react-tooltip";
import TooltipPropsType, { TooltipWrapperProps } from "./types";
import TooltipContext from "./TooltipContext";
Expand Down Expand Up @@ -107,15 +107,15 @@ export const Tooltip = ({
hasAdditionalContainer,
label,
position = "bottom",
...rest
}: { hasAdditionalContainer?: boolean } & TooltipPropsType) => {
const hasTooltip = useContext(TooltipContext);

return (
<TooltipContext.Provider value>
{label && !hasTooltip ? (
<Provider delayDuration={300}>
<Root>
<Trigger asChild>
<Trigger asChild {...rest}>
{hasAdditionalContainer ? <TooltipTriggerContainer>{children}</TooltipTriggerContainer> : children}
</Trigger>
<Portal>
Expand All @@ -128,15 +128,25 @@ export const Tooltip = ({
</Portal>
</Root>
</Provider>
) : isValidElement(children) ? (
cloneElement(children, { ...rest })
) : (
children
)}
</TooltipContext.Provider>
);
};

export const TooltipWrapper = ({ condition, children, label }: TooltipWrapperProps) =>
condition ? <Tooltip label={label}>{children}</Tooltip> : <>{children}</>;
export const TooltipWrapper = ({ condition, children, label, ...rest }: TooltipWrapperProps) =>
condition ? (
<Tooltip label={label} {...rest}>
{children}
</Tooltip>
) : isValidElement(children) ? (
cloneElement(children, { ...rest })
) : (
children
);

const DxcTooltip = (props: TooltipPropsType) => <Tooltip {...props} hasAdditionalContainer />;

Expand Down