@visactor/vrender 0.16.17 → 0.16.18-alpha.0

package/cjs/index.d.ts

@@ -1,3 +1,3 @@
-export declare const version = "0.16.17";
+export declare const version = "0.16.18-alpha.0";
 export * from '@visactor/vrender-core';
 export * from '@visactor/vrender-kits';

package/cjs/index.js

@@ -21,5 +21,5 @@ Object.defineProperty(exports, "__esModule", {
 
 const vrender_core_1 = require("@visactor/vrender-core"), vrender_kits_1 = require("@visactor/vrender-kits");
 
-exports.version = "0.16.17", (0, vrender_kits_1.loadAllModule)(vrender_core_1.container), 
+exports.version = "0.16.18-alpha.0", (0, vrender_kits_1.loadAllModule)(vrender_core_1.container), 
 __exportStar(require("@visactor/vrender-core"), exports), __exportStar(require("@visactor/vrender-kits"), exports);

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yDAAmD;AACnD,yDAAuD;AAG1C,QAAA,OAAO,GAAG,SAAS,CAAC;AAEjC,IAAA,4BAAa,EAAC,wBAAS,CAAC,CAAC;AAEzB,yDAAuC;AACvC,yDAAuC","file":"index.js","sourcesContent":["import { container } from '@visactor/vrender-core';\nimport { loadAllModule } from '@visactor/vrender-kits';\n\n// 导出版本号\nexport const version = \"0.16.17\";\n\nloadAllModule(container);\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yDAAmD;AACnD,yDAAuD;AAG1C,QAAA,OAAO,GAAG,iBAAiB,CAAC;AAEzC,IAAA,4BAAa,EAAC,wBAAS,CAAC,CAAC;AAEzB,yDAAuC;AACvC,yDAAuC","file":"index.js","sourcesContent":["import { container } from '@visactor/vrender-core';\nimport { loadAllModule } from '@visactor/vrender-kits';\n\n// 导出版本号\nexport const version = \"0.16.18-alpha.0\";\n\nloadAllModule(container);\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}

package/dist/index.js

@@ -6304,7 +6304,7 @@
     textureColor: "black",
     textureSize: 10,
     texturePadding: 2,
-    backgroundMode: 0,
+    backgroundMode: "no-repeat",
     blur: 0,
     cursor: null,
     html: null
@@ -8030,7 +8030,19 @@
   var FederatedEvent = /*#__PURE__*/function () {
     function FederatedEvent(manager) {
       _classCallCheck(this, FederatedEvent);
-      this.bubbles = !0, this.cancelBubble = !0, this.cancelable = !1, this.composed = !1, this.defaultPrevented = !1, this.eventPhase = FederatedEvent.prototype.NONE, this.propagationStopped = !1, this.propagationImmediatelyStopped = !1, this.layer = new Point(), this.page = new Point(), this.canvas = new Point(), this.viewport = new Point(), this.NONE = 0, this.CAPTURING_PHASE = 1, this.AT_TARGET = 2, this.BUBBLING_PHASE = 3, this.manager = manager;
+      this.bubbles = !0, this.cancelBubble = !0, this.cancelable = !1, this.composed = !1, this.defaultPrevented = !1, this.eventPhase = FederatedEvent.prototype.NONE, this.propagationStopped = !1, this.propagationImmediatelyStopped = !1, this.layer = {
+        x: 0,
+        y: 0
+      }, this.page = {
+        x: 0,
+        y: 0
+      }, this.canvas = {
+        x: 0,
+        y: 0
+      }, this.viewport = {
+        x: 0,
+        y: 0
+      }, this.NONE = 0, this.CAPTURING_PHASE = 1, this.AT_TARGET = 2, this.BUBBLING_PHASE = 3, this.manager = manager;
     }
     _createClass(FederatedEvent, [{
       key: "layerX",
@@ -8123,7 +8135,22 @@
     function FederatedMouseEvent() {
       var _this;
       _classCallCheck(this, FederatedMouseEvent);
-      _this = _super.apply(this, arguments), _this.client = new Point(), _this.movement = new Point(), _this.offset = new Point(), _this.global = new Point(), _this.screen = new Point();
+      _this = _super.apply(this, arguments), _this.client = {
+        x: 0,
+        y: 0
+      }, _this.movement = {
+        x: 0,
+        y: 0
+      }, _this.offset = {
+        x: 0,
+        y: 0
+      }, _this.global = {
+        x: 0,
+        y: 0
+      }, _this.screen = {
+        x: 0,
+        y: 0
+      };
       return _this;
     }
     _createClass(FederatedMouseEvent, [{
@@ -8474,12 +8501,14 @@
     }, {
       key: "copyMouseData",
       value: function copyMouseData(from, to) {
-        from instanceof FederatedMouseEvent && to instanceof FederatedMouseEvent && (to.altKey = from.altKey, to.button = from.button, to.buttons = from.buttons, to.client.copyFrom(from.client), to.ctrlKey = from.ctrlKey, to.shiftKey = from.shiftKey, to.metaKey = from.metaKey, to.movement.copyFrom(from.movement), to.canvas.copyFrom(from.canvas), to.screen.copyFrom(from.screen), to.global.copyFrom(from.global), to.offset.copyFrom(from.offset), to.viewport.copyFrom(from.viewport));
+        from instanceof FederatedMouseEvent && to instanceof FederatedMouseEvent && (to.altKey = from.altKey, to.button = from.button, to.buttons = from.buttons, to.ctrlKey = from.ctrlKey, to.shiftKey = from.shiftKey, to.metaKey = from.metaKey, ["client", "movement", "canvas", "screen", "global", "offset", "viewport"].forEach(function (key) {
+          to[key].x = from[key].x, to[key].y = from[key].y;
+        }));
       }
     }, {
       key: "copyData",
       value: function copyData(from, to) {
-        to.isTrusted = from.isTrusted, to.srcElement = from.srcElement, to.timeStamp = clock.now(), to.type = from.type, to.detail = from.detail, to.view = from.view, to.which = from.which, to.layer.copyFrom(from.layer), to.page.copyFrom(from.page), to.pickParams = from.pickParams;
+        to.isTrusted = from.isTrusted, to.srcElement = from.srcElement, to.timeStamp = clock.now(), to.type = from.type, to.detail = from.detail, to.view = from.view, to.which = from.which, to.layer.x = from.layer.x, to.layer.y = from.layer.y, to.page.x = from.page.x, to.page.y = from.page.y, to.pickParams = from.pickParams;
       }
     }, {
       key: "trackingData",
@@ -8700,7 +8729,7 @@
         var _this$mapToCanvasPoin = this.mapToCanvasPoint(nativeEvent),
           canvasX = _this$mapToCanvasPoin.x,
           canvasY = _this$mapToCanvasPoin.y;
-        event.canvas.x = canvasX, event.canvas.y = canvasY, event.global.copyFrom(event.canvas), event.offset.copyFrom(event.canvas);
+        event.canvas.x = canvasX, event.canvas.y = canvasY, event.global.x = canvasX, event.global.y = canvasY, event.offset.x = canvasX, event.offset.y = canvasY;
         var _this$mapToViewportPo = this.mapToViewportPoint(event),
           viewX = _this$mapToViewportPo.x,
           viewY = _this$mapToViewportPo.y;
@@ -8713,7 +8742,7 @@
         var _this$mapToCanvasPoin2 = this.mapToCanvasPoint(nativeEvent),
           canvasX = _this$mapToCanvasPoin2.x,
           canvasY = _this$mapToCanvasPoin2.y;
-        event.canvas.x = canvasX, event.canvas.y = canvasY, event.global.copyFrom(event.canvas), event.offset.copyFrom(event.canvas);
+        event.canvas.x = canvasX, event.canvas.y = canvasY, event.global.x = canvasX, event.global.y = canvasY, event.offset.x = canvasX, event.offset.y = canvasY;
         var _this$mapToViewportPo2 = this.mapToViewportPoint(event),
           viewX = _this$mapToViewportPo2.x,
           viewY = _this$mapToViewportPo2.y;
@@ -20963,7 +20992,10 @@
     _createClass(DefaultBaseBackgroundRenderContribution, [{
       key: "drawShape",
       value: function drawShape(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb, options) {
-        var background = graphic.attribute.background;
+        var _graphic$attribute = graphic.attribute,
+          background = _graphic$attribute.background,
+          _graphic$attribute$ba = _graphic$attribute.backgroundMode,
+          backgroundMode = _graphic$attribute$ba === void 0 ? graphicAttribute.backgroundMode : _graphic$attribute$ba;
         if (background) if (graphic.backgroundImg && graphic.resources) {
           var res = graphic.resources.get(background);
           if ("success" !== res.state || !res.data) return;
@@ -20978,9 +21010,17 @@
           }
           context.clip();
           var b = graphic.AABBBounds;
-          context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.drawImage(res.data, b.x1, b.y1, b.width(), b.height()), context.restore(), graphic.transMatrix.onlyTranslate() || context.setTransformForCurrent();
+          context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), this.doDrawImage(context, res.data, b, backgroundMode), context.restore(), graphic.transMatrix.onlyTranslate() || context.setTransformForCurrent();
         } else context.highPerformanceSave(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.fillStyle = background, context.fill(), context.highPerformanceRestore();
       }
+    }, {
+      key: "doDrawImage",
+      value: function doDrawImage(context, data, b, backgroundMode) {
+        if ("no-repeat" === backgroundMode) context.drawImage(data, b.x1, b.y1, b.width(), b.height());else {
+          var pattern = context.createPattern(data, backgroundMode);
+          context.fillStyle = pattern, context.translate(b.x1, b.y1), context.fillRect(0, 0, b.width(), b.height()), context.translate(-b.x1, -b.y1);
+        }
+      }
     }]);
     return DefaultBaseBackgroundRenderContribution;
   }();
@@ -21101,15 +21141,15 @@
       key: "drawShape",
       value: function drawShape(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb, options) {
         this.textureMap || this.initTextureMap(context, graphic.stage);
-        var _graphic$attribute = graphic.attribute,
-          _graphic$attribute$te = _graphic$attribute.texture,
-          texture = _graphic$attribute$te === void 0 ? graphicAttribute.texture : _graphic$attribute$te,
-          _graphic$attribute$te2 = _graphic$attribute.textureColor,
-          textureColor = _graphic$attribute$te2 === void 0 ? graphicAttribute.textureColor : _graphic$attribute$te2,
-          _graphic$attribute$te3 = _graphic$attribute.textureSize,
-          textureSize = _graphic$attribute$te3 === void 0 ? graphicAttribute.textureSize : _graphic$attribute$te3,
-          _graphic$attribute$te4 = _graphic$attribute.texturePadding,
-          texturePadding = _graphic$attribute$te4 === void 0 ? graphicAttribute.texturePadding : _graphic$attribute$te4;
+        var _graphic$attribute2 = graphic.attribute,
+          _graphic$attribute2$t = _graphic$attribute2.texture,
+          texture = _graphic$attribute2$t === void 0 ? graphicAttribute.texture : _graphic$attribute2$t,
+          _graphic$attribute2$t2 = _graphic$attribute2.textureColor,
+          textureColor = _graphic$attribute2$t2 === void 0 ? graphicAttribute.textureColor : _graphic$attribute2$t2,
+          _graphic$attribute2$t3 = _graphic$attribute2.textureSize,
+          textureSize = _graphic$attribute2$t3 === void 0 ? graphicAttribute.textureSize : _graphic$attribute2$t3,
+          _graphic$attribute2$t4 = _graphic$attribute2.texturePadding,
+          texturePadding = _graphic$attribute2$t4 === void 0 ? graphicAttribute.texturePadding : _graphic$attribute2$t4;
         if (!texture) return;
         var pattern = this.textureMap.get(texture);
         if (!pattern) switch (texture) {
@@ -21359,13 +21399,16 @@
     _createClass(DefaultGroupBackgroundRenderContribution, [{
       key: "drawShape",
       value: function drawShape(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb) {
-        var background = graphic.attribute.background;
+        var _graphic$attribute = graphic.attribute,
+          background = _graphic$attribute.background,
+          _graphic$attribute$ba = _graphic$attribute.backgroundMode,
+          backgroundMode = _graphic$attribute$ba === void 0 ? graphicAttribute.backgroundMode : _graphic$attribute$ba;
         if (background) if (graphic.backgroundImg && graphic.resources) {
           var res = graphic.resources.get(background);
           if ("success" !== res.state || !res.data) return;
           context.highPerformanceSave(), context.setTransformFromMatrix(graphic.parent.globalTransMatrix, !0);
           var b = graphic.AABBBounds;
-          context.drawImage(res.data, b.x1, b.y1, b.width(), b.height()), context.highPerformanceRestore(), context.setTransformForCurrent();
+          this.doDrawImage(context, res.data, b, backgroundMode), context.highPerformanceRestore(), context.setTransformForCurrent();
         } else context.highPerformanceSave(), context.fillStyle = background, context.fill(), context.highPerformanceRestore();
       }
     }]);
@@ -21393,9 +21436,9 @@
       key: "drawShape",
       value: function drawShape(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb) {
         var _graphic$attribute = graphic.attribute,
-          background = _graphic$attribute.background;
-          _graphic$attribute.width;
-          _graphic$attribute.height;
+          background = _graphic$attribute.background,
+          _graphic$attribute$ba = _graphic$attribute.backgroundMode,
+          backgroundMode = _graphic$attribute$ba === void 0 ? graphicAttribute.backgroundMode : _graphic$attribute$ba;
         if (background) if (graphic.backgroundImg) {
           var res = graphic.resources.get(background);
           if ("success" !== res.state || !res.data) return;
@@ -21409,7 +21452,7 @@
             context.setTransformFromMatrix(graphic.parent.globalTransMatrix, !0), context.translate(scrollX, scrollY);
           }
           var b = graphic.AABBBounds;
-          context.drawImage(res.data, b.x1, b.y1, b.width(), b.height()), context.restore(), graphic.transMatrix.onlyTranslate() || context.setTransformForCurrent();
+          this.doDrawImage(context, res.data, b, backgroundMode), context.restore(), graphic.transMatrix.onlyTranslate() || context.setTransformForCurrent();
         } else if (isObject$1(background)) {
           var stroke = background.stroke,
             fill = background.fill,
@@ -21426,9 +21469,9 @@
           var _getActualPosition = getActualPosition(graphic),
             _x = _getActualPosition.x,
             _y = _getActualPosition.y,
-            _width = _getActualPosition.width,
-            _height = _getActualPosition.height;
-          cornerRadius ? createRectPath(context, _x - expandX, _y - expandY, _width + 2 * expandX, _height + 2 * expandY, cornerRadius) : context.rect(_x - expandX, _y - expandY, _width + 2 * expandX, _height + 2 * expandY), context.globalAlpha = 1, fill && (context.fillStyle = fill, context.fill()), stroke && lineWidth > 0 && (context.lineWidth = lineWidth, context.strokeStyle = stroke, context.stroke());
+            width = _getActualPosition.width,
+            height = _getActualPosition.height;
+          cornerRadius ? createRectPath(context, _x - expandX, _y - expandY, width + 2 * expandX, height + 2 * expandY, cornerRadius) : context.rect(_x - expandX, _y - expandY, width + 2 * expandX, height + 2 * expandY), context.globalAlpha = 1, fill && (context.fillStyle = fill, context.fill()), stroke && lineWidth > 0 && (context.lineWidth = lineWidth, context.strokeStyle = stroke, context.stroke());
         } else {
           context.beginPath();
           var _b = graphic.AABBBounds;
@@ -22759,7 +22802,8 @@
           var b = getRectIntersect(dirtyBounds, stage.dirtyBounds, !1);
           dirtyBounds.x1 = Math.floor(b.x1), dirtyBounds.y1 = Math.floor(b.y1), dirtyBounds.x2 = Math.ceil(b.x2), dirtyBounds.y2 = Math.ceil(b.y2);
         }
-        this.backupDirtyBounds.copy(dirtyBounds), context.inuse = !0, context.clearMatrix(), context.setTransformForCurrent(!0);
+        var d = context.dpr % 1;
+        (d || .5 !== d) && (dirtyBounds.x1 = Math.floor(dirtyBounds.x1 * context.dpr) / context.dpr, dirtyBounds.y1 = Math.floor(dirtyBounds.y1 * context.dpr) / context.dpr, dirtyBounds.x2 = Math.ceil(dirtyBounds.x2 * context.dpr) / context.dpr, dirtyBounds.y2 = Math.ceil(dirtyBounds.y2 * context.dpr) / context.dpr), this.backupDirtyBounds.copy(dirtyBounds), context.inuse = !0, context.clearMatrix(), context.setTransformForCurrent(!0);
         var drawInArea = dirtyBounds.width() * context.dpr !== context.canvas.width || dirtyBounds.height() * context.dpr !== context.canvas.height;
         context.save(), context.translate(x, y, !0), drawInArea && (context.beginPath(), context.rect(dirtyBounds.x1, dirtyBounds.y1, dirtyBounds.width(), dirtyBounds.height()), context.clip()), stage.camera && (this.dirtyBounds.setValue(-1 / 0, -1 / 0, 1 / 0, 1 / 0), this.backupDirtyBounds.setValue(-1 / 0, -1 / 0, 1 / 0, 1 / 0)), this.clearScreen(renderService, context, drawContext), context.save(), renderService.renderTreeRoots.sort(function (a, b) {
           var _a, _b;
@@ -29216,7 +29260,7 @@
       var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       _classCallCheck(this, Gesture);
       var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-      _this = _super.call(this), _this.cachedEvents = [], _this.startPoints = [], _this.processEvent = {}, _this.throttleTimer = 0, _this.emitThrottles = [], _this.onStart = function (ev) {
+      _this = _super.call(this), _this.cachedEvents = [], _this.startPoints = [], _this.processEvent = {}, _this.throttleTimer = 0, _this.emitThrottles = [], _this.lastTapTarget = null, _this.onStart = function (ev) {
         _this.reset(), _this.startTime = clock.now();
         var _assertThisInitialize = _assertThisInitialized(_this),
           cachedEvents = _assertThisInitialize.cachedEvents,
@@ -29300,7 +29344,7 @@
               velocity > _this.config.swipe.velocity && distance > _this.config.swipe.threshold && (endEvent.velocity = velocity, endEvent.direction = calcDirection(prevMovePoint, lastMovePoint), _this.triggerEvent("swipe", endEvent));
             }
           }
-          now - _this.lastTapTime < _this.config.tap.interval ? _this.tapCount++ : _this.tapCount = 1, _this.lastTapTime = now, 1 === _this.tapCount ? _this.triggerEvent("tap", endEvent) : 2 === _this.tapCount && (_this.triggerEvent("doubletap", endEvent), _this.tapCount = 0);
+          now - _this.lastTapTime < _this.config.tap.interval && ev.target === _this.lastTapTarget ? _this.tapCount++ : _this.tapCount = 1, _this.lastTapTime = now, _this.lastTapTarget = ev.target, 1 === _this.tapCount ? _this.triggerEvent("tap", endEvent) : 2 === _this.tapCount && (_this.triggerEvent("doubletap", endEvent), _this.tapCount = 0);
         }
         for (var i = 0, len = cachedEvents.length; i < len; i++) if (cachedEvents[i].pointerId === endEvent.pointerId) {
           cachedEvents.splice(i, 1), startPoints.splice(i, 1);
@@ -34686,7 +34730,7 @@
 
   var roughModule = _roughModule;
 
-  const version = "0.16.17";
+  const version = "0.16.18-alpha.0";
   loadAllModule(container);
 
   exports.ACustomAnimate = ACustomAnimate;