@visactor/react-vtable 1.14.1 → 1.14.3

package/cjs/index.d.ts

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

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.14.1";
+__exportStar(require("./components"), exports), exports.version = "1.14.3";
 //# 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,QAAQ,CAAC","file":"index.js","sourcesContent":["export * from './tables';\nexport * from './table-components';\nexport * from './components';\n\nexport const version = \"1.14.1\";\n"]}
+{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,qDAAmC;AACnC,+CAA6B;AAEhB,QAAA,OAAO,GAAG,QAAQ,CAAC","file":"index.js","sourcesContent":["export * from './tables';\nexport * from './table-components';\nexport * from './components';\n\nexport const version = \"1.14.3\";\n"]}

package/dist/react-vtable.js

@@ -1732,19 +1732,10 @@
     }
     function isRotateAABBIntersect(box1, box2) {
       let isDeg = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : !1;
-      let ctx = arguments.length > 3 ? arguments[3] : undefined;
       const rect1 = toRect(box1, isDeg),
         rect2 = toRect(box2, isDeg),
-        vector = (start, end) => [end.x - start.x, end.y - start.y];
-      ctx && (ctx.save(), ctx.fillStyle = "red", ctx.globalAlpha = .6, rect1.forEach((item, index) => {
-        0 === index ? ctx.moveTo(item.x, item.y) : ctx.lineTo(item.x, item.y);
-      }), ctx.fill(), ctx.restore(), ctx.save(), ctx.fillStyle = "green", ctx.globalAlpha = .6, rect2.forEach((item, index) => {
-        0 === index ? ctx.moveTo(item.x, item.y) : ctx.lineTo(item.x, item.y);
-      }), ctx.fill(), ctx.restore());
-      const p1 = getCenterPoint(box1),
-        p2 = getCenterPoint(box2);
-      ctx && ctx.fillRect(p1.x, p1.y, 2, 2), ctx && ctx.fillRect(p2.x, p2.y, 2, 2);
-      const vp1p2 = vector(p1, p2),
+        vector = (start, end) => [end.x - start.x, end.y - start.y],
+        vp1p2 = vector(getCenterPoint(box1), getCenterPoint(box2)),
         AB = vector(rect1[0], rect1[1]),
         BC = vector(rect1[1], rect1[2]),
         A1B1 = vector(rect2[0], rect2[1]),
@@ -1964,7 +1955,8 @@
     class OBBBounds extends Bounds {
       constructor(bounds) {
         let angle = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-        super(bounds), bounds && (this.angle = angle);
+        var _a;
+        super(bounds), bounds && (this.angle = null !== (_a = bounds.angle) && void 0 !== _a ? _a : angle);
       }
       intersects(b) {
         return isRotateAABBIntersect(this, b);
@@ -1977,6 +1969,9 @@
         let angle = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
         return super.setValue(x1, y1, x2, y2), this.angle = angle, this;
       }
+      clone() {
+        return new OBBBounds(this);
+      }
     }
 
     class Matrix {
@@ -4618,7 +4613,7 @@
       return null;
     }
 
-    var __awaiter = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
+    var __awaiter$2 = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
       return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) {
           try {
@@ -4688,7 +4683,7 @@
       }
       forEachChildrenAsync(cb) {
         let reverse = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !1;
-        return __awaiter(this, void 0, void 0, function* () {
+        return __awaiter$2(this, void 0, void 0, function* () {
           if (reverse) {
             let child = this._lastChild,
               i = 0;
@@ -7941,68 +7936,6 @@
     const defaultRectTextureRenderContribution = defaultBaseTextureRenderContribution;
     const defaultRectBackgroundRenderContribution = defaultBaseBackgroundRenderContribution;
 
-    class DefaultImageBackgroundRenderContribution extends DefaultBaseBackgroundRenderContribution {
-      constructor() {
-        super(...arguments), this.time = BaseRenderContributionTime.beforeFillStroke;
-      }
-      drawShape(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb) {
-        const {
-          background: background,
-          backgroundMode = graphicAttribute.backgroundMode,
-          backgroundFit = graphicAttribute.backgroundFit
-        } = graphic.attribute;
-        if (background) if (graphic.backgroundImg) {
-          const res = graphic.resources.get(background);
-          if ("success" !== res.state || !res.data) return;
-          if (context.save(), graphic.parent && !graphic.transMatrix.onlyTranslate()) {
-            const groupAttribute = getTheme(graphic.parent).group,
-              {
-                scrollX = groupAttribute.scrollX,
-                scrollY = groupAttribute.scrollY
-              } = graphic.parent.attribute;
-            context.setTransformFromMatrix(graphic.parent.globalTransMatrix, !0), context.translate(scrollX, scrollY);
-          }
-          const b = graphic.AABBBounds;
-          this.doDrawImage(context, res.data, b, backgroundMode, backgroundFit), context.restore(), graphic.transMatrix.onlyTranslate() || context.setTransformForCurrent();
-        } else if (isObject$1(background)) {
-          const {
-            stroke: stroke,
-            fill: fill,
-            lineWidth = 1,
-            cornerRadius = 0,
-            expandX = 0,
-            expandY = 0
-          } = background;
-          if (!stroke && !fill) return;
-          context.beginPath();
-          const {
-            x: x,
-            y: y,
-            width: width,
-            height: height
-          } = getActualPosition(graphic);
-          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();
-          const b = graphic.AABBBounds;
-          context.rect(x, y, b.width(), b.height()), context.fillStyle = background, context.globalAlpha = 1, context.fill();
-        }
-      }
-    }
-    function getActualPosition(graphic) {
-      const boundsPadding = parsePadding(graphic.attribute.boundsPadding),
-        bounds = graphic.AABBBounds;
-      let x = bounds.x1,
-        y = bounds.y1,
-        width = bounds.width(),
-        height = bounds.height();
-      return isNumber$1(boundsPadding) ? (x += boundsPadding, y += boundsPadding, width -= 2 * boundsPadding, height -= 2 * boundsPadding) : (x += boundsPadding[3], y += boundsPadding[0], width -= boundsPadding[1] + boundsPadding[3], height -= boundsPadding[0] + boundsPadding[2]), {
-        x: x,
-        y: y,
-        width: width,
-        height: height
-      };
-    }
     class DefaultImageRenderContribution extends DefaultRectRenderContribution {
       constructor() {
         super(...arguments), this.time = BaseRenderContributionTime.afterFillStroke, this.useStyle = !0, this.order = 0;
@@ -8012,7 +7945,7 @@
       }
     }
     const defaultImageRenderContribution = new DefaultImageRenderContribution();
-    const defaultImageBackgroundRenderContribution = new DefaultImageBackgroundRenderContribution();
+    const defaultImageBackgroundRenderContribution = defaultBaseBackgroundRenderContribution;
 
     class DefaultSymbolRenderContribution {
       constructor() {
@@ -8502,26 +8435,25 @@
           doFill: doFill,
           doStroke: doStroke
         } = data;
-        context.setShadowBlendStyle && context.setShadowBlendStyle(image, imageAttribute), this.beforeRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb);
+        if (!url || !image.resources) return;
+        const res = image.resources.get(url);
+        if ("success" !== res.state) return;
+        let needRestore = !1;
+        0 === cornerRadius || isArray$1(cornerRadius) && cornerRadius.every(num => 0 === num) || (context.beginPath(), createRectPath(context, x, y, width, height, cornerRadius), needRestore = !0), context.setShadowBlendStyle && context.setShadowBlendStyle(image, image.attribute, imageAttribute);
         const _runFill = () => {
             if (doFill) if (fillCb) fillCb(context, image.attribute, imageAttribute);else if (fVisible) {
-              if (!url || !image.resources) return;
-              const res = image.resources.get(url);
-              if ("success" !== res.state) return;
-              let needRestore = !1;
-              0 === cornerRadius || isArray$1(cornerRadius) && cornerRadius.every(num => 0 === num) || (context.beginPath(), createRectPath(context, x, y, width, height, cornerRadius), context.save(), context.clip(), needRestore = !0), context.setCommonStyle(image, image.attribute, x, y, imageAttribute);
+              context.setCommonStyle(image, image.attribute, x, y, imageAttribute);
               let repeat = 0;
               if ("repeat" === repeatX && (repeat |= 1), "repeat" === repeatY && (repeat |= 2), repeat) {
                 const pattern = context.createPattern(res.data, repeatStr[repeat]);
                 context.fillStyle = pattern, context.translate(x, y, !0), context.fillRect(0, 0, width, height), context.translate(-x, -y, !0);
               } else context.drawImage(res.data, x, y, width, height);
-              needRestore && context.restore();
             }
           },
           _runStroke = () => {
             doStroke && (strokeCb ? strokeCb(context, image.attribute, imageAttribute) : sVisible && (context.setStrokeStyle(image, image.attribute, originX - x, originY - y, imageAttribute), context.stroke()));
           };
-        fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this.afterRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb);
+        fillStrokeOrder ? (_runStroke(), needRestore && (context.save(), context.clip()), this.beforeRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb), _runFill(), needRestore && context.restore()) : (needRestore && (context.save(), context.clip()), this.beforeRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb), _runFill(), needRestore && context.restore(), _runStroke()), this.afterRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb);
       }
       draw(image, renderService, drawContext) {
         const {
@@ -10914,12 +10846,37 @@
     }
 
     var __decorate$b = undefined && undefined.__decorate || function (decorators, target, key, desc) {
-      var d,
-        c = arguments.length,
-        r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
-      if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
-      return c > 3 && r && Object.defineProperty(target, key, r), r;
-    };
+        var d,
+          c = arguments.length,
+          r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
+        if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
+        return c > 3 && r && Object.defineProperty(target, key, r), r;
+      },
+      __awaiter$1 = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
+        return new (P || (P = Promise))(function (resolve, reject) {
+          function fulfilled(value) {
+            try {
+              step(generator.next(value));
+            } catch (e) {
+              reject(e);
+            }
+          }
+          function rejected(value) {
+            try {
+              step(generator.throw(value));
+            } catch (e) {
+              reject(e);
+            }
+          }
+          function step(result) {
+            var value;
+            result.done ? resolve(result.value) : (value = result.value, value instanceof P ? value : new P(function (resolve) {
+              resolve(value);
+            })).then(fulfilled, rejected);
+          }
+          step((generator = generator.apply(thisArg, _arguments || [])).next());
+        });
+      };
     let BaseEnvContribution = class {
       configure(service) {
         service.env === this.type && service.setActiveEnvContribution(this);
@@ -10988,6 +10945,13 @@
           left: 0
         };
       }
+      loadFont(font, source, descriptors) {
+        return __awaiter$1(this, void 0, void 0, function* () {
+          return {
+            loadState: "fail"
+          };
+        });
+      }
     };
     BaseEnvContribution = __decorate$b([injectable()], BaseEnvContribution);
 
