Skip to content

chore: add afterOpenChange #393

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
zombieJ merged 1 commit into from
Mar 18, 2025
Merged

chore: add afterOpenChange #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/Preview/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ export interface InternalPreviewConfig {
open?: boolean;
getContainer?: PortalProps['getContainer'];
zIndex?: number;
afterOpenChange?: (open: boolean) => void;

// Operation
movable?: boolean;
Expand Down Expand Up @@ -170,6 +171,7 @@ const Preview: React.FC<PreviewProps> = props => {
movable = true,
onClose,
open,
afterOpenChange,
icons = {},
closeIcon,
getContainer,
Expand Down Expand Up @@ -366,6 +368,7 @@ const Preview: React.FC<PreviewProps> = props => {
if (!nextVisible) {
setLockScroll(false);
}
afterOpenChange?.(nextVisible);
};

// ========================== Portal ==========================
Expand Down
8 changes: 6 additions & 2 deletions tests/preview.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,11 +974,13 @@ describe('Preview', () => {

it('should be closed when press esc after click portal', () => {
const onOpenChange = jest.fn();
const afterOpenChange = jest.fn();
const { container } = render(
<Image
src="https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png"
preview={{
onOpenChange,
afterOpenChange,
}}
/>,
);
Expand All @@ -991,15 +993,17 @@ describe('Preview', () => {
expect(document.querySelector('.rc-image-preview')).toBeTruthy();

expect(onOpenChange).toHaveBeenCalledWith(true);
expect(afterOpenChange).toHaveBeenCalledWith(true);

fireEvent.click(document.querySelector('.rc-image-preview-actions'));

fireEvent.keyDown(window, { key: 'Escape', keyCode: 27 });

expect(onOpenChange).toHaveBeenCalledWith(false);
expect(onOpenChange).toHaveBeenCalledTimes(2);
expect(afterOpenChange).toHaveBeenCalledWith(false);

onOpenChange.mockRestore();
expect(onOpenChange).toHaveBeenCalledTimes(2);
expect(afterOpenChange).toHaveBeenCalledTimes(2);
});

it('not modify preview image size', () => {
Expand Down
6 changes: 4 additions & 2 deletions tests/previewGroup.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ describe('PreviewGroup', () => {
it('onChange should be called', () => {
const onChange = jest.fn();
const onOpenChange = jest.fn();
const afterOpenChange = jest.fn();
const { container } = render(
<Image.PreviewGroup preview={{ onChange, onOpenChange }}>
<Image.PreviewGroup preview={{ onChange, onOpenChange, afterOpenChange }}>
<Image src="src1" className="firstImg" />
<Image preview={false} src="src2" />
<Image src="src3" />
Expand All @@ -29,7 +30,8 @@ describe('PreviewGroup', () => {
jest.runAllTimers();
});
expect(onChange).not.toHaveBeenCalled();
expect(onOpenChange).toBeCalledWith(true, { current: 0 });
expect(onOpenChange).toHaveBeenCalledWith(true, { current: 0 });
expect(afterOpenChange).toHaveBeenCalledWith(true);

fireEvent.click(document.querySelector('.rc-image-preview-switch-next'));
act(() => {
Expand Down