Skip to content

Commit d454cae

Browse files
authored
chore(modals)!: rename TooltipModal to TooltipDialog (#1892)
1 parent 4bb108f commit d454cae

35 files changed

+267
-262
lines changed

docs/migration.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@ consider additional positioning prop support on a case-by-case basis.
147147
#### @zendeskgarden/react-modals
148148

149149
- `DrawerModal`: renamed to `Drawer`
150-
- `TooltipModal`: removed `popperModifiers` prop (see [note](#breaking-changes))
150+
- `TooltipModal`: renamed to `TooltipDialog`
151+
- removed `popperModifiers` prop (see [note](#breaking-changes))
151152
- Removed internal `useFocusVisible` hook for both `Modal` and `Drawer`. For
152153
non-Garden modal content that still depends on the polyfill for focus styling,
153154
either:
@@ -156,7 +157,7 @@ consider additional positioning prop support on a case-by-case basis.
156157
1. Use
157158
[@zendeskgarden/container-focusvisible](https://www.npmjs.com/package/@zendeskgarden/container-focusvisible)
158159
to restore the polyfill
159-
- Removed `GARDEN_PLACEMENT` type export. Use `ITooltipModalProps['placement']` instead.
160+
- Removed `GARDEN_PLACEMENT` type export. Use `ITooltipDialogProps['placement']` instead.
160161
- Subcomponent exports for `Modal` have been deprecated and will be removed in a future major version.
161162
Update to subcomponent properties (e.g., `Modal.Body`).
162163

packages/colorpickers/src/elements/ColorPickerDialog/index.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { ColorPicker } from '../ColorPicker';
2323
import {
2424
StyledButton,
2525
StyledButtonPreview,
26-
StyledTooltipModal,
26+
StyledTooltipDialog,
2727
StyledTooltipBody
2828
} from '../../styled';
2929
import { IColor, IColorPickerDialogProps } from '../../types';
@@ -121,7 +121,7 @@ export const ColorPickerDialog = forwardRef<HTMLDivElement, IColorPickerDialogPr
121121
</Button.EndIcon>
122122
</StyledButton>
123123
)}
124-
<StyledTooltipModal
124+
<StyledTooltipDialog
125125
ref={ref}
126126
hasArrow={hasArrow}
127127
zIndex={zIndex}
@@ -147,7 +147,7 @@ export const ColorPickerDialog = forwardRef<HTMLDivElement, IColorPickerDialogPr
147147
onChange={isControlled ? onChange : setUncontrolledColor}
148148
/>
149149
</StyledTooltipBody>
150-
</StyledTooltipModal>
150+
</StyledTooltipDialog>
151151
</>
152152
);
153153
}
@@ -172,7 +172,7 @@ ColorPickerDialog.defaultProps = {
172172
placement: 'bottom-start',
173173
isAnimated: true,
174174
zIndex: 1000,
175-
hasArrow: false /* TooltipModal override */
175+
hasArrow: false /* TooltipDialog override */
176176
};
177177

178178
ColorPickerDialog.displayName = 'ColorPickerDialog';

packages/colorpickers/src/elements/ColorSwatchDialog/index.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { ColorSwatch } from '../ColorSwatch';
2424
import {
2525
StyledButton,
2626
StyledButtonPreview,
27-
StyledTooltipModal,
27+
StyledTooltipDialog,
2828
StyledTooltipBody
2929
} from '../../styled';
3030
import { IColorSwatchDialogProps } from '../../types';
@@ -153,7 +153,7 @@ export const ColorSwatchDialog = forwardRef<HTMLDivElement, IColorSwatchDialogPr
153153
</Button.EndIcon>
154154
</StyledButton>
155155
)}
156-
<StyledTooltipModal
156+
<StyledTooltipDialog
157157
ref={ref}
158158
zIndex={zIndex}
159159
hasArrow={hasArrow}
@@ -178,7 +178,7 @@ export const ColorSwatchDialog = forwardRef<HTMLDivElement, IColorSwatchDialogPr
178178
onSelect={handleSelect}
179179
/>
180180
</StyledTooltipBody>
181-
</StyledTooltipModal>
181+
</StyledTooltipDialog>
182182
</>
183183
);
184184
}
@@ -201,7 +201,7 @@ ColorSwatchDialog.defaultProps = {
201201
placement: 'bottom-start',
202202
isAnimated: true,
203203
zIndex: 1000,
204-
hasArrow: false /* TooltipModal override */
204+
hasArrow: false /* TooltipDialog override */
205205
};
206206

