Merge branch 'main' into develop

jbzhang99 · Aug 24, 2022 · 52da989 · 52da989
2 parents a187b38 + c75b627
commit 52da989
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-1.22.3
+1.22.4
diff --git a/frontend/src/Editor/Components/Image.jsx b/frontend/src/Editor/Components/Image.jsx
@@ -14,6 +14,7 @@ export const Image = function Image({ component, height, properties, styles, fir
   const imageRef = useRef(null);
   const [imageOffset, setImageOffset] = useState(0);
   const [rotation, setRotation] = useState(0);
+  const [zoomReset, setZoomReset] = useState(false);
 
   function Placeholder() {
     return <div className="skeleton-image" style={{ objectFit: 'contain', height }}></div>;
@@ -22,6 +23,11 @@ export const Image = function Image({ component, height, properties, styles, fir
     setImageOffset(computeOffset());
   }, [imageRef]);
 
+  useEffect(() => {
+    setRotation(0);
+    setZoomReset(true);
+  }, [source]);
+
   function computeOffset() {
     if (imageRef.current) {
       const clientRect = imageRef.current.getBoundingClientRect();
@@ -57,6 +63,11 @@ export const Image = function Image({ component, height, properties, styles, fir
     />
   );
 
+  const resetZoom = (resetTransform) => {
+    setZoomReset(false);
+    resetTransform();
+  };
+
   return (
     <div
       data-disabled={disabledState}
@@ -81,8 +92,9 @@ export const Image = function Image({ component, height, properties, styles, fir
           ) : zoomButtons ? (
             <>
               <TransformWrapper>
-                {({ zoomIn, zoomOut }) => (
+                {({ zoomIn, zoomOut, resetTransform }) => (
                   <>
+                    {zoomReset && resetZoom(resetTransform)}
                     <TransformComponent>{renderImage()}</TransformComponent>
                     {zoomButtons && (
                       <div className="zoom-button-wrapper">

diff --git a/server/.version b/server/.version
@@ -1 +1 @@
-1.22.3
+1.22.4