scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-09-27 01:21:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "Tweak column behaviour on visibility and order changes" (#5254)

Browse source 
This reverts commit 997ba12626.
This commit is contained in:
Tom Najdek 2025-05-05 14:01:22 +02:00 • committed by Dan Stillman
parent de0907c8f7
commit 55423024ea
2 changed files with 4 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
chrome/content/zotero/components/virtualized-table.jsx
View file

@ -1602,10 +1602,6 @@ var Columns = class {
this._virtualizedTable.props.storeColumnPrefs(prefs);
}
// Injects extra width into the first column if that column has
// `staticWidth` or `minWidth` configured, in order to accommodate space for
// the item type icon and the chevron.The original width is restored if the
// column is reordered to a different position.
_adjustColumnWidths = () => {
if (!this._virtualizedTable.props.firstColumnExtraWidth) {
return;
@ -1624,55 +1620,6 @@ var Columns = class {
});
};
// Measures the current width of the table header and redistributes the
// available width among visible columns. Static- and fixed-width columns
// preserve their stored width, while the remaining space is distributed
// proportionally among other columns based on each column's width property.
// This resolves an issue where the flex model causes slight column
// misalignment (see #4993).
_redistributeColumnWidths = () => {
let header = document.querySelector(`#${this._virtualizedTable.props.id} .virtualized-table-header`);
let headerRect = header.getBoundingClientRect();
const headerPadding = parseInt(window.getComputedStyle(header).paddingLeft) + parseInt(window.getComputedStyle(header).paddingRight);
const headerWidth = headerRect.width - headerPadding;
let nextVisibleColumns = this._columns.filter(c => !c.hidden);
// Normalize widths. Calculate widths for columns without a set value using the flex property.
nextVisibleColumns = nextVisibleColumns.map((column) => {
let width = parseFloat(column.width);
if (isNaN(width)) {
width = Math.max((headerWidth / nextVisibleColumns.length * (column.flex || 1)), column.minWidth || COLUMN_MIN_WIDTH);
}
return { ...column, width };
});
// Calculate the combined width of fixed and static columns, then subtract it from the header width to determine the available space.
let fixedColumns = nextVisibleColumns.filter(c => c.staticWidth || c.fixedWidth);
let fixedColumnsTotalWidth = fixedColumns.reduce((accumulator, column) => accumulator += column.width, 0);
let availableWidth = Math.max(headerWidth - fixedColumnsTotalWidth, 1); // safety catch for extreme case where fixed columns take up all the space
// Calculate the total width of the other columns
let otherColumns = nextVisibleColumns.filter(c => !c.staticWidth && !c.fixedWidth);
let otherColumnsTotalWidth = otherColumns.reduce((accumulator, column) => accumulator += column.width, 0);
// Calculate the fraction of space each non-fixed column should occupy. This iterates over all visible columns to keep the indexes, but calculations for fixed and static columns will be discarded
let otherColumnsFractions = nextVisibleColumns.map(column => column.width / otherColumnsTotalWidth);
let resizeData = {};
for (let i = 0; i < nextVisibleColumns.length; i++) {
let column = nextVisibleColumns[i];
if (column.staticWidth || column.fixedWidth) {
resizeData[column.dataKey] = column.width;
}
else {
const width = availableWidth * otherColumnsFractions[i];
resizeData[column.dataKey] = width;
}
}
this.onResize(resizeData);
};
/**
* Programatically sets the injected CSS width rules for each column.
* This is necessary for performance reasons
@ -1724,7 +1671,7 @@ var Columns = class {
});
this._adjustColumnWidths();
this.onResize(Object.fromEntries(this._columns.filter(c => !c.hidden).map(c => [c.dataKey, c.width])));
this.onResize(Object.fromEntries(this._columns.map(c => [c.dataKey, c.width])));
let prefs = this._getPrefs();
// reassign columns their ordinal values and set the prefs
@ -1754,7 +1701,7 @@ var Columns = class {
}
this._columns.sort((a, b) => a.ordinal - b.ordinal);
this._adjustColumnWidths();
this.onResize(Object.fromEntries(this._columns.filter(c => !c.hidden).map(c => [c.dataKey, c.width])));
this.onResize(Object.fromEntries(this._columns.map(c => [c.dataKey, c.width])));
this._storePrefs(prefs);
this._updateVirtualizedTable();
}
@ -1767,9 +1714,8 @@ var Columns = class {
if (prefs[column.dataKey]) {
prefs[column.dataKey].hidden = column.hidden;
}
this._adjustColumnWidths();
this._redistributeColumnWidths();
this.onResize(Object.fromEntries(this._columns.map(c => [c.dataKey, c.width])));
this._storePrefs(prefs);
this._updateVirtualizedTable();
}

3
chrome/content/zotero/itemTreeColumns.jsx
View file

@ -78,8 +78,7 @@ const COLUMNS = [
dataKey: "itemType",
label: "zotero.items.itemType",
showInColumnPicker: true,
width: "56",
staticWidth: true,
width: "40",
zoteroPersist: ["width", "hidden", "sortDirection"]
},
{