@idraw/core 0.4.0-beta.37 → 0.4.0-beta.38

package/dist/esm/middleware/info/index.js

@@ -27,6 +27,7 @@ export const MiddlewareInfo = (opts, config) => {
             eventHub.off(MIDDLEWARE_INTERNAL_EVENT_SHOW_INFO_ANGLE, showInfoAngleCallback);
         },
         beforeDrawFrame({ snapshot }) {
+            var _a;
             const { sharedStore } = snapshot;
             const selectedElementList = sharedStore[keySelectedElementList];
             const actionType = sharedStore[keyActionType];
@@ -104,18 +105,20 @@ export const MiddlewareInfo = (opts, config) => {
                             style
                         });
                         if (showAngleInfo) {
-                            drawAngleInfoText(overlayContext, {
-                                point: {
-                                    x: rectInfo.top.x + infoFontSize + 4,
-                                    y: rectInfo.top.y - infoFontSize * 2 - 18
-                                },
-                                rotateCenter: rectInfo.center,
-                                angle: totalAngle,
-                                text: angleText,
-                                fontSize: infoFontSize,
-                                lineHeight: infoLineHeight,
-                                style
-                            });
+                            if (((_a = elem.operations) === null || _a === void 0 ? void 0 : _a.rotatable) !== false) {
+                                drawAngleInfoText(overlayContext, {
+                                    point: {
+                                        x: rectInfo.top.x + infoFontSize + 4,
+                                        y: rectInfo.top.y - infoFontSize * 2 - 18
+                                    },
+                                    rotateCenter: rectInfo.center,
+                                    angle: totalAngle,
+                                    text: angleText,
+                                    fontSize: infoFontSize,
+                                    lineHeight: infoLineHeight,
+                                    style
+                                });
+                            }
                         }
                     }
                 }

package/dist/esm/middleware/selector/draw-wrapper.js

