Merge pull request #93 from Gkuzin13/dev

refactor: ellipse radius calculations
Gkuzin13 · Feb 25, 2024 · 1983a75 · 1983a75
2 parents ccc90f6 + fff9a11
commit 1983a75
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/apps/client/src/components/Canvas/Shapes/EllipseDrawable/EllipseDrawable.tsx b/apps/client/src/components/Canvas/Shapes/EllipseDrawable/EllipseDrawable.tsx
@@ -4,7 +4,6 @@ import useAnimatedDash from '@/hooks/useAnimatedDash/useAnimatedDash';
 import useNode from '@/hooks/useNode/useNode';
 import { calculateCircumference } from '@/utils/math';
 import { getDashValue, getSizeValue, getTotalDashLength } from '@/utils/shape';
-import { getEllipseRadius } from './helpers/calc';
 import { ELLIPSE } from '@/constants/shape';
 import type Konva from 'konva';
 import type { NodeComponentProps } from '@/components/Canvas/Node/Node';
@@ -35,9 +34,10 @@ const EllipseDrawable = ({
     (event: Konva.KonvaEventObject<Event>) => {
       const ellipse = event.target as Konva.Ellipse;
 
-      const { radiusX, radiusY } = getEllipseRadius(ellipse);
-
-      const totalLength = calculateCircumference(radiusX, radiusY);
+      const totalLength = calculateCircumference(
+        ellipse.radiusX() * ellipse.scaleX(),
+        ellipse.radiusY() * ellipse.scaleY(),
+      );
 
       const dash = getDashValue(
         totalLength,

diff --git a/apps/client/src/components/Canvas/Shapes/EllipseDrawable/helpers/calc.ts b/apps/client/src/components/Canvas/Shapes/EllipseDrawable/helpers/calc.ts
diff --git a/apps/client/src/components/Canvas/Transformer/NodesTransformer.tsx b/apps/client/src/components/Canvas/Transformer/NodesTransformer.tsx
@@ -5,7 +5,6 @@ import { TRANSFORMER } from '@/constants/shape';
 import { Transformer } from 'react-konva';
 import { normalizeTransformerSize } from './helpers';
 import { getNodeSize } from '../Shapes/EditableText/helpers/size';
-import { getEllipseRadius } from '../Shapes/EllipseDrawable/helpers/calc';
 import { getRectSize } from '../Shapes/RectDrawable/helpers/calc';
 import type Konva from 'konva';
 import type { NodeObject, Point } from 'shared';
@@ -220,15 +219,14 @@ const NodesTransformer = ({
         }
         case 'ellipse': {
           const ellipse = element as Konva.Ellipse;
-          const { radiusX, radiusY } = getEllipseRadius(ellipse);
 
           updatedNodes.push({
             ...node,
             nodeProps: {
               ...node.nodeProps,
               point: [ellipse.x(), ellipse.y()],
-              width: radiusX,
-              height: radiusY,
+              width: ellipse.radiusX() * ellipse.scaleX(),
+              height: ellipse.radiusY() * ellipse.scaleY(),
               rotation: ellipse.rotation(),
             },
           });