@idraw/core 0.4.0-beta.42 → 0.4.0-beta.44

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

@@ -20,7 +20,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var _Core_instances, _Core_board, _Core_canvas, _Core_container, _Core_initContainer;
+var _Core_instances, _Core_board, _Core_canvas, _Core_container, _Core_initContainer, _Core_resetData;
 import { deepClone, createElement, getElementPositionFromList, toFlattenElement, deleteElementInList, findElementFromListByPosition, updateElementInListByPosition, insertElementToListByPosition, moveElementPosition, toFlattenLayout, toFlattenGlobal, get, mergeLayout, mergeGlobal } from '@idraw/util';
 import { Board, Sharer, Calculator } from './board';
 import { createBoardContent, validateElements } from '@idraw/util';
@@ -84,8 +84,9 @@ export class Core {
         __classPrivateFieldGet(this, _Core_board, "f").resetMiddlewareConfig(middleware, config);
     }
     setData(data) {
-        validateElements((data === null || data === void 0 ? void 0 : data.elements) || []);
-        __classPrivateFieldGet(this, _Core_board, "f").setData(data);
+        const loader = __classPrivateFieldGet(this, _Core_board, "f").getRenderer().getLoader();
+        loader.reset();
+        __classPrivateFieldGet(this, _Core_instances, "m", _Core_resetData).call(this, data);
     }
     getData() {
         return __classPrivateFieldGet(this, _Core_board, "f").getData();
@@ -129,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);
     }
@@ -161,7 +177,9 @@ export class Core {
         const before = toFlattenElement(beforeElem);
         const updatedElement = updateElementInListByPosition(position, element, data.elements, { strict: true });
         const after = toFlattenElement(updatedElement);
-        this.setData(data);
+        const loader = __classPrivateFieldGet(this, _Core_board, "f").getRenderer().getLoader();
+        loader.resetElementAsset(element);
+        __classPrivateFieldGet(this, _Core_instances, "m", _Core_resetData).call(this, data);
         this.refresh();
         const modifyRecord = {
             type: 'updateElement',
@@ -183,7 +201,9 @@ export class Core {
             beforeElement: beforeElem
         });
         updateElementInListByPosition(position, restElement, data.elements);
-        this.setData(data);
+        const loader = __classPrivateFieldGet(this, _Core_board, "f").getRenderer().getLoader();
+        loader.resetElementAsset(Object.assign(Object.assign({}, element), { type: beforeElem.type }));
+        __classPrivateFieldGet(this, _Core_instances, "m", _Core_resetData).call(this, data);
         this.refresh();
         return modifyRecord;
     }
@@ -218,7 +238,7 @@ export class Core {
                 after
             }
         };
-        this.setData(data);
+        __classPrivateFieldGet(this, _Core_instances, "m", _Core_resetData).call(this, data);
         this.refresh();
         return modifyRecord;
     }
@@ -238,7 +258,7 @@ export class Core {
             time: Date.now(),
             content: { method: 'addElement', uuid: element.uuid, position, element: deepClone(element) }
         };
-        this.setData(data);
+        __classPrivateFieldGet(this, _Core_instances, "m", _Core_resetData).call(this, data);
         this.refresh();
         return modifyRecord;
     }
@@ -251,8 +271,12 @@ export class Core {
             time: Date.now(),
             content: { method: 'deleteElement', uuid, position, element: element ? deepClone(element) : null }
         };
+        if (element) {
+            const loader = __classPrivateFieldGet(this, _Core_board, "f").getRenderer().getLoader();
+            loader.resetElementAsset(element);
+        }
         deleteElementInList(uuid, data.elements);
-        this.setData(data);
+        __classPrivateFieldGet(this, _Core_instances, "m", _Core_resetData).call(this, data);
         this.refresh();
         return modifyRecord;
     }
@@ -266,7 +290,7 @@ export class Core {
         };
         const { elements: list } = moveElementPosition(data.elements, { from, to });
         data.elements = list;
-        this.setData(data);
+        __classPrivateFieldGet(this, _Core_instances, "m", _Core_resetData).call(this, data);
         this.refresh();
         return modifyRecord;
     }
