@visactor/vtable 0.9.3-alpha.2 → 0.9.3-alpha.3

package/cjs/core/BaseTable.js

@@ -46,7 +46,7 @@ class BaseTable extends EventTarget_1.EventTarget {
     constructor(options = {}) {
         var _a, _b, _c, _d, _e, _f, _g;
         super(), this.showFrozenIcon = !0, this.showSort = !0, this.bottomFrozenRowCount = 0, 
-        this.rightFrozenColCount = 0, this.version = "0.9.3-alpha.2", this.id = `VTable${Date.now()}`, 
+        this.rightFrozenColCount = 0, this.version = "0.9.3-alpha.3", this.id = `VTable${Date.now()}`, 
         this.throttleInvalidate = (0, util_1.throttle2)(this.invalidate.bind(this), 200);
         const {frozenColCount: frozenColCount = 0, defaultRowHeight: defaultRowHeight = 40, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth = 80, defaultHeaderColWidth: defaultHeaderColWidth, widthMode: widthMode = "standard", heightMode: heightMode = "standard", autoFillWidth: autoFillWidth = !1, keyboardOptions: keyboardOptions, parentElement: parentElement, columnResizeMode: columnResizeMode, dragHeaderMode: dragHeaderMode, showFrozenIcon: showFrozenIcon, allowFrozenColCount: allowFrozenColCount, padding: padding, hover: hover, menu: menu, select: click, customRender: customRender, pixelRatio: pixelRatio = pixel_ratio_1.defaultPixelRatio} = options;
         this.options = options, this._widthMode = widthMode, this._heightMode = heightMode, 
@@ -379,7 +379,7 @@ class BaseTable extends EventTarget_1.EventTarget {
             height;
         }
         let h = 0;
-        if ("standard" === this.heightMode && this.internalProps.layoutMap && endRow >= this.columnHeaderLevelCount && !this.bottomFrozenRowCount) {
+        if ("standard" === this.heightMode && this.internalProps.layoutMap && endRow >= this.columnHeaderLevelCount && !this.bottomFrozenRowCount && !this.hasAutoImageColumn()) {
             for (let i = startRow; i < this.columnHeaderLevelCount; i++) h += this.getRowHeight(i);
             h += this.defaultRowHeight * (endRow - Math.max(this.columnHeaderLevelCount, startRow) + 1);
         } else for (let i = startRow; i <= endRow; i++) h += this.getRowHeight(i);
@@ -735,34 +735,20 @@ class BaseTable extends EventTarget_1.EventTarget {
     }
     _getMouseAbstractPoint(evt, isAddScroll = !0) {
         let e;
-        if (!evt) return null;
+        if (!evt) return {
+            inTable: !1,
+            x: void 0,
+            y: void 0
+        };
         e = isTouchEvent(evt) ? evt.changedTouches[0] : evt;
         const clientX = e.clientX || e.pageX + window.scrollX, clientY = e.clientY || e.pageY + window.scrollY, rect = this.internalProps.canvas.getBoundingClientRect();
-        if (rect.right <= clientX) return null;
-        if (rect.bottom <= clientY) return null;
+        let inTable = !0;
+        rect.right <= clientX && (inTable = !1), rect.bottom <= clientY && (inTable = !1);
         const currentWidth = rect.width, widthRatio = currentWidth / (this.canvas.offsetWidth || currentWidth), currentHeight = rect.height, heightRatio = currentHeight / (this.canvas.offsetHeight || currentHeight);
         return {
             x: (clientX - rect.left) / widthRatio + (isAddScroll ? this.scrollLeft : 0) - this.tableX,
-            y: (clientY - rect.top) / heightRatio + (isAddScroll ? this.scrollTop : 0) - this.tableY
-        };
-    }
-    _getCellEventArgsSet(e) {
-        const abstractPos = this._getMouseAbstractPoint(e);
-        if (!abstractPos) return {};
-        const cell = this.getCellAt(abstractPos.x, abstractPos.y);
-        if (cell.col < 0 || cell.row < 0) return {
-            abstractPos: abstractPos,
-            cell: cell
-        };
-        return {
-            abstractPos: abstractPos,
-            cell: cell,
-            eventArgs: {
-                col: cell.col,
-                row: cell.row,
-                event: e,
-                rect: cell.rect
-            }
+            y: (clientY - rect.top) / heightRatio + (isAddScroll ? this.scrollTop : 0) - this.tableY,
+            inTable: inTable
         };
     }
     getTheme() {
@@ -1361,6 +1347,9 @@ class BaseTable extends EventTarget_1.EventTarget {
         }
         return customLayout;
     }
+    hasAutoImageColumn() {
+        return this.internalProps.layoutMap.columnObjects.find((column => !("image" !== column.columnType || !column.define.imageAutoSizing)));
+    }
 }
 
 exports.BaseTable = BaseTable;