@@ -33,10 +33,11 @@ export function drawLockedVertexesWrapper(ctx, vertexes, opts) {
     }
 }
 export function drawSelectedElementControllersVertexes(ctx, controller, opts) {
+    var _a;
     if (!controller) {
         return;
     }
-    const { hideControllers, style, rotateControllerPattern, viewSizeInfo } = opts;
+    const { hideControllers, style, rotateControllerPattern, viewSizeInfo, element } = opts;
     const { devicePixelRatio = 1 } = viewSizeInfo;
     const { activeColor } = style;
     const { elementWrapper, topLeft, topRight, bottomLeft, bottomRight, rotate } = controller;
@@ -48,9 +49,11 @@ export function drawSelectedElementControllersVertexes(ctx, controller, opts) {
         drawVertexes(ctx, calcViewVertexes(topRight.vertexes, opts), ctrlOpts);
         drawVertexes(ctx, calcViewVertexes(bottomLeft.vertexes, opts), ctrlOpts);
         drawVertexes(ctx, calcViewVertexes(bottomRight.vertexes, opts), ctrlOpts);
-        drawCircleController(ctx, calcViewPointSize(rotate.center, opts), Object.assign(Object.assign({}, ctrlOpts), { size: rotate.size, borderWidth: 0 }));
-        const rotateCenter = calcViewPointSize(rotate.center, opts);
-        ctx.drawImage(rotateControllerPattern.canvas, 0, 0, rotateControllerPattern.canvas.width / devicePixelRatio, rotateControllerPattern.canvas.height / devicePixelRatio, rotateCenter.x - rotate.size / 2, rotateCenter.y - rotate.size / 2, rotate.size, rotate.size);
+        if (((_a = element === null || element === void 0 ? void 0 : element.operations) === null || _a === void 0 ? void 0 : _a.rotatable) !== false) {
+            drawCircleController(ctx, calcViewPointSize(rotate.center, opts), Object.assign(Object.assign({}, ctrlOpts), { size: rotate.size, borderWidth: 0 }));
+            const rotateCenter = calcViewPointSize(rotate.center, opts);
+            ctx.drawImage(rotateControllerPattern.canvas, 0, 0, rotateControllerPattern.canvas.width / devicePixelRatio, rotateControllerPattern.canvas.height / devicePixelRatio, rotateCenter.x - rotate.size / 2, rotateCenter.y - rotate.size / 2, rotate.size, rotate.size);
+        }
     }
 }
 export function drawElementListShadows(ctx, elements, opts) {

package/dist/esm/middleware/selector/index.js

@@ -1,7 +1,7 @@
-import { is, calcElementsViewInfo, calcElementVertexesInGroup, calcElementQueueVertexesQueueInGroup, calcElementSizeController, calcElementCenterFromVertexes, rotatePointInGroup, getGroupQueueFromList, findElementsFromList, findElementsFromListByPositions, getElementPositionFromList, getElementPositionMapFromList, deepResizeGroupElement, getElementSize } from '@idraw/util';
+import { is, calcElementsViewInfo, calcElementVertexesInGroup, calcElementQueueVertexesQueueInGroup, calcElementSizeController, calcElementCenterFromVertexes, rotatePointInGroup, getGroupQueueFromList, findElementsFromList, findElementsFromListByPositions, getElementPositionFromList, getElementPositionMapFromList, deepResizeGroupElement, getElementSize, calcPointMoveElementInGroup, isSameElementSize } from '@idraw/util';
 import { drawHoverVertexesWrapper, drawLockedVertexesWrapper, drawArea, drawListArea, drawGroupQueueVertexesWrappers, drawSelectedElementControllersVertexes } from './draw-wrapper';
 import { drawReferenceLines } from './draw-reference';
-import { getPointTarget, resizeElement, rotateElement, getSelectedListArea, calcSelectedElementsArea, isElementInGroup, isPointInViewActiveGroup, calcMoveInGroup } from './util';
+import { getPointTarget, resizeElement, rotateElement, getSelectedListArea, calcSelectedElementsArea, isElementInGroup, isPointInViewActiveGroup } from './util';
 import { keyActionType, keyResizeType, keyAreaStart, keyAreaEnd, keyGroupQueue, keyGroupQueueVertexesList, keyHoverElement, keyHoverElementVertexes, keySelectedElementList, keySelectedElementListVertexes, keySelectedElementController, keySelectedElementPosition, keyIsMoving, keyEnableSelectInGroup, keyEnableSnapToGrid, controllerSize, rotateControllerSize, rotateControllerPosition, defaultStyle } from './config';
 import { calcReferenceInfo } from './reference';
 import { coreEventKeys } from '../../config';
@@ -365,7 +365,7 @@ export const MiddlewareSelector = (opts, config) => {
                 inBusyMode = 'drag';
                 eventHub.trigger(MIDDLEWARE_INTERNAL_EVENT_SHOW_INFO_ANGLE, { show: false });
                 if (data && (elems === null || elems === void 0 ? void 0 : elems.length) === 1 && moveOriginalStartElementSize && originalStart && end && ((_b = (_a = elems[0]) === null || _a === void 0 ? void 0 : _a.operations) === null || _b === void 0 ? void 0 : _b.locked) !== true) {
-                    const { moveX, moveY } = calcMoveInGroup(originalStart, end, groupQueue);
+                    const { moveX, moveY } = calcPointMoveElementInGroup(originalStart, end, groupQueue);
                     let totalMoveX = calculator.toGridNum(moveX / scale);
                     let totalMoveY = calculator.toGridNum(moveY / scale);
                     if (enableSnapToGrid === true) {
@@ -699,7 +699,19 @@ export const MiddlewareSelector = (opts, config) => {
             const isMoving = sharedStore[keyIsMoving];
             const enableSnapToGrid = sharedStore[keyEnableSnapToGrid];
             const drawBaseOpts = { calculator, viewScaleInfo, viewSizeInfo, style };
-            const selectedElementController = sharedStore[keySelectedElementController];
+            let selectedElementController = sharedStore[keySelectedElementController];
+            if (selectedElementController && selectedElements.length === 1 && elem) {
+                if (!isSameElementSize(elem, selectedElementController.originalElementSize)) {
+                    selectedElementController = calcElementSizeController(elem, {
+                        groupQueue: groupQueue || [],
+                        controllerSize,
+                        viewScaleInfo,
+                        rotateControllerPosition,
+                        rotateControllerSize
+                    });
+                    sharer.setSharedStorage(keySelectedElementController, selectedElementController);
+                }
+            }
             const isHoverLocked = !!((_a = hoverElement === null || hoverElement === void 0 ? void 0 : hoverElement.operations) === null || _a === void 0 ? void 0 : _a.locked);
             if ((groupQueue === null || groupQueue === void 0 ? void 0 : groupQueue.length) > 0) {
                 drawGroupQueueVertexesWrappers(overlayContext, groupQueueVertexesList, drawBaseOpts);

package/dist/esm/middleware/selector/util.d.ts

@@ -56,7 +56,3 @@ export declare function calcSelectedElementsArea(elements: Element<ElementType>[
     calculator: ViewCalculator;
 }): AreaSize | null;
 export declare function isElementInGroup(elem: Element<ElementType>, group: Element<'group'>): boolean;
-export declare function calcMoveInGroup(start: PointSize, end: PointSize, groupQueue: Element<'group'>[]): {
-    moveX: number;
-    moveY: number;
-};

package/dist/esm/middleware/selector/util.js

@@ -1,4 +1,4 @@
-import { calcElementCenter, rotateElementVertexes, calcElementVertexesInGroup, calcElementQueueVertexesQueueInGroup, calcViewPointSize, calcViewElementSize, rotatePointInGroup, rotatePoint, parseAngleToRadian, parseRadianToAngle, limitAngle, calcRadian } from '@idraw/util';
+import { calcElementCenter, rotateElementVertexes, calcElementVertexesInGroup, calcElementQueueVertexesQueueInGroup, calcViewPointSize, calcViewElementSize, rotatePoint, parseAngleToRadian, parseRadianToAngle, limitAngle, calcRadian } from '@idraw/util';
 function parseRadian(angle) {
     return (angle * Math.PI) / 180;
 }
@@ -39,7 +39,7 @@ export function isPointInViewActiveGroup(p, opts) {
     return isPointInViewActiveVertexes(p, { ctx, vertexes, viewScaleInfo, viewSizeInfo });
 }
 export function getPointTarget(p, opts) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const target = {
         type: null,
         elements: [],
@@ -50,7 +50,10 @@ export function getPointTarget(p, opts) {
     const { ctx, data, calculator, selectedElements, viewScaleInfo, viewSizeInfo, areaSize, groupQueue, selectedElementController } = opts;
     if (selectedElementController) {
         const { left, right, top, bottom, topLeft, topRight, bottomLeft, bottomRight, rotate } = selectedElementController;
-        const ctrls = [left, right, top, bottom, topLeft, topRight, bottomLeft, bottomRight, rotate];
+        const ctrls = [left, right, top, bottom, topLeft, topRight, bottomLeft, bottomRight];
+        if ((selectedElements === null || selectedElements === void 0 ? void 0 : selectedElements.length) === 1 && ((_b = (_a = selectedElements === null || selectedElements === void 0 ? void 0 : selectedElements[0]) === null || _a === void 0 ? void 0 : _a.operations) === null || _b === void 0 ? void 0 : _b.rotatable) !== false) {
+            ctrls.push(rotate);
+        }
         for (let i = 0; i < ctrls.length; i++) {
             const ctrl = ctrls[i];
             if (isPointInViewActiveVertexes(p, { ctx, vertexes: ctrl.vertexes, viewSizeInfo, viewScaleInfo })) {
@@ -65,7 +68,7 @@ export function getPointTarget(p, opts) {
     }
     if (groupQueue && Array.isArray(groupQueue) && groupQueue.length > 0) {
         const lastGroup = groupQueue[groupQueue.length - 1];
-        if (((_a = lastGroup === null || lastGroup === void 0 ? void 0 : lastGroup.detail) === null || _a === void 0 ? void 0 : _a.children) && Array.isArray((_b = lastGroup === null || lastGroup === void 0 ? void 0 : lastGroup.detail) === null || _b === void 0 ? void 0 : _b.children)) {
+        if (((_c = lastGroup === null || lastGroup === void 0 ? void 0 : lastGroup.detail) === null || _c === void 0 ? void 0 : _c.children) && Array.isArray((_d = lastGroup === null || lastGroup === void 0 ? void 0 : lastGroup.detail) === null || _d === void 0 ? void 0 : _d.children)) {
             for (let i = lastGroup.detail.children.length - 1; i >= 0; i--) {
                 const child = lastGroup.detail.children[i];
                 const vertexes = calcElementVertexesInGroup(child, { groupQueue });
@@ -94,7 +97,7 @@ export function getPointTarget(p, opts) {
     }
     if (data) {
         const { index, element } = calculator.getPointElement(p, { data, viewScaleInfo, viewSizeInfo });
-        if (index >= 0 && element && ((_c = element === null || element === void 0 ? void 0 : element.operations) === null || _c === void 0 ? void 0 : _c.invisible) !== true) {
+        if (index >= 0 && element && ((_e = element === null || element === void 0 ? void 0 : element.operations) === null || _e === void 0 ? void 0 : _e.invisible) !== true) {
             target.elements = [element];
             target.type = 'over-element';
             return target;
@@ -784,28 +787,3 @@ export function isElementInGroup(elem, group) {
     }
     return false;
 }
-export function calcMoveInGroup(start, end, groupQueue) {
-    let moveX = end.x - start.x;
-    let moveY = end.y - start.y;
-    const pointGroupQueue = [];
-    groupQueue.forEach((group) => {
-        const { x, y, w, h, angle = 0 } = group;
-        pointGroupQueue.push({
-            x,
-            y,
-            w,
-            h,
-            angle: 0 - angle
-        });
-    });
-    if ((groupQueue === null || groupQueue === void 0 ? void 0 : groupQueue.length) > 0) {
-        const startInGroup = rotatePointInGroup(start, pointGroupQueue);
-        const endInGroup = rotatePointInGroup(end, pointGroupQueue);
-        moveX = endInGroup.x - startInGroup.x;
-        moveY = endInGroup.y - startInGroup.y;
-    }
-    return {
-        moveX,
-        moveY
-    };
-}

package/dist/index.global.js

@@ -1272,6 +1272,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
     _loop(elements);
     return positionMap;
   }
+  function isSameElementSize(elem1, elem2) {
+    return elem1.x === elem2.x && elem1.y === elem2.y && elem1.h === elem2.h && elem1.w === elem2.w && limitAngle(elem1.angle || 0) === limitAngle(elem2.angle || 0);
+  }
   function getElementVertexes(elemSize) {
     const { x: x2, y: y2, h: h2, w: w2 } = elemSize;
     return [
@@ -1755,6 +1758,8 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
     });
     const rotateVertexes2 = calcElementVertexes(rotateSize);
     const sizeController = {
+      originalElementCenter: calcElementCenter(elemSize),
+      originalElementSize: Object.assign({}, elemSize),
       elementWrapper: vertexes,
       left: {
         type: "left",
@@ -2142,6 +2147,31 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       }
     return t;
   });
+  function calcPointMoveElementInGroup(start, end, groupQueue) {
+    let moveX = end.x - start.x;
+    let moveY = end.y - start.y;
+    const pointGroupQueue = [];
+    groupQueue.forEach((group) => {
+      const { x: x2, y: y2, w: w2, h: h2, angle: angle2 = 0 } = group;
+      pointGroupQueue.push({
+        x: x2,
+        y: y2,
+        w: w2,
+        h: h2,
+        angle: 0 - angle2
+      });
+    });
+    if ((groupQueue === null || groupQueue === void 0 ? void 0 : groupQueue.length) > 0) {
+      const startInGroup = rotatePointInGroup(start, pointGroupQueue);
+      const endInGroup = rotatePointInGroup(end, pointGroupQueue);
+      moveX = endInGroup.x - startInGroup.x;
+      moveY = endInGroup.y - startInGroup.y;
+    }
+    return {
+      moveX,
+      moveY
+    };
+  }
   function createColorStyle(ctx, color2, opts) {
     if (typeof color2 === "string") {
       return color2;
@@ -4792,6 +4822,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
     }
   }
   function drawSelectedElementControllersVertexes(ctx, controller, opts) {
+    var _a;
     if (!controller) {
       return;
     }
@@ -4799,8 +4830,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       hideControllers,
       style,
       rotateControllerPattern,
-      viewSizeInfo
-      // calculator, element, viewScaleInfo, viewSizeInfo
+      viewSizeInfo,
+      element
+      // calculator, viewScaleInfo, viewSizeInfo
     } = opts;
     const { devicePixelRatio = 1 } = viewSizeInfo;
     const { activeColor: activeColor2 } = style;
@@ -4813,19 +4845,21 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       drawVertexes(ctx, calcViewVertexes(topRight.vertexes, opts), ctrlOpts);
       drawVertexes(ctx, calcViewVertexes(bottomLeft.vertexes, opts), ctrlOpts);
       drawVertexes(ctx, calcViewVertexes(bottomRight.vertexes, opts), ctrlOpts);
-      drawCircleController(ctx, calcViewPointSize(rotate.center, opts), { ...ctrlOpts, size: rotate.size, borderWidth: 0 });
-      const rotateCenter = calcViewPointSize(rotate.center, opts);
-      ctx.drawImage(
-        rotateControllerPattern.canvas,
-        0,
-        0,
-        rotateControllerPattern.canvas.width / devicePixelRatio,
-        rotateControllerPattern.canvas.height / devicePixelRatio,
-        rotateCenter.x - rotate.size / 2,
-        rotateCenter.y - rotate.size / 2,
-        rotate.size,
-        rotate.size
-      );
+      if (((_a = element == null ? void 0 : element.operations) == null ? void 0 : _a.rotatable) !== false) {
+        drawCircleController(ctx, calcViewPointSize(rotate.center, opts), { ...ctrlOpts, size: rotate.size, borderWidth: 0 });
+        const rotateCenter = calcViewPointSize(rotate.center, opts);
+        ctx.drawImage(
+          rotateControllerPattern.canvas,
+          0,
+          0,
+          rotateControllerPattern.canvas.width / devicePixelRatio,
+          rotateControllerPattern.canvas.height / devicePixelRatio,
+          rotateCenter.x - rotate.size / 2,
+          rotateCenter.y - rotate.size / 2,
+          rotate.size,
+          rotate.size
+        );
+      }
     }
   }
   function drawArea(ctx, opts) {
@@ -4940,7 +4974,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
     return isPointInViewActiveVertexes(p, { ctx, vertexes, viewScaleInfo, viewSizeInfo });
   }
   function getPointTarget(p, opts) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const target = {
       type: null,
       elements: [],
@@ -4951,7 +4985,10 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
     const { ctx, data, calculator, selectedElements, viewScaleInfo, viewSizeInfo, areaSize, groupQueue, selectedElementController } = opts;
     if (selectedElementController) {
       const { left, right, top, bottom, topLeft, topRight, bottomLeft, bottomRight, rotate } = selectedElementController;
-      const ctrls = [left, right, top, bottom, topLeft, topRight, bottomLeft, bottomRight, rotate];
+      const ctrls = [left, right, top, bottom, topLeft, topRight, bottomLeft, bottomRight];
+      if ((selectedElements == null ? void 0 : selectedElements.length) === 1 && ((_b = (_a = selectedElements == null ? void 0 : selectedElements[0]) == null ? void 0 : _a.operations) == null ? void 0 : _b.rotatable) !== false) {
+        ctrls.push(rotate);
+      }
       for (let i = 0; i < ctrls.length; i++) {
         const ctrl = ctrls[i];
         if (isPointInViewActiveVertexes(p, { ctx, vertexes: ctrl.vertexes, viewSizeInfo, viewScaleInfo })) {
@@ -4966,7 +5003,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
     }
     if (groupQueue && Array.isArray(groupQueue) && groupQueue.length > 0) {
       const lastGroup = groupQueue[groupQueue.length - 1];
-      if (((_a = lastGroup == null ? void 0 : lastGroup.detail) == null ? void 0 : _a.children) && Array.isArray((_b = lastGroup == null ? void 0 : lastGroup.detail) == null ? void 0 : _b.children)) {
+      if (((_c = lastGroup == null ? void 0 : lastGroup.detail) == null ? void 0 : _c.children) && Array.isArray((_d = lastGroup == null ? void 0 : lastGroup.detail) == null ? void 0 : _d.children)) {
         for (let i = lastGroup.detail.children.length - 1; i >= 0; i--) {
           const child = lastGroup.detail.children[i];
           const vertexes = calcElementVertexesInGroup(child, { groupQueue });
@@ -4995,7 +5032,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
     }
     if (data) {
       const { index, element } = calculator.getPointElement(p, { data, viewScaleInfo, viewSizeInfo });
-      if (index >= 0 && element && ((_c = element == null ? void 0 : element.operations) == null ? void 0 : _c.invisible) !== true) {
+      if (index >= 0 && element && ((_e = element == null ? void 0 : element.operations) == null ? void 0 : _e.invisible) !== true) {
         target.elements = [element];
         target.type = "over-element";
         return target;
@@ -5643,31 +5680,6 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
     }
     return false;
   }
-  function calcMoveInGroup(start, end, groupQueue) {
-    let moveX = end.x - start.x;
-    let moveY = end.y - start.y;
-    const pointGroupQueue = [];
-    groupQueue.forEach((group) => {
-      const { x: x2, y: y2, w: w2, h: h2, angle: angle2 = 0 } = group;
-      pointGroupQueue.push({
-        x: x2,
-        y: y2,
-        w: w2,
-        h: h2,
-        angle: 0 - angle2
-      });
-    });
-    if ((groupQueue == null ? void 0 : groupQueue.length) > 0) {
-      const startInGroup = rotatePointInGroup(start, pointGroupQueue);
-      const endInGroup = rotatePointInGroup(end, pointGroupQueue);
-      moveX = endInGroup.x - startInGroup.x;
-      moveY = endInGroup.y - startInGroup.y;
-    }
-    return {
-      moveX,
-      moveY
-    };
-  }
   const unitSize = 2;
   function getViewBoxInfo(rectInfo) {
     const boxInfo = {
@@ -6669,6 +6681,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         eventHub.off(MIDDLEWARE_INTERNAL_EVENT_SHOW_INFO_ANGLE, showInfoAngleCallback);
       },
       beforeDrawFrame({ snapshot }) {
+        var _a;
         const { sharedStore } = snapshot;
         const selectedElementList = sharedStore[keySelectedElementList];
         const actionType = sharedStore[keyActionType];
@@ -6746,18 +6759,20 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
                 style
               });
               if (showAngleInfo) {
-                drawAngleInfoText(overlayContext, {
-                  point: {
-                    x: rectInfo.top.x + infoFontSize + 4,
-                    y: rectInfo.top.y - infoFontSize * 2 - 18
-                  },
-                  rotateCenter: rectInfo.center,
-                  angle: totalAngle,
-                  text: angleText,
-                  fontSize: infoFontSize,
-                  lineHeight: infoLineHeight,
-                  style
-                });
+                if (((_a = elem.operations) == null ? void 0 : _a.rotatable) !== false) {
+                  drawAngleInfoText(overlayContext, {
+                    point: {
+                      x: rectInfo.top.x + infoFontSize + 4,
+                      y: rectInfo.top.y - infoFontSize * 2 - 18
+                    },
+                    rotateCenter: rectInfo.center,
+                    angle: totalAngle,
+                    text: angleText,
+                    fontSize: infoFontSize,
+                    lineHeight: infoLineHeight,
+                    style
+                  });
+                }
               }
             }
           }
@@ -7112,7 +7127,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
           inBusyMode = "drag";
           eventHub.trigger(MIDDLEWARE_INTERNAL_EVENT_SHOW_INFO_ANGLE, { show: false });
           if (data && (elems == null ? void 0 : elems.length) === 1 && moveOriginalStartElementSize && originalStart && end && ((_b = (_a = elems[0]) == null ? void 0 : _a.operations) == null ? void 0 : _b.locked) !== true) {
-            const { moveX, moveY } = calcMoveInGroup(originalStart, end, groupQueue);
+            const { moveX, moveY } = calcPointMoveElementInGroup(originalStart, end, groupQueue);
             let totalMoveX = calculator.toGridNum(moveX / scale);
             let totalMoveY = calculator.toGridNum(moveY / scale);
             if (enableSnapToGrid === true) {
@@ -7434,7 +7449,19 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         const isMoving = sharedStore[keyIsMoving];
         const enableSnapToGrid = sharedStore[keyEnableSnapToGrid];
         const drawBaseOpts = { calculator, viewScaleInfo, viewSizeInfo, style };
-        const selectedElementController = sharedStore[keySelectedElementController];
+        let selectedElementController = sharedStore[keySelectedElementController];
+        if (selectedElementController && selectedElements.length === 1 && elem) {
+          if (!isSameElementSize(elem, selectedElementController.originalElementSize)) {
+            selectedElementController = calcElementSizeController(elem, {
+              groupQueue: groupQueue || [],
+              controllerSize: controllerSize$1,
+              viewScaleInfo,
+              rotateControllerPosition,
+              rotateControllerSize
+            });
+            sharer2.setSharedStorage(keySelectedElementController, selectedElementController);
+          }
+        }
         const isHoverLocked = !!((_a = hoverElement == null ? void 0 : hoverElement.operations) == null ? void 0 : _a.locked);
         if ((groupQueue == null ? void 0 : groupQueue.length) > 0) {
           drawGroupQueueVertexesWrappers(overlayContext, groupQueueVertexesList, drawBaseOpts);