Merge pull request #374 from JakKowalCzyk/fix-col-width

Fixed auto column width adjustment
dhatim · Dec 20, 2023 · 659bddf · 659bddf
2 parents f151196 + 481ba3d
commit 659bddf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java b/fastexcel-writer/src/main/java/org/dhatim/fastexcel/Worksheet.java
@@ -785,8 +785,9 @@ private void writeCols(Writer w, int maxCol) throws IOException {
             }
             boolean isHidden = hiddenColumns.contains(c);
             boolean hasStyle = colStyles.containsKey(c);
+            boolean widthChanged = colWidths.containsKey(c) || maxWidth > DEFAULT_COL_WIDTH;
             int groupLevel = groupColums.get(c);
-            if (colWidths.containsKey(c) || isHidden || groupLevel!=0 || hasStyle) {
+            if (widthChanged || isHidden || groupLevel != 0 || hasStyle) {
                 if (!started) {
                     w.append("<cols>");
                     started = true;

diff --git a/fastexcel-writer/src/test/java/org/dhatim/fastexcel/CorrectnessTest.java b/fastexcel-writer/src/test/java/org/dhatim/fastexcel/CorrectnessTest.java
@@ -699,13 +699,15 @@ void testColumnStyle() throws Exception {
             worksheet.style(1).bold().set();
             worksheet.style(1).fillColor(Color.BLACK).set();
             worksheet.style(1, 1).fillColor(Color.BLUE_GRAY).set();
+            worksheet.value(1, 1, "test");
 
             worksheet.style(2).format("dd/MM/yyyy").set();
 
             worksheet.range(3, 3, 6, 3)
                     .style().horizontalAlignment("left").fontColor(Color.ALMOND)
                     .set();
             worksheet.style(3).horizontalAlignment("center").set();
+            worksheet.value(3, 3, "long test, long test, long test");
 
             worksheet.style(4)
                     .borderColor(BorderSide.RIGHT, BLACK)
@@ -748,7 +750,11 @@ void testColumnStyle() throws Exception {
             worksheet.style(12)
                     .fillColor(Color.YELLOW)
                     .set(new ConditionalFormattingExpressionRule("L1>1", false));
+
+            worksheet.value(4, 13, "not long");
+            worksheet.value(4, 14, "not long long long long long");
         });
     }
 
+
 }