@visactor/react-vtable 1.19.10-alpha.2 → 1.19.10-alpha.4

package/cjs/index.d.ts

@@ -1,4 +1,4 @@
 export * from './tables';
 export * from './table-components';
 export * from './components';
-export declare const version = "1.19.10-alpha.2";
+export declare const version = "1.19.10-alpha.4";

package/cjs/index.js

@@ -18,5 +18,5 @@ var __createBinding = this && this.__createBinding || (Object.create ? function(
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.version = void 0, __exportStar(require("./tables"), exports), __exportStar(require("./table-components"), exports), 
-__exportStar(require("./components"), exports), exports.version = "1.19.10-alpha.2";
+__exportStar(require("./components"), exports), exports.version = "1.19.10-alpha.4";
 //# sourceMappingURL=index.js.map

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,qDAAmC;AACnC,+CAA6B;AAEhB,QAAA,OAAO,GAAG,iBAAiB,CAAC","file":"index.js","sourcesContent":["export * from './tables';\nexport * from './table-components';\nexport * from './components';\n\nexport const version = \"1.19.10-alpha.2\";\n"]}
+{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,qDAAmC;AACnC,+CAA6B;AAEhB,QAAA,OAAO,GAAG,iBAAiB,CAAC","file":"index.js","sourcesContent":["export * from './tables';\nexport * from './table-components';\nexport * from './components';\n\nexport const version = \"1.19.10-alpha.4\";\n"]}

package/dist/react-vtable.js

@@ -1381,7 +1381,15 @@
     const EnvContribution = Symbol.for("EnvContribution");
     const DEFAULT_TEXT_FONT_FAMILY$1 = "PingFang SC,Helvetica Neue,Microsoft Yahei,system-ui,-apple-system,segoe ui,Roboto,Helvetica,Arial,sans-serif,apple color emoji,segoe ui emoji,segoe ui symbol";
 
-    class Application {}
+    const container = new Container();
+
+    const RenderService = Symbol.for("RenderService");
+
+    class Application {
+      get renderService() {
+        return this._renderService || (this._renderService = container.get(RenderService)), this._renderService;
+      }
+    }
     const application = new Application();
 
     var MeasureModeEnum;
@@ -3749,7 +3757,8 @@
       y1: 0,
       strokeBoundsBuffer: 0,
       cornerRadius: 0,
-      cornerType: "round"
+      cornerType: "round",
+      drawStrokeWhenZeroWH: !1
     });
     Object.assign(Object.assign({}, DefaultAttribute), {
       width: 0,
@@ -3758,7 +3767,8 @@
       y1: 0,
       cornerRadius: 0,
       length: 0,
-      cornerType: "round"
+      cornerType: "round",
+      drawStrokeWhenZeroWH: !1
     });
     const DefaultSymbolAttribute = Object.assign(Object.assign({}, DefaultAttribute), {
       symbolType: "circle",
@@ -3985,6 +3995,34 @@
         }
         return c;
       }