207207
ColorSwatchDialog.displayName = 'ColorSwatchDialog';

packages/colorpickers/src/styled/ColorPickerDialog/StyledTooltipBody.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
*/
77

88
import styled from 'styled-components';
9-
import { TooltipModal } from '@zendeskgarden/react-modals';
9+
import { TooltipDialog } from '@zendeskgarden/react-modals';
1010
import { retrieveComponentStyles, DEFAULT_THEME } from '@zendeskgarden/react-theming';
1111

12-
const COMPONENT_ID = 'colorpickers.colordialog_tooltipmodal_body';
12+
const COMPONENT_ID = 'colorpickers.colordialog_tooltipdialog_body';
1313

14-
export const StyledTooltipBody = styled(TooltipModal.Body as unknown as 'div').attrs({
14+
export const StyledTooltipBody = styled(TooltipDialog.Body as unknown as 'div').attrs({
1515
'data-garden-id': COMPONENT_ID,
1616
'data-garden-version': PACKAGE_VERSION
1717
})`

packages/colorpickers/src/styled/ColorPickerDialog/StyledTooltipModal.ts renamed to packages/colorpickers/src/styled/ColorPickerDialog/StyledTooltipDialog.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
*/
77

88
import styled from 'styled-components';
9-
import { TooltipModal } from '@zendeskgarden/react-modals';
9+
import { TooltipDialog } from '@zendeskgarden/react-modals';
1010
import { retrieveComponentStyles, DEFAULT_THEME } from '@zendeskgarden/react-theming';
1111

12-
const COMPONENT_ID = 'colorpickers.colordialog_tooltipmodal';
12+
const COMPONENT_ID = 'colorpickers.colordialog_tooltipdialog';
1313

1414
/**
15-
* 1. Override default TooltipModal styling
15+
* 1. Override default TooltipDialog styling
1616
*/
17-
export const StyledTooltipModal = styled(TooltipModal as any).attrs({
17+
export const StyledTooltipDialog = styled(TooltipDialog as any).attrs({
1818
'data-garden-id': COMPONENT_ID,
1919
'data-garden-version': PACKAGE_VERSION
2020
})`
@@ -25,6 +25,6 @@ export const StyledTooltipModal = styled(TooltipModal as any).attrs({
2525
${props => retrieveComponentStyles(COMPONENT_ID, props)};
2626
`;
2727

28-
StyledTooltipModal.defaultProps = {
28+
StyledTooltipDialog.defaultProps = {
2929
theme: DEFAULT_THEME
3030
};

packages/colorpickers/src/styled/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export * from './ColorPicker/StyledSliders';
2121

2222
export * from './ColorPickerDialog/StyledButton';
2323
export * from './ColorPickerDialog/StyledButtonPreview';
24-
export * from './ColorPickerDialog/StyledTooltipModal';
24+
export * from './ColorPickerDialog/StyledTooltipDialog';
2525
export * from './ColorPickerDialog/StyledTooltipBody';
2626

2727
export * from './ColorSwatch/StyledColorSwatch';

packages/colorpickers/src/types/index.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import { HTMLAttributes } from 'react';
9-
import { ITooltipModalProps } from '@zendeskgarden/react-modals';
9+
import { ITooltipDialogProps } from '@zendeskgarden/react-modals';
1010

1111
export interface IColor {
1212
hex: string;
@@ -75,21 +75,21 @@ export interface IColorPickerDialogProps extends IColorPickerProps {
7575
*/
7676
onClose?: (color: IColor) => void;
7777
/** Adjusts the placement of the color dialog */
78-
placement?: ITooltipModalProps['placement'];
78+
placement?: ITooltipDialogProps['placement'];
7979
/** Disables the color dialog button */
8080
disabled?: boolean;
8181
/**
8282
* Sets the `z-index` of the color dialog
8383
*/
84-
zIndex?: ITooltipModalProps['zIndex'];
84+
zIndex?: ITooltipDialogProps['zIndex'];
8585
/**
8686
* Adds an arrow to the color dialog
8787
*/
88-
hasArrow?: ITooltipModalProps['hasArrow'];
88+
hasArrow?: ITooltipDialogProps['hasArrow'];
8989
/**
9090
* Animates the color dialog
9191
*/
92-
isAnimated?: ITooltipModalProps['isAnimated'];
92+
isAnimated?: ITooltipDialogProps['isAnimated'];
9393
/**
9494
* Opens the dialog in a controlled color picker dialog
9595
*/
@@ -136,15 +136,15 @@ export interface IColorSwatchProps extends Omit<HTMLAttributes<HTMLTableElement>
136136

137137
export interface IColorSwatchDialogProps extends IColorSwatchProps {
138138
/** Adjusts the placement of the color dialog */
139-
placement?: ITooltipModalProps['placement'];
139+
placement?: ITooltipDialogProps['placement'];
140140
/** Disables the color dialog button */
141141
disabled?: boolean;
142142
/** Sets the `z-index` of the color dialog */
143-
zIndex?: ITooltipModalProps['zIndex'];
143+
zIndex?: ITooltipDialogProps['zIndex'];
144144
/** Adds an arrow to the color dialog */
145-
hasArrow?: ITooltipModalProps['hasArrow'];
145+
hasArrow?: ITooltipDialogProps['hasArrow'];
146146
/** Animates the color dialog */
147-
isAnimated?: ITooltipModalProps['isAnimated'];
147+
isAnimated?: ITooltipDialogProps['isAnimated'];
148148
/** Applies inset `box-shadow` styling on focus */
149149
focusInset?: boolean;
150150
/** Passes HTML attributes to the color dialog button element */

packages/modals/README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ const [isOpen, setIsOpen] = useState(false)
6767
</ThemeProvider>
6868
```
6969

70-
### TooltipModal
70+
### TooltipDialog
7171

7272
```jsx
7373
import { ThemeProvider } from '@zendeskgarden/react-theming';
74-
import { TooltipModal } from '@zendeskgarden/react-modals';
74+
import { TooltipDialog } from '@zendeskgarden/react-modals';
7575
import { Button } from '@zendeskgarden/react-buttons';
7676

7777
const [isOpen, setIsOpen] = useState(false);
@@ -81,18 +81,18 @@ const buttonRef = useRef(null);
8181
<Button ref={buttonRef} onClick={() => setIsOpen(!isOpen)}>
8282
Open
8383
</Button>
84-
<TooltipModal
84+
<TooltipDialog
8585
onClose={() => setIsOpen(false)}
8686
referenceElement={isOpen && buttonRef.current ? buttonRef.current : undefined}
8787
>
88-
<TooltipModal.Title>Example Title</TooltipModal.Title>
89-
<TooltipModal.Body>Some content</TooltipModal.Body>
90-
<TooltipModal.Footer>
91-
<TooltipModal.FooterItem>
88+
<TooltipDialog.Title>Example Title</TooltipDialog.Title>
89+
<TooltipDialog.Body>Some content</TooltipDialog.Body>
90+
<TooltipDialog.Footer>
91+
<TooltipDialog.FooterItem>
9292
<Button>Click</Button>
93-
</TooltipModal.FooterItem>
94-
</TooltipModal.Footer>
95-
<TooltipModal.Close aria-label="Close" />
96-
</TooltipModal>
93+
</TooltipDialog.FooterItem>
94+
</TooltipDialog.Footer>
95+
<TooltipDialog.Close aria-label="Close" />
96+
</TooltipDialog>
9797
</ThemeProvider>;
9898
```

packages/modals/demo/stories/TooltipModalStory.tsx renamed to packages/modals/demo/stories/TooltipDialogStory.tsx

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import { getColor } from '@zendeskgarden/react-theming';
1212
import { Grid } from '@zendeskgarden/react-grid';
1313
import { Button, IconButton } from '@zendeskgarden/react-buttons';
1414
import { Avatar } from '@zendeskgarden/react-avatars';
15-
import { ITooltipModalProps, TooltipModal } from '@zendeskgarden/react-modals';
15+
import { ITooltipDialogProps, TooltipDialog } from '@zendeskgarden/react-modals';
1616

1717
const PLACEMENT = ['top-start', 'top', 'top-end', 'bottom-start', 'bottom', 'bottom-end'] as const;
1818

19-
interface IArgs extends ITooltipModalProps {
19+
interface IArgs extends ITooltipDialogProps {
2020
count: number;
2121
handleClick: (ref?: HTMLElement | null) => void;
2222
hasBody: boolean;
@@ -30,7 +30,7 @@ interface IArgs extends ITooltipModalProps {
3030
dialogAriaLabel: string;
3131
}
3232

33-
export const TooltipModalStory: Story<IArgs> = ({
33+
export const TooltipDialogStory: Story<IArgs> = ({
3434
count,
3535
handleClick,
3636
hasBody,
@@ -58,20 +58,20 @@ export const TooltipModalStory: Story<IArgs> = ({
5858

5959
return (
6060
<>
61-
<TooltipModal {...args} placement={args.placement || PLACEMENT[current]} {...ariaProp}>
62-
{hasTitle && <TooltipModal.Title tag={tag}>{title}</TooltipModal.Title>}
63-
{hasBody && <TooltipModal.Body>{body}</TooltipModal.Body>}
61+
<TooltipDialog {...args} placement={args.placement || PLACEMENT[current]} {...ariaProp}>
62+
{hasTitle && <TooltipDialog.Title tag={tag}>{title}</TooltipDialog.Title>}
63+
{hasBody && <TooltipDialog.Body>{body}</TooltipDialog.Body>}
6464
{hasFooter && (
65-
<TooltipModal.Footer>
65+
<TooltipDialog.Footer>
6666
{current > 0 && (
67-
<TooltipModal.FooterItem>
67+
<TooltipDialog.FooterItem>
6868
<Button size="small" isBasic onClick={() => handleClick(refs.current[current - 1])}>
6969
Previous
7070
</Button>
71-
</TooltipModal.FooterItem>
71+
</TooltipDialog.FooterItem>
7272
)}
7373
{current >= 0 && (
74-
<TooltipModal.FooterItem>
74+
<TooltipDialog.FooterItem>
7575
<Button
7676
isPrimary
7777
size="small"
@@ -83,12 +83,12 @@ export const TooltipModalStory: Story<IArgs> = ({
8383
>
8484
{current === refs.current.length - 1 ? 'Finish' : 'Next'}
8585
</Button>
86-
</TooltipModal.FooterItem>
86+
</TooltipDialog.FooterItem>
8787
)}
88-
</TooltipModal.Footer>
88+
</TooltipDialog.Footer>
8989
)}
90-
{hasClose && <TooltipModal.Close aria-label={closeAriaLabel} />}
91-
</TooltipModal>
90+
{hasClose && <TooltipDialog.Close aria-label={closeAriaLabel} />}
91+
</TooltipDialog>
9292
<Grid>
9393
<Grid.Row style={{ height: 'calc(100vh - 80px)' }}>
9494
{[...Array(count)].map((_, index) => (

packages/modals/demo/stories/data.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export const MODAL_FOOTER_ITEMS: IFooterItem[] = [
3838
}
3939
];
4040

41-
export const TOOLTIP_MODAL_BODY = `Gumbo beet greens corn soko endive gumbo
41+
export const TOOLTIP_DIALOG_BODY = `Gumbo beet greens corn soko endive gumbo
4242
gourd. Parsley shallot courgette tatsoi pea sprouts fava bean collard greens
4343
dandelion okra wakame tomato. Dandelion cucumber earthnut pea peanut soko
4444
zucchini.`;

0 commit comments

Comments
 (0)