@taocompany/magic-grid 0.1.3 → 0.1.4

package/dist/index.es.js

@@ -17742,6 +17742,19 @@ var Ex = class {
 	canToggleHeaderSort(e) {
 		return this.columnResizeSession.isActive() || this.deps.columnDragController.shouldSuppressSortClick() || z(e) || B(e) || this.isExpandColumnEntry(e) || this.isGroupColumnEntry(e) || this.isTreeColumnEntry(e) ? !1 : this.deps.columnModel.getColumnById(e)?.sortable ?? !1;
 	}
+	shouldHeaderClickSortAndSelectColumn(e) {
+		return !this.deps.isCellSelectionEnabled?.() || !this.deps.getCellSelectionOptions?.().enableColumnSelection ? !1 : this.canToggleHeaderSort(e);
+	}
+	tryApplyHeaderColumnSelection(e, t) {
+		if (!this.cellRangeInteraction.tryHeaderColumnSelection(e)) return !1;
+		let n = this.deps.rowModel.getRow(0);
+		return n && this.setFocusedCell({
+			rowId: n.id,
+			colId: e,
+			rowIndex: 0,
+			colIndex: t
+		}), !0;
+	}
 	applyIndexFocus(e, t, n, r = {}) {
 		!this.deps.indexFocusService || !this.isIndexColumnEntry(n) || (this.deps.indexFocusService.selectRow(e, t, (e) => this.deps.rowModel.getRow(e)?.id, r), this.deps.applyIndexFocusVisuals(), this.deps.eventBus.emit("indexFocusChanged", { focusedRowIds: this.deps.indexFocusService.getFocusedRowIds() }), this.syncCellRangeFromIndexFocus(t));
 	}
@@ -17796,7 +17809,7 @@ var Ex = class {
 		if (!t) return;
 		this.clearIndexFocusState();
 		let n = this.isSelectionColumnEntry(t.colId) && this.deps.selectionService?.isMultiple(), r = y_(e.target), i = this.deps.columnModel.getColumnById(t.colId);
-		if (this.focusController.isHeaderNavigationEnabled() ? (e.preventDefault(), e.stopPropagation(), this.setFocusedCell({
+		if (this.focusController.isHeaderNavigationEnabled() ? (e.preventDefault(), e.stopPropagation(), this.canToggleHeaderSort(t.colId) || this.setFocusedCell({
 			rowId: Qe,
 			colId: t.colId,
 			rowIndex: -1,
@@ -17818,15 +17831,8 @@ var Ex = class {
 			});
 			return;
 		}
-		if (!Pb(e.target) && this.cellRangeInteraction.tryHeaderColumnSelection(t.colId)) {
+		if (!this.shouldHeaderClickSortAndSelectColumn(t.colId) && !Pb(e.target) && this.tryApplyHeaderColumnSelection(t.colId, t.colIndex)) {
 			e.preventDefault(), e.stopPropagation(), this.suppressHeaderSortClick = !0;
-			let n = this.deps.rowModel.getRow(0);
-			n && this.setFocusedCell({
-				rowId: n.id,
-				colId: t.colId,
-				rowIndex: 0,
-				colIndex: t.colIndex
-			});
 			return;
 		}
 	};
@@ -17866,7 +17872,7 @@ var Ex = class {
 			this.deps.columnDragController.shouldSuppressSortClick() && (e.preventDefault(), e.stopPropagation());
 			return;
 		}
-		e.preventDefault(), e.stopPropagation(), this.deps.toggleHeaderSort(t.colId);
+		e.preventDefault(), e.stopPropagation(), this.deps.toggleHeaderSort(t.colId), this.shouldHeaderClickSortAndSelectColumn(t.colId) && this.tryApplyHeaderColumnSelection(t.colId, t.colIndex);
 	};
 	handleFloatingFilterClick = (e) => {
 		let t = g_(e.target);