Skip to content

fix(tooltips): ensure correct padding for TooltipDialog's inner elements if Close btn exists #1917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 11, 2024
Merged

fix(tooltips): ensure correct padding for TooltipDialog's inner elements if Close btn exists #1917

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6ba604
fix(tooltips): add end padding to first descendant el if close btn ex…
ze-flo Sep 10, 2024
efb7e07
chore: pr feedback
ze-flo Sep 10, 2024
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
16 changes: 12 additions & 4 deletions packages/modals/src/styled/StyledTooltipDialog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
* found at http://www.apache.org/licenses/LICENSE-2.0.
*/

import styled from 'styled-components';
import styled, { DefaultTheme, ThemeProps } from 'styled-components';
import { Placement } from '@floating-ui/react-dom';
import {
arrowStyles,
retrieveComponentStyles,
getArrowPosition
} from '@zendeskgarden/react-theming';
import { StyledTooltipDialogClose } from '../styled/StyledTooltipDialogClose';
import { TransitionStatus } from 'react-transition-group';
import { ITooltipDialogProps } from '../types';

Expand All @@ -23,14 +24,19 @@ export interface IStyledTooltipDialogProps
transitionState?: TransitionStatus;
}

const sizeStyles = (props: ThemeProps<DefaultTheme>) => `
padding: ${props.theme.space.base * 5}px;
width: 400px;
&:has(${StyledTooltipDialogClose}) > :first-child {
padding-${props.theme.rtl ? 'left' : 'right'}: ${props.theme.space.base * 8}px;
}
`;

export const StyledTooltipDialog = styled.div.attrs<IStyledTooltipDialogProps>(props => ({
'data-garden-id': COMPONENT_ID,
'data-garden-version': PACKAGE_VERSION,
className: props.isAnimated && 'is-animated'
}))<IStyledTooltipDialogProps>`
padding: ${props => props.theme.space.base * 5}px;
width: 400px;

${props => {
const computedArrowStyles = arrowStyles(getArrowPosition(props.theme, props.placement), {
size: `${props.theme.space.base * 2}px`,
Expand All @@ -45,5 +51,7 @@ export const StyledTooltipDialog = styled.div.attrs<IStyledTooltipDialogProps>(p
return props.hasArrow && computedArrowStyles;
}};

${sizeStyles}

${props => retrieveComponentStyles(COMPONENT_ID, props)};
`;
1 change: 0 additions & 1 deletion packages/modals/src/styled/StyledTooltipDialogTitle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ const COMPONENT_ID = 'modals.tooltip_dialog.title';

const sizeStyles = (props: ThemeProps<DefaultTheme>) => `
/* stylelint-disable-next-line property-no-unknown */
padding-${props.theme.rtl ? 'left' : 'right'}: ${props.theme.space.base * 8}px;
line-height: ${getLineHeight(props.theme.lineHeights.md, props.theme.fontSizes.md)};
font-size: ${props.theme.fontSizes.md};
`;
Expand Down