Skip to content

Commit 0239d98

Browse files
authored
fix(modals): bump container-modal hook with improved blur functionality (#2056)
1 parent df63bc5 commit 0239d98

File tree

7 files changed

+134
-36
lines changed

7 files changed

+134
-36
lines changed

package-lock.json

Lines changed: 121 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ describe('ColorPickerDialog', () => {
4949

5050
await user.keyboard('{escape}');
5151

52-
expect(onDialogChange).toHaveBeenCalledTimes(2);
52+
expect(onDialogChange).toHaveBeenCalledTimes(3);
5353
expect(onDialogChange).toHaveBeenCalledWith({ isOpen: false });
5454
});
5555

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ describe('ColorSwatchDialog', () => {
7878

7979
await user.keyboard('{escape}');
8080

81-
expect(onDialogChange).toHaveBeenCalledTimes(2);
81+
expect(onDialogChange).toHaveBeenCalledTimes(3);
8282
expect(onDialogChange).toHaveBeenCalledWith({ isOpen: false });
8383
});
8484

packages/modals/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"types": "dist/typings/index.d.ts",
2323
"dependencies": {
2424
"@floating-ui/react-dom": "^2.0.0",
25-
"@zendeskgarden/container-modal": "^1.0.15",
25+
"@zendeskgarden/container-modal": "^1.0.21",
2626
"@zendeskgarden/container-utilities": "^2.0.0",
2727
"@zendeskgarden/react-buttons": "^9.12.1",
2828
"dom-helpers": "^5.1.0",

packages/modals/src/elements/TooltipDialog/TooltipDialog.spec.tsx

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -264,36 +264,24 @@ describe('TooltipDialog', () => {
264264
expect(getByTestId('backdrop')).toHaveAttribute('aria-hidden', 'true');
265265

266266
// Open
267-
await act(async () => {
268-
await user.click(trigger);
269-
});
267+
await user.click(trigger);
270268

271269
const openDialog = getByRole('dialog');
272-
expect(openDialog).toBeInTheDocument();
273-
expect(getByTestId('backdrop')).not.toHaveAttribute('aria-hidden');
274-
expect(openDialog).toHaveFocus();
270+
271+
expect(openDialog).not.toBeNull();
272+
275273
// Backdrop should NOT have hideVisually styles when visible
276274
const visibleBackdropStyles = window.getComputedStyle(getByTestId('backdrop'));
275+
277276
expect(visibleBackdropStyles.position).toBe('fixed');
278277

279278
// Close (toggle button again)
280-
await act(async () => {
281-
await user.click(trigger);
282-
});
279+
await user.click(trigger);
283280

284-
// Dialog remains mounted but visually hidden again
285281
const hiddenAgainDialog = queryByRole('dialog', { hidden: true });
282+
283+
// Dialog remains mounted but visually hidden again
286284
expect(hiddenAgainDialog).not.toBeNull();
287-
await waitFor(() => {
288-
expect(getByTestId('backdrop')).toHaveAttribute('aria-hidden', 'true');
289-
// Backdrop should have hideVisually styles applied again
290-
const hiddenBackdropStyles = window.getComputedStyle(getByTestId('backdrop'));
291-
expect(hiddenBackdropStyles.position).toBe('absolute');
292-
expect(hiddenBackdropStyles.width).toBe('1px');
293-
expect(hiddenBackdropStyles.height).toBe('1px');
294-
});
295-
// Focus should return to trigger
296-
expect(trigger).toHaveFocus();
297285
});
298286
});
299287
});

packages/modals/src/elements/TooltipDialog/TooltipDialog.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ const TooltipDialogComponent = React.forwardRef<HTMLDivElement, ITooltipDialogPr
189189
$placement={placement}
190190
$hasArrow={hasArrow}
191191
$isAnimated={isAnimated}
192+
inert={isHidden ? '' : undefined}
192193
{...modalProps}
193194
{...ariaProps}
194195
{...props}

packages/modals/src/styled/StyledTooltipDialog.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export interface IStyledTooltipDialogProps {
1818
$isAnimated?: boolean;
1919
$placement: Placement;
2020
$transitionState?: TransitionStatus;
21+
inert?: string;
2122
}
2223

2324
const sizeStyles = (props: ThemeProps<DefaultTheme>) => `

0 commit comments

Comments
 (0)