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

package/dist/esm/index.js

@@ -32,6 +32,7 @@ export class Core {
         const { devicePixelRatio = 1, width, height, createCustomContext2D } = opts;
         __classPrivateFieldSet(this, _Core_container, container, "f");
         const canvas = document.createElement('canvas');
+        canvas.setAttribute('tabindex', '0');
         __classPrivateFieldSet(this, _Core_canvas, canvas, "f");
         __classPrivateFieldGet(this, _Core_instances, "m", _Core_initContainer).call(this);
         container.appendChild(canvas);

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/layout-selector/config.d.ts

@@ -3,7 +3,9 @@ export declare const key = "LAYOUT_SELECT";
 export declare const keyLayoutActionType: unique symbol;
 export declare const keyLayoutControlType: unique symbol;
 export declare const keyLayoutController: unique symbol;
-export declare const keyLayoutIsHover: unique symbol;
+export declare const keyLayoutIsHoverContent: unique symbol;
+export declare const keyLayoutIsHoverController: unique symbol;
 export declare const keyLayoutIsSelected: unique symbol;
+export declare const keyLayoutIsBusyMoving: unique symbol;
 export declare const controllerSize = 10;
 export declare const defaultStyle: MiddlewareLayoutSelectorStyle;

package/dist/esm/middleware/layout-selector/config.js

@@ -2,8 +2,10 @@ export const key = 'LAYOUT_SELECT';
 export const keyLayoutActionType = Symbol(`${key}_layoutActionType`);
 export const keyLayoutControlType = Symbol(`${key}_layoutControlType`);
 export const keyLayoutController = Symbol(`${key}_layoutController`);
-export const keyLayoutIsHover = Symbol(`${key}_layoutIsHover`);
+export const keyLayoutIsHoverContent = Symbol(`${key}_layoutIsHoverContent`);
+export const keyLayoutIsHoverController = Symbol(`${key}_layoutIsHoverController`);
 export const keyLayoutIsSelected = Symbol(`${key}_layoutIsSelected`);
+export const keyLayoutIsBusyMoving = Symbol(`${key}_layoutIsSelected`);
 export const controllerSize = 10;
 export const defaultStyle = {
     activeColor: '#b331c9'

package/dist/esm/middleware/layout-selector/index.d.ts

@@ -1,5 +1,5 @@
 import type { BoardMiddleware, MiddlewareLayoutSelectorConfig, CoreEventMap } from '@idraw/types';
 import type { LayoutSelectorSharedStorage } from './types';
-import { keyLayoutIsSelected } from './config';
-export { keyLayoutIsSelected };
+import { keyLayoutIsSelected, keyLayoutIsBusyMoving } from './config';
+export { keyLayoutIsSelected, keyLayoutIsBusyMoving };
 export declare const MiddlewareLayoutSelector: BoardMiddleware<LayoutSelectorSharedStorage, CoreEventMap, MiddlewareLayoutSelectorConfig>;

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

@@ -1,9 +1,9 @@
 import { calcLayoutSizeController, isViewPointInVertexes, getViewScaleInfoFromSnapshot, isViewPointInElementSize, calcViewElementSize } from '@idraw/util';
-import { keyLayoutActionType, keyLayoutController, keyLayoutControlType, keyLayoutIsHover, keyLayoutIsSelected, controllerSize, defaultStyle } from './config';
-import { keyActionType as keyElementActionType, keyHoverElement } from '../selector';
+import { keyLayoutActionType, keyLayoutController, keyLayoutControlType, keyLayoutIsHoverContent, keyLayoutIsHoverController, keyLayoutIsSelected, keyLayoutIsBusyMoving, controllerSize, defaultStyle } from './config';
+import { keyActionType as keyElementActionType } from '../selector';
 import { drawLayoutController, drawLayoutHover } from './util';
 import { coreEventKeys } from '../../config';
-export { keyLayoutIsSelected };
+export { keyLayoutIsSelected, keyLayoutIsBusyMoving };
 export const MiddlewareLayoutSelector = (opts, config) => {
     const { sharer, boardContent, calculator, viewer, eventHub } = opts;
     const { overlayContext } = boardContent;
@@ -11,27 +11,19 @@ export const MiddlewareLayoutSelector = (opts, config) => {
     const { activeColor } = innerConfig;
     const style = { activeColor };
     let prevPoint = null;
-    let prevIsHover = null;
+    let prevIsHoverContent = null;
     let prevIsSelected = null;
-    let isBusy = null;
     const clear = () => {
         prevPoint = null;
         sharer.setSharedStorage(keyLayoutActionType, null);
         sharer.setSharedStorage(keyLayoutControlType, null);
         sharer.setSharedStorage(keyLayoutController, null);
-        sharer.setSharedStorage(keyLayoutIsHover, null);
+        sharer.setSharedStorage(keyLayoutIsHoverContent, null);
+        sharer.setSharedStorage(keyLayoutIsHoverController, null);
         sharer.setSharedStorage(keyLayoutIsSelected, null);
-        prevIsHover = null;
+        sharer.setSharedStorage(keyLayoutIsBusyMoving, null);
+        prevIsHoverContent = null;
         prevIsSelected = null;
-        isBusy = null;
-    };
-    const isInElementHover = () => {
-        const hoverElement = sharer.getSharedStorage(keyHoverElement);
-        if (hoverElement) {
-            clear();
-            return true;
-        }
-        return false;
     };
     const isInElementAction = () => {
         const elementActionType = sharer.getSharedStorage(keyElementActionType);
@@ -78,6 +70,7 @@ export const MiddlewareLayoutSelector = (opts, config) => {
     const resetControlType = (e) => {
         const data = sharer.getActiveStorage('data');
         const controller = sharer.getSharedStorage(keyLayoutController);
+        let controllerType = null;
         if (controller && (data === null || data === void 0 ? void 0 : data.layout) && (e === null || e === void 0 ? void 0 : e.point)) {
             let layoutControlType = null;
             if (controller) {
@@ -93,14 +86,20 @@ export const MiddlewareLayoutSelector = (opts, config) => {
                 if (layoutControlType) {
                     sharer.setSharedStorage(keyLayoutControlType, layoutControlType);
                     eventHub.trigger(coreEventKeys.CLEAR_SELECT);
-                    return layoutControlType;
+                    controllerType = layoutControlType;
                 }
             }
         }
-        return null;
+        if (controllerType) {
+            sharer.setSharedStorage(keyLayoutIsHoverController, true);
+        }
+        else {
+            sharer.setSharedStorage(keyLayoutIsHoverController, false);
+        }
+        return controllerType;
     };
     const updateCursor = (controlType) => {
-        if (isBusy === true) {
+        if (sharer.getSharedStorage(keyLayoutIsBusyMoving) === true) {
             return;
         }
         eventHub.trigger(coreEventKeys.CURSOR, {
@@ -116,23 +115,20 @@ export const MiddlewareLayoutSelector = (opts, config) => {
             resetController();
         },
         hover: (e) => {
-            if (isBusy === true) {
+            if (sharer.getSharedStorage(keyLayoutIsBusyMoving) === true) {
                 return;
             }
             if (isInElementAction()) {
                 return;
             }
-            if (isInElementHover()) {
-                return;
-            }
             if (isInLayout(e.point)) {
-                sharer.setSharedStorage(keyLayoutIsHover, true);
+                sharer.setSharedStorage(keyLayoutIsHoverContent, true);
             }
             else {
-                sharer.setSharedStorage(keyLayoutIsHover, false);
-                if (prevIsHover === true) {
+                sharer.setSharedStorage(keyLayoutIsHoverContent, false);
+                if (prevIsHoverContent === true) {
                     viewer.drawFrame();
-                    prevIsHover = false;
+                    prevIsHoverContent = false;
                 }
             }
             if (sharer.getSharedStorage(keyLayoutIsSelected) === true) {
@@ -155,12 +151,18 @@ export const MiddlewareLayoutSelector = (opts, config) => {
                         updateCursor(layoutControlType);
                     }
                 }
+                if (sharer.getSharedStorage(keyLayoutIsHoverController) === true) {
+                    return false;
+                }
                 return;
             }
-            if (sharer.getSharedStorage(keyLayoutIsHover) && !prevIsHover) {
+            if (sharer.getSharedStorage(keyLayoutIsHoverContent) && !prevIsHoverContent) {
                 viewer.drawFrame();
             }
-            prevIsHover = sharer.getSharedStorage(keyLayoutIsHover);
+            prevIsHoverContent = sharer.getSharedStorage(keyLayoutIsHoverContent);
+            if (sharer.getSharedStorage(keyLayoutIsHoverController) === true) {
+                return false;
+            }
         },
         pointStart: (e) => {
             if (isInElementAction()) {
@@ -186,6 +188,9 @@ export const MiddlewareLayoutSelector = (opts, config) => {
                 viewer.drawFrame();
             }
             prevIsSelected = sharer.getSharedStorage(keyLayoutIsSelected);
+            if (sharer.getSharedStorage(keyLayoutIsHoverController) === true) {
+                return false;
+            }
         },
         pointMove: (e) => {
             if (!sharer.getSharedStorage(keyLayoutIsSelected)) {
@@ -198,7 +203,7 @@ export const MiddlewareLayoutSelector = (opts, config) => {
             const data = sharer.getActiveStorage('data');
             if (layoutActionType === 'resize' && layoutControlType && (data === null || data === void 0 ? void 0 : data.layout)) {
                 if (prevPoint) {
-                    isBusy = true;
+                    sharer.setSharedStorage(keyLayoutIsBusyMoving, true);
                     const scale = sharer.getActiveStorage('scale');
                     const viewMoveX = e.point.x - prevPoint.x;
                     const viewMoveY = e.point.y - prevPoint.y;
@@ -288,7 +293,7 @@ export const MiddlewareLayoutSelector = (opts, config) => {
             }
         },
         pointEnd: () => {
-            isBusy = false;
+            sharer.setSharedStorage(keyLayoutIsBusyMoving, false);
             const layoutActionType = sharer.getSharedStorage(keyLayoutActionType);
             const layoutControlType = sharer.getSharedStorage(keyLayoutControlType);
             const data = sharer.getActiveStorage('data');
@@ -298,6 +303,9 @@ export const MiddlewareLayoutSelector = (opts, config) => {
                     data
                 });
             }
+            if (sharer.getSharedStorage(keyLayoutIsHoverController) === true) {
+                return false;
+            }
         },
         beforeDrawFrame: ({ snapshot }) => {
             var _a;
@@ -306,7 +314,7 @@ export const MiddlewareLayoutSelector = (opts, config) => {
             }
             const { sharedStore, activeStore } = snapshot;
             const layoutActionType = sharedStore[keyLayoutActionType];
-            const layoutIsHover = sharedStore[keyLayoutIsHover];
+            const layoutIsHover = sharedStore[keyLayoutIsHoverContent];
             const layoutIsSelected = sharedStore[keyLayoutIsSelected];
             if ((_a = activeStore.data) === null || _a === void 0 ? void 0 : _a.layout) {
                 const { x, y, w, h } = activeStore.data.layout;

package/dist/esm/middleware/layout-selector/types.d.ts

@@ -1,5 +1,5 @@
 import type { LayoutSizeController, Element } from '@idraw/types';
-import { keyLayoutActionType, keyLayoutControlType, keyLayoutController, keyLayoutIsHover, keyLayoutIsSelected } from './config';
+import { keyLayoutActionType, keyLayoutControlType, keyLayoutController, keyLayoutIsHoverContent, keyLayoutIsHoverController, keyLayoutIsSelected, keyLayoutIsBusyMoving } from './config';
 import { keyActionType as keyElementActionType, keyHoverElement } from '../selector';
 import type { ActionType as ElementActionType } from '../selector';
 export type ActionType = 'resize' | null;
@@ -10,6 +10,8 @@ export type LayoutSelectorSharedStorage = {
     [keyLayoutController]: LayoutSizeController | null;
     [keyElementActionType]: ElementActionType | null;
     [keyHoverElement]: Element | null;
-    [keyLayoutIsHover]: boolean | null;
+    [keyLayoutIsHoverContent]: boolean | null;
+    [keyLayoutIsHoverController]: boolean | null;
     [keyLayoutIsSelected]: boolean | null;
+    [keyLayoutIsBusyMoving]: boolean | null;
 };

package/dist/esm/middleware/layout-selector/types.js

@@ -1,2 +1,2 @@
-import { keyLayoutActionType, keyLayoutControlType, keyLayoutController, keyLayoutIsHover, keyLayoutIsSelected } from './config';
+import { keyLayoutActionType, keyLayoutControlType, keyLayoutController, keyLayoutIsHoverContent, keyLayoutIsHoverController, keyLayoutIsSelected, keyLayoutIsBusyMoving } from './config';
 import { keyActionType as keyElementActionType, keyHoverElement } from '../selector';

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,11 +1,11 @@
-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';
-import { keyLayoutIsSelected } from '../layout-selector';
+import { keyLayoutIsSelected, keyLayoutIsBusyMoving } from '../layout-selector';
 import { createRotateControllerPattern } from './pattern';
 import { MIDDLEWARE_INTERNAL_EVENT_SHOW_INFO_ANGLE } from '../info';
 export { keySelectedElementList, keyHoverElement, keyActionType, keyResizeType, keyGroupQueue };
@@ -174,6 +174,10 @@ export const MiddlewareSelector = (opts, config) => {
         hover: (e) => {
             var _a, _b, _c, _d, _e;
             const layoutIsSelected = sharer.getSharedStorage(keyLayoutIsSelected);
+            const layoutIsBusyMoving = sharer.getSharedStorage(keyLayoutIsBusyMoving);
+            if (layoutIsBusyMoving === true) {
+                return;
+            }
             const resizeType = sharer.getSharedStorage(keyResizeType);
             const actionType = sharer.getSharedStorage(keyActionType);
             const groupQueue = sharer.getSharedStorage(keyGroupQueue);
@@ -361,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) {
@@ -695,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/types.d.ts

@@ -1,6 +1,6 @@
 import { Data, ElementSize, ElementType, Element, ViewContext2D, Point, PointSize, ViewScaleInfo, ViewSizeInfo, ViewCalculator, PointWatcherEvent, BoardMiddleware, ViewRectVertexes, ElementSizeController, ElementPosition } from '@idraw/types';
 import { keyActionType, keyResizeType, keyAreaStart, keyAreaEnd, keyGroupQueue, keyGroupQueueVertexesList, keyHoverElement, keyHoverElementVertexes, keySelectedElementList, keySelectedElementListVertexes, keySelectedElementController, keySelectedElementPosition, keyIsMoving, keyEnableSelectInGroup, keyEnableSnapToGrid, keyDebugElemCenter, keyDebugEnd0, keyDebugEndHorizontal, keyDebugEndVertical, keyDebugStartHorizontal, keyDebugStartVertical } from './config';
-import { keyLayoutIsSelected } from '../layout-selector';
+import { keyLayoutIsSelected, keyLayoutIsBusyMoving } from '../layout-selector';
 export { Data, ElementType, Element, ElementSize, ViewContext2D, Point, PointSize, ViewScaleInfo, ViewSizeInfo, ViewCalculator, PointWatcherEvent, BoardMiddleware };
 export type ControllerStyle = ElementSize & {
     borderWidth: number;
@@ -42,4 +42,5 @@ export type DeepSelectorSharedStorage = {
     [keyDebugStartHorizontal]: PointSize | null;
     [keyDebugStartVertical]: PointSize | null;
     [keyLayoutIsSelected]: boolean | null;
+    [keyLayoutIsBusyMoving]: boolean | null;
 };

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

@@ -1,2 +1,2 @@
 import { keyActionType, keyResizeType, keyAreaStart, keyAreaEnd, keyGroupQueue, keyGroupQueueVertexesList, keyHoverElement, keyHoverElementVertexes, keySelectedElementList, keySelectedElementListVertexes, keySelectedElementController, keySelectedElementPosition, keyIsMoving, keyEnableSelectInGroup, keyEnableSnapToGrid, keyDebugElemCenter, keyDebugEnd0, keyDebugEndHorizontal, keyDebugEndVertical, keyDebugStartHorizontal, keyDebugStartVertical } from './config';
-import { keyLayoutIsSelected } from '../layout-selector';
+import { keyLayoutIsSelected, keyLayoutIsBusyMoving } from '../layout-selector';

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
-    };
-}