Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions packages/primevue/src/datatable/DataTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1312,19 +1312,20 @@ export default {
onColumnResizeEnd() {
let delta = isRTL(this.$el) ? this.lastResizeHelperX - this.$refs.resizeHelper.offsetLeft : this.$refs.resizeHelper.offsetLeft - this.lastResizeHelperX;
let columnWidth = this.resizeColumnElement.offsetWidth;
let newColumnWidth = columnWidth + delta;
let minWidth = this.resizeColumnElement.style.minWidth || 15;
const minWidth = this.resizeColumnElement.style.minWidth || 15;
const useMin = columnWidth + delta < parseInt(minWidth, 10);
const newColumnWidth = useMin ? minWidth : columnWidth + delta;
const difference = useMin ? minWidth - columnWidth : delta;

if (columnWidth + delta > parseInt(minWidth, 10)) {
if (this.columnResizeMode === 'fit') {
if (this.columnResizeMode === 'fit') {
let nextColumn = this.resizeColumnElement.nextElementSibling;
let nextColumnWidth = nextColumn.offsetWidth - delta;
let nextColumnWidth = nextColumn.offsetWidth - difference;

if (newColumnWidth > 15 && nextColumnWidth > 15) {
this.resizeTableCells(newColumnWidth, nextColumnWidth);
}
} else if (this.columnResizeMode === 'expand') {
const tableWidth = this.$refs.table.offsetWidth + delta + 'px';
const tableWidth = `${this.$refs.table.offsetWidth + difference}px`;

const updateTableWidth = (el) => {
!!el && (el.style.width = el.style.minWidth = tableWidth);
Expand All @@ -1345,9 +1346,8 @@ export default {

this.$emit('column-resize-end', {
element: this.resizeColumnElement,
delta: delta
delta: difference
});
}

this.$refs.resizeHelper.style.display = 'none';
this.resizeColumn = null;
Expand Down
46 changes: 23 additions & 23 deletions packages/primevue/src/treetable/TreeTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -684,35 +684,35 @@ export default {
onColumnResizeEnd() {
let delta = isRTL(this.$el) ? this.lastResizeHelperX - this.$refs.resizeHelper.offsetLeft : this.$refs.resizeHelper.offsetLeft - this.lastResizeHelperX;
let columnWidth = this.resizeColumnElement.offsetWidth;
let newColumnWidth = columnWidth + delta;
let minWidth = this.resizeColumnElement.style.minWidth || 15;
const minWidth = this.resizeColumnElement.style.minWidth || 15;
const useMin = columnWidth + delta < parseInt(minWidth, 10)
const newColumnWidth = useMin ? minWidth : columnWidth + delta;
const difference = useMin ? minWidth - columnWidth : delta;

if (columnWidth + delta > parseInt(minWidth, 10)) {
if (this.columnResizeMode === 'fit') {
let nextColumn = this.resizeColumnElement.nextElementSibling;
let nextColumnWidth = nextColumn.offsetWidth - delta;
if (this.columnResizeMode === 'fit') {
let nextColumn = this.resizeColumnElement.nextElementSibling;
let nextColumnWidth = nextColumn.offsetWidth - difference;

if (newColumnWidth > 15 && nextColumnWidth > 15) {
this.resizeTableCells(newColumnWidth, nextColumnWidth);
}
} else if (this.columnResizeMode === 'expand') {
const tableWidth = this.$refs.table.offsetWidth + delta + 'px';

const updateTableWidth = (el) => {
!!el && (el.style.width = el.style.minWidth = tableWidth);
};

// Reasoning: resize table cells before updating the table width so that it can use existing computed cell widths and adjust only the one column.
this.resizeTableCells(newColumnWidth);
updateTableWidth(this.$refs.table);
if (newColumnWidth > 15 && nextColumnWidth > 15) {
this.resizeTableCells(newColumnWidth, nextColumnWidth);
}
} else if (this.columnResizeMode === 'expand') {
const tableWidth = `${this.$refs.table.offsetWidth + difference}px`;

this.$emit('column-resize-end', {
element: this.resizeColumnElement,
delta: delta
});
const updateTableWidth = (el) => {
!!el && (el.style.width = el.style.minWidth = tableWidth);
};

// Reasoning: resize table cells before updating the table width so that it can use existing computed cell widths and adjust only the one column.
this.resizeTableCells(newColumnWidth);
updateTableWidth(this.$refs.table);
}

this.$emit('column-resize-end', {
element: this.resizeColumnElement,
delta: difference
});

this.$refs.resizeHelper.style.display = 'none';
this.resizeColumn = null;
this.$el.removeAttribute('data-p-unselectable-text');
Expand Down