@@ -285,7 +309,7 @@ export class Core {
             if (data.layout) {
                 modifyRecord.content.before = toFlattenLayout(data.layout);
                 delete data['layout'];
-                this.setData(data);
+                __classPrivateFieldGet(this, _Core_instances, "m", _Core_resetData).call(this, data);
                 this.refresh();
                 return modifyRecord;
             }
@@ -313,7 +337,7 @@ export class Core {
         }
         modifyRecord.content.after = after;
         mergeLayout(data.layout, layout);
-        this.setData(data);
+        __classPrivateFieldGet(this, _Core_instances, "m", _Core_resetData).call(this, data);
         this.refresh();
         return modifyRecord;
     }
@@ -332,7 +356,7 @@ export class Core {
             if (data.global) {
                 modifyRecord.content.before = toFlattenGlobal(data.global);
                 delete data['global'];
-                this.setData(data);
+                __classPrivateFieldGet(this, _Core_instances, "m", _Core_resetData).call(this, data);
                 this.refresh();
                 return modifyRecord;
             }
@@ -355,7 +379,7 @@ export class Core {
         }
         modifyRecord.content.after = after;
         mergeGlobal(data.global, global);
-        this.setData(data);
+        __classPrivateFieldGet(this, _Core_instances, "m", _Core_resetData).call(this, data);
         this.refresh();
         return modifyRecord;
     }
