@visactor/vtable 1.26.3-alpha.0 → 1.26.3

package/cjs/event/EventHandler.js

@@ -125,4 +125,4 @@ class EventHandler {
 }
 
 exports.EventHandler = EventHandler;
-//# sourceMappingURL=EventHandler.js.map
+//# sourceMappingURL=EventHandler.js.map

package/cjs/event/EventTarget.js

@@ -66,4 +66,4 @@ class EventTarget {
 }
 
 exports.EventTarget = EventTarget;
-//# sourceMappingURL=EventTarget.js.map
+//# sourceMappingURL=EventTarget.js.map

package/cjs/event/drill.js

@@ -35,4 +35,4 @@ function checkHaveDrill(table) {
 }
 
 exports.bindDrillEvent = bindDrillEvent, exports.drillClick = drillClick, exports.checkHaveDrill = checkHaveDrill;
-//# sourceMappingURL=drill.js.map
+//# sourceMappingURL=drill.js.map

package/cjs/event/event.js

@@ -549,4 +549,4 @@ class EventManager {
 }
 
 exports.EventManager = EventManager;
-//# sourceMappingURL=event.js.map
+//# sourceMappingURL=event.js.map

package/cjs/event/helper.js

@@ -42,4 +42,4 @@ function fireMoveColEventListeners(table, endMoveColSuccess, e) {
 }
 
 exports.fireMoveColEventListeners = fireMoveColEventListeners;
-//# sourceMappingURL=helper.js.map
+//# sourceMappingURL=helper.js.map

package/cjs/event/listener/table-group.js

