@idraw/core 0.4.0-beta.43 → 0.4.0-beta.45

package/dist/esm/board/index.js

@@ -189,25 +189,33 @@ export class Board {
         return __classPrivateFieldGet(this, _Board_eventHub, "f");
     }
     onWatcherEvents() {
+        if (__classPrivateFieldGet(this, _Board_opts, "f").disableWatcher === true) {
+            return;
+        }
         __classPrivateFieldGet(this, _Board_watcher, "f").onEvents();
     }
     offWatcherEvents() {
+        if (__classPrivateFieldGet(this, _Board_opts, "f").disableWatcher === true) {
+            return;
+        }
         __classPrivateFieldGet(this, _Board_watcher, "f").offEvents();
     }
 }
 _Board_opts = new WeakMap(), _Board_middlewareMap = new WeakMap(), _Board_activeMiddlewareObjs = new WeakMap(), _Board_watcher = new WeakMap(), _Board_renderer = new WeakMap(), _Board_sharer = new WeakMap(), _Board_viewer = new WeakMap(), _Board_calculator = new WeakMap(), _Board_eventHub = new WeakMap(), _Board_hasDestroyed = new WeakMap(), _Board_instances = new WeakSet(), _Board_init = function _Board_init() {
-    __classPrivateFieldGet(this, _Board_watcher, "f").on('pointStart', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handlePointStart).bind(this));
-    __classPrivateFieldGet(this, _Board_watcher, "f").on('pointEnd', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handlePointEnd).bind(this));
-    __classPrivateFieldGet(this, _Board_watcher, "f").on('pointMove', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handlePointMove).bind(this));
-    __classPrivateFieldGet(this, _Board_watcher, "f").on('pointLeave', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handlePointLeave).bind(this));
-    __classPrivateFieldGet(this, _Board_watcher, "f").on('hover', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handleHover).bind(this));
-    __classPrivateFieldGet(this, _Board_watcher, "f").on('wheel', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handleWheel).bind(this));
-    __classPrivateFieldGet(this, _Board_watcher, "f").on('wheelScale', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handleWheelScale).bind(this));
-    __classPrivateFieldGet(this, _Board_watcher, "f").on('scrollX', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handleScrollX).bind(this));
-    __classPrivateFieldGet(this, _Board_watcher, "f").on('scrollY', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handleScrollY).bind(this));
-    __classPrivateFieldGet(this, _Board_watcher, "f").on('resize', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handleResize).bind(this));
-    __classPrivateFieldGet(this, _Board_watcher, "f").on('doubleClick', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handleDoubleClick).bind(this));
-    __classPrivateFieldGet(this, _Board_watcher, "f").on('contextMenu', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handleContextMenu).bind(this));
+    if (__classPrivateFieldGet(this, _Board_opts, "f").disableWatcher !== true) {
+        __classPrivateFieldGet(this, _Board_watcher, "f").on('pointStart', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handlePointStart).bind(this));
+        __classPrivateFieldGet(this, _Board_watcher, "f").on('pointEnd', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handlePointEnd).bind(this));
+        __classPrivateFieldGet(this, _Board_watcher, "f").on('pointMove', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handlePointMove).bind(this));
+        __classPrivateFieldGet(this, _Board_watcher, "f").on('pointLeave', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handlePointLeave).bind(this));
+        __classPrivateFieldGet(this, _Board_watcher, "f").on('hover', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handleHover).bind(this));
+        __classPrivateFieldGet(this, _Board_watcher, "f").on('wheel', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handleWheel).bind(this));
+        __classPrivateFieldGet(this, _Board_watcher, "f").on('wheelScale', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handleWheelScale).bind(this));
+        __classPrivateFieldGet(this, _Board_watcher, "f").on('scrollX', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handleScrollX).bind(this));
+        __classPrivateFieldGet(this, _Board_watcher, "f").on('scrollY', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handleScrollY).bind(this));
+        __classPrivateFieldGet(this, _Board_watcher, "f").on('resize', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handleResize).bind(this));
+        __classPrivateFieldGet(this, _Board_watcher, "f").on('doubleClick', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handleDoubleClick).bind(this));
+        __classPrivateFieldGet(this, _Board_watcher, "f").on('contextMenu', __classPrivateFieldGet(this, _Board_instances, "m", _Board_handleContextMenu).bind(this));
+    }
     __classPrivateFieldGet(this, _Board_renderer, "f").on('load', () => {
         __classPrivateFieldGet(this, _Board_eventHub, "f").trigger('loadResource');
     });

