@visactor/vtable 1.13.3-alpha.3 → 1.13.3-alpha.5

package/dist/vtable.js

@@ -34075,7 +34075,7 @@
             if (table.widthMode === 'autoWidth') {
                 table.scenegraph.recalculateColWidths();
             }
-            if (table.isAutoRowHeight()) {
+            if (table.heightMode === 'autoHeight') {
                 table.scenegraph.recalculateRowHeights();
             }
             table.scenegraph.renderSceneGraph();
@@ -37515,7 +37515,8 @@
         table.defaultHeaderColWidth;
         const isDefaultHeaderHasAuto = table.defaultHeaderRowHeight === 'auto' ||
             (isArray$1(table.defaultHeaderRowHeight) && table.defaultHeaderRowHeight.some(item => item === 'auto'));
-        const isAllRowsAuto = table.isAutoRowHeight() || (table.heightMode === 'adaptive' && table.options.autoHeightInAdaptiveMode !== false);
+        const isAllRowsAuto = table.heightMode === 'autoHeight' ||
+            (table.heightMode === 'adaptive' && table.options.autoHeightInAdaptiveMode !== false);
         const isDefaultRowHeightIsAuto = table.options.defaultRowHeight === 'auto';
         if (isAllRowsAuto || isDefaultHeaderHasAuto || isDefaultRowHeightIsAuto) {
             rowStart = rowStart ?? 0;
@@ -37736,22 +37737,14 @@
         }
     }
     function computeRowHeight(row, startCol, endCol, table) {
-        const isAllRowsAuto = table.isAutoRowHeight() || (table.heightMode === 'adaptive' && table.options.autoHeightInAdaptiveMode !== false);
+        const isAllRowsAuto = table.heightMode === 'autoHeight' ||
+            (table.heightMode === 'adaptive' && table.options.autoHeightInAdaptiveMode !== false);
         if (!isAllRowsAuto && table.getDefaultRowHeight(row) !== 'auto') {
             return table.getDefaultRowHeight(row);
         }
         let maxHeight;
         if (table.options.customComputeRowHeight) {
-            const customRowHeight = table.options.customComputeRowHeight({
-                row,
-                table
-            });
-            if (typeof customRowHeight === 'number') {
-                return customRowHeight;
-            }
-            else if (customRowHeight !== 'auto') {
-                return table.getDefaultRowHeight(row);
-            }
+            return table.options.customComputeRowHeight({ row, table: table });
         }
         if (table.isPivotChart() &&
             row >= table.columnHeaderLevelCount &&
@@ -37810,7 +37803,7 @@
         const { layoutMap } = table.internalProps;
         const row = table.columnHeaderLevelCount;
         if ((table.internalProps.autoWrapText || table.internalProps.enableLineBreak || table.isPivotChart()) &&
-            (table.isAutoRowHeight() || table.options.heightMode === 'adaptive')) {
+            (table.options.heightMode === 'autoHeight' || table.options.heightMode === 'adaptive')) {
             return false;
         }
         for (let col = 0; col < table.colCount; col++) {
@@ -37838,7 +37831,7 @@
     function checkFixedStyleAndNoWrapForTranspose(table, row) {
         const { layoutMap } = table.internalProps;
         if ((table.internalProps.autoWrapText || table.internalProps.enableLineBreak) &&
-            (table.isAutoRowHeight() || table.options.heightMode === 'adaptive')) {
+            (table.options.heightMode === 'autoHeight' || table.options.heightMode === 'adaptive')) {
             return false;
         }
         const cellDefine = layoutMap.getBody(table.rowHeaderLevelCount, row);
@@ -37860,7 +37853,8 @@
     }
     function checkPivotFixedStyleAndNoWrap(table, row) {
         const { layoutMap } = table.internalProps;
-        if (table.internalProps.autoWrapText && (table.isAutoRowHeight() || table.options.heightMode === 'adaptive')) {
+        if (table.internalProps.autoWrapText &&
+            (table.options.heightMode === 'autoHeight' || table.options.heightMode === 'adaptive')) {
             return false;
         }
         const headerDefine = layoutMap.getHeader(table.rowHeaderLevelCount, row);
@@ -42973,7 +42967,7 @@
         let distColForCompute;
         let distRowForCompute;
         if (table.widthMode === 'adaptive' ||
-            (table.options.autoWrapText && (table.heightMode === 'adaptive' || table.isAutoRowHeight()))) {
+            (table.options.autoWrapText && (table.heightMode === 'adaptive' || table.heightMode === 'autoHeight'))) {
             distColForCompute = table.colCount - 1;
             distCol = Math.min(proxy.firstScreenColLimit, table.colCount - 1);
         }
@@ -43501,7 +43495,7 @@
             const distEndRow = direction === 'up' ? proxy.rowEnd + count : proxy.rowStart - 1;
             let syncTopRow;
             let syncBottomRow;
-            if (proxy.table.isAutoRowHeight()) {
+            if (proxy.table.heightMode === 'autoHeight') {
                 syncTopRow = distStartRow;
                 syncBottomRow = distEndRow;
             }
@@ -43516,7 +43510,7 @@
             proxy.rowStart = direction === 'up' ? proxy.rowStart + count : proxy.rowStart - count;
             proxy.rowEnd = direction === 'up' ? proxy.rowEnd + count : proxy.rowEnd - count;
             const sync = updateRowContent(syncTopRow, syncBottomRow, proxy, true);
-            if (proxy.table.isAutoRowHeight()) {
+            if (proxy.table.heightMode === 'autoHeight') {
                 updateAutoRow(proxy.bodyLeftCol, proxy.bodyRightCol, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up', true);
                 updateAutoRow(0, proxy.table.frozenColCount - 1, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up', true);
                 updateAutoRow(proxy.table.colCount - proxy.table.rightFrozenColCount, proxy.table.colCount - 1, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up', true);
@@ -43524,7 +43518,7 @@
             proxy.currentRow = direction === 'up' ? proxy.currentRow + count : proxy.currentRow - count;
             proxy.totalRow = Math.max(0, Math.min(proxy.bodyBottomRow, direction === 'up' ? proxy.totalRow + count : proxy.totalRow - count, proxy.table.rowCount - 1));
             proxy.referenceRow = proxy.rowStart + Math.floor((proxy.rowEnd - proxy.rowStart) / 2);
-            if (proxy.table.isAutoRowHeight() && sync) {
+            if (proxy.table.heightMode === 'autoHeight' && sync) {
                 proxy.rowUpdatePos = Math.min(proxy.rowUpdatePos, proxy.rowEnd + 1);
             }
             else {
@@ -43540,7 +43534,7 @@
             const distStartRowY = proxy.table.getRowsHeight(proxy.bodyTopRow, distStartRow - 1);
             let syncTopRow;
             let syncBottomRow;
-            if (proxy.table.isAutoRowHeight()) {
+            if (proxy.table.heightMode === 'autoHeight') {
                 syncTopRow = distStartRow;
                 syncBottomRow = distEndRow;
             }
@@ -43553,7 +43547,7 @@
             proxy.rowStart = distStartRow;
             proxy.rowEnd = distEndRow;
             const sync = updateRowContent(syncTopRow, syncBottomRow, proxy, true);
-            if (proxy.table.isAutoRowHeight()) {
+            if (proxy.table.heightMode === 'autoHeight') {
                 updateAutoRow(proxy.bodyLeftCol, proxy.bodyRightCol, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up');
                 updateAutoRow(0, proxy.table.frozenColCount - 1, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up');
                 updateAutoRow(proxy.table.colCount - proxy.table.rightFrozenColCount, proxy.table.colCount - 1, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up');
@@ -43561,7 +43555,7 @@
             proxy.currentRow = direction === 'up' ? proxy.currentRow + count : proxy.currentRow - count;
             proxy.totalRow = Math.max(0, Math.min(proxy.bodyBottomRow, direction === 'up' ? proxy.totalRow + count : proxy.totalRow - count, proxy.table.rowCount - 1));
             proxy.referenceRow = proxy.rowStart + Math.floor((proxy.rowEnd - proxy.rowStart) / 2);
-            if (proxy.table.isAutoRowHeight() && sync) {
+            if (proxy.table.heightMode === 'autoHeight' && sync) {
                 proxy.rowUpdatePos = proxy.rowEnd + 1;
             }
             else {
@@ -43685,7 +43679,7 @@
         });
         let syncTopRow;
         let syncBottomRow;
-        if (proxy.table.isAutoRowHeight()) {
+        if (proxy.table.heightMode === 'autoHeight') {
             syncTopRow = proxy.rowStart;
             syncBottomRow = proxy.rowEnd;
         }
@@ -43727,13 +43721,13 @@
             }
         }
         updateRowContent(syncTopRow, syncBottomRow, proxy);
-        if (proxy.table.isAutoRowHeight()) {
+        if (proxy.table.heightMode === 'autoHeight') {
             updateAutoRow(proxy.bodyLeftCol, proxy.bodyRightCol, syncTopRow, syncBottomRow, proxy.table, proxy.rowEnd > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up');
         }
         proxy.rowUpdatePos = proxy.rowStart;
         proxy.rowUpdateDirection = proxy.rowEnd > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up';
         proxy.table.scenegraph.updateNextFrame();
-        if (!proxy.table.isAutoRowHeight()) {
+        if (proxy.table.heightMode !== 'autoHeight') {
             await proxy.progress();
         }
     }
@@ -44094,7 +44088,7 @@
                 this.rowLimit = Math.max(100, Math.ceil((table.tableNoFrameHeight * 2) / table.defaultRowHeight));
                 this.colLimit = Math.max(100, Math.ceil((table.tableNoFrameWidth * 2) / table.defaultColWidth));
             }
-            else if (this.table.isAutoRowHeight()) {
+            else if (this.table.heightMode === 'autoHeight') {
                 this.rowLimit = Math.max(100, Math.ceil((table.tableNoFrameHeight * 2) / table.defaultRowHeight));
             }
             else if (this.table.widthMode === 'autoWidth') {
@@ -44377,11 +44371,11 @@
         }
         updateCellGroups(count) {
             const distRow = Math.min(this.bodyBottomRow, this.rowUpdatePos + count);
-            if (this.table.isAutoRowHeight()) {
+            if (this.table.heightMode === 'autoHeight') {
                 computeRowsHeight(this.table, this.rowUpdatePos, distRow, false);
             }
             updateRowContent(this.rowUpdatePos, distRow, this);
-            if (this.table.isAutoRowHeight()) {
+            if (this.table.heightMode === 'autoHeight') {
                 updateAutoRow(this.bodyLeftCol, this.bodyRightCol, this.rowUpdatePos, distRow, this.table, this.rowUpdateDirection, true);
                 updateAutoRow(0, this.table.frozenColCount - 1, this.rowUpdatePos, distRow, this.table, this.rowUpdateDirection, true);
                 updateAutoRow(this.table.colCount - this.table.rightFrozenColCount, this.table.colCount - 1, this.rowUpdatePos, distRow, this.table, this.rowUpdateDirection, true);
@@ -44391,11 +44385,11 @@
         updateBottomFrozenCellGroups() {
             const startRow = this.table.rowCount - this.table.bottomFrozenRowCount;
             const endRow = this.table.rowCount - 1;
-            if (this.table.isAutoRowHeight()) {
+            if (this.table.heightMode === 'autoHeight') {
                 computeRowsHeight(this.table, startRow, endRow, false);
             }
             updateRowContent(startRow, endRow, this);
-            if (this.table.isAutoRowHeight()) {
+            if (this.table.heightMode === 'autoHeight') {
                 updateAutoRow(this.bodyLeftCol, this.bodyRightCol, startRow, endRow, this.table, this.rowUpdateDirection);
                 updateAutoRow(0, this.table.frozenColCount - 1, startRow, endRow, this.table, this.rowUpdateDirection);
                 updateAutoRow(this.table.colCount - this.table.rightFrozenColCount, this.table.colCount - 1, startRow, endRow, this.table, this.rowUpdateDirection);
@@ -44408,7 +44402,7 @@
                 computeColsWidth(this.table, startCol, endCol, false);
             }
             updateColContent(startCol, endCol, this);
-            if (this.table.isAutoRowHeight()) {
+            if (this.table.heightMode === 'autoHeight') {
                 updateAutoColumn(startCol, endCol, this.table, this.colUpdateDirection);
             }
         }
@@ -45650,11 +45644,11 @@
                 addNeedUpdateTag({
                     start: {
                         row: beforeCell.mergeStartRow,
-                        col: scene.table.isAutoRowHeight() ? 0 : beforeCell.mergeStartCol
+                        col: scene.table.heightMode === 'autoHeight' ? 0 : beforeCell.mergeStartCol
                     },
                     end: {
                         row: beforeCell.mergeEndRow,
-                        col: scene.table.isAutoRowHeight() ? scene.table.colCount - 1 : beforeCell.mergeEndCol
+                        col: scene.table.heightMode === 'autoHeight' ? scene.table.colCount - 1 : beforeCell.mergeEndCol
                     }
                 }, scene);
                 row = beforeCell.mergeStartRow;
@@ -45664,11 +45658,11 @@
                 addNeedUpdateTag({
                     start: {
                         row: afterCell.mergeStartRow,
-                        col: scene.table.isAutoRowHeight() ? 0 : afterCell.mergeStartCol
+                        col: scene.table.heightMode === 'autoHeight' ? 0 : afterCell.mergeStartCol
                     },
                     end: {
                         row: afterCell.mergeEndRow,
-                        col: scene.table.isAutoRowHeight() ? scene.table.colCount - 1 : afterCell.mergeEndCol
+                        col: scene.table.heightMode === 'autoHeight' ? scene.table.colCount - 1 : afterCell.mergeEndCol
                     }
                 }, scene);
                 row = afterCell.mergeStartRow;
@@ -48592,7 +48586,7 @@
                 (this.table.autoFillHeight && (this.table.getAllRowsHeight() <= this.table.tableNoFrameHeight || isNotFillHeight))) {
                 this.table.scenegraph.recalculateRowHeights();
             }
-            else if (this.table.isAutoRowHeight()) {
+            else if (this.table.heightMode === 'autoHeight') {
                 for (let i = 0; i < updateRows.length; i++) {
                     const row = updateRows[i];
                     const oldHeight = this.table.getRowHeight(row);
@@ -58104,7 +58098,7 @@
         cacheStyle = cacheStyle.clone();
         for (const key in customCellStyle) {
             const value = customCellStyle[key];
-            if (isValid$1(value)) {
+            if (value) {
                 cacheStyle[`_${key}`] = value;
             }
         }
@@ -58371,7 +58365,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.13.3-alpha.3";
+        version = "1.13.3-alpha.5";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -59057,7 +59051,6 @@
             let h = 0;
             const isDefaultRowHeightIsAuto = this.options.defaultRowHeight === 'auto';
             if (this.heightMode === 'standard' &&
-                !this.options.customComputeRowHeight &&
                 !this.autoFillHeight &&
                 this.internalProps.layoutMap &&
                 !this.hasAutoImageColumn() &&
@@ -59122,9 +59115,6 @@
             if (this.heightMode === 'autoHeight') {
                 return true;
             }
-            else if (this.options.customComputeRowHeight) {
-                return true;
-            }
             else if (row >= 0 && row < this.columnHeaderLevelCount) {
                 return this.getDefaultRowHeight(row) === 'auto';
             }
@@ -63663,7 +63653,7 @@
                     table.scenegraph.recalculateRowHeights();
                 }
             }
-            else if (table.isAutoRowHeight() && !table.internalProps._heightResizedRowMap.has(row)) {
+            else if (table.heightMode === 'autoHeight' && !table.internalProps._heightResizedRowMap.has(row)) {
                 const oldHeight = table.getRowHeight(row);
                 const newHeight = computeRowHeight(row, 0, table.colCount - 1, table);
                 table.scenegraph.updateRowHeight(row, newHeight - oldHeight);
@@ -63813,7 +63803,7 @@
             (table.autoFillHeight && table.getAllRowsHeight() <= table.tableNoFrameHeight)) {
             table.scenegraph.recalculateRowHeights();
         }
-        else if (table.isAutoRowHeight()) {
+        else if (table.heightMode === 'autoHeight') {
             const rows = [];
             const deltaYs = [];
             for (let sRow = startRow; sRow <= range.end.row; sRow++) {
@@ -69652,7 +69642,7 @@
         const autoWrapText = cellStyle.autoWrapText ?? table.internalProps.autoWrapText;
         const { lineClamp } = cellStyle;
         const autoColWidth = colWidth === 'auto';
-        const autoRowHeight = table.isAutoRowHeight();
+        const autoRowHeight = table.heightMode === 'autoHeight';
         const attribute = {
             maxLineWidth: autoColWidth
                 ? Infinity
@@ -76953,7 +76943,7 @@
                         this.scenegraph.recalculateRowHeights();
                     }
                 }
-                else if (this.isAutoRowHeight() && !this.internalProps._heightResizedRowMap.has(row)) {
+                else if (this.heightMode === 'autoHeight' && !this.internalProps._heightResizedRowMap.has(row)) {
                     const oldHeight = this.getRowHeight(row);
                     const newHeight = computeRowHeight(row, 0, this.colCount - 1, this);
                     this.scenegraph.updateRowHeight(row, newHeight - oldHeight);
@@ -77051,7 +77041,7 @@
             if (this.heightMode === 'adaptive' || (this.autoFillHeight && this.getAllRowsHeight() <= this.tableNoFrameHeight)) {
                 this.scenegraph.recalculateRowHeights();
             }
-            else if (this.isAutoRowHeight()) {
+            else if (this.heightMode === 'autoHeight') {
                 const rows = [];
                 const deltaYs = [];
                 for (let sRow = startRow; sRow <= range.end.row; sRow++) {
@@ -78849,7 +78839,7 @@
     }
 
     registerForVrender();
-    const version = "1.13.3-alpha.3";
+    const version = "1.13.3-alpha.5";
     function getIcons() {
         return get$2();
     }