+      static processColorStops(colorStops) {
+        if (!colorStops || 0 === colorStops.length) return [];
+        if (colorStops.some(item => item.length)) {
+          const stops = colorStops.map(item => ({
+            color: item.value,
+            offset: item.length ? parseFloat(item.length.value) / 100 : -1
+          }));
+          stops[0].offset < 0 && (stops[0].offset = 0), stops[stops.length - 1].offset < 0 && (stops[stops.length - 1].offset = 1);
+          for (let i = 1; i < stops.length - 1; i++) if (stops[i].offset < 0) {
+            const prevWithOffsetIdx = i - 1;
+            let nextWithOffsetIdx = i + 1;
+            for (; nextWithOffsetIdx < stops.length && stops[nextWithOffsetIdx].offset < 0;) nextWithOffsetIdx++;
+            const startOffset = stops[prevWithOffsetIdx].offset,
+              endOffset = stops[nextWithOffsetIdx].offset,
+              unspecCount = nextWithOffsetIdx - prevWithOffsetIdx;
+            for (let j = 1; j < unspecCount; j++) stops[prevWithOffsetIdx + j].offset = startOffset + (endOffset - startOffset) * j / unspecCount;
+            i = nextWithOffsetIdx - 1;
+          }
+          return stops;
+        }
+        return colorStops.map((item, index) => {
+          const offset = colorStops.length > 1 ? index / (colorStops.length - 1) : 0;
+          return {
+            color: item.value,
+            offset: offset
+          };
+        });
+      }
       static ParseConic(datum) {
         const {
             orientation: orientation,
@@ -3998,10 +4036,7 @@
           y: .5,
           startAngle: sa,
           endAngle: sa + pi2,
-          stops: colorStops.map(item => ({
-            color: item.value,
-            offset: parseFloat(item.length.value) / 100
-          }))
+          stops: GradientParser.processColorStops(colorStops)
         };
       }
       static ParseRadial(datum) {
@@ -4016,10 +4051,7 @@
           y1: .5,
           r0: 0,
           r1: 1,
-          stops: colorStops.map(item => ({
-            color: item.value,
-            offset: parseFloat(item.length.value) / 100
-          }))
+          stops: GradientParser.processColorStops(colorStops)
         };
       }
       static ParseLinear(datum) {
@@ -4041,10 +4073,7 @@
           y0: y0,
           x1: x1,
           y1: y1,
-          stops: colorStops.map(item => ({
-            color: item.value,
-            offset: parseFloat(item.length.value) / 100
-          }))
+          stops: GradientParser.processColorStops(colorStops)
         };
       }
     }
@@ -4232,8 +4261,6 @@
       return result.width += space, result;
     }
 
-    const container = new Container();
-
     const CanvasFactory = Symbol.for("CanvasFactory");
 
     function wrapCanvas(params) {
@@ -6727,7 +6754,7 @@
         });
       }
       setAttributes(params, forceUpdateTag = !1, context) {
-        (params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params).background ? this.loadImage(params.background, !0) : params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic), this._setAttributes(params, forceUpdateTag, context);
+        params && ((params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params).background ? this.loadImage(params.background, !0) : params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic), this._setAttributes(params, forceUpdateTag, context));
       }
       _setAttributes(params, forceUpdateTag = !1, context) {
         const keys = Object.keys(params);
@@ -7362,8 +7389,8 @@
     function strokeVisible(opacity, strokeOpacity) {
       return opacity * strokeOpacity > 0;
     }
-    function rectStrokeVisible(opacity, strokeOpacity, width, height) {
-      return opacity * strokeOpacity > 0 && 0 !== width && 0 !== height;
+    function rectStrokeVisible(opacity, strokeOpacity, width, height, drawStrokeWhenZeroWH) {
+      return drawStrokeWhenZeroWH ? opacity * strokeOpacity > 0 : opacity * strokeOpacity > 0 && 0 !== width && 0 !== height;
     }
 
     const ImageRenderContribution = Symbol.for("ImageRenderContribution");
@@ -7725,7 +7752,7 @@
           this.cache.layoutData.lines.forEach(item => {
             mergedText += item.str;
           });
-          return (Array.isArray(text) ? text.join("") : text) !== mergedText;
+          return (Array.isArray(text) ? text.join("") : text).toString() !== mergedText;
         }
         return "vertical" === attribute.direction && this.cache.verticalList && this.cache.verticalList[0] ? this.cache.verticalList[0].map(item => item.text).join("") !== attribute.text.toString() : null != this.clipedText && this.clipedText !== attribute.text.toString();
       }
