Skip to content

Feature:1.add onImagesClick function.(if you wish for only click the images without move event to close the Viewer) #180

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.

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ I'm sorry, ssr is not currently supported in `3.x`, it will be fixed in `4.0`.
| rotatable | boolean | true | whether to show 'rotate' button | false |
| scalable | boolean | true | whether to show 'scale' button | false |
| onMaskClick | (e) => void | - | callback function when mask is clicked | false |
| onImagesClick | (e) => void | - | callback function when over images is clicked but not move | false |
| downloadable | boolean | false | whether to show 'download' | false |
| noClose | boolean | false | to not render close button | false |
| noNavbar | boolean | false | to not render the navbar | false |
Expand Down
7 changes: 7 additions & 0 deletions src/ViewerCanvas.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export interface ViewerCanvasProps {
drag: boolean;
container: HTMLElement;
onCanvasMouseDown: (e: React.MouseEvent<HTMLDivElement>) => void;
onImagesMouseDown: (e: React.MouseEvent<HTMLDivElement>) => void;
}

export interface ViewerCanvasState {
Expand All @@ -30,6 +31,7 @@ export interface ViewerCanvasState {

export default function ViewerCanvas(props: ViewerCanvasProps) {
const isMouseDown = React.useRef(false);
const isMouseMove = React.useRef(false);
const prePosition = React.useRef({
x: 0,
y: 0,
Expand Down Expand Up @@ -107,11 +109,16 @@ export default function ViewerCanvas(props: ViewerCanvasProps) {
x: e.clientX,
y: e.clientY,
});
isMouseMove.current = true
}
};

function handleMouseUp(e) {
isMouseDown.current = false;
if(!isMouseMove.current && props.onImagesMouseDown) {
props.onImagesMouseDown()
}
isMouseMove.current = false
}

function bindWindowResizeEvent(remove?: boolean) {
Expand Down
6 changes: 6 additions & 0 deletions src/ViewerCore.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export default (props: ViewerProps) => {
rotatable = true,
scalable = true,
onMaskClick = noop,
onImagesClick = noop,
changeable = true,
customToolbar = (toolbars) => toolbars,
zoomSpeed = .05,
Expand Down Expand Up @@ -461,6 +462,10 @@ export default (props: ViewerProps) => {
onMaskClick(e);
}

function handleImagesMouseDown(e) {
onImagesClick(e);
}

function bindEvent(remove: boolean = false) {
let funcName = 'addEventListener';
if (remove) {
Expand Down Expand Up @@ -684,6 +689,7 @@ export default (props: ViewerProps) => {
drag={drag}
container={props.container}
onCanvasMouseDown={handleCanvasMouseDown}
onImagesMouseDown={handleImagesMouseDown}
/>
{props.noFooter || (
<div className={`${prefixCls}-footer`} style={{ zIndex: zIndex + 5 }}>
Expand Down
2 changes: 2 additions & 0 deletions src/ViewerProps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ interface ViewerProps {
scalable?: boolean;
/** callback function when mask is clicked */
onMaskClick?: (e: React.MouseEvent<HTMLDivElement>) => void;
/** callback function when over images is clicked but not move */
onImagesClick?: (e: React.MouseEvent<HTMLDivElement>) => void;
/** 是否显示下载按钮 */
downloadable?: boolean;
/** 图片是否可循环 */
Expand Down