package/dist/esm/board/viewer.js

@@ -157,7 +157,7 @@ _Viewer_opts = new WeakMap(), _Viewer_drawFrameSnapshotQueue = new WeakMap(), _V
         __classPrivateFieldSet(this, _Viewer_drawFrameStatus, 'COMPLETE', "f");
         return;
     }
-    if ((__classPrivateFieldSet(this, _Viewer_drawFrameStatus, 'DRAWING', "f"))) {
+    if (__classPrivateFieldGet(this, _Viewer_drawFrameStatus, "f") === 'DRAWING') {
         requestAnimationFrame(() => {
             __classPrivateFieldGet(this, _Viewer_instances, "m", _Viewer_drawAnimationFrame).call(this);
         });

package/dist/esm/index.d.ts

@@ -36,6 +36,7 @@ export declare class Core<E extends CoreEventMap = CoreEventMap> {
         viewScaleInfo: ViewScaleInfo;
     };
     refresh(): void;
+    forceRender(): void;
     setViewScale(opts: {
         scale: number;
         offsetX: number;

package/dist/esm/index.js

@@ -43,7 +43,7 @@ export class Core {
         _Core_board.set(this, void 0);
         _Core_canvas.set(this, void 0);
         _Core_container.set(this, void 0);
-        const { devicePixelRatio = 1, width, height } = opts;
+        const { devicePixelRatio = 1, width, height, disableWatcher = false } = opts;
         __classPrivateFieldSet(this, _Core_container, container, "f");
         const canvas = document.createElement('canvas');
         canvas.setAttribute('tabindex', '0');
@@ -51,7 +51,7 @@ export class Core {
         __classPrivateFieldGet(this, _Core_instances, "m", _Core_initContainer).call(this);
         container.appendChild(canvas);
         const boardContent = createBoardContent(canvas, { width, height, devicePixelRatio });
-        const board = new Board({ boardContent, container });
+        const board = new Board({ boardContent, container, disableWatcher });
         const sharer = board.getSharer();
         sharer.setActiveViewSizeInfo({
             width,
@@ -130,6 +130,21 @@ export class Core {
     refresh() {
         __classPrivateFieldGet(this, _Core_board, "f").getViewer().drawFrame();
     }
+    forceRender() {
+        const renderer = __classPrivateFieldGet(this, _Core_board, "f").getRenderer();
+        const calculator = renderer.getCalculator();
+        const loader = renderer.getLoader();
+        const data = this.getData();
+        if (data) {
+            const { viewScaleInfo, viewSizeInfo } = this.getViewInfo();
+            calculator.resetVirtualFlatItemMap(data, {
+                viewScaleInfo,
+                viewSizeInfo
+            });
+        }
+        loader.reset();
+        this.refresh();
+    }
     setViewScale(opts) {
         __classPrivateFieldGet(this, _Core_board, "f").updateViewScaleInfo(opts);
     }

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

@@ -1,4 +1,4 @@
-import { is, calcElementsViewInfo, calcElementVertexesInGroup, calcElementQueueVertexesQueueInGroup, calcElementSizeController, calcElementCenterFromVertexes, rotatePointInGroup, getGroupQueueFromList, findElementsFromList, findElementsFromListByPositions, getElementPositionFromList, getElementPositionMapFromList, deepResizeGroupElement, getElementSize, calcPointMoveElementInGroup, isSameElementSize, toFlattenElement } from '@idraw/util';
+import { is, calcElementsViewInfo, calcElementVertexesInGroup, calcElementQueueVertexesQueueInGroup, calcElementSizeController, calcElementCenterFromVertexes, rotatePointInGroup, getGroupQueueFromList, findElementsFromList, findElementsFromListByPositions, getElementPositionFromList, getElementPositionMapFromList, resizeEffectGroupElement, getElementSize, calcPointMoveElementInGroup, isSameElementSize, toFlattenElement } 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 } from './util';
@@ -282,6 +282,11 @@ export const MiddlewareSelector = (opts, config) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
             prevPoint = e.point;
             moveOriginalStartPoint = e.point;
+            sharer.setSharedStorage(keyActionType, null);
+            sharer.setSharedStorage(keyResizeType, null);
+            sharer.setSharedStorage(keyAreaStart, null);
+            sharer.setSharedStorage(keyAreaEnd, null);
+            sharer.setSharedStorage(keyHoverElement, null);
             const groupQueue = sharer.getSharedStorage(keyGroupQueue);
             if ((groupQueue === null || groupQueue === void 0 ? void 0 : groupQueue.length) > 0) {
                 if (isPointInViewActiveGroup(e.point, {
@@ -498,17 +503,25 @@ export const MiddlewareSelector = (opts, config) => {
                     else {
                         const resizedElemSize = resizeElement(Object.assign(Object.assign({}, moveOriginalStartElementSize), { operations: elems[0].operations }), { scale, start: resizeStart, end: resizeEnd, resizeType, sharer });
                         const calcOpts = { ignore: !!moveOriginalStartElementSize.angle };
-                        elems[0].x = calculator.toGridNum(resizedElemSize.x, calcOpts);
-                        elems[0].y = calculator.toGridNum(resizedElemSize.y, calcOpts);
-                        if (elems[0].type === 'group' && ((_c = elems[0].operations) === null || _c === void 0 ? void 0 : _c.deepResize) === true) {
-                            deepResizeGroupElement(elems[0], {
-                                w: calculator.toGridNum(resizedElemSize.w, calcOpts),
-                                h: calculator.toGridNum(resizedElemSize.h, calcOpts)
-                            });
+                        const gridX = calculator.toGridNum(resizedElemSize.x, calcOpts);
+                        const gridY = calculator.toGridNum(resizedElemSize.y, calcOpts);
+                        const gridW = calculator.toGridNum(resizedElemSize.w, calcOpts);
+                        const gridH = calculator.toGridNum(resizedElemSize.h, calcOpts);
+                        if (elems[0].type === 'group') {
+                            resizeEffectGroupElement(elems[0], {
+                                x: gridX,
+                                y: gridY,
+                                w: gridW,
+                                h: gridH
+                            }, { resizeEffect: (_c = elems[0].operations) === null || _c === void 0 ? void 0 : _c.resizeEffect });
+                            elems[0].x = gridX;
+                            elems[0].y = gridY;
                         }
                         else {
-                            elems[0].w = calculator.toGridNum(resizedElemSize.w, calcOpts);
-                            elems[0].h = calculator.toGridNum(resizedElemSize.h, calcOpts);
+                            elems[0].x = gridX;
+                            elems[0].y = gridY;
+                            elems[0].w = gridW;
+                            elems[0].h = gridH;
                         }
                     }
                     updateSelectedElementList([elems[0]]);

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

@@ -61,6 +61,7 @@ export function getPointTarget(p, opts) {
                 if (selectedElements && (selectedElements === null || selectedElements === void 0 ? void 0 : selectedElements.length) > 0) {
                     target.groupQueue = groupQueue || [];
                     target.elements = [selectedElements[0]];
+                    return target;
                 }
                 break;
             }