@visactor/vtable 1.4.2-beta.0 → 1.5.0

package/es/core/BaseTable.js

@@ -36,8 +36,6 @@ import { BodyHelper } from "../body-helper/body-helper";
 
 import { HeaderHelper } from "../header-helper/header-helper";
 
-import { TooltipHandler } from "../components/tooltip/TooltipHandler";
-
 import { AABBBounds, isNumber, isBoolean, isFunction, isValid, cloneDeep } from "@visactor/vutils";
 
 import { measureTextBounds, textMeasure } from "../scenegraph/utils/text-measure";
@@ -46,18 +44,12 @@ import { getProp } from "../scenegraph/utils/get-prop";
 
 import { IconCache } from "../plugins/icons";
 
-import { _applyColWidthLimits, _getScrollableVisibleRect, _getTargetFrozenColAt, _getTargetFrozenRowAt, _setDataSource, _toPxWidth, createRootElement, getStyleTheme, updateRootElementPadding } from "./tableHelper";
-
-import { MenuHandler } from "../components/menu/dom/MenuHandler";
+import { _applyColWidthLimits, _getScrollableVisibleRect, _setDataSource, _toPxWidth, createRootElement, getStyleTheme, updateRootElementPadding } from "./tableHelper";
 
 import { FocusInput } from "./FouseInput";
 
 import { defaultPixelRatio } from "../tools/pixel-ratio";
 
-import { createLegend } from "../components/legend/create-legend";
-
-import { DataSet } from "@visactor/vdataset";
-
 import { setBatchRenderChartCount } from "../scenegraph/graphic/contributions/chart-render-helper";
 
 import { isLeftOrRightAxis, isTopOrBottomAxis } from "../layout/chart-helper/get-axis-config";
@@ -74,6 +66,10 @@ import { ReactCustomLayout } from "../components/react/react-custom-layout";
 
 import { hasAutoImageColumn } from "../layout/layout-helper";
 
+import { Factory } from "./factory";
+
+import { getCellAt, getCellAtRelativePosition, getColAt, getRowAt, getTargetColAt, getTargetColAtConsiderRightFrozen, getTargetRowAt, getTargetRowAtConsiderBottomFrozen } from "./utils/get-cell-position";
+
 const {toBoxArray: toBoxArray} = utilStyle, {isTouchEvent: isTouchEvent} = event, rangeReg = /^\$(\d+)\$(\d+)$/;
 
 importStyle();
@@ -86,10 +82,10 @@ export class BaseTable extends EventTarget {
     }
     constructor(container, options = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.4.2-beta.0", this.id = `VTable${Date.now()}`, 
+        if (super(), this.showFrozenIcon = !0, this.version = "1.5.0", this.id = `VTable${Date.now()}`, 
         this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), 
         !container && "node" !== options.mode) throw new Error("vtable's container is undefined");
-        const {frozenColCount: frozenColCount = 0, defaultRowHeight: defaultRowHeight = 40, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth = 80, defaultHeaderColWidth: defaultHeaderColWidth, widthMode: widthMode = "standard", heightMode: heightMode = "standard", autoFillWidth: autoFillWidth = !1, autoFillHeight: autoFillHeight = !1, widthAdaptiveMode: widthAdaptiveMode = "only-body", heightAdaptiveMode: heightAdaptiveMode = "only-body", keyboardOptions: keyboardOptions, eventOptions: eventOptions, rowSeriesNumber: rowSeriesNumber, columnResizeMode: columnResizeMode, rowResizeMode: rowResizeMode = "none", dragHeaderMode: dragHeaderMode, showFrozenIcon: showFrozenIcon, allowFrozenColCount: allowFrozenColCount, padding: padding, hover: hover, menu: menu, select: click, customRender: customRender, pixelRatio: pixelRatio = defaultPixelRatio, renderChartAsync: renderChartAsync, renderChartAsyncBatchCount: renderChartAsyncBatchCount, mode: mode, modeParams: modeParams, canvasWidth: canvasWidth, canvasHeight: canvasHeight, overscrollBehavior: overscrollBehavior, limitMinWidth: limitMinWidth, limitMinHeight: limitMinHeight, clearDOM: clearDOM = !0} = options;
+        const {frozenColCount: frozenColCount = 0, frozenRowCount: frozenRowCount, defaultRowHeight: defaultRowHeight = 40, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth = 80, defaultHeaderColWidth: defaultHeaderColWidth, widthMode: widthMode = "standard", heightMode: heightMode = "standard", autoFillWidth: autoFillWidth = !1, autoFillHeight: autoFillHeight = !1, widthAdaptiveMode: widthAdaptiveMode = "only-body", heightAdaptiveMode: heightAdaptiveMode = "only-body", keyboardOptions: keyboardOptions, eventOptions: eventOptions, rowSeriesNumber: rowSeriesNumber, columnResizeMode: columnResizeMode, rowResizeMode: rowResizeMode = "none", dragHeaderMode: dragHeaderMode, showFrozenIcon: showFrozenIcon, allowFrozenColCount: allowFrozenColCount, padding: padding, hover: hover, menu: menu, select: click, customRender: customRender, pixelRatio: pixelRatio = defaultPixelRatio, renderChartAsync: renderChartAsync, renderChartAsyncBatchCount: renderChartAsyncBatchCount, mode: mode, modeParams: modeParams, canvasWidth: canvasWidth, canvasHeight: canvasHeight, overscrollBehavior: overscrollBehavior, limitMinWidth: limitMinWidth, limitMinHeight: limitMinHeight, clearDOM: clearDOM = !0} = options;
         this.container = container, this.options = options, this._widthMode = widthMode, 
         this._heightMode = heightMode, this._widthAdaptiveMode = widthAdaptiveMode, this._heightAdaptiveMode = heightAdaptiveMode, 
         this._autoFillWidth = autoFillWidth, this._autoFillHeight = autoFillHeight, this.customRender = customRender, 
