@visactor/vtable 1.26.4 → 1.26.6

package/es/scenegraph/runtime-contributions.js

@@ -0,0 +1,20 @@
+import { installRuntimeContributionModule } from "@visactor/vrender/entries/runtime-contribution";
+
+import { CanvasPickerContribution } from "@visactor/vrender-kits/picker/contributions/constants";
+
+import splitModule from "./graphic/contributions";
+
+import textMeasureModule from "./utils/text-measure";
+
+export function installVTableRuntimeContributions(app) {
+    installRuntimeContributionModule(splitModule, {
+        app: app,
+        targets: [ "graphic-renderer", "draw-contribution", {
+            picker: CanvasPickerContribution
+        } ]
+    }), installRuntimeContributionModule(textMeasureModule, {
+        app: app,
+        targets: [ "graphic-renderer" ]
+    });
+}
+//# sourceMappingURL=runtime-contributions.js.map

package/es/scenegraph/runtime-contributions.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/scenegraph/runtime-contributions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gCAAgC,EAAE,MAAM,gDAAgD,CAAC;AAClG,OAAO,EAAE,wBAAwB,EAAE,MAAM,uDAAuD,CAAC;AAEjG,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAClD,OAAO,iBAAiB,MAAM,sBAAsB,CAAC;AAErD,MAAM,UAAU,iCAAiC,CAAC,GAAU;IAC1D,gCAAgC,CAAC,WAAW,EAAE;QAC5C,GAAG;QACH,OAAO,EAAE,CAAC,kBAAkB,EAAE,mBAAmB,EAAE,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC;KACzF,CAAC,CAAC;IAEH,gCAAgC,CAAC,iBAAiB,EAAE;QAClD,GAAG;QACH,OAAO,EAAE,CAAC,kBAAkB,CAAC;KAC9B,CAAC,CAAC;AACL,CAAC","file":"runtime-contributions.js","sourcesContent":["import type { IApp } from '@visactor/vrender-core';\nimport { installRuntimeContributionModule } from '@visactor/vrender/entries/runtime-contribution';\nimport { CanvasPickerContribution } from '@visactor/vrender-kits/picker/contributions/constants';\n\nimport splitModule from './graphic/contributions';\nimport textMeasureModule from './utils/text-measure';\n\nexport function installVTableRuntimeContributions(app?: IApp): void {\n  installRuntimeContributionModule(splitModule, {\n    app,\n    targets: ['graphic-renderer', 'draw-contribution', { picker: CanvasPickerContribution }]\n  });\n\n  installRuntimeContributionModule(textMeasureModule, {\n    app,\n    targets: ['graphic-renderer']\n  });\n}\n"]}

package/es/scenegraph/scenegraph.d.ts

@@ -1,4 +1,4 @@
-import type { IStage, IRect, IRectGraphicAttribute } from './../vrender';
+import { type IRect, type IRectGraphicAttribute, type IStage } from './../vrender';
 import type { CellRange, CellSubLocation } from '../ts-types';
 import { type CellAddress, type SortOrder } from '../ts-types';
 import type { Group } from './graphic/group';
