fix: 🐛 Performance and regression

BetterTyped · Oct 23, 2023 · 11c0f41 · 11c0f41
1 parent 2777107
commit 11c0f41
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 21 deletions.
diff --git a/src/components/transform-component/transform-component.tsx b/src/components/transform-component/transform-component.tsx
@@ -24,7 +24,7 @@ export const TransformComponent: React.FC<Props> = ({
   wrapperProps = {},
   contentProps = {},
 }: Props) => {
-  const { init } = useContext(Context);
+  const { init, cleanupWindowEvents } = useContext(Context);
 
   const wrapperRef = useRef<HTMLDivElement | null>(null);
   const contentRef = useRef<HTMLDivElement | null>(null);
@@ -33,9 +33,12 @@ export const TransformComponent: React.FC<Props> = ({
     const wrapper = wrapperRef.current;
     const content = contentRef.current;
     if (wrapper !== null && content !== null && init) {
-      init(wrapper, content);
+      init?.(wrapper, content);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
+    return () => {
+      cleanupWindowEvents?.();
+    };
   }, []);
 
   return (

diff --git a/src/components/transform-wrapper/transform-wrapper.tsx b/src/components/transform-wrapper/transform-wrapper.tsx
@@ -32,9 +32,6 @@ export const TransformWrapper = React.forwardRef(
 
     useEffect(() => {
       instance.update(props);
-      return () => {
-        instance.cleanupWindowEvents();
-      };
     }, [instance, props]);
 
     return <Context.Provider value={instance}>{content}</Context.Provider>;

diff --git a/src/core/bounds/bounds.utils.ts b/src/core/bounds/bounds.utils.ts
@@ -170,26 +170,15 @@ export function getMouseBoundedPosition(
     paddingY = paddingValueY;
   }
 
-  const rubberbandX = rubberbandIfOutOfBounds(
-    positionX,
-    minPositionX,
-    maxPositionX,
-  );
-  const rubberbandY = rubberbandIfOutOfBounds(
-    positionY,
-    minPositionY,
-    maxPositionY,
-  );
-
   const x = boundLimiter(
-    rubberbandX,
+    positionX,
     minPositionX - paddingX,
     maxPositionX + paddingX,
     limitToBounds,
   );
 
   const y = boundLimiter(
-    rubberbandY,
+    positionY,
     minPositionY - paddingY,
     maxPositionY + paddingY,
     limitToBounds,

diff --git a/src/core/instance.core.ts b/src/core/instance.core.ts
@@ -208,9 +208,9 @@ export class ZoomPanPinch {
     const keysPressed = this.isPressingKeys(this.setup.panning.activationKeys);
     if (!keysPressed) return;
 
-    if(event.button == 0 && !this.setup.panning.allowLeftClickPan) return;
-    if(event.button == 1 && !this.setup.panning.allowMiddleClickPan) return;
-    if(event.button == 2 && !this.setup.panning.allowRightClickPan) return;
+    if (event.button === 0 && !this.setup.panning.allowLeftClickPan) return;
+    if (event.button === 1 && !this.setup.panning.allowMiddleClickPan) return;
+    if (event.button === 2 && !this.setup.panning.allowRightClickPan) return;
 
     event.preventDefault();
     event.stopPropagation();