@@ -115,7 +111,8 @@ export class BaseTable extends EventTarget {
         internalProps.element.appendChild(internalProps.headerDomContainer))), internalProps.handler = new EventHandler, 
         isNumber(this.options.resizeTime) && (internalProps.handler.resizeTime = this.options.resizeTime), 
         internalProps.pixelRatio = pixelRatio, internalProps.frozenColCount = frozenColCount, 
-        internalProps.defaultRowHeight = defaultRowHeight, internalProps.defaultHeaderRowHeight = null != defaultHeaderRowHeight ? defaultHeaderRowHeight : defaultRowHeight, 
+        internalProps.frozenRowCount = frozenRowCount, internalProps.defaultRowHeight = defaultRowHeight, 
+        internalProps.defaultHeaderRowHeight = null != defaultHeaderRowHeight ? defaultHeaderRowHeight : defaultRowHeight, 
         internalProps.defaultColWidth = defaultColWidth, internalProps.defaultHeaderColWidth = null != defaultHeaderColWidth ? defaultHeaderColWidth : defaultColWidth, 
         internalProps.keyboardOptions = keyboardOptions, internalProps.eventOptions = eventOptions, 
         internalProps.rowSeriesNumber = rowSeriesNumber, internalProps.columnResizeMode = columnResizeMode, 
