@visactor/vrender 0.22.9-alpha.1 → 0.22.9-alpha.2

package/dist/index.js

@@ -492,14 +492,11 @@
     const ContributionProvider = Symbol("ContributionProvider");
     class ContributionProviderCache {
       constructor(serviceIdentifier, container) {
-        this.serviceIdentifier = serviceIdentifier, this.container = container, ContributionStore.setStore(this.serviceIdentifier, this);
+        this.serviceIdentifier = serviceIdentifier, this.container = container;
       }
       getContributions() {
         return this.caches || (this.caches = [], this.container && this.container.isBound(this.serviceIdentifier) && this.caches.push(...this.container.getAll(this.serviceIdentifier))), this.caches;
       }
-      refresh() {
-        this.caches && (this.caches.length = 0, this.container && this.container.isBound(this.serviceIdentifier) && this.caches.push(...this.container.getAll(this.serviceIdentifier)));
-      }
     }
     function bindContributionProvider(bind, id) {
       bind(ContributionProvider).toDynamicValue(_ref => {
@@ -517,20 +514,6 @@
         return new ContributionProviderCache(id, container);
       }).whenTargetNamed(id);
     }
-    class ContributionStore {
-      static getStore(id) {
-        return this.store.get(id);
-      }
-      static setStore(id, cache) {
-        this.store.set(id, cache);
-      }
-      static refreshAllContributions() {
-        this.store.forEach(cache => {
-          cache.refresh();
-        });
-      }
-    }
-    ContributionStore.store = new Map();
 
     class Hook {
       constructor(args, name) {
@@ -16333,9 +16316,6 @@
       init(contributions) {
         contributions && (this._renderContribitions = contributions.getContributions()), this._renderContribitions || (this._renderContribitions = []), this.builtinContributions || (this.builtinContributions = []), this.builtinContributions.push(defaultBaseClipRenderBeforeContribution), this.builtinContributions.push(defaultBaseClipRenderAfterContribution), this.builtinContributions.forEach(item => this._renderContribitions.push(item)), this._renderContribitions.length && (this._renderContribitions.sort((a, b) => b.order - a.order), this._beforeRenderContribitions = this._renderContribitions.filter(c => c.time === exports.BaseRenderContributionTime.beforeFillStroke), this._afterRenderContribitions = this._renderContribitions.filter(c => c.time === exports.BaseRenderContributionTime.afterFillStroke));
       }
-      reInit() {
-        this.init(this.graphicRenderContributions);
-      }
       beforeRenderStep(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb, params) {
         this._beforeRenderContribitions && this._beforeRenderContribitions.forEach(c => {
           if (c.supportedAppName && graphic.stage && graphic.stage.params && graphic.stage.params.context && graphic.stage.params.context.appName) {
@@ -16505,8 +16485,8 @@
         };
       };
     exports.DefaultCanvasArcRender = class DefaultCanvasArcRender extends BaseRender {
-      constructor(graphicRenderContributions) {
-        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = ARC_NUMBER_TYPE, this.builtinContributions = [defaultArcRenderContribution, defaultArcBackgroundRenderContribution, defaultArcTextureRenderContribution], this.init(graphicRenderContributions);
+      constructor(arcRenderContribitions) {
+        super(), this.arcRenderContribitions = arcRenderContribitions, this.numberType = ARC_NUMBER_TYPE, this.builtinContributions = [defaultArcRenderContribution, defaultArcBackgroundRenderContribution, defaultArcTextureRenderContribution], this.init(arcRenderContribitions);
       }
       drawArcTailCapPath(arc, context, cx, cy, outerRadius, innerRadius, _sa, _ea) {
         const capAngle = _ea - _sa,
@@ -16681,8 +16661,8 @@
         };
       };
     exports.DefaultCanvasCircleRender = class DefaultCanvasCircleRender extends BaseRender {
-      constructor(graphicRenderContributions) {
-        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = CIRCLE_NUMBER_TYPE, this.builtinContributions = [defaultCircleRenderContribution, defaultCircleBackgroundRenderContribution, defaultCircleTextureRenderContribution], this.init(graphicRenderContributions);
+      constructor(circleRenderContribitions) {
+        super(), this.circleRenderContribitions = circleRenderContribitions, this.numberType = CIRCLE_NUMBER_TYPE, this.builtinContributions = [defaultCircleRenderContribution, defaultCircleBackgroundRenderContribution, defaultCircleTextureRenderContribution], this.init(circleRenderContribitions);
       }
       drawShape(circle, context, x, y, drawContext, params, fillCb, strokeCb) {
         const circleAttribute = getTheme(circle, null == params ? void 0 : params.theme).circle,
@@ -17068,8 +17048,8 @@
         };
       };
     exports.DefaultCanvasAreaRender = class DefaultCanvasAreaRender extends BaseRender {
-      constructor(graphicRenderContributions) {
-        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = AREA_NUMBER_TYPE, this.builtinContributions = [defaultAreaTextureRenderContribution, defaultAreaBackgroundRenderContribution], this.init(graphicRenderContributions);
+      constructor(areaRenderContribitions) {
+        super(), this.areaRenderContribitions = areaRenderContribitions, this.numberType = AREA_NUMBER_TYPE, this.builtinContributions = [defaultAreaTextureRenderContribution, defaultAreaBackgroundRenderContribution], this.init(areaRenderContribitions);
       }
       drawLinearAreaHighPerformance(area, context, fill, stroke, fillOpacity, strokeOpacity, offsetX, offsetY, areaAttribute, drawContext, params, fillCb, strokeCb) {
         var _a, _b, _c;
@@ -17312,8 +17292,8 @@
         };
       };
     exports.DefaultCanvasPathRender = class DefaultCanvasPathRender extends BaseRender {
-      constructor(graphicRenderContributions) {
-        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = PATH_NUMBER_TYPE, this.builtinContributions = [defaultPathBackgroundRenderContribution, defaultPathTextureRenderContribution], this.init(graphicRenderContributions);
+      constructor(pathRenderContribitions) {
+        super(), this.pathRenderContribitions = pathRenderContribitions, this.numberType = PATH_NUMBER_TYPE, this.builtinContributions = [defaultPathBackgroundRenderContribution, defaultPathTextureRenderContribution], this.init(pathRenderContribitions);
       }
       drawShape(path, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a, _b, _c;
@@ -17368,8 +17348,8 @@
         };
       };
     exports.DefaultCanvasRectRender = class DefaultCanvasRectRender extends BaseRender {
-      constructor(graphicRenderContributions) {
-        super(), this.graphicRenderContributions = graphicRenderContributions, this.type = "rect", this.numberType = RECT_NUMBER_TYPE, this.builtinContributions = [defaultRectRenderContribution, defaultRectBackgroundRenderContribution, defaultRectTextureRenderContribution], this.init(graphicRenderContributions);
+      constructor(rectRenderContribitions) {
+        super(), this.rectRenderContribitions = rectRenderContribitions, this.type = "rect", this.numberType = RECT_NUMBER_TYPE, this.builtinContributions = [defaultRectRenderContribution, defaultRectBackgroundRenderContribution, defaultRectTextureRenderContribution], this.init(rectRenderContribitions);
       }
       drawShape(rect, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a;
@@ -17440,8 +17420,8 @@
         };
       };
     exports.DefaultCanvasSymbolRender = class DefaultCanvasSymbolRender extends BaseRender {
-      constructor(graphicRenderContributions) {
-        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = SYMBOL_NUMBER_TYPE, this.builtinContributions = [defaultSymbolRenderContribution, defaultSymbolBackgroundRenderContribution, defaultSymbolTextureRenderContribution, defaultSymbolClipRangeStrokeRenderContribution], this.init(graphicRenderContributions);
+      constructor(symbolRenderContribitions) {
+        super(), this.symbolRenderContribitions = symbolRenderContribitions, this.numberType = SYMBOL_NUMBER_TYPE, this.builtinContributions = [defaultSymbolRenderContribution, defaultSymbolBackgroundRenderContribution, defaultSymbolTextureRenderContribution, defaultSymbolClipRangeStrokeRenderContribution], this.init(symbolRenderContribitions);
       }
       drawShape(symbol, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a;
@@ -17612,8 +17592,8 @@
         };
       };
     exports.DefaultCanvasTextRender = class DefaultCanvasTextRender extends BaseRender {
-      constructor(graphicRenderContributions) {
-        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = TEXT_NUMBER_TYPE, this.builtinContributions = [defaultTextBackgroundRenderContribution], this.init(graphicRenderContributions);
+      constructor(textRenderContribitions) {
+        super(), this.textRenderContribitions = textRenderContribitions, this.numberType = TEXT_NUMBER_TYPE, this.builtinContributions = [defaultTextBackgroundRenderContribution], this.init(textRenderContribitions);
       }
       drawShape(text, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a, _b, _c;
@@ -17827,8 +17807,8 @@
         };
       };
     exports.DefaultCanvasPolygonRender = class DefaultCanvasPolygonRender extends BaseRender {
-      constructor(graphicRenderContributions) {
-        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = POLYGON_NUMBER_TYPE, this.builtinContributions = [defaultPolygonBackgroundRenderContribution, defaultPolygonTextureRenderContribution], this.init(graphicRenderContributions);
+      constructor(polygonRenderContribitions) {
+        super(), this.polygonRenderContribitions = polygonRenderContribitions, this.numberType = POLYGON_NUMBER_TYPE, this.builtinContributions = [defaultPolygonBackgroundRenderContribution, defaultPolygonTextureRenderContribution], this.init(polygonRenderContribitions);
       }
       drawShape(polygon, context, x, y, drawContext, params, fillCb, strokeCb) {
         const polygonAttribute = getTheme(polygon, null == params ? void 0 : params.theme).polygon,
@@ -17883,9 +17863,6 @@
       constructor(groupRenderContribitions) {
         this.groupRenderContribitions = groupRenderContribitions, this.numberType = GROUP_NUMBER_TYPE;
       }
-      reInit() {
-        this._groupRenderContribitions = this.groupRenderContribitions.getContributions() || [], this._groupRenderContribitions.push(defaultGroupBackgroundRenderContribution);
-      }
       drawShape(group, context, x, y, drawContext, params, fillCb, strokeCb) {
         const groupAttribute = getTheme(group, null == params ? void 0 : params.theme).group,
           {
@@ -18016,8 +17993,8 @@
       };
     const repeatStr = ["", "repeat-x", "repeat-y", "repeat"];
     exports.DefaultCanvasImageRender = class DefaultCanvasImageRender extends BaseRender {
-      constructor(graphicRenderContributions) {
-        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = IMAGE_NUMBER_TYPE, this.builtinContributions = [defaultImageRenderContribution, defaultImageBackgroundRenderContribution], this.init(graphicRenderContributions);
+      constructor(imageRenderContribitions) {
+        super(), this.imageRenderContribitions = imageRenderContribitions, this.numberType = IMAGE_NUMBER_TYPE, this.builtinContributions = [defaultImageRenderContribution, defaultImageBackgroundRenderContribution], this.init(imageRenderContribitions);
       }
       drawShape(image, context, x, y, drawContext, params, fillCb, strokeCb) {
         const imageAttribute = getTheme(image).image,
@@ -18347,9 +18324,6 @@
       afterDraw(params) {
         this.drawContribution.afterDraw && this.drawContribution.afterDraw(this, Object.assign({}, this.drawParams));
       }
-      reInit() {
-        this.drawContribution.reInit();
-      }
       render(groups, params) {
         this.renderTreeRoots = groups, this.drawParams = params;
         const updateBounds = params.updateBounds;
@@ -18753,11 +18727,6 @@
       constructor(contributions, drawItemInterceptorContributions) {
         this.contributions = contributions, this.drawItemInterceptorContributions = drawItemInterceptorContributions, this.currentRenderMap = new Map(), this.defaultRenderMap = new Map(), this.styleRenderMap = new Map(), this.dirtyBounds = new Bounds(), this.backupDirtyBounds = new Bounds(), this.global = application.global, this.layerService = application.layerService, isArray$1(this.contributions) || (this.contributions = [this.contributions]), this.init();
       }
-      reInit() {
-        this.init(), this.contributions.forEach(item => {
-          item.reInit();
-        });
-      }
       init() {
         this.contributions.forEach(item => {
           if (item.style) {
@@ -19885,9 +19854,6 @@
       getPickerService() {
         return this.pickerService || (this.pickerService = container.get(PickerService)), this.pickerService;
       }
-      reInit() {
-        this.renderService.reInit(), this.pickerService.reInit();
-      }
     }
 
     function createStage(params) {
@@ -20485,9 +20451,6 @@
       constructor(pickItemInterceptorContributions, pickServiceInterceptorContributions) {
         this.pickItemInterceptorContributions = pickItemInterceptorContributions, this.pickServiceInterceptorContributions = pickServiceInterceptorContributions, this.type = "default", this.global = application.global;
       }
-      reInit() {
-        this._init();
-      }
       _init() {
         this.InterceptorContributions = this.pickItemInterceptorContributions.getContributions().sort((a, b) => a.order - b.order), this.pickerServiceInterceptorContributions = this.pickServiceInterceptorContributions.getContributions().sort((a, b) => a.order - b.order);
       }
@@ -20602,7 +20565,6 @@
           this.configure(global, env);
         }), this.configure(this.global, this.global.env);
       }
-      reInit() {}
       configure(global, env) {}
       pick(graphics, point, params) {
         let result = {
@@ -20692,9 +20654,15 @@
           currentTarget: {
             value: event.currentTarget
           }
-        }), event instanceof MouseEvent || event instanceof PointerEvent) transformPoint(event.clientX, event.clientY, transformMatrix, containerRect, transformedEvent);else if (event instanceof TouchEvent && event.touches.length > 0) {
-          const touch = event.touches[0];
-          transformPoint(touch.clientX, touch.clientY, transformMatrix, containerRect, transformedEvent);
+        }), event instanceof MouseEvent || event instanceof PointerEvent) transformPoint(event.clientX, event.clientY, transformMatrix, containerRect, transformedEvent);else if (event instanceof TouchEvent) {
+          if (event.touches.length > 0) {
+            const touch = transformedEvent.touches[0];
+            transformPoint(touch.clientX, touch.clientY, transformMatrix, containerRect, touch);
+          }
+          if (event.changedTouches.length > 0) {
+            const touch = transformedEvent.changedTouches[0];
+            transformPoint(touch.clientX, touch.clientY, transformMatrix, containerRect, touch);
+          }
         }
         return transformedEvent;
       };
@@ -20725,10 +20693,22 @@
       });
     }
     function mapToCanvasPointForCanvas(nativeEvent) {
+      var _a;
       if (isNumber(nativeEvent._canvasX) && isNumber(nativeEvent._canvasY)) return {
         x: nativeEvent._canvasX,
         y: nativeEvent._canvasY
       };
+      if (nativeEvent.changedTouches) {
+        const data = null !== (_a = nativeEvent.changedTouches[0]) && void 0 !== _a ? _a : {};
+        return {
+          x: data._canvasX,
+          y: data._canvasY
+        };
+      }
+      return {
+        x: nativeEvent._canvasX || 0,
+        y: nativeEvent._canvasY || 0
+      };
     }
 
     var __rest$1 = undefined && undefined.__rest || function (s, e) {
@@ -21942,7 +21922,6 @@
       constructor() {
         this.numberType = GLYPH_NUMBER_TYPE;
       }
-      reInit() {}
       drawShape(glyph, context, x, y, drawContext, params, fillCb, strokeCb) {
         drawContext.drawContribution && glyph.getSubGraphic().forEach(item => {
           const renderer = drawContext.drawContribution.getRenderContribution(item);
@@ -24475,10 +24454,6 @@
       drawShape(graphic, ctx, x, y, drawContext, params, fillCb, strokeCb) {
         if (this.canvasRenderer.drawShape) return this.canvasRenderer.drawShape(graphic, ctx, x, y, drawContext, params, fillCb, strokeCb);
       }
-      reInit() {
-        var _a;
-        null === (_a = this.canvasRenderer) || void 0 === _a || _a.reInit();
-      }
     }
 
     var __decorate$18 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
@@ -32033,7 +32008,7 @@
 
     const roughModule = _roughModule;
 
-    const version = "0.22.9-alpha.1";
+    const version = "0.22.9-alpha.2";
     preLoadAllModule();
     if (isBrowserEnv()) {
         loadBrowserEnv(container);
@@ -32130,7 +32105,6 @@
     exports.ContainerModule = ContainerModule;
     exports.Context2dFactory = Context2dFactory;
     exports.ContributionProvider = ContributionProvider;
-    exports.ContributionStore = ContributionStore;
     exports.CurveContext = CurveContext;
     exports.CustomEvent = CustomEvent;
     exports.CustomPath2D = CustomPath2D;