@@ -7824,7 +7851,7 @@
         return fontSize ? .1 * fontSize : 0;
       }
       updateHorizontalMultilineAABBBounds(text) {
-        var _a;
+        var _a, _b;
         const textTheme = this.getGraphicTheme(),
           attribute = this.attribute,
           {
@@ -7851,7 +7878,7 @@
           const bbox = this.cache.layoutData.bbox;
           return this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
         }
-        const textMeasure = application.graphicUtil.textMeasure,
+        const textMeasure = application.graphicUtil.getTextMeasureInstance(this.textMeasureId || (null === (_b = this.stage) || void 0 === _b ? void 0 : _b.textMeasureId)),
           layoutData = new CanvasTextLayout(fontFamily, {
             fontSize: fontSize,
             fontWeight: fontWeight,
@@ -7869,7 +7896,7 @@
         return this.cache.layoutData = layoutData, this.clearUpdateShapeTag(), this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
       }
       updateWrapAABBBounds(text) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const textTheme = this.getGraphicTheme(),
           {
             fontFamily = textTheme.fontFamily,
@@ -7895,7 +7922,7 @@
           const bbox = this.cache.layoutData.bbox;
           return this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
         }
-        const textMeasure = application.graphicUtil.textMeasure,
+        const textMeasure = application.graphicUtil.getTextMeasureInstance(this.textMeasureId || (null === (_b = this.stage) || void 0 === _b ? void 0 : _b.textMeasureId)),
           textOptions = {
             fontSize: fontSize,
             fontWeight: fontWeight,
@@ -7927,7 +7954,7 @@
             if ("" !== str && "" === clip.str || clip.wordBreaked) {
               if (ellipsis) {
                 const clipEllipsis = textMeasure.clipTextWithSuffix(str, textOptions, maxLineWidth, ellipsis, !1, suffixPosition);
-                clip.str = null !== (_b = clipEllipsis.str) && void 0 !== _b ? _b : "", clip.width = null !== (_c = clipEllipsis.width) && void 0 !== _c ? _c : 0;
+                clip.str = null !== (_c = clipEllipsis.str) && void 0 !== _c ? _c : "", clip.width = null !== (_d = clipEllipsis.width) && void 0 !== _d ? _d : 0;
               } else clip.str = "", clip.width = 0;
               needCut = !1;
             }
@@ -7990,9 +8017,9 @@
         return this.cache.layoutData = layoutData, this.clearUpdateShapeTag(), this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
       }
       updateVerticalMultilineAABBBounds(text) {
-        var _a, _b;
+        var _a, _b, _c;
         const textTheme = this.getGraphicTheme(),
-          textMeasure = application.graphicUtil.textMeasure;
+          textMeasure = application.graphicUtil.getTextMeasureInstance(this.textMeasureId || (null === (_a = this.stage) || void 0 === _a ? void 0 : _a.textMeasureId));
         let width;
         const attribute = this.attribute,
           {
@@ -8013,7 +8040,7 @@
         } = attribute;
         if (!verticalMode) {
           const t = textAlign;
-          textAlign = null !== (_a = Text.baselineMapAlign[textBaseline]) && void 0 !== _a ? _a : "left", textBaseline = null !== (_b = Text.alignMapBaseline[t]) && void 0 !== _b ? _b : "top";
+          textAlign = null !== (_b = Text.baselineMapAlign[textBaseline]) && void 0 !== _b ? _b : "left", textBaseline = null !== (_c = Text.alignMapBaseline[t]) && void 0 !== _c ? _c : "top";
         }
         if (width = 0, !this.shouldUpdateShape() && this.cache) {
           this.cache.verticalList.forEach(item => {
@@ -8127,7 +8154,7 @@
         return isArray$1(text) ? !text.every(t => null == t || "" === t) : null != text && "" !== text;
       }
       updateMultilineAABBBounds(text) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const textTheme = this.getGraphicTheme(),
           {
             fontFamily = textTheme.fontFamily,
@@ -8151,7 +8178,7 @@
           const bbox = this.cache.layoutData.bbox;
           return this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height), stroke && this._AABBBounds.expand(lineWidth / 2), this._AABBBounds;
         }
-        const textMeasure = application.graphicUtil.textMeasure,
+        const textMeasure = application.graphicUtil.getTextMeasureInstance(this.textMeasureId || (null === (_c = this.stage) || void 0 === _c ? void 0 : _c.textMeasureId)),
           layoutObj = new CanvasTextLayout(fontFamily, {
             fontSize: fontSize,
             fontWeight: fontWeight,
@@ -8180,7 +8207,7 @@
             if ("" !== str && "" === clip.str) {
               if (ellipsis) {
                 const clipEllipsis = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis, !1, suffixPosition);
-                clip.str = null !== (_c = clipEllipsis.str) && void 0 !== _c ? _c : "", clip.width = null !== (_d = clipEllipsis.width) && void 0 !== _d ? _d : 0;
+                clip.str = null !== (_d = clipEllipsis.str) && void 0 !== _d ? _d : "", clip.width = null !== (_e = clipEllipsis.width) && void 0 !== _e ? _e : 0;
               } else clip.str = "", clip.width = 0;
               needCut = !1;
             }
@@ -9194,7 +9221,7 @@
           case "right":
             deltaX = -aabbBounds.width();
         }
-        return aabbBounds.translate(deltaX, deltaY), application.graphicService.updateTempAABBBounds(aabbBounds), null == attribute.forceBoundsHeight && null == attribute.forceBoundsWidth || application.graphicService.updateHTMLTextAABBBounds(attribute, richtextTheme, aabbBounds), this.widthWithoutTransform = aabbBounds.x2 - aabbBounds.x1, this.heightWithoutTransform = aabbBounds.y2 - aabbBounds.y1, application.graphicService.transformAABBBounds(attribute, aabbBounds, richtextTheme, !1, this), 0 === aabbBounds.width() && 0 === aabbBounds.height() && aabbBounds.clear(), aabbBounds;
+        return height || ("middle" === this.verticalDirection ? deltaY -= aabbBounds.height() / 2 : "bottom" === this.verticalDirection && (deltaY -= aabbBounds.height())), aabbBounds.translate(deltaX, deltaY), application.graphicService.updateTempAABBBounds(aabbBounds), null == attribute.forceBoundsHeight && null == attribute.forceBoundsWidth || application.graphicService.updateHTMLTextAABBBounds(attribute, richtextTheme, aabbBounds), this.widthWithoutTransform = aabbBounds.x2 - aabbBounds.x1, this.heightWithoutTransform = aabbBounds.y2 - aabbBounds.y1, application.graphicService.transformAABBBounds(attribute, aabbBounds, richtextTheme, !1, this), 0 === aabbBounds.width() && 0 === aabbBounds.height() && aabbBounds.clear(), aabbBounds;
       }
       needUpdateTags(keys) {
         return super.needUpdateTags(keys, RICHTEXT_UPDATE_TAG_KEY);
@@ -10408,7 +10435,8 @@
           y1: y1,
           x: originX = rectAttribute.x,
           y: originY = rectAttribute.y,
-          fillStrokeOrder = rectAttribute.fillStrokeOrder
+          fillStrokeOrder = rectAttribute.fillStrokeOrder,
+          drawStrokeWhenZeroWH = rectAttribute.drawStrokeWhenZeroWH
         } = rect.attribute;
         let {
           width: width,
@@ -10416,7 +10444,7 @@
         } = rect.attribute;
         width = (null != width ? width : x1 - originX) || 0, height = (null != height ? height : y1 - originY) || 0;
         const fVisible = rectFillVisible(opacity, fillOpacity, width, height, fill),
-          sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height),
+          sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height, drawStrokeWhenZeroWH),
           doFill = runFill(fill, background),
           doStroke = runStroke(stroke, lineWidth);
         if (!rect.valid || !visible) return;
@@ -19788,7 +19816,7 @@
     const Checkbox = React.forwardRef(CheckboxComponent);
     Checkbox.displayName = 'Checkbox';
 
-    const version = "1.19.10-alpha.2";
+    const version = "1.19.10-alpha.4";
 
     Object.defineProperty(exports, 'register', {
         enumerable: true,