@@ -49,6 +49,8 @@ export declare class Scenegraph {
     lastSelectId: string;
     component: TableComponent;
     stage: IStage;
+    stageOwned: boolean;
+    releaseVRenderAppRef?: () => void;
     table: BaseTableAPI;
     isPivot: boolean;
     hasFrozen: boolean;
@@ -81,6 +83,7 @@ export declare class Scenegraph {
     initSceneGraph(): void;
     canvasShowMenu(): void;
     clearCells(): void;
+    releaseStage(): void;
     updateStageBackground(): void;
     createComponent(): void;
     updateComponent(): void;

package/es/scenegraph/scenegraph.js

@@ -1,4 +1,6 @@
-import { createStage, container, vglobal, registerForVrender } from "./../vrender";
+import { setPoptipTheme, registerForVrender } from "./../vrender";
+
+import { createStageFromVRenderApp } from "../vrender-app";
 
 import { InternalIconName } from "../ts-types";
 
@@ -16,8 +18,6 @@ import { getQuadProps } from "./utils/padding";
 
 import { createFrameBorder, updateCornerRadius, updateFrameBorder, updateFrameBorderSize } from "./style/frame-border";
 
-import splitModule from "./graphic/contributions";
-
 import { getProp } from "./utils/get-prop";
 
 import { dealWithIcon } from "./utils/text-icon-layout";
@@ -54,9 +54,7 @@ import { initSceneGraph } from "./group-creater/init-scenegraph";
 
 import { updateContainerChildrenX, updateContainerChildrenY } from "./utils/update-container";
 
-import { setPoptipTheme } from "./../vrender";
-
-import textMeasureModule from "./utils/text-measure";
+import { installVTableRuntimeContributions } from "./runtime-contributions";
 
 import { getIconByXY, hideClickIcon, hideHoverIcon, resetResidentHoverIcon, residentHoverIcon, setIconHoverStyle, setIconNormalStyle, showClickIcon, showHoverIcon, updateFrozenIcon, updateHierarchyIcon, updateSortIcon } from "./icon/icon-update";
 
@@ -82,22 +80,25 @@ import { getCellEventArgsSet } from "../event/util";
 
 import { clearAndReleaseBrushingChartInstance, getBrushingChartInstance, getBrushingChartInstanceCellPos } from "./graphic/active-cell-chart-list";
 
-registerForVrender(), container.load(splitModule), container.load(textMeasureModule);
+registerForVrender(), installVTableRuntimeContributions();
 
 export class Scenegraph {
     constructor(table) {
+        var _a, _b;
         let width, height;
-        this._needUpdateContainer = !1, this.table = table, this.hasFrozen = !1, this.clear = !0, 
-        this.mergeMap = new Map, this.brushingChartInstance = void 0, this.brushingChartInstanceCellPos = {
+        this.stageOwned = !0, this._needUpdateContainer = !1, this.table = table, this.hasFrozen = !1, 
+        this.clear = !0, this.mergeMap = new Map, this.brushingChartInstance = void 0, this.brushingChartInstanceCellPos = {
             col: -1,
             row: -1
         }, this.chartInstanceListColumnByColumnDirection = {}, this.chartInstanceListRowByRowDirection = {}, 
         this.delayRunDimensionHoverTimerForColumnDirection = [], this.delayRunDimensionHoverTimerForRowDirection = [], 
         this.delayRunDimensionHoverTimerForViewRange = [], this.disabledTooltipToAllChartInstances = !1, 
-        setPoptipTheme(this.table.theme.textPopTipStyle), "node" === Env.mode ? (vglobal.setEnv("node", table.options.modeParams), 
-        width = table.canvasWidth, height = table.canvasHeight) : table.options.canvas && table.options.viewBox ? (vglobal.setEnv("browser"), 
-        width = table.options.viewBox.x2 - table.options.viewBox.x1, height = table.options.viewBox.y2 - table.options.viewBox.y1) : (vglobal.setEnv("browser"), 
-        width = table.canvas.width, height = table.canvas.height), this.stage = createStage(Object.assign({
+        setPoptipTheme(this.table.theme.textPopTipStyle);
+        const mode = null !== (_a = table.options.mode) && void 0 !== _a ? _a : "node" === Env.mode ? "node" : "browser";
+        "node" === mode ? (width = table.canvasWidth, height = table.canvasHeight) : table.options.canvas && table.options.viewBox ? (width = table.options.viewBox.x2 - table.options.viewBox.x1, 
+        height = table.options.viewBox.y2 - table.options.viewBox.y1) : (width = table.canvas.width, 
+        height = table.canvas.height);
+        const {stage: stage, releaseAppRef: releaseAppRef, stageOwned: stageOwned} = createStageFromVRenderApp(Object.assign({
             canvas: table.canvas,
             width: width,
             height: height,
@@ -112,8 +113,19 @@ export class Scenegraph {
                 this.table.options.afterRender && this.table.options.afterRender(stage), this.table.fireListeners("after_render", null);
             },
             canvasControled: !table.options.canvas,
-            viewBox: table.options.viewBox
-        }, table.options.renderOption)), this.stage.defaultLayer.setTheme({
+            viewBox: table.options.viewBox,
+            context: {
+                appName: "vtable"
+            }
+        }, table.options.renderOption), {
+            mode: mode,
+            scope: null !== (_b = table.options.vRenderAppScope) && void 0 !== _b ? _b : "vtable",
+            app: table.options.vRenderApp,
+            stage: table.options.stage,
+            envParams: table.options.modeParams
+        });
+        this.stage = stage, this.stageOwned = stageOwned, this.releaseVRenderAppRef = releaseAppRef, 
+        this.stage.defaultLayer.setTheme({
             group: {
                 boundsPadding: 0,
                 strokeBoundsBuffer: 0,
@@ -296,6 +308,20 @@ export class Scenegraph {
         delete this.tableGroup.border), null === (_u = this.proxy) || void 0 === _u || _u.release(), 
         null === (_v = this.table.reactCustomLayout) || void 0 === _v || _v.clearCache();
     }
+    releaseStage() {
+        var _a, _b, _c;
+        const releaseAppRef = this.releaseVRenderAppRef;
+        this.releaseVRenderAppRef = void 0;
+        try {
+            if (this.stageOwned) null === (_a = this.stage) || void 0 === _a || _a.release(); else {
+                const tableGroup = this.tableGroup, tableGroupParent = null == tableGroup ? void 0 : tableGroup.parent;
+                null === (_b = null == tableGroupParent ? void 0 : tableGroupParent.removeChild) || void 0 === _b || _b.call(tableGroupParent, tableGroup), 
+                null === (_c = null == tableGroup ? void 0 : tableGroup.release) || void 0 === _c || _c.call(tableGroup, !0);
+            }
+        } finally {
+            null == releaseAppRef || releaseAppRef();
+        }
+    }
     updateStageBackground() {
         this.stage.background = this.table.theme.underlayBackgroundColor, this.stage.renderNextFrame();
     }
@@ -626,27 +652,49 @@ export class Scenegraph {
                 height: this.tableGroup.attribute.height
             })));
         }
-        this.table.bottomFrozenRowCount > 0 && (this.bottomFrozenGroup.setAttribute("y", this.tableGroup.attribute.height - this.table.getBottomFrozenRowsHeight()), 
-        this.leftBottomCornerGroup.setAttributes({
-            visible: !0,
-            y: this.tableGroup.attribute.height - this.table.getBottomFrozenRowsHeight(),
-            height: this.table.getBottomFrozenRowsHeight(),
-            width: this.table.getFrozenColsWidth()
-        }), this.rightBottomCornerGroup.setAttributes({
-            visible: !0,
-            y: this.tableGroup.attribute.height - this.table.getBottomFrozenRowsHeight(),
-            height: this.table.getBottomFrozenRowsHeight()
-        })), this.table.rightFrozenColCount > 0 && (this.rightFrozenGroup.setAttribute("x", this.tableGroup.attribute.width - this.table.getRightFrozenColsWidth()), 
-        this.rightTopCornerGroup.setAttributes({
-            visible: !0,
-            x: this.tableGroup.attribute.width - this.table.getRightFrozenColsWidth(),
-            width: this.table.getRightFrozenColsWidth(),
-            height: this.table.getFrozenRowsHeight()
+        const hasFrozenCols = this.table.frozenColCount > 0, hasRightFrozenCols = this.table.rightFrozenColCount > 0, hasFrozenRows = this.table.frozenRowCount > 0, hasBottomFrozenRows = this.table.bottomFrozenRowCount > 0;
+        if (hasBottomFrozenRows) {
+            const bottomFrozenRowsHeight = this.table.getBottomFrozenRowsHeight(), topFrozenBottom = Math.max(this.colHeaderGroup.attribute.y + this.colHeaderGroup.attribute.height, this.cornerHeaderGroup.attribute.y + this.cornerHeaderGroup.attribute.height, this.rightTopCornerGroup.attribute.y + this.rightTopCornerGroup.attribute.height), middleContentBottom = Math.max(this.rowHeaderGroup.attribute.y + this.rowHeaderGroup.attribute.height, this.bodyGroup.attribute.y + this.bodyGroup.attribute.height, this.rightFrozenGroup.attribute.y + this.rightFrozenGroup.attribute.height, topFrozenBottom), bottomFrozenY = Math.min(this.tableGroup.attribute.height - bottomFrozenRowsHeight, middleContentBottom);
+            this.bottomFrozenGroup.setAttribute("y", bottomFrozenY), this.leftBottomCornerGroup.setAttributes({
+                visible: hasFrozenCols,
+                y: bottomFrozenY,
+                height: bottomFrozenRowsHeight,
+                width: hasFrozenCols ? this.table.getFrozenColsWidth() : 0
+            }), this.rightBottomCornerGroup.setAttributes({
+                visible: hasRightFrozenCols,
+                x: 0,
+                y: bottomFrozenY,
+                width: 0,
+                height: bottomFrozenRowsHeight
+            });
+        } else this.leftBottomCornerGroup.setAttributes({
+            visible: !1,
+            width: 0,
+            height: 0
         }), this.rightBottomCornerGroup.setAttributes({
-            visible: !0,
-            x: this.tableGroup.attribute.width - this.table.getRightFrozenColsWidth(),
-            width: this.table.getRightFrozenColsWidth()
-        })), this.updateDomContainer();
+            visible: !1,
+            width: 0,
+            height: 0
+        });
+        if (hasRightFrozenCols) {
+            const rightFrozenColsWidth = this.table.getRightFrozenColsWidth(), middleContentRight = Math.max(this.colHeaderGroup.attribute.x + this.colHeaderGroup.attribute.width, this.bodyGroup.attribute.x + this.bodyGroup.attribute.width, this.bottomFrozenGroup.attribute.x + this.bottomFrozenGroup.attribute.width), rightFrozenX = Math.min(this.tableGroup.attribute.width - rightFrozenColsWidth, middleContentRight);
+            this.rightFrozenGroup.setAttribute("x", rightFrozenX), this.rightTopCornerGroup.setAttributes({
+                visible: hasFrozenRows,
+                x: rightFrozenX,
+                width: hasFrozenRows ? rightFrozenColsWidth : 0,
+                height: hasFrozenRows ? this.table.getFrozenRowsHeight() : 0
+            }), this.rightBottomCornerGroup.setAttributes({
+                visible: hasBottomFrozenRows,
+                x: rightFrozenX,
+                width: hasBottomFrozenRows ? rightFrozenColsWidth : 0,
+                height: hasBottomFrozenRows ? this.table.getBottomFrozenRowsHeight() : 0
+            });
+        } else this.rightTopCornerGroup.setAttributes({
+            visible: !1,
+            width: 0,
+            height: 0
+        });
+        this.updateDomContainer();
     }
     updateRowHeight(row, detaY, skipTableHeightMap) {
         detaY = Math.round(detaY), updateRowHeight(this, row, detaY, skipTableHeightMap),