Fix primefaces#5771: Image mask click handling

melloware · Jan 15, 2024 · 0e1667d · 0e1667d
1 parent f926a04
commit 0e1667d
Showing 1 changed file with 7 additions and 26 deletions.
diff --git a/components/lib/image/Image.js b/components/lib/image/Image.js
@@ -28,7 +28,6 @@ export const Image = React.memo(
  const imageRef = React.useRef(null);
  const maskRef = React.useRef(null);
  const previewRef = React.useRef(null);
- const previewClick = React.useRef(false);
  const previewButton = React.useRef(null);
  const zoomOutDisabled = scaleState <= 0.5;
  const zoomInDisabled = scaleState >= 1.5;
@@ -70,18 +69,10 @@ export const Image = React.memo(
  };
 
  const hide = () => {
- if (!previewClick.current) {
- setPreviewVisibleState(false);
- DomHandler.unblockBodyScroll();
- setRotateState(0);
- setScaleState(1);
- }
-
- previewClick.current = false;
- };
-
- const onPreviewImageClick = () => {
- previewClick.current = true;
+ setPreviewVisibleState(false);
+ DomHandler.unblockBodyScroll();
+ setRotateState(0);
+ setScaleState(1);
  };
 
  const onMaskClick = (event) => {
@@ -91,13 +82,9 @@ export const Image = React.memo(
  return;
  }
 
- if (!previewClick.current) {
- setPreviewVisibleState(false);
- setRotateState(0);
- setScaleState(0);
- }
-
- previewClick.current = false;
+ setPreviewVisibleState(false);
+ setRotateState(0);
+ setScaleState(1);
  };
 
  const onMaskKeydown = (event) => {
@@ -120,17 +107,14 @@ export const Image = React.memo(
  const { alt: name, src } = props;
 
  DomHandler.saveAs({ name, src });
- previewClick.current = true;
  };
 
  const rotateRight = () => {
  setRotateState((prevRotate) => prevRotate + 90);
- previewClick.current = true;
  };
 
  const rotateLeft = () => {
  setRotateState((prevRotate) => prevRotate - 90);
- previewClick.current = true;
  };
 
  const zoomIn = () => {
@@ -139,7 +123,6 @@ export const Image = React.memo(
 
  return prevScale + 0.1;
  });
- previewClick.current = true;
  };
 
  const zoomOut = () => {
@@ -148,7 +131,6 @@ export const Image = React.memo(
 
  return prevScale - 0.1;
  });
- previewClick.current = true;
  };
 
  const onEntering = () => {
@@ -305,7 +287,6 @@ export const Image = React.memo(
  src: props.zoomSrc || props.src,
  className: cx('preview'),
  style: sx('preview', { rotateState, scaleState }),
- onClick: onPreviewImageClick,
  crossOrigin: crossOrigin,
  referrerPolicy: referrerPolicy,
  useMap: useMap,