Skip to content

Bound flatCols to MaxColumns when flattening worksheet columns #2370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xuri merged 2 commits into from
Aug 7, 2026
Merged

Bound flatCols to MaxColumns when flattening worksheet columns #2370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aebe551
Bound flatCols to MaxColumns when flattening worksheet columns
arpitjain099 Aug 6, 2026
bac5891
Simplify code and update unit tests
xuri Aug 7, 2026
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
4 changes: 2 additions & 2 deletions col.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ func (ws *xlsxWorksheet) setColWidth(minVal, maxVal int, width float64) {
// and check the worksheet columns.
func flatCols(col xlsxCol, cols []xlsxCol, replacer func(fc, c xlsxCol) xlsxCol) []xlsxCol {
var fc []xlsxCol
for i := col.Min; i <= col.Max; i++ {
for i := max(MinColumns, col.Min); i <= min(MaxColumns, col.Max); i++ {
var c xlsxCol
_ = deepcopy.Copy(&c, col)
c.Min, c.Max = i, i
Expand All @@ -561,7 +561,7 @@ func flatCols(col xlsxCol, cols []xlsxCol, replacer func(fc, c xlsxCol) xlsxCol)
return -1, false
}
for _, column := range cols {
for i := column.Min; i <= column.Max; i++ {
for i := max(MinColumns, column.Min); i <= min(MaxColumns, column.Max); i++ {
if idx, ok := inFlat(i, fc); ok {
fc[idx] = replacer(fc[idx], column)
continue
Expand Down
13 changes: 13 additions & 0 deletions col_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,19 @@ func TestColWidth(t *testing.T) {

assert.NoError(t, f.SaveAs(filepath.Join("test", "TestColWidth.xlsx")))
convertRowHeightToPixels(0)

t.Run("with_invalid_column_number", func(t *testing.T) {
f := NewFile()
ws, err := f.workSheetReader("Sheet1")
assert.NoError(t, err)
ws.Cols = &xlsxCols{Col: []xlsxCol{{Min: 0, Max: MaxColumns + 1, Width: float64Ptr(9)}}}
assert.NoError(t, f.SetColWidth("Sheet1", "A", "A", 12))
assert.Equal(t, len(ws.Cols.Col), MaxColumns)
width, err := f.GetColWidth("Sheet1", "A")
assert.NoError(t, err)
assert.Equal(t, 12.0, width)
assert.NoError(t, f.Close())
})
}

func TestGetColStyle(t *testing.T) {
Expand Down