@@ -11032,7 +10996,7 @@
         const fVisible = fillVisible(opacity, fillOpacity, !0),
           sVisible = fillVisible(opacity, strokeOpacity, !0);
         if (!fVisible) return;
-        context.translate(x, y), this.beforeRenderStep(richtext, context, x, y, fVisible, sVisible, fVisible, sVisible, richtextAttribute, drawContext);
+        context.setShadowBlendStyle && context.setShadowBlendStyle(richtext, richtext.attribute, richtextAttribute), context.translate(x, y), this.beforeRenderStep(richtext, context, x, y, fVisible, sVisible, fVisible, sVisible, richtextAttribute, drawContext);
         richtext.getFrameCache().draw(context, this.drawIcon), this.afterRenderStep(richtext, context, x, y, fVisible, sVisible, fVisible, sVisible, richtextAttribute, drawContext);
       }
       drawIcon(icon, context, x, y, baseline) {
@@ -11109,11 +11073,18 @@
 
     class HtmlAttributePlugin {
       constructor() {
-        this.name = "HtmlAttributePlugin", this.activeEvent = "onRegister", this._uid = Generator.GenAutoIncrementId(), this.key = this.name + this._uid, this.htmlMap = {}, this.renderId = 0;
+        this.name = "HtmlAttributePlugin", this.activeEvent = "onRegister", this._uid = Generator.GenAutoIncrementId(), this.key = this.name + this._uid, this.htmlMap = {}, this.renderId = 0, this.onWheel = ev => {
+          try {
+            const newEvent = new ev.constructor(ev.type, ev);
+            this.pluginService.stage.window.getContext().getCanvas().nativeCanvas.dispatchEvent(newEvent);
+          } catch (err) {
+            return;
+          }
+        };
       }
       activate(context) {
         this.pluginService = context, context.stage.hooks.afterRender.tap(this.key, stage => {
-          stage && stage === this.pluginService.stage && this.drawHTML(context.stage.renderService);
+          stage && stage === this.pluginService.stage && this.drawHTML([...context.stage.getChildren()]);
         });
       }
       deactivate(context) {
@@ -11175,10 +11146,13 @@
       }
       updateStyleOfWrapContainer(graphic, stage, wrapContainer, nativeContainer, options) {
         const {
-          pointerEvents: pointerEvents
+          pointerEvents: pointerEvents,
+          penetrateEventList = []
         } = options;
         let calculateStyle = this.parseDefaultStyleFromGraphic(graphic);
-        calculateStyle.display = !1 !== graphic.attribute.visible ? "block" : "none", calculateStyle.pointerEvents = !0 === pointerEvents ? "all" : pointerEvents || "none", wrapContainer.style.position || (wrapContainer.style.position = "absolute", nativeContainer.style.position = "relative");
+        calculateStyle.display = !1 !== graphic.attribute.visible ? "block" : "none", calculateStyle.pointerEvents = !0 === pointerEvents ? "all" : pointerEvents || "none", "none" !== calculateStyle.pointerEvents && (this.removeWrapContainerEventListener(wrapContainer), penetrateEventList.forEach(event => {
+          "wheel" === event && wrapContainer.addEventListener("wheel", this.onWheel);
+        })), wrapContainer.style.position || (wrapContainer.style.position = "absolute", nativeContainer.style.position = "relative");
         let left = 0,
           top = 0;
         const b = graphic.globalAABBBounds;
@@ -11206,7 +11180,7 @@
         } else isObject$1(options.style) ? calculateStyle = Object.assign(Object.assign({}, calculateStyle), options.style) : isString$1(options.style) && options.style && (calculateStyle = Object.assign(Object.assign({}, calculateStyle), styleStringToObject(options.style)));
         application.global.updateDom(wrapContainer, {
           width: options.width,
-          height: options.width,
+          height: options.height,
           style: calculateStyle
         });
       }
@@ -11215,8 +11189,8 @@
           this.htmlMap[key] && this.htmlMap[key].renderId !== this.renderId && this.removeElement(key);
         }), this.renderId += 1;
       }