@@ -205,67 +205,67 @@ function bindTableGroupListener(eventManager) {
         }));
     })), table.scenegraph.tableGroup.addEventListener("pointerup", (e => {
         var _a, _b, _c, _d, _e, _f, _g, _h;
-        if (0 === e.button) {
-            if ("grabing" === stateManager.interactionState) {
-                if (stateManager.updateInteractionState(ts_types_1.InteractionState.default), stateManager.isResizeCol()) endResizeCol(table); else if (stateManager.isResizeRow()) endResizeRow(table); else if (stateManager.isMoveCol()) {
-                    const endMoveColSuccess = table.stateManager.endMoveCol();
-                    (0, helper_2.fireMoveColEventListeners)(table, endMoveColSuccess, e.nativeEvent);
-                } else if (stateManager.isSelecting()) {
-                    table.stateManager.endSelectCells(), table.stateManager.isFillHandle() && table.stateManager.endFillSelect();
-                    const eventArgsSet = getEventArgsSet(e);
-                    if (table.eventManager.isDraging && eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.DRAG_SELECT_END)) {
-                        const cellsEvent = {
-                            event: e.nativeEvent,
-                            cells: [],
-                            col: eventArgsSet.eventArgs.target.col,
-                            row: eventArgsSet.eventArgs.target.row,
-                            scaleRatio: table.canvas.getBoundingClientRect().width / table.canvas.offsetWidth,
-                            target: null === (_a = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.target,
-                            mergeCellInfo: null === (_b = eventArgsSet.eventArgs) || void 0 === _b ? void 0 : _b.mergeInfo
-                        };
-                        cellsEvent.cells = table.getSelectedCellInfos(), table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.DRAG_SELECT_END, cellsEvent);
-                    }
-                }
-            } else stateManager.interactionState === ts_types_1.InteractionState.scrolling && stateManager.updateInteractionState(ts_types_1.InteractionState.default);
-            if (!table.eventManager.isDraging) {
+        if (0 !== e.button) return;
+        const endedResizeCol = stateManager.isResizeCol(), endedResizeRow = stateManager.isResizeRow(), endedMoveCol = stateManager.isMoveCol(), shouldSkipClickCell = endedResizeCol || endedResizeRow;
+        if ("grabing" === stateManager.interactionState) {
+            if (stateManager.updateInteractionState(ts_types_1.InteractionState.default), endedResizeCol) endResizeCol(table); else if (endedResizeRow) endResizeRow(table); else if (endedMoveCol) {
+                const endMoveColSuccess = table.stateManager.endMoveCol();
+                (0, helper_2.fireMoveColEventListeners)(table, endMoveColSuccess, e.nativeEvent);
+            } else if (stateManager.isSelecting()) {
+                table.stateManager.endSelectCells(), table.stateManager.isFillHandle() && table.stateManager.endFillSelect();
                 const eventArgsSet = getEventArgsSet(e);
-                if (!eventManager.isTouchMove && 0 === e.button && eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.CLICK_CELL)) {
-                    const {col: col, row: row} = eventArgsSet.eventArgs, cellInfo = table.getCellInfo(col, row);
-                    let icon, position;
-                    if (null === (_c = eventArgsSet.eventArgs) || void 0 === _c ? void 0 : _c.target) {
-                        const iconInfo = (0, icon_1.getIconAndPositionFromTarget)(null === (_d = eventArgsSet.eventArgs) || void 0 === _d ? void 0 : _d.target);
-                        iconInfo && (icon = iconInfo.icon, position = iconInfo.position);
-                    }
-                    const cellsEvent = Object.assign(Object.assign({}, cellInfo), {
+                if (table.eventManager.isDraging && eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.DRAG_SELECT_END)) {
+                    const cellsEvent = {
                         event: e.nativeEvent,
-                        federatedEvent: e,
                         cells: [],
-                        targetIcon: icon ? {
-                            name: icon.name,
-                            position: position,
-                            funcType: icon.attribute.funcType
-                        } : void 0,
-                        target: null === (_e = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _e ? void 0 : _e.target,
-                        mergeCellInfo: null === (_f = eventArgsSet.eventArgs) || void 0 === _f ? void 0 : _f.mergeInfo
-                    });
-                    table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.CLICK_CELL, cellsEvent);
+                        col: eventArgsSet.eventArgs.target.col,
+                        row: eventArgsSet.eventArgs.target.row,
+                        scaleRatio: table.canvas.getBoundingClientRect().width / table.canvas.offsetWidth,
+                        target: null === (_a = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _a ? void 0 : _a.target,
+                        mergeCellInfo: null === (_b = eventArgsSet.eventArgs) || void 0 === _b ? void 0 : _b.mergeInfo
+                    };
+                    cellsEvent.cells = table.getSelectedCellInfos(), table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.DRAG_SELECT_END, cellsEvent);
                 }
             }
-            if (table.hasListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.MOUSEUP_CELL)) {
-                const eventArgsSet = getEventArgsSet(e);
-                eventArgsSet.eventArgs && table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.MOUSEUP_CELL, {
-                    col: eventArgsSet.eventArgs.col,
-                    row: eventArgsSet.eventArgs.row,
+        } else stateManager.interactionState === ts_types_1.InteractionState.scrolling && stateManager.updateInteractionState(ts_types_1.InteractionState.default);
+        if (!table.eventManager.isDraging && !shouldSkipClickCell) {
+            const eventArgsSet = getEventArgsSet(e);
+            if (!eventManager.isTouchMove && 0 === e.button && eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.CLICK_CELL)) {
+                const {col: col, row: row} = eventArgsSet.eventArgs, cellInfo = table.getCellInfo(col, row);
+                let icon, position;
+                if (null === (_c = eventArgsSet.eventArgs) || void 0 === _c ? void 0 : _c.target) {
+                    const iconInfo = (0, icon_1.getIconAndPositionFromTarget)(null === (_d = eventArgsSet.eventArgs) || void 0 === _d ? void 0 : _d.target);
+                    iconInfo && (icon = iconInfo.icon, position = iconInfo.position);
+                }
+                const cellsEvent = Object.assign(Object.assign({}, cellInfo), {
                     event: e.nativeEvent,
-                    target: null === (_g = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _g ? void 0 : _g.target,
-                    mergeCellInfo: null === (_h = eventArgsSet.eventArgs) || void 0 === _h ? void 0 : _h.mergeInfo
+                    federatedEvent: e,
+                    cells: [],
+                    targetIcon: icon ? {
+                        name: icon.name,
+                        position: position,
+                        funcType: icon.attribute.funcType
+                    } : void 0,
+                    target: null === (_e = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _e ? void 0 : _e.target,
+                    mergeCellInfo: null === (_f = eventArgsSet.eventArgs) || void 0 === _f ? void 0 : _f.mergeInfo
                 });
+                table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.CLICK_CELL, cellsEvent);
             }
-            setTimeout((() => {
-                eventManager.isDown = !1, eventManager.isTouchdown = !1, eventManager.isTouchMove = !1, 
-                eventManager.isDraging = !1, eventManager.touchMovePoints = [];
-            }), 0);
         }
+        if (table.hasListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.MOUSEUP_CELL)) {
+            const eventArgsSet = getEventArgsSet(e);
+            eventArgsSet.eventArgs && table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.MOUSEUP_CELL, {
+                col: eventArgsSet.eventArgs.col,
+                row: eventArgsSet.eventArgs.row,
+                event: e.nativeEvent,
+                target: null === (_g = null == eventArgsSet ? void 0 : eventArgsSet.eventArgs) || void 0 === _g ? void 0 : _g.target,
+                mergeCellInfo: null === (_h = eventArgsSet.eventArgs) || void 0 === _h ? void 0 : _h.mergeInfo
+            });
+        }
+        setTimeout((() => {
+            eventManager.isDown = !1, eventManager.isTouchdown = !1, eventManager.isTouchMove = !1, 
+            eventManager.isDraging = !1, eventManager.touchMovePoints = [];
+        }), 0);
     })), table.scenegraph.tableGroup.addEventListener("rightdown", (e => {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         const eventArgsSet = getEventArgsSet(e);