Skip to content

Commit c9ed895

Browse files
authored
fix: Fix missing scrim background on LoadingOverlay (#2098)
Background class wasn't applied when LoadingOverlay has error or is loading
1 parent 8e47216 commit c9ed895

2 files changed

Lines changed: 52 additions & 3 deletions

File tree

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
import React from 'react';
2+
import { render, screen } from '@testing-library/react';
3+
import LoadingOverlay from './LoadingOverlay';
4+
5+
describe('LoadingOverlay', () => {
6+
it('renders loading spinner and no scrim on initial loading', () => {
7+
const { container } = render(
8+
<LoadingOverlay isLoading data-testid="test-overlay" />
9+
);
10+
expect(screen.getByTestId('test-overlay-spinner')).toBeInTheDocument();
11+
expect(
12+
container.getElementsByClassName('iris-panel-scrim-background').length
13+
).toBe(0);
14+
});
15+
16+
it('renders error message and no scrim when errorMessage is provided on initial loading', () => {
17+
const errorMessage = 'An error occurred';
18+
const { container } = render(
19+
<LoadingOverlay errorMessage={errorMessage} />
20+
);
21+
const errorElement = screen.getByText(errorMessage);
22+
expect(errorElement).toBeInTheDocument();
23+
expect(
24+
container.getElementsByClassName('iris-panel-scrim-background').length
25+
).toBe(0);
26+
});
27+
28+
it('renders scrim when loaded and errorMessage is provided', () => {
29+
const { container } = render(
30+
<LoadingOverlay isLoaded errorMessage="ERROR_MESSAGE" />
31+
);
32+
expect(
33+
container.getElementsByClassName('iris-panel-scrim-background').length
34+
).toBe(1);
35+
});
36+
37+
it('renders scrim when isLoaded is true and loading again', () => {
38+
const { container } = render(<LoadingOverlay isLoaded isLoading />);
39+
expect(
40+
container.getElementsByClassName('iris-panel-scrim-background').length
41+
).toBe(1);
42+
});
43+
});

packages/components/src/LoadingOverlay.tsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ type LoadingOverlayProps = {
1111
isLoaded?: boolean;
1212
isLoading?: boolean;
1313
errorMessage?: string | null;
14+
className?: string | null;
15+
scrimClassName?: string;
16+
timeout?: number | { enter?: number; exit?: number; appear?: number };
1417
'data-testid'?: string;
1518
};
1619

@@ -21,6 +24,9 @@ function LoadingOverlay({
2124
isLoaded = false,
2225
isLoading = true,
2326
errorMessage = null,
27+
className = null,
28+
scrimClassName = 'iris-panel-scrim-background',
29+
timeout = ThemeExport.transitionMs,
2430
'data-testid': dataTestId,
2531
}: LoadingOverlayProps): JSX.Element {
2632
const messageTestId =
@@ -31,8 +37,8 @@ function LoadingOverlay({
3137
return (
3238
<CSSTransition
3339
in={Boolean(errorMessage) || !isLoaded || isLoading}
34-
timeout={ThemeExport.transitionMs}
35-
classNames={isLoaded ? 'fade' : ''}
40+
timeout={timeout}
41+
classNames={classNames(className, { fade: isLoaded })}
3642
mountOnEnter
3743
unmountOnExit
3844
>
@@ -41,7 +47,7 @@ function LoadingOverlay({
4147
className={classNames(
4248
'iris-panel-message-overlay',
4349
'fill-parent-absolute',
44-
{ 'iris-panel-scrim-background': isLoaded }
50+
{ [scrimClassName]: isLoaded }
4551
)}
4652
>
4753
<div className="message-content">

0 commit comments

Comments
 (0)