@visactor/vtable-calendar 1.17.2 → 1.17.3-alpha.0

package/dist/vtable-calendar.js

@@ -37406,12 +37406,12 @@
         isWidthNumber = !Array.isArray(strokeArrayWidth),
         isStrokeTrue = !Array.isArray(stroke),
         isSplitDraw = Array.isArray(strokeArrayColor) || widthInfo.isSplitDraw;
-      context.setStrokeStyle(rect, rect.attribute, x, y, rectAttribute);
+      context.stroke(), context.setStrokeStyle(rect, rect.attribute, x, y, rectAttribute);
       const {
         lineDash = groupAttribute.lineDash
       } = group.attribute;
       let isDash = !1;
-      lineDash.length && lineDash.some(dash => Array.isArray(dash)) && (isDash = !0), context.moveTo(x, y);
+      lineDash.length && lineDash.some(dash => Array.isArray(dash)) && (isDash = !0), context.beginPath(), context.moveTo(x, y);
       const strokeTop = (isStrokeTrue || stroke[0]) && (isWidthNumber || strokeArrayWidth[0]),
         strokeRight = (isStrokeTrue || stroke[1]) && (isWidthNumber || strokeArrayWidth[1]),
         strokeBottom = (isStrokeTrue || stroke[2]) && (isWidthNumber || strokeArrayWidth[2]),
@@ -37432,7 +37432,7 @@
         isWidthNumber ? widthInfo.width : strokeArrayWidth[3], isWidthNumber ? widthInfo.width : strokeArrayWidth[3];
         context.moveTo(x1, y1), context.lineTo(x2, y2), (isSplitDraw || isDash) && (strokeArrayColor && strokeArrayColor[3] ? context.strokeStyle = strokeArrayColor[3] : strokeArrayColor && !strokeArrayColor[3] && (context.strokeStyle = "transparent"), isWidthNumber || (context.lineWidth = strokeArrayWidth[3]), context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d, isDash && context.setLineDash(null !== (_d = lineDash[3]) && void 0 !== _d ? _d : []), context.stroke(), context.beginPath(), context.moveTo(x, y));
       } else 3 === i && context.moveTo(x, y);
-      isSplitDraw || isDash || (!isWidthNumber && widthInfo.width && (context.lineWidth = widthInfo.width), context.stroke()), context.lineDashOffset = 0, context.setLineDash([]), context.closePath();
+      context.closePath(), isSplitDraw || isDash || (!isWidthNumber && widthInfo.width && (context.lineWidth = widthInfo.width), context.stroke()), context.lineDashOffset = 0, context.setLineDash([]), context.beginPath();
     }
 
     var __decorate$1 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
@@ -39413,7 +39413,7 @@
     }
 
     function createCellSelectBorder(scene, start_Col, start_Row, end_Col, end_Row, selectRangeType, selectId, strokes) {
-      var _a, _b, _c, _d, _e, _f, _g, _h;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _j;
       let isHasFillHandleRect = !!(null === (_a = scene.table.options.excelOptions) || void 0 === _a ? void 0 : _a.fillHandle);
       if ((null === (_b = scene.table.stateManager.select.ranges) || void 0 === _b ? void 0 : _b.length) > 1) isHasFillHandleRect = !1, scene.removeFillHandleFromSelectComponents();else if (1 === (null === (_c = scene.table.stateManager.select.ranges) || void 0 === _c ? void 0 : _c.length)) {
         const maxRow = Math.max(scene.table.stateManager.select.ranges[0].start.row, scene.table.stateManager.select.ranges[0].end.row),
@@ -39439,7 +39439,8 @@
           y: firstCellBound.y1 - scene.tableGroup.attribute.y,
           width: 0,
           height: 0,
-          visible: !0
+          visible: !0,
+          cornerRadius: getCornerRadius(selectRangeType, null === (_j = scene.table.theme.frameStyle) || void 0 === _j ? void 0 : _j.cornerRadius, start_Col, start_Row, end_Col, end_Row, scene.table)
         });
       let fillhandle;
       isHasFillHandleRect && (fillhandle = createRect({
@@ -39457,6 +39458,15 @@
         role: selectRangeType
       }), scene.tableGroup.insertAfter(rect, "body" === selectRangeType ? scene.bodyGroup : "columnHeader" === selectRangeType ? scene.colHeaderGroup : "rowHeader" === selectRangeType ? scene.rowHeaderGroup : "cornerHeader" === selectRangeType ? scene.cornerHeaderGroup : "rightTopCorner" === selectRangeType ? scene.rightTopCornerGroup : "rightFrozen" === selectRangeType ? scene.rightFrozenGroup : "leftBottomCorner" === selectRangeType ? scene.leftBottomCornerGroup : "bottomFrozen" === selectRangeType ? scene.bottomFrozenGroup : scene.rightBottomCornerGroup), isHasFillHandleRect && scene.tableGroup.insertAfter(fillhandle, "body" === selectRangeType ? scene.bodyGroup : "columnHeader" === selectRangeType ? scene.colHeaderGroup : "rowHeader" === selectRangeType ? scene.rowHeaderGroup : "cornerHeader" === selectRangeType ? scene.cornerHeaderGroup : "rightTopCorner" === selectRangeType ? scene.rightTopCornerGroup : "rightFrozen" === selectRangeType ? scene.rightFrozenGroup : "leftBottomCorner" === selectRangeType ? scene.leftBottomCornerGroup : "bottomFrozen" === selectRangeType ? scene.bottomFrozenGroup : scene.rightBottomCornerGroup);
     }