@@ -363,4 +387,7 @@ export class Core {
 _Core_board = new WeakMap(), _Core_canvas = new WeakMap(), _Core_container = new WeakMap(), _Core_instances = new WeakSet(), _Core_initContainer = function _Core_initContainer() {
     const container = __classPrivateFieldGet(this, _Core_container, "f");
     container.style.position = 'relative';
+}, _Core_resetData = function _Core_resetData(data) {
+    validateElements((data === null || data === void 0 ? void 0 : data.elements) || []);
+    __classPrivateFieldGet(this, _Core_board, "f").setData(data);
 };

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

@@ -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, {

package/dist/index.global.js

@@ -8,7 +8,7 @@ var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
 
-  var _opts, _store, _hasDestroyed, _BoardWatcher_instances, init_fn, _onWheel, _onContextMenu, _onClick, _onPointLeave, _onPointEnd, _onPointMove, _onPointStart, _onHover, isInTarget_fn, getPoint_fn, isVaildPoint_fn, _activeStore, _sharedStore, _opts2, _drawFrameSnapshotQueue, _drawFrameStatus, _Viewer_instances, init_fn2, drawAnimationFrame_fn, _opts3, _middlewareMap, _activeMiddlewareObjs, _watcher, _renderer, _sharer, _viewer, _calculator, _eventHub, _hasDestroyed2, _Board_instances, init_fn3, handlePointStart_fn, handlePointEnd_fn, handlePointMove_fn, handlePointLeave_fn, handleHover_fn, handleDoubleClick_fn, handleContextMenu_fn, handleWheel_fn, handleWheelScale_fn, handleScrollX_fn, handleScrollY_fn, handleResize_fn, handleClear_fn, handleBeforeDrawFrame_fn, handleAfterDrawFrame_fn, resetActiveMiddlewareObjs_fn, _eventHub2, _container, _cursorType, _resizeCursorBaseImage, _cursorImageMap, _Cursor_instances, init_fn4, loadResizeCursorBaseImage_fn, resetCursor_fn, setCursorResize_fn, appendRotateResizeImage_fn, _board, _canvas, _container2, _Core_instances, initContainer_fn;
+  var _opts, _store, _hasDestroyed, _BoardWatcher_instances, init_fn, _onWheel, _onContextMenu, _onClick, _onPointLeave, _onPointEnd, _onPointMove, _onPointStart, _onHover, isInTarget_fn, getPoint_fn, isVaildPoint_fn, _activeStore, _sharedStore, _opts2, _drawFrameSnapshotQueue, _drawFrameStatus, _Viewer_instances, init_fn2, drawAnimationFrame_fn, _opts3, _middlewareMap, _activeMiddlewareObjs, _watcher, _renderer, _sharer, _viewer, _calculator, _eventHub, _hasDestroyed2, _Board_instances, init_fn3, handlePointStart_fn, handlePointEnd_fn, handlePointMove_fn, handlePointLeave_fn, handleHover_fn, handleDoubleClick_fn, handleContextMenu_fn, handleWheel_fn, handleWheelScale_fn, handleScrollX_fn, handleScrollY_fn, handleResize_fn, handleClear_fn, handleBeforeDrawFrame_fn, handleAfterDrawFrame_fn, resetActiveMiddlewareObjs_fn, _eventHub2, _container, _cursorType, _resizeCursorBaseImage, _cursorImageMap, _Cursor_instances, init_fn4, loadResizeCursorBaseImage_fn, resetCursor_fn, setCursorResize_fn, appendRotateResizeImage_fn, _board, _canvas, _container2, _Core_instances, initContainer_fn, resetData_fn;
   function isColorStr(color2) {
     return typeof color2 === "string" && (/^#([0-9a-f]{3}|[0-9a-f]{6}|[0-9a-f]{8})$/i.test(color2) || /^[a-z]{1,}$/i.test(color2));
   }
@@ -3082,7 +3082,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
   }
   function drawSVG(ctx, elem, opts) {
     const content = opts.loader.getContent(elem);
-    const { viewScaleInfo, viewSizeInfo, parentOpacity } = opts;
+    const { viewScaleInfo, parentOpacity } = opts;
     const { x: x2, y: y2, w: w2, h: h2, angle: angle2 } = calcViewElementSize(elem, { viewScaleInfo }) || elem;
     rotateElement$1(ctx, { x: x2, y: y2, w: w2, h: h2, angle: angle2 }, () => {
       if (!content && !opts.loader.isDestroyed()) {
@@ -3097,7 +3097,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
   }
   function drawHTML(ctx, elem, opts) {
     const content = opts.loader.getContent(elem);
-    const { viewScaleInfo, viewSizeInfo, parentOpacity } = opts;
+    const { viewScaleInfo, parentOpacity } = opts;
     const { x: x2, y: y2, w: w2, h: h2, angle: angle2 } = calcViewElementSize(elem, { viewScaleInfo }) || elem;
     rotateElement$1(ctx, { x: x2, y: y2, w: w2, h: h2, angle: angle2 }, () => {
       if (!content && !opts.loader.isDestroyed()) {
@@ -3555,6 +3555,38 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
     isDestroyed() {
       return __classPrivateFieldGet$2(this, _Loader_hasDestroyed, "f");
     }
+    reset() {
+      if (__classPrivateFieldGet$2(this, _Loader_hasDestroyed, "f") === true) {
+        return;
+      }
+      __classPrivateFieldSet$2(this, _Loader_currentLoadItemMap, {}, "f");
+      __classPrivateFieldSet$2(this, _Loader_storageLoadItemMap, {}, "f");
+    }
+    resetElementAsset(element) {
+      if (supportElementTypes.includes(element.type)) {
+        let assetId = null;
+        let resource = null;
+        if (element.type === "image" && typeof element.detail.src === "string") {
+          resource = element.detail.src;
+        } else if (element.type === "svg" && typeof element.detail.svg === "string") {
+          resource = element.detail.svg;
+        } else if (element.type === "html" && typeof element.detail.html === "string") {
+          resource = element.detail.html;
+        }
+        if (typeof resource === "string") {
+          this.load(element, {});
+          if (isAssetId(resource)) {
+            assetId = resource;
+          } else if (element.uuid) {
+            assetId = createAssetId(resource, element.uuid);
+          }
+        }
+        if (assetId && isAssetId(assetId)) {
+          delete __classPrivateFieldGet$2(this, _Loader_storageLoadItemMap, "f")[assetId];
+          delete __classPrivateFieldGet$2(this, _Loader_currentLoadItemMap, "f")[assetId];
+        }
+      }
+    }
     destroy() {
       __classPrivateFieldSet$2(this, _Loader_hasDestroyed, true, "f");
       this.clear();
@@ -4654,7 +4686,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       __privateSet(this, _drawFrameStatus, "COMPLETE");
       return;
     }
-    if (__privateSet(this, _drawFrameStatus, "DRAWING")) {
+    if (__privateGet(this, _drawFrameStatus) === "DRAWING") {
       requestAnimationFrame(() => {
         __privateMethod(this, _Viewer_instances, drawAnimationFrame_fn).call(this);
       });
@@ -7714,6 +7746,11 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
         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 ? void 0 : groupQueue.length) > 0) {
           if (isPointInViewActiveGroup(e.point, {
@@ -9420,8 +9457,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       __privateGet(this, _board).resetMiddlewareConfig(middleware, config);
     }
     setData(data) {
-      validateElements((data == null ? void 0 : data.elements) || []);
-      __privateGet(this, _board).setData(data);
+      const loader = __privateGet(this, _board).getRenderer().getLoader();
+      loader.reset();
+      __privateMethod(this, _Core_instances, resetData_fn).call(this, data);
     }
     getData() {
       return __privateGet(this, _board).getData();
@@ -9468,6 +9506,21 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
     refresh() {
       __privateGet(this, _board).getViewer().drawFrame();
     }
+    forceRender() {
+      const renderer = __privateGet(this, _board).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) {
       __privateGet(this, _board).updateViewScaleInfo(opts);
     }
@@ -9502,7 +9555,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       const before = toFlattenElement(beforeElem);
       const updatedElement = updateElementInListByPosition(position, element, data.elements, { strict: true });
       const after = toFlattenElement(updatedElement);
-      this.setData(data);
+      const loader = __privateGet(this, _board).getRenderer().getLoader();
+      loader.resetElementAsset(element);
+      __privateMethod(this, _Core_instances, resetData_fn).call(this, data);
       this.refresh();
       const modifyRecord = {
         type: "updateElement",
@@ -9524,7 +9579,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         beforeElement: beforeElem
       });
       updateElementInListByPosition(position, restElement, data.elements);
-      this.setData(data);
+      const loader = __privateGet(this, _board).getRenderer().getLoader();
+      loader.resetElementAsset({ ...element, type: beforeElem.type });
+      __privateMethod(this, _Core_instances, resetData_fn).call(this, data);
       this.refresh();
       return modifyRecord;
     }
@@ -9565,7 +9622,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
           after
         }
       };
-      this.setData(data);
+      __privateMethod(this, _Core_instances, resetData_fn).call(this, data);
       this.refresh();
       return modifyRecord;
     }
@@ -9584,7 +9641,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         time: Date.now(),
         content: { method: "addElement", uuid: element.uuid, position, element: deepClone(element) }
       };
-      this.setData(data);
+      __privateMethod(this, _Core_instances, resetData_fn).call(this, data);
       this.refresh();
       return modifyRecord;
     }
@@ -9597,8 +9654,12 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         time: Date.now(),
         content: { method: "deleteElement", uuid, position, element: element ? deepClone(element) : null }
       };
+      if (element) {
+        const loader = __privateGet(this, _board).getRenderer().getLoader();
+        loader.resetElementAsset(element);
+      }
       deleteElementInList(uuid, data.elements);
-      this.setData(data);
+      __privateMethod(this, _Core_instances, resetData_fn).call(this, data);
       this.refresh();
       return modifyRecord;
     }
@@ -9612,7 +9673,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       };
       const { elements: list } = moveElementPosition(data.elements, { from, to });
       data.elements = list;
-      this.setData(data);
+      __privateMethod(this, _Core_instances, resetData_fn).call(this, data);
       this.refresh();
       return modifyRecord;
     }
@@ -9631,7 +9692,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         if (data.layout) {
           modifyRecord.content.before = toFlattenLayout(data.layout);
           delete data["layout"];
-          this.setData(data);
+          __privateMethod(this, _Core_instances, resetData_fn).call(this, data);
           this.refresh();
           return modifyRecord;
         } else {
@@ -9657,7 +9718,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       }
       modifyRecord.content.after = after;
       mergeLayout(data.layout, layout);
-      this.setData(data);
+      __privateMethod(this, _Core_instances, resetData_fn).call(this, data);
       this.refresh();
       return modifyRecord;
     }
@@ -9676,7 +9737,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
         if (data.global) {
           modifyRecord.content.before = toFlattenGlobal(data.global);
           delete data["global"];
-          this.setData(data);
+          __privateMethod(this, _Core_instances, resetData_fn).call(this, data);
           this.refresh();
           return modifyRecord;
         } else {
@@ -9697,7 +9758,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       }
       modifyRecord.content.after = after;
       mergeGlobal(data.global, global);
-      this.setData(data);
+      __privateMethod(this, _Core_instances, resetData_fn).call(this, data);
       this.refresh();
       return modifyRecord;
     }
@@ -9710,6 +9771,10 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
     const container = __privateGet(this, _container2);
     container.style.position = "relative";
   };
+  resetData_fn = function(data) {
+    validateElements((data == null ? void 0 : data.elements) || []);
+    __privateGet(this, _board).setData(data);
+  };
   exports.Board = Board;
   exports.Calculator = Calculator;
   exports.Core = Core;