Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ export default () => (
| --- | --- | --- | --- |
| open | boolean | - | Whether the preview is open or not |
| closeIcon | React.ReactNode | - | Custom close icon |
| maskClosable | boolean | true | Whether to close preview on clicking mask |
| src | string | - | Customize preview src |
| movable | boolean | true | Enable drag |
| scaleStep | number | 0.5 | The number to which the scale is increased or decreased |
Expand Down Expand Up @@ -114,6 +115,7 @@ export default () => (
| movable | boolean | true | Enable drag |
| current | number | - | Current index |
| closeIcon | React.ReactNode | - | Custom close icon |
| maskClosable | boolean | true | Whether to close preview on clicking mask |
| scaleStep | number | 0.5 | The number to which the scale is increased or decreased |
| minScale | number | 1 | Min scale |
| maxScale | number | 50 | Max scale |
Expand Down
4 changes: 3 additions & 1 deletion src/Preview/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ export interface InternalPreviewConfig {
open?: boolean;
getContainer?: PortalProps['getContainer'];
zIndex?: number;
maskClosable?: boolean;
afterOpenChange?: (open: boolean) => void;

// Operation
Expand Down Expand Up @@ -174,6 +175,7 @@ const Preview: React.FC<PreviewProps> = props => {
onClose,
open,
afterOpenChange,
maskClosable = true,
icons = {},
closeIcon,
getContainer,
Expand Down Expand Up @@ -450,7 +452,7 @@ const Preview: React.FC<PreviewProps> = props => {
<div
className={clsx(`${prefixCls}-mask`, classNames.mask)}
style={styles.mask}
onClick={onClose}
onClick={maskClosable ? onClose : undefined}
/>

{/* Body */}
Expand Down
27 changes: 27 additions & 0 deletions tests/preview.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,33 @@ describe('Preview', () => {
expect(onPreviewCloseMock).toHaveBeenCalledWith(false);
});

it('maskClosable should control mask close behavior only', () => {
const onPreviewOpenChange = jest.fn();
const { container } = render(
<Image
src="https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png"
preview={{
maskClosable: false,
onOpenChange: onPreviewOpenChange,
}}
/>,
);

fireEvent.click(container.querySelector('.rc-image'));
act(() => {
jest.runAllTimers();
});

onPreviewOpenChange.mockReset();

fireEvent.click(document.querySelector('.rc-image-preview-mask'));
expect(document.querySelector('.rc-image-preview')).toBeTruthy();
expect(onPreviewOpenChange).not.toHaveBeenCalled();

fireEvent.click(document.querySelector('.rc-image-preview-close'));
expect(onPreviewOpenChange).toHaveBeenCalledWith(false);
});

it('Unmount', () => {
const { container, unmount } = render(
<Image src="https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png" />,
Expand Down
Loading