@@ -142,28 +139,37 @@ export class BaseTable extends EventTarget {
         internalProps.limitMaxAutoWidth = null !== (_f = options.limitMaxAutoWidth) && void 0 !== _f ? _f : 450, 
         internalProps.limitMinWidth = null != limitMinWidth ? "number" == typeof limitMinWidth ? limitMinWidth : limitMinWidth ? 10 : 0 : 10, 
         internalProps.limitMinHeight = null != limitMinHeight ? "number" == typeof limitMinHeight ? limitMinHeight : limitMinHeight ? 10 : 0 : 10, 
-        this._vDataSet = new DataSet, this.scenegraph = new Scenegraph(this), this.stateManager = new StateManager(this), 
-        this.eventManager = new EventManager(this), options.legends) if (internalProps.legends = [], 
-        Array.isArray(options.legends)) {
-            for (let i = 0; i < options.legends.length; i++) internalProps.legends.push(createLegend(options.legends[i], this));
-            this.scenegraph.tableGroup.setAttributes({
+        this.scenegraph = new Scenegraph(this), this.stateManager = new StateManager(this), 
+        this.eventManager = new EventManager(this), options.legends) {
+            internalProps.legends = [];
+            const createLegend = Factory.getFunction("createLegend");
+            if (Array.isArray(options.legends)) {
+                for (let i = 0; i < options.legends.length; i++) internalProps.legends.push(createLegend(options.legends[i], this));
+                this.scenegraph.tableGroup.setAttributes({
+                    x: this.tableX,
+                    y: this.tableY
+                });
+            } else internalProps.legends.push(createLegend(options.legends, this)), this.scenegraph.tableGroup.setAttributes({
                 x: this.tableX,
                 y: this.tableY
             });
-        } else internalProps.legends.push(createLegend(options.legends, this)), this.scenegraph.tableGroup.setAttributes({
-            x: this.tableX,
-            y: this.tableY
-        });
-        internalProps.tooltip = Object.assign({
+        }
+        if (internalProps.tooltip = Object.assign({
             renderMode: "html",
             isShowOverflowTextTooltip: !1,
             confine: !0
-        }, options.tooltip), "html" === internalProps.tooltip.renderMode && (internalProps.tooltipHandler = new TooltipHandler(this, internalProps.tooltip.confine)), 
-        internalProps.menu = Object.assign({
+        }, options.tooltip), "html" === internalProps.tooltip.renderMode) {
+            const TooltipHandler = Factory.getComponent("tooltipHandler");
+            internalProps.tooltipHandler = new TooltipHandler(this, internalProps.tooltip.confine);
+        }
+        if (internalProps.menu = Object.assign({
             renderMode: "html"
         }, options.menu), Array.isArray(null === (_g = options.menu) || void 0 === _g ? void 0 : _g.dropDownMenuHighlight) && this.setDropDownMenuHighlight(null === (_h = options.menu) || void 0 === _h ? void 0 : _h.dropDownMenuHighlight), 
         Array.isArray(null === (_j = options.menu) || void 0 === _j ? void 0 : _j.defaultHeaderMenuItems) && (this.globalDropDownMenu = options.menu.defaultHeaderMenuItems), 
-        "html" === internalProps.menu.renderMode && (internalProps.menuHandler = new MenuHandler(this)), 
+        "html" === internalProps.menu.renderMode) {
+            const MenuHandler = Factory.getComponent("menuHandler");
+            internalProps.menuHandler = new MenuHandler(this);
+        }
         this.headerStyleCache = new Map, this.bodyStyleCache = new Map, this.bodyBottomStyleCache = new Map, 
         internalProps.stick = {
             changedCells: new Map
@@ -642,41 +648,16 @@ export class BaseTable extends EventTarget {
         } : null;
     }
     getRowAt(absoluteY) {
-        const frozen = _getTargetFrozenRowAt(this, absoluteY);
-        if (frozen) return frozen;
-        let row = this.getTargetRowAt(absoluteY);
-        return row || (row = {
-            top: -1,
-            row: -1,
-            bottom: -1,
-            height: -1
-        }), row;
+        return getRowAt(absoluteY, this);
     }
     getColAt(absoluteX) {
-        const frozen = _getTargetFrozenColAt(this, absoluteX);
-        if (frozen) return frozen;
-        let col = this.getTargetColAt(absoluteX);
-        return col || (col = {
-            left: -1,
-            col: -1,
-            right: -1,
-            width: 1
-        }), col;
+        return getColAt(absoluteX, this);
     }
     getCellAt(absoluteX, absoluteY) {
-        const rowInfo = this.getRowAt(absoluteY), {row: row, top: top, bottom: bottom, height: height} = rowInfo, colInfo = this.getColAt(absoluteX), {col: col, left: left, right: right, width: width} = colInfo;
-        return {
-            row: row,
-            col: col,
-            rect: {
-                left: left,
-                right: right,
-                top: top,
-                bottom: bottom,
-                width: width,
-                height: height
-            }
-        };
+        return getCellAt(absoluteX, absoluteY, this);
+    }
+    getCellAtRelativePosition(relativeX, relativeY) {
+        return getCellAtRelativePosition(relativeX, relativeY, this);
     }
     _checkRowCol(col, row) {
         return col >= 0 && col < this.colCount && row >= 0 && row < this.rowCount;
@@ -853,32 +834,42 @@ export class BaseTable extends EventTarget {
         internalProps.limitMaxAutoWidth = null !== (_d = options.limitMaxAutoWidth) && void 0 !== _d ? _d : 450, 
         internalProps.limitMinWidth = null != limitMinWidth ? "number" == typeof limitMinWidth ? limitMinWidth : limitMinWidth ? 10 : 0 : 10, 
         internalProps.limitMinHeight = null != limitMinHeight ? "number" == typeof limitMinHeight ? limitMinHeight : limitMinHeight ? 10 : 0 : 10, 
-        this._vDataSet = new DataSet, null === (_e = internalProps.legends) || void 0 === _e || _e.forEach((legend => {
+        null === (_e = internalProps.legends) || void 0 === _e || _e.forEach((legend => {
             null == legend || legend.release();
         })), null === (_f = internalProps.title) || void 0 === _f || _f.release(), internalProps.title = null, 
         null === (_g = internalProps.emptyTip) || void 0 === _g || _g.release(), internalProps.emptyTip = null, 
         internalProps.layoutMap.release(), this.scenegraph.clearCells(), this.scenegraph.updateComponent(), 
         this.stateManager.updateOptionSetState(), this._updateSize(), this.eventManager.updateEventBinder(), 
-        options.legends) if (internalProps.legends = [], Array.isArray(options.legends)) {
-            for (let i = 0; i < options.legends.length; i++) internalProps.legends.push(createLegend(options.legends[i], this));
-            this.scenegraph.tableGroup.setAttributes({
+        options.legends) {
+            internalProps.legends = [];
+            const createLegend = Factory.getFunction("createLegend");
+            if (Array.isArray(options.legends)) {
+                for (let i = 0; i < options.legends.length; i++) internalProps.legends.push(createLegend(options.legends[i], this));
+                this.scenegraph.tableGroup.setAttributes({
+                    x: this.tableX,
+                    y: this.tableY
+                });
+            } else internalProps.legends.push(createLegend(options.legends, this)), this.scenegraph.tableGroup.setAttributes({
                 x: this.tableX,
                 y: this.tableY
             });
-        } else internalProps.legends.push(createLegend(options.legends, this)), this.scenegraph.tableGroup.setAttributes({
-            x: this.tableX,
-            y: this.tableY
-        });
-        internalProps.tooltip = Object.assign({
+        }
+        if (internalProps.tooltip = Object.assign({
             renderMode: "html",
             isShowOverflowTextTooltip: !1,
             confine: !0
-        }, options.tooltip), "html" !== internalProps.tooltip.renderMode || internalProps.tooltipHandler || (internalProps.tooltipHandler = new TooltipHandler(this, internalProps.tooltip.confine)), 
-        internalProps.menu = Object.assign({
+        }, options.tooltip), "html" === internalProps.tooltip.renderMode && !internalProps.tooltipHandler) {
+            const TooltipHandler = Factory.getComponent("tooltipHandler");
+            internalProps.tooltipHandler = new TooltipHandler(this, internalProps.tooltip.confine);
+        }
+        if (internalProps.menu = Object.assign({
             renderMode: "html"
         }, options.menu), Array.isArray(null === (_h = options.menu) || void 0 === _h ? void 0 : _h.dropDownMenuHighlight) && this.setDropDownMenuHighlight(null === (_j = options.menu) || void 0 === _j ? void 0 : _j.dropDownMenuHighlight), 
         Array.isArray(null === (_k = options.menu) || void 0 === _k ? void 0 : _k.defaultHeaderMenuItems) && (this.globalDropDownMenu = options.menu.defaultHeaderMenuItems), 
-        "html" !== internalProps.menu.renderMode || internalProps.menuHandler || (internalProps.menuHandler = new MenuHandler(this)), 
+        "html" === internalProps.menu.renderMode && !internalProps.menuHandler) {
+            const MenuHandler = Factory.getComponent("menuHandler");
+            internalProps.menuHandler = new MenuHandler(this);
+        }
         this.clearCellStyleCache(), this.clearColWidthCache(), this.clearRowHeightCache(), 
         internalProps.customMergeCell = options.customMergeCell, this.customCellStylePlugin.updateCustomCell(null !== (_l = options.customCellStyle) && void 0 !== _l ? _l : [], null !== (_m = options.customCellStyleArrangement) && void 0 !== _m ? _m : []);
     }
@@ -939,140 +930,31 @@ export class BaseTable extends EventTarget {
         return this.internalProps.theme;
     }
     getTargetColAt(absoluteX) {
-        if (0 === absoluteX) return {
-            left: 0,
-            col: 0,
-            right: 0,
-            width: 0
-        };
-        const findAfter = (startCol, startRight) => {
-            let left = startRight - this.getColWidth(startCol);
-            const {colCount: colCount} = this.internalProps;
-            for (let col = startCol; col < colCount; col++) {
-                const width = this.getColWidth(col), right = left + width;
-                if (Math.round(left) <= Math.round(absoluteX) && Math.round(absoluteX) < Math.round(right)) return {
-                    left: left,
-                    col: col,
-                    right: right,
-                    width: width
-                };
-                left = right;
-            }
-            return null;
-        }, candCol = this.computeTargetColByX(absoluteX), right = this.getColsWidth(0, candCol);
-        return absoluteX >= right ? findAfter(candCol, right) : ((startCol, startRight) => {
-            let right = startRight;
-            for (let col = startCol; col >= 0; col--) {
-                const width = this.getColWidth(col), left = right - width;
-                if (Math.round(left) <= Math.round(absoluteX) && Math.round(absoluteX) < Math.round(right)) return {
-                    left: left,
-                    col: col,
-                    right: right,
-                    width: width
-                };
-                right = left;
-            }
-            return null;
-        })(candCol, right);
+        return getTargetColAt(absoluteX, this);
     }
     getTargetRowAt(absoluteY) {
-        if (0 === absoluteY) return {
-            top: 0,
-            row: 0,
-            bottom: 0,
-            height: 0
-        };
-        const findAfter = (startRow, startBottom) => {
-            let top = startBottom - this.getRowHeight(startRow);
-            const {rowCount: rowCount} = this.internalProps;
-            for (let row = startRow; row < rowCount; row++) {
-                const height = this.getRowHeight(row), bottom = top + height;
-                if (Math.round(top) <= Math.round(absoluteY) && Math.round(absoluteY) < Math.round(bottom)) return {
-                    top: top,
-                    row: row,
-                    bottom: bottom,
-                    height: height
-                };
-                top = bottom;
-            }
-            return null;
-        }, candRow = this.computeTargetRowByY(absoluteY), bottom = this.getRowsHeight(0, candRow);
-        return absoluteY >= bottom ? findAfter(candRow, bottom) : ((startRow, startBottom) => {
-            let bottom = startBottom;
-            for (let row = startRow; row >= 0; row--) {
-                const height = this.getRowHeight(row), top = bottom - height;
-                if (Math.round(top) <= Math.round(absoluteY) && Math.round(absoluteY) < Math.round(bottom)) return {
-                    top: top,
-                    row: row,
-                    bottom: bottom,
-                    height: height
-                };
-                bottom = top;
-            }
-            return null;
-        })(candRow, bottom);
+        return getTargetRowAt(absoluteY, this);
     }
     getTargetColAtConsiderRightFrozen(absoluteX, isConsider) {
-        if (0 === absoluteX) return {
-            left: 0,
-            col: 0,
-            right: 0,
-            width: 0
-        };
-        if (isConsider && absoluteX > this.tableNoFrameWidth - this.getRightFrozenColsWidth() && absoluteX < this.tableNoFrameWidth) for (let i = 0; i < this.rightFrozenColCount; i++) if (absoluteX > this.tableNoFrameWidth - this.getColsWidth(this.colCount - i - 1, this.colCount - 1)) return {
-            col: this.colCount - i - 1,
-            left: void 0,
-            right: void 0,
-            width: void 0
-        };
-        return this.getTargetColAt(absoluteX);
+        return getTargetColAtConsiderRightFrozen(absoluteX, isConsider, this);
     }
     getTargetRowAtConsiderBottomFrozen(absoluteY, isConsider) {
-        if (0 === absoluteY) return {
-            top: 0,
-            row: 0,
-            bottom: 0,
-            height: 0
-        };
-        if (isConsider && absoluteY > this.tableNoFrameHeight - this.getBottomFrozenRowsHeight() && absoluteY < this.tableNoFrameHeight) for (let i = 0; i < this.rightFrozenColCount; i++) if (absoluteY > this.tableNoFrameHeight - this.getRowsHeight(this.rowCount - i - 1, this.rowCount - 1)) return {
-            row: this.rowCount - i - 1,
-            top: void 0,
-            bottom: void 0,
-            height: void 0
-        };
-        return this.getTargetRowAt(absoluteY);
-    }
-    computeTargetRowByY(absoluteY) {
-        let defaultRowHeight = this.internalProps.defaultRowHeight;
-        return this._rowRangeHeightsMap.get("$0$" + (this.rowCount - 1)) && (defaultRowHeight = this._rowRangeHeightsMap.get("$0$" + (this.rowCount - 1)) / this.rowCount), 
-        Math.min(Math.ceil(absoluteY / defaultRowHeight), this.rowCount - 1);
-    }
-    computeTargetColByX(absoluteX) {
-        if (this._colRangeWidthsMap.get("$0$" + (this.colCount - 1))) {
-            let startCol = 0, endCol = this.colCount - 1;
-            for (;endCol - startCol > 1; ) {
-                const midCol = Math.floor((startCol + endCol) / 2);
-                if (absoluteX < this._colRangeWidthsMap.get(`$0$${midCol}`)) endCol = midCol; else {
-                    if (!(absoluteX > this._colRangeWidthsMap.get(`$0$${midCol}`))) return midCol;
-                    startCol = midCol;
-                }
-            }
-            return endCol;
-        }
-        return Math.min(Math.ceil(absoluteX / this.internalProps.defaultColWidth), this.colCount - 1);
+        return getTargetRowAtConsiderBottomFrozen(absoluteY, isConsider, this);
     }
     clearSelected() {
         this.stateManager.updateSelectPos(-1, -1);
     }
     selectCell(col, row, isShift, isCtrl) {
-        this.stateManager.updateSelectPos(col, row, isShift, isCtrl), this.stateManager.endSelectCells();
+        var _a;
+        const isHasSelected = !!(null === (_a = this.stateManager.select.ranges) || void 0 === _a ? void 0 : _a.length);
+        this.stateManager.updateSelectPos(col, row, isShift, isCtrl), this.stateManager.endSelectCells(!0, isHasSelected);
     }
     selectCells(cellRanges) {
         const {scrollLeft: scrollLeft, scrollTop: scrollTop} = this;
         cellRanges.forEach(((cellRange, index) => {
             cellRange.start.col === cellRange.end.col && cellRange.start.row === cellRange.end.row ? this.stateManager.updateSelectPos(cellRange.start.col, cellRange.start.row, !1, index >= 1, !1, !1, !0) : (this.stateManager.updateSelectPos(cellRange.start.col, cellRange.start.row, !1, index >= 1, !1, !1, !0), 
             this.stateManager.updateInteractionState(InteractionState.grabing), this.stateManager.updateSelectPos(cellRange.end.col, cellRange.end.row, !1, index >= 1, !1, !1, !0)), 
-            this.stateManager.endSelectCells(!1), this.stateManager.updateInteractionState(InteractionState.default);
+            this.stateManager.endSelectCells(!1, !1), this.stateManager.updateInteractionState(InteractionState.default);
         })), this.setScrollTop(scrollTop), this.setScrollLeft(scrollLeft);
     }
     get recordsCount() {
@@ -1202,7 +1084,7 @@ export class BaseTable extends EventTarget {
         var _a;
         if (this.internalProps.customMergeCell) {
             const customMerge = this.internalProps.customMergeCell(col, row, this);
-            if (customMerge && customMerge.range && (customMerge.text || customMerge.customLayout || customMerge.customRender)) return customMerge.range;
+            if (customMerge && customMerge.range && (isValid(customMerge.text) || customMerge.customLayout || customMerge.customRender)) return customMerge.range;
         }
         return null === (_a = this.internalProps.layoutMap) || void 0 === _a ? void 0 : _a.getCellRange(col, row);
     }
@@ -1212,7 +1094,7 @@ export class BaseTable extends EventTarget {
     getCustomMerge(col, row) {
         if (this.internalProps.customMergeCell) {
             const customMerge = this.internalProps.customMergeCell(col, row, this);
-            if (customMerge && customMerge.range && (customMerge.text || customMerge.customLayout || this.customRender)) {
+            if (customMerge && customMerge.range && (isValid(customMerge.text) || customMerge.customLayout || this.customRender)) {
                 if (customMerge.style) {
                     const styleClass = this.internalProps.bodyHelper.getStyleClass("text"), style = customMerge.style, fullStyle = columnStyleContents.of(style, this.theme.bodyStyle, {
                         col: col,
@@ -1890,5 +1772,11 @@ export class BaseTable extends EventTarget {
     get headerDomContainer() {
         return this.internalProps.headerDomContainer;
     }
+    showMoverLine(col, row) {
+        this.scenegraph.component.showMoveCol(col, row, 0), this.scenegraph.renderSceneGraph();
+    }
+    hideMoverLine(col, row) {
+        this.scenegraph.component.hideMoveCol(), this.scenegraph.renderSceneGraph();
+    }
 }
 //# sourceMappingURL=BaseTable.js.map