@visactor/vrender 0.22.2 → 0.22.4

package/cjs/index.d.ts

@@ -1,4 +1,4 @@
 import '@visactor/vrender-core';
-export declare const version = "0.22.2";
+export declare const version = "0.22.4";
 export * from '@visactor/vrender-core';
 export * from '@visactor/vrender-kits';

package/cjs/index.js

@@ -21,7 +21,7 @@ Object.defineProperty(exports, "__esModule", {
 
 const vrender_core_1 = require("@visactor/vrender-core"), vrender_kits_1 = require("@visactor/vrender-kits"), vrender_kits_2 = require("@visactor/vrender-kits");
 
-exports.version = "0.22.2", (0, vrender_core_1.preLoadAllModule)(), (0, vrender_core_1.isBrowserEnv)() ? (0, 
+exports.version = "0.22.4", (0, vrender_core_1.preLoadAllModule)(), (0, vrender_core_1.isBrowserEnv)() ? (0, 
 vrender_kits_1.loadBrowserEnv)(vrender_core_1.container) : (0, vrender_core_1.isNodeEnv)() && (0, 
 vrender_kits_1.loadNodeEnv)(vrender_core_1.container), (0, vrender_kits_2.registerArc)(), 
 (0, vrender_kits_2.registerArc3d)(), (0, vrender_kits_2.registerArea)(), (0, vrender_kits_2.registerCircle)(), 

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAWgC;AAChC,yDAAqE;AACrE,yDAmBgC;AAEnB,QAAA,OAAO,GAAG,QAAQ,CAAC;AAEhC,IAAA,+BAAgB,GAAE,CAAC;AAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;IAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;CAC3B;KAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;IACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;CACxB;AACD,IAAA,0BAAW,GAAE,CAAC;AACd,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,8BAAe,GAAE,CAAC;AAClB,IAAA,gCAAiB,GAAE,CAAC;AACpB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,+BAAgB,GAAE,CAAC;AACnB,IAAA,iCAAkB,GAAE,CAAC;AACrB,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,+BAAgB,GAAE,CAAC;AAEnB,IAAA,uCAAwB,GAAE,CAAC;AAC3B,IAAA,4CAA6B,GAAE,CAAC;AAChC,IAAA,0CAA2B,GAAE,CAAC;AAC9B,IAAA,2CAA4B,GAAE,CAAC;AAC/B,IAAA,uCAAwB,GAAE,CAAC;AAC3B,IAAA,kCAAmB,GAAE,CAAC;AACtB,yDAAuC;AACvC,yDAAuC","file":"index.js","sourcesContent":["import '@visactor/vrender-core';\nimport {\n  container,\n  isBrowserEnv,\n  isNodeEnv,\n  preLoadAllModule,\n  registerFlexLayoutPlugin,\n  registerViewTransform3dPlugin,\n  registerHtmlAttributePlugin,\n  registerReactAttributePlugin,\n  registerDirectionalLight,\n  registerOrthoCamera\n} from '@visactor/vrender-core';\nimport { loadBrowserEnv, loadNodeEnv } from '@visactor/vrender-kits';\nimport {\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\nexport const version = \"0.22.2\";\n\npreLoadAllModule();\n\nif (isBrowserEnv()) {\n  loadBrowserEnv(container);\n} else if (isNodeEnv()) {\n  loadNodeEnv(container);\n}\nregisterArc();\nregisterArc3d();\nregisterArea();\nregisterCircle();\nregisterGlyph();\nregisterGroup();\nregisterImage();\nregisterLine();\nregisterPath();\nregisterPolygon();\nregisterPyramid3d();\nregisterRect();\nregisterRect3d();\nregisterRichtext();\nregisterShadowRoot();\nregisterSymbol();\nregisterText();\nregisterWrapText();\n\nregisterFlexLayoutPlugin();\nregisterViewTransform3dPlugin();\nregisterHtmlAttributePlugin();\nregisterReactAttributePlugin();\nregisterDirectionalLight();\nregisterOrthoCamera();\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAWgC;AAChC,yDAAqE;AACrE,yDAmBgC;AAEnB,QAAA,OAAO,GAAG,QAAQ,CAAC;AAEhC,IAAA,+BAAgB,GAAE,CAAC;AAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;IAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;CAC3B;KAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;IACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;CACxB;AACD,IAAA,0BAAW,GAAE,CAAC;AACd,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,8BAAe,GAAE,CAAC;AAClB,IAAA,gCAAiB,GAAE,CAAC;AACpB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,+BAAgB,GAAE,CAAC;AACnB,IAAA,iCAAkB,GAAE,CAAC;AACrB,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,+BAAgB,GAAE,CAAC;AAEnB,IAAA,uCAAwB,GAAE,CAAC;AAC3B,IAAA,4CAA6B,GAAE,CAAC;AAChC,IAAA,0CAA2B,GAAE,CAAC;AAC9B,IAAA,2CAA4B,GAAE,CAAC;AAC/B,IAAA,uCAAwB,GAAE,CAAC;AAC3B,IAAA,kCAAmB,GAAE,CAAC;AACtB,yDAAuC;AACvC,yDAAuC","file":"index.js","sourcesContent":["import '@visactor/vrender-core';\nimport {\n  container,\n  isBrowserEnv,\n  isNodeEnv,\n  preLoadAllModule,\n  registerFlexLayoutPlugin,\n  registerViewTransform3dPlugin,\n  registerHtmlAttributePlugin,\n  registerReactAttributePlugin,\n  registerDirectionalLight,\n  registerOrthoCamera\n} from '@visactor/vrender-core';\nimport { loadBrowserEnv, loadNodeEnv } from '@visactor/vrender-kits';\nimport {\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\nexport const version = \"0.22.4\";\n\npreLoadAllModule();\n\nif (isBrowserEnv()) {\n  loadBrowserEnv(container);\n} else if (isNodeEnv()) {\n  loadNodeEnv(container);\n}\nregisterArc();\nregisterArc3d();\nregisterArea();\nregisterCircle();\nregisterGlyph();\nregisterGroup();\nregisterImage();\nregisterLine();\nregisterPath();\nregisterPolygon();\nregisterPyramid3d();\nregisterRect();\nregisterRect3d();\nregisterRichtext();\nregisterShadowRoot();\nregisterSymbol();\nregisterText();\nregisterWrapText();\n\nregisterFlexLayoutPlugin();\nregisterViewTransform3dPlugin();\nregisterHtmlAttributePlugin();\nregisterReactAttributePlugin();\nregisterDirectionalLight();\nregisterOrthoCamera();\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}

package/dist/index.es.js

@@ -15622,6 +15622,7 @@ class DefaultBaseTextureRenderContribution {
     texture && this.drawTexture(texture, graphic, context, x, y, graphicAttribute, textureColor, textureSize, texturePadding);
   }
   drawTexture(texture, graphic, context, x, y, graphicAttribute, textureColor, textureSize, texturePadding) {
+    var _a;
     const {
       textureRatio = graphicAttribute.textureRatio,
       textureOptions = null
@@ -15653,12 +15654,32 @@ class DefaultBaseTextureRenderContribution {
         pattern = this.createGridPattern(textureSize, texturePadding, textureColor, context);
     }
     if (textureOptions && textureOptions.dynamicTexture) {
-      context.save(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.clip();
       const {
-          gridConfig = {}
+          gridConfig = {},
+          useNewCanvas: useNewCanvas
         } = textureOptions,
-        b = graphic.AABBBounds,
-        width = b.width(),
+        b = graphic.AABBBounds;
+      x = b.x1, y = b.y1;
+      const originalContext = context;
+      let newCanvas;
+      if (useNewCanvas) {
+        newCanvas = canvasAllocate.allocate({
+          width: b.width(),
+          height: b.height(),
+          dpr: context.dpr
+        });
+        const ctx = newCanvas.getContext("2d");
+        ctx.clearRect(0, 0, b.width(), b.height()), x = 0, y = 0, context = ctx;
+      }
+      if (originalContext.save(), graphic.parent && !graphic.transMatrix.onlyTranslate()) {
+        const {
+          scrollX = 0,
+          scrollY = 0
+        } = graphic.parent.attribute;
+        originalContext.setTransformFromMatrix(graphic.parent.globalTransMatrix), originalContext.translate(scrollX, scrollY, !0);
+      }
+      originalContext.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), originalContext.clip();
+      const width = b.width(),
         height = b.height(),
         padding = texturePadding,
         cellSize = textureSize,
@@ -15677,9 +15698,9 @@ class DefaultBaseTextureRenderContribution {
       for (let i = 0; i < gridRows; i++) for (let j = 0; j < gridColumns; j++) {
         const _x = x + cellSize / 2 + j * cellSize,
           _y = y + cellSize / 2 + i * cellSize;
-        context.beginPath(), !1 === parsedPath.draw(context, Math.min(sizeW - gutterColumn, sizeH - gutterRow), _x, _y, 0) && context.closePath(), context.fillStyle = textureColor, textureOptions.dynamicTexture(context, i, j, gridRows, gridColumns, textureRatio, graphic);
+        null === (_a = textureOptions.beforeDynamicTexture) || void 0 === _a || _a.call(textureOptions, context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height()), context.beginPath(), !1 === parsedPath.draw(context, Math.min(sizeW - gutterColumn, sizeH - gutterRow), _x, _y, 0) && context.closePath(), context.fillStyle = textureColor, textureOptions.dynamicTexture(context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height());
       }
-      context.restore();
+      useNewCanvas && (originalContext.globalAlpha = 1, originalContext.drawImage(newCanvas.nativeCanvas, 0, 0, newCanvas.nativeCanvas.width, newCanvas.nativeCanvas.height, b.x1, b.y1, b.width() * originalContext.dpr, b.height() * originalContext.dpr)), originalContext.restore();
     } else if (pattern) context.highPerformanceSave(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.fillStyle = pattern, context.fill(), context.highPerformanceRestore();else if ("wave" === texture) {
       context.save(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.clip();
       const b = graphic.AABBBounds;
@@ -20437,7 +20458,8 @@ function getDefaultCharacterConfig(attribute) {
     stroke = !1,
     fontWeight = "normal",
     lineHeight: lineHeight,
-    fontFamily = "Arial"
+    fontFamily = "Arial",
+    textAlign: textAlign
   } = attribute;
   let {
     fontSize = 12
@@ -20448,7 +20470,8 @@ function getDefaultCharacterConfig(attribute) {
     fontSize: fontSize,
     fontWeight: fontWeight,
     fontFamily: fontFamily,
-    lineHeight: lineHeight
+    lineHeight: lineHeight,
+    textAlign: textAlign
   };
 }
 function findConfigIndexByCursorIdx(textConfig, cursorIndex) {
@@ -20497,9 +20520,9 @@ class EditModule {
       } else {
         const configIdx = this.composingConfigIdx,
           lastConfig = textConfig[configIdx] || textConfig[configIdx - 1];
-        textConfig.splice(configIdx, 0, Object.assign(Object.assign({
+        textConfig.splice(configIdx, 0, Object.assign(Object.assign(Object.assign({
           fill: "black"
-        }, lastConfig), {
+        }, getDefaultCharacterConfig(this.currRt.attribute)), lastConfig), {
           text: ""
         }));
       }
@@ -20893,6 +20916,7 @@ class RichTextEditPlugin {
         boundsStrokeWhenInput: boundsStrokeWhenInput
       } = editOptions;
     if (!editOptions || !boundsStrokeWhenInput) return;
+    this.offsetShadowRoot();
     const b = this.getRichTextAABBBounds(this.currRt),
       height = b.height(),
       width = b.width();
@@ -20907,7 +20931,7 @@ class RichTextEditPlugin {
       zIndex: -1
     });
     const shadow = this.getShadow(this.currRt);
-    this.addEditLineOrBgOrBounds(this.shadowBounds, shadow), this.offsetLineBgAndShadowBounds(), this.offsetShadowRoot();
+    this.addEditLineOrBgOrBounds(this.shadowBounds, shadow), this.offsetLineBgAndShadowBounds();
   }
   trySyncPlaceholderToTextConfig() {
     if (!this.currRt) return;
@@ -21170,8 +21194,8 @@ class RichTextEditPlugin {
   getShadow(rt) {
     const sr = rt.shadowRoot || rt.attachShadow();
     return sr.setAttributes({
-      width: 1,
-      height: 1
+      width: 0,
+      height: 0
     }), sr;
   }
   getLineByPoint(cache, p1) {
@@ -25021,7 +25045,7 @@ class Gesture extends EventEmitter {
     let config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     super(), this.cachedEvents = [], this.startPoints = [], this.processEvent = {}, this.throttleTimer = 0, this.emitThrottles = [], this.lastTapTarget = null, this.onStart = ev => {
-      this.cachedEvents = [], this.startPoints = [], this.reset(), this.startTime = clock.now();
+      this.startTime = clock.now();
       const {
         cachedEvents: cachedEvents,
         startPoints: startPoints
@@ -31610,7 +31634,7 @@ function particleEffect(ctx, row, column, rowCount, columnCount, ratio, graphic)
 
 const roughModule = _roughModule;
 
-const version = "0.22.2";
+const version = "0.22.4";
 preLoadAllModule();
 if (isBrowserEnv()) {
     loadBrowserEnv(container);

package/dist/index.js

@@ -15628,6 +15628,7 @@
         texture && this.drawTexture(texture, graphic, context, x, y, graphicAttribute, textureColor, textureSize, texturePadding);
       }
       drawTexture(texture, graphic, context, x, y, graphicAttribute, textureColor, textureSize, texturePadding) {
+        var _a;
         const {
           textureRatio = graphicAttribute.textureRatio,
           textureOptions = null
@@ -15659,12 +15660,32 @@
             pattern = this.createGridPattern(textureSize, texturePadding, textureColor, context);
         }
         if (textureOptions && textureOptions.dynamicTexture) {
-          context.save(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.clip();
           const {
-              gridConfig = {}
+              gridConfig = {},
+              useNewCanvas: useNewCanvas
             } = textureOptions,
-            b = graphic.AABBBounds,
-            width = b.width(),
+            b = graphic.AABBBounds;
+          x = b.x1, y = b.y1;
+          const originalContext = context;
+          let newCanvas;
+          if (useNewCanvas) {
+            newCanvas = canvasAllocate.allocate({
+              width: b.width(),
+              height: b.height(),
+              dpr: context.dpr
+            });
+            const ctx = newCanvas.getContext("2d");
+            ctx.clearRect(0, 0, b.width(), b.height()), x = 0, y = 0, context = ctx;
+          }
+          if (originalContext.save(), graphic.parent && !graphic.transMatrix.onlyTranslate()) {
+            const {
+              scrollX = 0,
+              scrollY = 0
+            } = graphic.parent.attribute;
+            originalContext.setTransformFromMatrix(graphic.parent.globalTransMatrix), originalContext.translate(scrollX, scrollY, !0);
+          }
+          originalContext.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), originalContext.clip();
+          const width = b.width(),
             height = b.height(),
             padding = texturePadding,
             cellSize = textureSize,
@@ -15683,9 +15704,9 @@
           for (let i = 0; i < gridRows; i++) for (let j = 0; j < gridColumns; j++) {
             const _x = x + cellSize / 2 + j * cellSize,
               _y = y + cellSize / 2 + i * cellSize;
-            context.beginPath(), !1 === parsedPath.draw(context, Math.min(sizeW - gutterColumn, sizeH - gutterRow), _x, _y, 0) && context.closePath(), context.fillStyle = textureColor, textureOptions.dynamicTexture(context, i, j, gridRows, gridColumns, textureRatio, graphic);
+            null === (_a = textureOptions.beforeDynamicTexture) || void 0 === _a || _a.call(textureOptions, context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height()), context.beginPath(), !1 === parsedPath.draw(context, Math.min(sizeW - gutterColumn, sizeH - gutterRow), _x, _y, 0) && context.closePath(), context.fillStyle = textureColor, textureOptions.dynamicTexture(context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height());
           }
-          context.restore();
+          useNewCanvas && (originalContext.globalAlpha = 1, originalContext.drawImage(newCanvas.nativeCanvas, 0, 0, newCanvas.nativeCanvas.width, newCanvas.nativeCanvas.height, b.x1, b.y1, b.width() * originalContext.dpr, b.height() * originalContext.dpr)), originalContext.restore();
         } else if (pattern) context.highPerformanceSave(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.fillStyle = pattern, context.fill(), context.highPerformanceRestore();else if ("wave" === texture) {
           context.save(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.clip();
           const b = graphic.AABBBounds;
@@ -20443,7 +20464,8 @@
         stroke = !1,
         fontWeight = "normal",
         lineHeight: lineHeight,
-        fontFamily = "Arial"
+        fontFamily = "Arial",
+        textAlign: textAlign
       } = attribute;
       let {
         fontSize = 12
@@ -20454,7 +20476,8 @@
         fontSize: fontSize,
         fontWeight: fontWeight,
         fontFamily: fontFamily,
-        lineHeight: lineHeight
+        lineHeight: lineHeight,
+        textAlign: textAlign
       };
     }
     function findConfigIndexByCursorIdx(textConfig, cursorIndex) {
@@ -20503,9 +20526,9 @@
           } else {
             const configIdx = this.composingConfigIdx,
               lastConfig = textConfig[configIdx] || textConfig[configIdx - 1];
-            textConfig.splice(configIdx, 0, Object.assign(Object.assign({
+            textConfig.splice(configIdx, 0, Object.assign(Object.assign(Object.assign({
               fill: "black"
-            }, lastConfig), {
+            }, getDefaultCharacterConfig(this.currRt.attribute)), lastConfig), {
               text: ""
             }));
           }
@@ -20899,6 +20922,7 @@
             boundsStrokeWhenInput: boundsStrokeWhenInput
           } = editOptions;
         if (!editOptions || !boundsStrokeWhenInput) return;
+        this.offsetShadowRoot();
         const b = this.getRichTextAABBBounds(this.currRt),
           height = b.height(),
           width = b.width();
@@ -20913,7 +20937,7 @@
           zIndex: -1
         });
         const shadow = this.getShadow(this.currRt);
-        this.addEditLineOrBgOrBounds(this.shadowBounds, shadow), this.offsetLineBgAndShadowBounds(), this.offsetShadowRoot();
+        this.addEditLineOrBgOrBounds(this.shadowBounds, shadow), this.offsetLineBgAndShadowBounds();
       }
       trySyncPlaceholderToTextConfig() {
         if (!this.currRt) return;
@@ -21176,8 +21200,8 @@
       getShadow(rt) {
         const sr = rt.shadowRoot || rt.attachShadow();
         return sr.setAttributes({
-          width: 1,
-          height: 1
+          width: 0,
+          height: 0
         }), sr;
       }
       getLineByPoint(cache, p1) {
@@ -25027,7 +25051,7 @@
         let config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         super(), this.cachedEvents = [], this.startPoints = [], this.processEvent = {}, this.throttleTimer = 0, this.emitThrottles = [], this.lastTapTarget = null, this.onStart = ev => {
-          this.cachedEvents = [], this.startPoints = [], this.reset(), this.startTime = clock.now();
+          this.startTime = clock.now();
           const {
             cachedEvents: cachedEvents,
             startPoints: startPoints
@@ -31616,7 +31640,7 @@
 
     const roughModule = _roughModule;
 
-    const version = "0.22.2";
+    const version = "0.22.4";
     preLoadAllModule();
     if (isBrowserEnv()) {
         loadBrowserEnv(container);