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

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();
@@ -161,7 +162,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 +186,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 +223,7 @@ export class Core {
                 after
             }
         };
-        this.setData(data);
+        __classPrivateFieldGet(this, _Core_instances, "m", _Core_resetData).call(this, data);
         this.refresh();
         return modifyRecord;
     }
@@ -238,7 +243,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 +256,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 +275,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 +294,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 +322,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 +341,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 +364,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 +372,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/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));
   }
@@ -33,47 +33,41 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
     }
     return result;
   }
-  function generate32Base36Hash(str) {
-    const hash256 = generate256BitHash(str);
-    return bigIntToBase36(hash256).padStart(32, "0").slice(0, 32);
-  }
-  function generate256BitHash(str) {
-    let h1 = 0xcbf29ce484222325n, h2 = 0x84222325cbf29ce4n;
-    let h3 = 0x1b3n * h1, h4 = 0x1000000n * h2;
-    const prime = 0x100000001b3n;
-    const chunkSize = 4096;
-    for (let i = 0; i < str.length; i += chunkSize) {
-      const chunk = str.slice(i, i + chunkSize);
-      for (let j = 0; j < chunk.length; j++) {
-        const code = BigInt(chunk.charCodeAt(j) + i + j);
-        h1 = (h1 ^ code) * prime;
-        h2 = (h2 ^ h1) * prime ^ h3;
-        h3 = (h3 ^ h2) * prime + h4;
-        h4 = (h4 ^ h3) * prime | 0x1234567890abcdefn;
-      }
-    }
-    return h1 << 192n | h2 << 128n | h3 << 64n | h4;
-  }
-  function bigIntToBase36(num) {
-    const chars = "0123456789abcdefghijklmnopqrstuvwxyz";
-    if (num === 0n)
-      return "0";
-    let result = "";
-    while (num > 0n) {
-      const rem = num % 36n;
-      result = chars[Number(rem)] + result;
-      num = num / 36n;
-    }
-    return result;
-  }
   function createUUID() {
     function _createStr() {
       return ((1 + Math.random()) * 65536 | 0).toString(16).substring(1);
     }
     return `${_createStr()}${_createStr()}-${_createStr()}-${_createStr()}-${_createStr()}-${_createStr()}${_createStr()}${_createStr()}`;
   }
-  function createAssetId(assetStr) {
-    return `@assets/${generate32Base36Hash(assetStr)}`;
+  function limitHexStr(str, seed) {
+    let count = 0;
+    for (let i = 0; i < str.length; i++) {
+      count += str.charCodeAt(i);
+    }
+    return (count + seed).toString(16).substring(0, 4);
+  }
+  function sumCharCodes(str) {
+    let sum = 0;
+    for (let i = 0; i < str.length; i++) {
+      sum += str.charCodeAt(i);
+    }
+    return sum;
+  }
+  function createAssetId(assetStr, elemUUID) {
+    const len = assetStr.length;
+    const seed = sumCharCodes(elemUUID);
+    const mid = Math.floor(len / 2);
+    const start4 = assetStr.substring(0, 4).padStart(4, "0");
+    const end4 = assetStr.substring(0, 4).padStart(4, "0");
+    const str1 = limitHexStr(len.toString(16).padStart(4, start4), seed).padStart(4, "0");
+    const str2 = limitHexStr(assetStr.substring(mid - 4, mid).padStart(4, start4), seed).padStart(4, "0");
+    const str3 = limitHexStr(assetStr.substring(mid - 8, mid - 4).padStart(4, start4), seed).padStart(4, "0");
+    const str4 = limitHexStr(assetStr.substring(mid - 12, mid - 8).padStart(4, start4), seed).padStart(4, "0");
+    const str5 = limitHexStr(assetStr.substring(mid - 16, mid - 12).padStart(4, end4), seed).padStart(4, "0");
+    const str6 = limitHexStr(assetStr.substring(mid, mid + 4).padStart(4, end4), seed).padStart(4, "0");
+    const str7 = limitHexStr(assetStr.substring(mid + 4, mid + 8).padStart(4, end4), seed).padStart(4, "0");
+    const str8 = limitHexStr(end4.padStart(4, start4).padStart(4, end4), seed);
+    return `@assets/${str1}${str2}-${str3}-${str4}-${str5}-${str6}${str7}${str8}`;
   }
   function isAssetId(id) {
     return /^@assets\/[0-9a-z-]{0,}$/.test(`${id}`);
@@ -3088,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()) {
@@ -3103,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()) {
@@ -3512,9 +3506,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       if (isAssetId(source)) {
         return source;
       }
-      return createAssetId(source);
+      return createAssetId(source, element.uuid);
     }
-    return createAssetId(`${createUUID()}-${element.uuid}-${createUUID()}-${createUUID()}`);
+    return createAssetId(`${createUUID()}-${element.uuid}-${createUUID()}-${createUUID()}`, element.uuid);
   };
   class Loader extends EventEmitter {
     constructor() {
@@ -3561,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();
@@ -9426,8 +9452,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();
@@ -9508,7 +9535,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",
@@ -9530,7 +9559,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;
     }
@@ -9571,7 +9602,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;
     }
@@ -9590,7 +9621,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;
     }
@@ -9603,8 +9634,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;
     }
@@ -9618,7 +9653,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;
     }
@@ -9637,7 +9672,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 {
@@ -9663,7 +9698,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;
     }
@@ -9682,7 +9717,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 {
@@ -9703,7 +9738,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;
     }
@@ -9716,6 +9751,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;