+    function getCornerRadius(selectRangeType, cornerRadius, start_Col, start_Row, end_Col, end_Row, table) {
+      if (!cornerRadius) return;
+      const cornerRadiusArray = Array.isArray(cornerRadius) ? cornerRadius : [cornerRadius, cornerRadius, cornerRadius, cornerRadius],
+        tableEndCol = table.colCount - 1,
+        tableEndRow = table.rowCount - 1,
+        result = [0, 0, 0, 0];
+      let changed = !1;
+      return 0 === start_Col && 0 === start_Row ? (result[0] = cornerRadiusArray[0], changed = !0) : end_Col === tableEndCol && end_Row === tableEndRow ? (result[2] = cornerRadiusArray[2], changed = !0) : 0 === start_Col && end_Row === tableEndRow ? (result[3] = cornerRadiusArray[3], changed = !0) : end_Col === tableEndCol && 0 === start_Row && (result[1] = cornerRadiusArray[1], changed = !0), changed ? result : void 0;
+    }
 
     function moveSelectingRangeComponentsToSelectedRangeComponents(scene) {
       scene.selectingRangeComponents.forEach((rangeComponent, key) => {
@@ -42951,76 +42961,108 @@
         var _a, _b;
         const totalHeight = this.table.getAllRowsHeight(),
           oldVerticalBarPos = this.scroll.verticalBarPos;
-        this.scroll.verticalBarPos = Math.ceil(yRatio * (totalHeight - this.table.scenegraph.height)), isValid$3(this.scroll.verticalBarPos) && !isNaN(this.scroll.verticalBarPos) || (this.scroll.verticalBarPos = 0), this.table.scenegraph.setY(-this.scroll.verticalBarPos, 1 === yRatio), this.scroll.verticalBarPos -= this.table.scenegraph.proxy.deltaY, this.table.scenegraph.proxy.deltaY = 0, this.updateHoverPos(-1, -1), this.table.fireListeners(TABLE_EVENT_TYPE.SCROLL, {
+        let verticalBarPos = Math.ceil(yRatio * (totalHeight - this.table.scenegraph.height));
+        isValid$3(verticalBarPos) && !isNaN(verticalBarPos) || (verticalBarPos = 0);
+        const dy = verticalBarPos - this.table.scenegraph.proxy.deltaY - oldVerticalBarPos;
+        if (this.table.fireListeners(TABLE_EVENT_TYPE.SCROLL, {
           event: void 0,
-          scrollTop: this.scroll.verticalBarPos,
+          scrollTop: verticalBarPos - this.table.scenegraph.proxy.deltaY,
           scrollLeft: this.scroll.horizontalBarPos,
           scrollHeight: null === (_a = this.table.theme.scrollStyle) || void 0 === _a ? void 0 : _a.width,
           scrollWidth: null === (_b = this.table.theme.scrollStyle) || void 0 === _b ? void 0 : _b.width,
           viewHeight: this.table.tableNoFrameHeight,
           viewWidth: this.table.tableNoFrameWidth,
           scrollDirection: "vertical",
-          scrollRatioY: yRatio
-        }), oldVerticalBarPos !== this.scroll.verticalBarPos && this.checkVerticalScrollBarEnd();
+          scrollRatioY: yRatio,
+          dy: dy
+        }).some(value => !1 === value)) {
+          const yRatio = this.scroll.verticalBarPos / (totalHeight - this.table.scenegraph.height);
+          this.table.scenegraph.component.updateVerticalScrollBarPos(yRatio);
+        } else this.scroll.verticalBarPos = verticalBarPos, this.table.scenegraph.setY(-this.scroll.verticalBarPos, 1 === yRatio), this.scroll.verticalBarPos -= this.table.scenegraph.proxy.deltaY, this.table.scenegraph.proxy.deltaY = 0, this.updateHoverPos(-1, -1), oldVerticalBarPos !== this.scroll.verticalBarPos && this.checkVerticalScrollBarEnd();
       }
       updateHorizontalScrollBar(xRatio) {
         var _a, _b;
         const totalWidth = this.table.getAllColsWidth(),
           oldHorizontalBarPos = this.scroll.horizontalBarPos;
-        this.scroll.horizontalBarPos = Math.ceil(xRatio * (totalWidth - this.table.scenegraph.width)), isValid$3(this.scroll.horizontalBarPos) && !isNaN(this.scroll.horizontalBarPos) || (this.scroll.horizontalBarPos = 0), this.table.scenegraph.setX(-this.scroll.horizontalBarPos, 1 === xRatio), this.scroll.horizontalBarPos -= this.table.scenegraph.proxy.deltaX, this.table.scenegraph.proxy.deltaX = 0, this.updateHoverPos(-1, -1), this.table.fireListeners(TABLE_EVENT_TYPE.SCROLL, {
+        let horizontalBarPos = Math.ceil(xRatio * (totalWidth - this.table.scenegraph.width));
+        isValid$3(horizontalBarPos) && !isNaN(horizontalBarPos) || (horizontalBarPos = 0);
+        const dx = horizontalBarPos - this.table.scenegraph.proxy.deltaX - oldHorizontalBarPos;
+        if (this.table.fireListeners(TABLE_EVENT_TYPE.SCROLL, {
           event: void 0,
           scrollTop: this.scroll.verticalBarPos,
-          scrollLeft: this.scroll.horizontalBarPos,
+          scrollLeft: horizontalBarPos - this.table.scenegraph.proxy.deltaX,
           scrollHeight: null === (_a = this.table.theme.scrollStyle) || void 0 === _a ? void 0 : _a.width,
           scrollWidth: null === (_b = this.table.theme.scrollStyle) || void 0 === _b ? void 0 : _b.width,
           viewHeight: this.table.tableNoFrameHeight,
           viewWidth: this.table.tableNoFrameWidth,
           scrollDirection: "horizontal",
-          scrollRatioX: xRatio
-        }), oldHorizontalBarPos !== this.scroll.horizontalBarPos && this.checkHorizontalScrollBarEnd();
+          scrollRatioX: xRatio,
+          dx: dx
+        }).some(value => !1 === value)) {
+          const xRatio = this.scroll.horizontalBarPos / (totalWidth - this.table.scenegraph.width);
+          this.table.scenegraph.component.updateHorizontalScrollBarPos(xRatio);
+        } else this.scroll.horizontalBarPos = horizontalBarPos, this.table.scenegraph.setX(-this.scroll.horizontalBarPos, 1 === xRatio), this.scroll.horizontalBarPos -= this.table.scenegraph.proxy.deltaX, this.table.scenegraph.proxy.deltaX = 0, this.updateHoverPos(-1, -1), oldHorizontalBarPos !== this.scroll.horizontalBarPos && this.checkHorizontalScrollBarEnd();
       }
       setScrollTop(top, event) {
         let triggerEvent = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : !0;
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const totalHeight = this.table.getAllRowsHeight(),
           sizeTolerance = (null === (_a = this.table.options.customConfig) || void 0 === _a ? void 0 : _a._disableColumnAndRowSizeRound) ? 1 : 0;
-        top = Math.max(0, Math.min(top, totalHeight - this.table.scenegraph.height - sizeTolerance)), ((top = Math.ceil(top)) !== this.scroll.verticalBarPos || this.table.isPivotChart()) && this.updateHoverPos(-1, -1);
-        const oldVerticalBarPos = this.scroll.verticalBarPos;
-        this.scroll.verticalBarPos = top, isValid$3(this.scroll.verticalBarPos) && !isNaN(this.scroll.verticalBarPos) || (this.scroll.verticalBarPos = 0), this.table.scenegraph.setY(-top);
-        const yRatio = top / (totalHeight - this.table.scenegraph.height);
-        this.table.scenegraph.component.updateVerticalScrollBarPos(yRatio), oldVerticalBarPos !== top && triggerEvent && (this.table.fireListeners(TABLE_EVENT_TYPE.SCROLL, {
-          event: null == event ? void 0 : event.nativeEvent,
-          scrollTop: this.scroll.verticalBarPos,
-          scrollLeft: this.scroll.horizontalBarPos,
-          scrollHeight: null === (_b = this.table.theme.scrollStyle) || void 0 === _b ? void 0 : _b.width,
-          scrollWidth: null === (_c = this.table.theme.scrollStyle) || void 0 === _c ? void 0 : _c.width,
-          viewHeight: this.table.tableNoFrameHeight,
-          viewWidth: this.table.tableNoFrameWidth,
-          scrollDirection: "vertical",
-          scrollRatioY: yRatio
-        }), this.checkVerticalScrollBarEnd());
+        top = Math.max(0, Math.min(top, totalHeight - this.table.scenegraph.height - sizeTolerance)), top = Math.ceil(top);
+        const oldVerticalBarPos = this.scroll.verticalBarPos,
+          yRatio = top / (totalHeight - this.table.scenegraph.height);
+        if ((oldVerticalBarPos !== top || !0 === (null === (_c = null === (_b = this.table.options) || void 0 === _b ? void 0 : _b.customConfig) || void 0 === _c ? void 0 : _c.scrollEventAlwaysTrigger)) && triggerEvent) {
+          let verticalBarPos = top;
+          isValid$3(verticalBarPos) && !isNaN(verticalBarPos) || (verticalBarPos = 0);
+          const dy = verticalBarPos - oldVerticalBarPos;
+          if (this.table.fireListeners(TABLE_EVENT_TYPE.SCROLL, {
+            event: null == event ? void 0 : event.nativeEvent,
+            scrollTop: verticalBarPos,
+            scrollLeft: this.scroll.horizontalBarPos,
+            scrollHeight: null === (_d = this.table.theme.scrollStyle) || void 0 === _d ? void 0 : _d.width,
+            scrollWidth: null === (_e = this.table.theme.scrollStyle) || void 0 === _e ? void 0 : _e.width,
+            viewHeight: this.table.tableNoFrameHeight,
+            viewWidth: this.table.tableNoFrameWidth,
+            scrollDirection: "vertical",
+            scrollRatioY: yRatio,
+            dy: dy
+          }).some(value => !1 === value)) {
+            const yRatio = this.scroll.verticalBarPos / (totalHeight - this.table.scenegraph.height);
+            return void this.table.scenegraph.component.updateVerticalScrollBarPos(yRatio);
+          }
+        }
+        (top !== this.scroll.verticalBarPos || this.table.isPivotChart()) && this.updateHoverPos(-1, -1), this.scroll.verticalBarPos = top, isValid$3(this.scroll.verticalBarPos) && !isNaN(this.scroll.verticalBarPos) || (this.scroll.verticalBarPos = 0), this.table.scenegraph.setY(-top), this.table.scenegraph.component.updateVerticalScrollBarPos(yRatio), oldVerticalBarPos !== top && triggerEvent && this.checkVerticalScrollBarEnd();
       }
       setScrollLeft(left, event) {
         let triggerEvent = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : !0;
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         this.table.scrollLeft;
         const totalWidth = this.table.getAllColsWidth(),
           sizeTolerance = (this.table.getFrozenColsWidth(), (null === (_a = this.table.options.customConfig) || void 0 === _a ? void 0 : _a._disableColumnAndRowSizeRound) ? 1 : 0);
-        left = Math.max(0, Math.min(left, totalWidth - this.table.scenegraph.width - sizeTolerance)), (left = Math.ceil(left)) !== this.scroll.horizontalBarPos && this.updateHoverPos(-1, -1);
-        const oldHorizontalBarPos = this.scroll.horizontalBarPos;
-        this.scroll.horizontalBarPos = left, isValid$3(this.scroll.horizontalBarPos) && !isNaN(this.scroll.horizontalBarPos) || (this.scroll.horizontalBarPos = 0), this.table.scenegraph.setX(-left);
-        const xRatio = left / (totalWidth - this.table.scenegraph.width);
-        this.table.scenegraph.component.updateHorizontalScrollBarPos(xRatio), oldHorizontalBarPos !== left && triggerEvent && (this.table.fireListeners(TABLE_EVENT_TYPE.SCROLL, {
-          event: null == event ? void 0 : event.nativeEvent,
-          scrollTop: this.scroll.verticalBarPos,
-          scrollLeft: this.scroll.horizontalBarPos,
-          scrollHeight: null === (_b = this.table.theme.scrollStyle) || void 0 === _b ? void 0 : _b.width,
-          scrollWidth: null === (_c = this.table.theme.scrollStyle) || void 0 === _c ? void 0 : _c.width,
-          viewHeight: this.table.tableNoFrameHeight,
-          viewWidth: this.table.tableNoFrameWidth,
-          scrollDirection: "horizontal",
-          scrollRatioX: xRatio
-        }), this.checkHorizontalScrollBarEnd());
+        left = Math.max(0, Math.min(left, totalWidth - this.table.scenegraph.width - sizeTolerance)), left = Math.ceil(left);
+        const oldHorizontalBarPos = this.scroll.horizontalBarPos,
+          xRatio = left / (totalWidth - this.table.scenegraph.width);
+        if ((oldHorizontalBarPos !== left || !0 === (null === (_c = null === (_b = this.table.options) || void 0 === _b ? void 0 : _b.customConfig) || void 0 === _c ? void 0 : _c.scrollEventAlwaysTrigger)) && triggerEvent) {
+          let horizontalBarPos = left;
+          isValid$3(horizontalBarPos) && !isNaN(horizontalBarPos) || (horizontalBarPos = 0);
+          const dx = horizontalBarPos - oldHorizontalBarPos;
+          if (this.table.fireListeners(TABLE_EVENT_TYPE.SCROLL, {
+            event: null == event ? void 0 : event.nativeEvent,
+            scrollTop: this.scroll.verticalBarPos,
+            scrollLeft: horizontalBarPos,
+            scrollHeight: null === (_d = this.table.theme.scrollStyle) || void 0 === _d ? void 0 : _d.width,
+            scrollWidth: null === (_e = this.table.theme.scrollStyle) || void 0 === _e ? void 0 : _e.width,
+            viewHeight: this.table.tableNoFrameHeight,
+            viewWidth: this.table.tableNoFrameWidth,
+            scrollDirection: "horizontal",
+            scrollRatioX: xRatio,
+            dx: dx
+          }).some(value => !1 === value)) {
+            const xRatio = this.scroll.horizontalBarPos / (totalWidth - this.table.scenegraph.width);
+            return void this.table.scenegraph.component.updateHorizontalScrollBarPos(xRatio);
+          }
+        }
+        left !== this.scroll.horizontalBarPos && this.updateHoverPos(-1, -1), this.scroll.horizontalBarPos = left, isValid$3(this.scroll.horizontalBarPos) && !isNaN(this.scroll.horizontalBarPos) || (this.scroll.horizontalBarPos = 0), this.table.scenegraph.setX(-left), this.table.scenegraph.component.updateHorizontalScrollBarPos(xRatio), oldHorizontalBarPos !== left && triggerEvent && this.checkHorizontalScrollBarEnd();
       }
       hideVerticalScrollBar() {
         this.table.scenegraph.component.hideVerticalScrollBar();
@@ -47481,7 +47523,7 @@
       constructor(container) {
         let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.17.2", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
+        if (super(), this.showFrozenIcon = !0, this.version = "1.17.3-alpha.0", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
         !1 === (null === (_a = options.customConfig) || void 0 === _a ? void 0 : _a.imageAnonymous) && (vglobal.isImageAnonymous = !1);
         const {
           frozenColCount = 0,
@@ -47836,7 +47878,7 @@
         }
       }
       _updateSize() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3;
         const {
           padding: padding
         } = this;
@@ -47854,20 +47896,20 @@
           const {
             canvas: canvas
           } = this.internalProps;
-          widthP = (null !== (_c = null === (_b = canvas.parentElement) || void 0 === _b ? void 0 : _b.offsetWidth) && void 0 !== _c ? _c : 1) - (this.options.tableSizeAntiJitter ? 1 : 0), heightP = (null !== (_e = null === (_d = canvas.parentElement) || void 0 === _d ? void 0 : _d.offsetHeight) && void 0 !== _e ? _e : 1) - (this.options.tableSizeAntiJitter ? 1 : 0), (null === (_f = null == this ? void 0 : this.scenegraph) || void 0 === _f ? void 0 : _f.stage) ? this.scenegraph.stage.resize(widthP, heightP) : (canvas.style.width = "", canvas.style.height = "", canvas.width = widthP, canvas.height = heightP, canvas.style.width = `${widthP}px`, canvas.style.height = `${heightP}px`);
+          widthP = (null !== (_c = null === (_b = canvas.parentElement) || void 0 === _b ? void 0 : _b.offsetWidth) && void 0 !== _c ? _c : 1) - (this.options.tableSizeAntiJitter ? 1 : 0), heightP = (null !== (_e = null === (_d = canvas.parentElement) || void 0 === _d ? void 0 : _d.offsetHeight) && void 0 !== _e ? _e : 1) - (this.options.tableSizeAntiJitter ? 1 : 0), (null === (_f = null == this ? void 0 : this.scenegraph) || void 0 === _f ? void 0 : _f.stage) || (canvas.style.width = "", canvas.style.height = "", canvas.width = widthP, canvas.height = heightP, canvas.style.width = `${widthP}px`, canvas.style.height = `${heightP}px`), (null === (_g = this.options) || void 0 === _g ? void 0 : _g.viewBox) && (widthP = this.options.viewBox.x2 - this.options.viewBox.x1, heightP = this.options.viewBox.y2 - this.options.viewBox.y1), (null === (_h = null == this ? void 0 : this.scenegraph) || void 0 === _h ? void 0 : _h.stage) && (this.options.viewBox ? this.scenegraph.stage.setViewBox(this.options.viewBox, !1) : this.scenegraph.stage.resize(widthP, heightP));
         } else "node" === Env.mode && (widthP = this.canvasWidth - 1, heightP = this.canvasHeight - 1);
         const width = Math.floor(widthP - getVerticalScrollBarSize(this.getTheme().scrollStyle)),
           height = Math.floor(heightP - getHorizontalScrollBarSize(this.getTheme().scrollStyle));
-        if (null === (_g = this.internalProps.theme) || void 0 === _g ? void 0 : _g.frameStyle) {
-          const lineWidths = toBoxArray(null !== (_j = null === (_h = this.internalProps.theme.frameStyle) || void 0 === _h ? void 0 : _h.borderLineWidth) && void 0 !== _j ? _j : [null]),
-            shadowWidths = toBoxArray(null !== (_l = null === (_k = this.internalProps.theme.frameStyle) || void 0 === _k ? void 0 : _k.shadowBlur) && void 0 !== _l ? _l : [0]);
-          (null === (_m = this.theme.frameStyle) || void 0 === _m ? void 0 : _m.innerBorder) ? (this.tableX = 0, this.tableY = 0, this.tableNoFrameWidth = width - (null !== (_o = shadowWidths[1]) && void 0 !== _o ? _o : 0), this.tableNoFrameHeight = height - (null !== (_p = shadowWidths[2]) && void 0 !== _p ? _p : 0)) : (this.tableX = (null !== (_q = lineWidths[3]) && void 0 !== _q ? _q : 0) + (null !== (_r = shadowWidths[3]) && void 0 !== _r ? _r : 0), this.tableY = (null !== (_s = lineWidths[0]) && void 0 !== _s ? _s : 0) + (null !== (_t = shadowWidths[0]) && void 0 !== _t ? _t : 0), this.tableNoFrameWidth = width - ((null !== (_u = lineWidths[1]) && void 0 !== _u ? _u : 0) + (null !== (_v = shadowWidths[1]) && void 0 !== _v ? _v : 0)) - ((null !== (_w = lineWidths[3]) && void 0 !== _w ? _w : 0) + (null !== (_x = shadowWidths[3]) && void 0 !== _x ? _x : 0)), this.tableNoFrameHeight = height - ((null !== (_y = lineWidths[0]) && void 0 !== _y ? _y : 0) + (null !== (_z = shadowWidths[0]) && void 0 !== _z ? _z : 0)) - ((null !== (_0 = lineWidths[2]) && void 0 !== _0 ? _0 : 0) + (null !== (_1 = shadowWidths[2]) && void 0 !== _1 ? _1 : 0)));
+        if (null === (_j = this.internalProps.theme) || void 0 === _j ? void 0 : _j.frameStyle) {
+          const lineWidths = toBoxArray(null !== (_l = null === (_k = this.internalProps.theme.frameStyle) || void 0 === _k ? void 0 : _k.borderLineWidth) && void 0 !== _l ? _l : [null]),
+            shadowWidths = toBoxArray(null !== (_o = null === (_m = this.internalProps.theme.frameStyle) || void 0 === _m ? void 0 : _m.shadowBlur) && void 0 !== _o ? _o : [0]);
+          (null === (_p = this.theme.frameStyle) || void 0 === _p ? void 0 : _p.innerBorder) ? (this.tableX = 0, this.tableY = 0, this.tableNoFrameWidth = width - (null !== (_q = shadowWidths[1]) && void 0 !== _q ? _q : 0), this.tableNoFrameHeight = height - (null !== (_r = shadowWidths[2]) && void 0 !== _r ? _r : 0)) : (this.tableX = (null !== (_s = lineWidths[3]) && void 0 !== _s ? _s : 0) + (null !== (_t = shadowWidths[3]) && void 0 !== _t ? _t : 0), this.tableY = (null !== (_u = lineWidths[0]) && void 0 !== _u ? _u : 0) + (null !== (_v = shadowWidths[0]) && void 0 !== _v ? _v : 0), this.tableNoFrameWidth = width - ((null !== (_w = lineWidths[1]) && void 0 !== _w ? _w : 0) + (null !== (_x = shadowWidths[1]) && void 0 !== _x ? _x : 0)) - ((null !== (_y = lineWidths[3]) && void 0 !== _y ? _y : 0) + (null !== (_z = shadowWidths[3]) && void 0 !== _z ? _z : 0)), this.tableNoFrameHeight = height - ((null !== (_0 = lineWidths[0]) && void 0 !== _0 ? _0 : 0) + (null !== (_1 = shadowWidths[0]) && void 0 !== _1 ? _1 : 0)) - ((null !== (_2 = lineWidths[2]) && void 0 !== _2 ? _2 : 0) + (null !== (_3 = shadowWidths[2]) && void 0 !== _3 ? _3 : 0)));
         }
       }
       updateViewBox(newViewBox) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
-        const oldWidth = null !== (_d = null !== (_b = null === (_a = this.options) || void 0 === _a ? void 0 : _a.viewBox.x2) && void 0 !== _b ? _b : 0 - (null === (_c = this.options) || void 0 === _c ? void 0 : _c.viewBox.x1)) && void 0 !== _d ? _d : 0,
-          oldHeight = null !== (_h = null !== (_f = null === (_e = this.options) || void 0 === _e ? void 0 : _e.viewBox.y2) && void 0 !== _f ? _f : 0 - (null === (_g = this.options) || void 0 === _g ? void 0 : _g.viewBox.y1)) && void 0 !== _h ? _h : 0,
+        const oldWidth = (null !== (_b = null === (_a = this.options) || void 0 === _a ? void 0 : _a.viewBox.x2) && void 0 !== _b ? _b : 0) - (null !== (_d = null === (_c = this.options) || void 0 === _c ? void 0 : _c.viewBox.x1) && void 0 !== _d ? _d : 0),
+          oldHeight = (null !== (_f = null === (_e = this.options) || void 0 === _e ? void 0 : _e.viewBox.y2) && void 0 !== _f ? _f : 0) - (null !== (_h = null === (_g = this.options) || void 0 === _g ? void 0 : _g.viewBox.y1) && void 0 !== _h ? _h : 0),
           newWidth = newViewBox.x2 - newViewBox.x1,
           newHeight = newViewBox.y2 - newViewBox.y1;
         this.options.viewBox = newViewBox, oldWidth !== newWidth || oldHeight !== newHeight ? this.resize() : this.scenegraph.stage.setViewBox(this.options.viewBox, !0);