Skip to content
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

Jump to bottom

improve: preview props #34

Merged
merged 4 commits into from Oct 14, 2020
Merged

improve: preview props #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3967a7
improve: preview props
hengkx Oct 13, 2020
a9c74a7
Update README.md
hengkx Oct 13, 2020
1da9808
ts
hengkx Oct 14, 2020
20abbbc
fix test
hengkx Oct 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@ ReactDOM.render(

| Name | Type | Default | Description |
| --- | --- | --- | --- |
| preview | boolean \| {visible: boolean,onVisibleChange:function(value, prevValue) } | true | Whether to show preview |
| preview | boolean \| {visible: boolean,onVisibleChange:function(value, prevValue),getContainer: string \| HTMLElement \| (() => HTMLElement) \| false } | true | Whether to show preview |
| prefixCls | string | rc-image | Classname prefix |
| placeholder | boolean \| ReactElement | - | if `true` will set default placeholder or use `ReactElement` set customize placeholder |
| fallback | string | - | Load failed src |
Expand Down
8 changes: 4 additions & 4 deletions src/Image.tsx
View file
Open in desktop
Expand Up @@ -3,11 +3,13 @@ import { useState } from 'react';
import cn from 'classnames';
import { getOffset } from 'rc-util/lib/Dom/css';
import useMergedState from 'rc-util/lib/hooks/useMergedState';
import { GetContainer } from 'rc-util/lib/PortalWrapper';
import Preview from './Preview';

export interface ImagePreviewType {
visible?: boolean;
onVisibleChange?: (value: boolean, prevValue: boolean) => void;
getContainer?: GetContainer | false;
}

export interface ImageProps
Expand All @@ -25,7 +27,6 @@ export interface ImageProps
*/
onPreviewClose?: (value: boolean, prevValue: boolean) => void;
onClick?: (e: React.MouseEvent<HTMLDivElement>) => void;
getPopupContainer?: () => HTMLElement;
}

type ImageStatus = 'normal' | 'error' | 'loading';
Expand All @@ -34,7 +35,6 @@ const ImageInternal: React.FC<ImageProps> = ({
src,
alt,
onPreviewClose: onInitialPreviewClose,
getPopupContainer,
prefixCls = 'rc-image',
previewPrefixCls = `${prefixCls}-preview`,
placeholder,
Expand All @@ -57,7 +57,7 @@ const ImageInternal: React.FC<ImageProps> = ({
...otherProps
}) => {
const isCustomPlaceholder = placeholder && placeholder !== true;
const { visible = undefined, onVisibleChange = onInitialPreviewClose } =
const { visible = undefined, onVisibleChange = onInitialPreviewClose, getContainer = undefined } =
hengkx marked this conversation as resolved.
Show resolved Hide resolved
typeof preview === 'object' ? preview : {};
const isControlled = visible !== undefined;
const [isShowPreview, setShowPreview] = useMergedState(!!visible, {
Expand Down Expand Up @@ -157,7 +157,7 @@ const ImageInternal: React.FC<ImageProps> = ({
mousePosition={mousePosition}
src={mergedSrc}
alt={alt}
getContainer={getPopupContainer}
getContainer={getContainer}
/>
)}
</>
Expand Down
106 changes: 106 additions & 0 deletions tests/__snapshots__/controlled.test.tsx.snap
View file
Open in desktop
@@ -0,0 +1,106 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Controlled With previewVisible 1`] = `
<div
className="rc-image-preview"
onClick={[Function]}
role="document"
style={Object {}}
>
<div
aria-hidden="true"
style={
Object {
"height": 0,
"outline": "none",
"overflow": "hidden",
"width": 0,
}
}
tabIndex={0}
/>
<div
className="rc-image-preview-content"
>
<div
className="rc-image-preview-body"
>
<ul
className="rc-image-preview-operations"
>
<li
className="rc-image-preview-operations-operation"
onClick={[Function]}
>
<ForwardRef(CloseOutlined)
className="rc-image-preview-operations-icon"
/>
</li>
<li
className="rc-image-preview-operations-operation"
onClick={[Function]}
>
<ForwardRef(ZoomInOutlined)
className="rc-image-preview-operations-icon"
/>
</li>
<li
className="rc-image-preview-operations-operation rc-image-preview-operations-operation-disabled"
onClick={[Function]}
>
<ForwardRef(ZoomOutOutlined)
className="rc-image-preview-operations-icon"
/>
</li>
<li
className="rc-image-preview-operations-operation"
onClick={[Function]}
>
<ForwardRef(RotateRightOutlined)
className="rc-image-preview-operations-icon"
/>
</li>
<li
className="rc-image-preview-operations-operation"
onClick={[Function]}
>
<ForwardRef(RotateLeftOutlined)
className="rc-image-preview-operations-icon"
/>
</li>
</ul>
<div
className="rc-image-preview-img-wrapper"
style={
Object {
"transform": "translate3d(0px, 0px, 0)",
}
}
>
<img
className="rc-image-preview-img"
onMouseDown={[Function]}
src="https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png"
style={
Object {
"transform": "scale3d(1, 1, 1) rotate(0deg)",
}
}
/>
</div>
</div>
</div>
<div
aria-hidden="true"
style={
Object {
"height": 0,
"outline": "none",
"overflow": "hidden",
"width": 0,
}
}
tabIndex={0}
/>
</div>
`;
2 changes: 1 addition & 1 deletion tests/controlled.test.tsx
View file
Open in desktop
Expand Up @@ -27,6 +27,6 @@ describe('Controlled', () => {
wrapper.update();
});

expect(wrapper.find('.rc-image-preview').get(0)).toBeFalsy();
expect(wrapper.find('.rc-image-preview').get(0)).toMatchSnapshot();
});
});