-      drawHTML(renderService) {
-        "browser" === application.global.env && (renderService.renderTreeRoots.sort((a, b) => {
+      drawHTML(layers) {
+        "browser" === application.global.env && (layers.sort((a, b) => {
           var _a, _b;
           return (null !== (_a = a.attribute.zIndex) && void 0 !== _a ? _a : DefaultAttribute.zIndex) - (null !== (_b = b.attribute.zIndex) && void 0 !== _b ? _b : DefaultAttribute.zIndex);
         }).forEach(group => {
@@ -11235,6 +11209,9 @@
         } = this.htmlMap[id];
         wrapContainer && application.global.removeDom(wrapContainer), this.htmlMap[id] = null;
       }
+      removeWrapContainerEventListener(wrapContainer) {
+        wrapContainer.removeEventListener("wheel", this.onWheel);
+      }
       renderGraphicHTML(graphic) {
         var _a;
         const {
@@ -11355,10 +11332,17 @@
           this.render(), this.bindEvents();
         });
       }
-      setAttribute(key, value, forceUpdateTag) {
+      setAttribute(key, value, forceUpdateTag, context) {
+        const params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate({
+          [key]: value
+        }, this.attribute, key, context);
+        if (params) return this._setAttributes(params, forceUpdateTag);
         isPlainObject$1(this.attribute[key]) && isPlainObject$1(value) && !isFunction$1(this.attribute[key]) && !isFunction$1(value) ? merge(this.attribute[key], value) : this.attribute[key] = value, GROUP_ATTRIBUTES.includes(key) || this.render(), this.valid = this.isValid(), this.updateShapeAndBoundsTagSetted() || !forceUpdateTag && !this.needUpdateTag(key) ? this.addUpdateBoundTag() : this.addUpdateShapeAndBoundsTag(), this.addUpdatePositionTag(), this.onAttributeUpdate();
       }
-      setAttributes(params, forceUpdateTag) {
+      setAttributes(params, forceUpdateTag, context) {
+        return params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params, this._setAttributes(params, forceUpdateTag);
+      }
+      _setAttributes(params, forceUpdateTag) {
         const keys = Object.keys(params);
         this._mergeAttributes(params, keys), keys.every(key => GROUP_ATTRIBUTES.includes(key)) || this.render(), this.valid = this.isValid(), this.updateShapeAndBoundsTagSetted() || !forceUpdateTag && !this.needUpdateTags(keys) ? this.addUpdateBoundTag() : this.addUpdateShapeAndBoundsTag(), this.addUpdatePositionTag(), this.onAttributeUpdate();
       }
@@ -11450,6 +11434,31 @@
       },
       __metadata$6 = undefined && undefined.__metadata || function (k, v) {
         if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
+      },
+      __awaiter = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
+        return new (P || (P = Promise))(function (resolve, reject) {
+          function fulfilled(value) {
+            try {
+              step(generator.next(value));
+            } catch (e) {
+              reject(e);
+            }
+          }
+          function rejected(value) {
+            try {
+              step(generator.throw(value));
+            } catch (e) {
+              reject(e);
+            }
+          }
+          function step(result) {
+            var value;
+            result.done ? resolve(result.value) : (value = result.value, value instanceof P ? value : new P(function (resolve) {
+              resolve(value);
+            })).then(fulfilled, rejected);
+          }
+          step((generator = generator.apply(thisArg, _arguments || [])).next());
+        });
       };
     class DynamicB {
       get x1() {
@@ -11645,6 +11654,19 @@
           left: actualLeft
         };
       }
+      loadFont(font, source, descriptors) {
+        return __awaiter(this, void 0, void 0, function* () {
+          return new FontFace(font, isString$1(source) ? `url(${source})` : source, descriptors).load().then(function (loadedFont) {
+            return document.fonts.add(loadedFont), {
+              loadState: "success"
+            };
+          }).catch(function (error) {
+            return {
+              loadState: "fail"
+            };
+          });
+        });
+      }
     };
     BrowserEnvContribution = __decorate$9([injectable(), __metadata$6("design:paramtypes", [])], BrowserEnvContribution);
 
@@ -19580,7 +19602,7 @@
     const Checkbox = React.forwardRef(CheckboxComponent);
     Checkbox.displayName = 'Checkbox';
 
-    const version = "1.14.1";
+    const version = "1.14.3";
 
     Object.defineProperty(exports, 'register', {
         enumerable: true,