Merge branch 'dev'

Author: rabanti-github

Changelog.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## v3.4.1
+
+---
+Release Date: **19.01.2025**
+
+- Fixed a bug on writing default column widths (not persisted in some cases)
+- Code maintenance
+
+
 ## v3.4.0
 
 ---

Demo/Demo.csproj

@@ -15,9 +15,9 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <TargetFrameworks>net45;net5.0</TargetFrameworks>
     <StartupObject>Demo.Program</StartupObject>
-    <Version>3.4.0</Version>
-    <AssemblyVersion>3.4.0.0</AssemblyVersion>
-    <FileVersion>3.4.0.0</FileVersion>
+    <Version>3.4.1</Version>
+    <AssemblyVersion>3.4.1.0</AssemblyVersion>
+    <FileVersion>3.4.1.0</FileVersion>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageTags>XLSX Excel ExcelWriter Office</PackageTags>

PicoXLSX/Cell.cs

@@ -396,7 +396,7 @@ public static IEnumerable<Cell> ConvertArray<T>(IEnumerable<T> list)
             Type t;
             foreach (T item in list)
             {
-                if (item == null)
+                if (object.Equals(item, default(T)))
                 {
                     c = new Cell(null, CellType.EMPTY);
                     output.Add(c);
@@ -1002,11 +1002,23 @@ public override int GetHashCode()
 
 
             // Operator overloads
+            /// <summary>
+            /// Compares two objects whether they are ranges and equal. The cell types (possible $ prefix) are considered. This method reflects <see cref="Equals(object)"/>
+            /// </summary>
+            /// <param name="range1">First range object</param>
+            /// <param name="range2">Second range object</param>
+            /// <returns>True, if both objects are equal, otherwise false</returns>
             public static bool operator ==(Range range1, Range range2)
             {
                 return range1.Equals(range2);
             }
 
+            /// <summary>
+            /// Compares two objects whether they not equal. This method reflects the inverted method of <see cref="Equals(object)"/>
+            /// </summary>
+            /// <param name="range1">First range object</param>
+            /// <param name="range2">Second range object</param>
+            /// <returns>False, if both objects are equal, otherwise true</returns>
             public static bool operator !=(Range range1, Range range2)
             {
                 return !range1.Equals(range2);

PicoXLSX/LowLevel.cs

@@ -22,6 +22,11 @@ namespace PicoXLSX
     /// </summary>
     internal class LowLevel
     {
+        /// <summary>
+        /// Threshold, using when floats are compared
+        /// </summary>
+        private const float FLOAT_THRESHOLD = 0.0001f;
+
         /// <summary>
         /// Defines the WORKBOOK
         /// </summary>
@@ -916,7 +921,7 @@ private string CreateColsString(Worksheet worksheet)
                 StringBuilder sb = new StringBuilder();
                 foreach (KeyValuePair<int, Worksheet.Column> column in worksheet.Columns)
                 {
-                    if (column.Value.Width == worksheet.DefaultColumnWidth && !column.Value.IsHidden) { continue; }
+                    if (Math.Abs(column.Value.Width - worksheet.DefaultColumnWidth) < FLOAT_THRESHOLD && !column.Value.IsHidden) { continue; }
                     if (worksheet.Columns.ContainsKey(column.Key) && worksheet.Columns[column.Key].IsHidden)
                     {
                         hidden = " hidden=\"1\"";
@@ -997,7 +1002,7 @@ private string CreateRowString(DynamicRow dynamicRow, Worksheet worksheet)
             int rowNumber = dynamicRow.RowNumber;
             string height = "";
             string hidden = "";
-            if (worksheet.RowHeights.ContainsKey(rowNumber) && worksheet.RowHeights[rowNumber] != worksheet.DefaultRowHeight)
+            if (worksheet.RowHeights.ContainsKey(rowNumber) && Math.Abs(worksheet.RowHeights[rowNumber] - worksheet.DefaultRowHeight) > FLOAT_THRESHOLD)
             {
                 height = " x14ac:dyDescent=\"0.25\" customHeight=\"1\" ht=\"" + GetInternalRowHeight(worksheet.RowHeights[rowNumber]).ToString("G", culture) + "\"";
             }

PicoXLSX/PicoXLSX.csproj

@@ -23,9 +23,9 @@
     <PackageLicenseFile></PackageLicenseFile>
     <PackageReleaseNotes>Please see https://github.com/rabanti-github/PicoXLSX/blob/master/Changelog.md for the release notes</PackageReleaseNotes>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Version>3.4.0</Version>
-    <AssemblyVersion>3.4.0.0</AssemblyVersion>
-    <FileVersion>3.4.0.0</FileVersion>
+    <Version>3.4.1</Version>
+    <AssemblyVersion>3.4.1.0</AssemblyVersion>
+    <FileVersion>3.4.1.0</FileVersion>
     <RepositoryType>git</RepositoryType>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>

PicoXLSX/Style.cs

@@ -2277,7 +2277,7 @@ internal static void AddPropertyAsJson(StringBuilder sb, string name, object val
             sb.Append("\"").Append(name).Append("\": ");
             if (value == null)
             {
-                sb.Append("\"\"");
+                sb.Append("__null__");
             }
             else
             {

PicoXLSX/Worksheet.cs

@@ -1868,11 +1868,7 @@ internal void RecalculateColumns()
             List<int> columnsToDelete = new List<int>();
             foreach (KeyValuePair<int, Column> col in columns)
             {
-                if (!col.Value.HasAutoFilter && !col.Value.IsHidden && Math.Abs(col.Value.Width - DEFAULT_COLUMN_WIDTH) <= FLOAT_THRESHOLD)
-                {
-                    columnsToDelete.Add(col.Key);
-                }
-                if (!col.Value.HasAutoFilter && !col.Value.IsHidden && Math.Abs(col.Value.Width - DEFAULT_COLUMN_WIDTH) <= FLOAT_THRESHOLD)
+                if (!col.Value.HasAutoFilter && !col.Value.IsHidden && Math.Abs(col.Value.Width - DEFAULT_COLUMN_WIDTH) <= FLOAT_THRESHOLD && col.Value.DefaultColumnStyle == null)
                 {
                     columnsToDelete.Add(col.Key);
                 }

README.md

@@ -1,7 +1,10 @@
-# PicoXLSX ![PicoXLSX](https://rabanti-github.github.io/PicoXLSX/icons/PicoXLSX.png)
+![NanoXLSX](https://raw.githubusercontent.com/rabanti-github/PicoXLSX/refs/heads/master/Documentation/icons/PicoXLSX.png)
+
+# PicoXLSX
 
 ![nuget](https://img.shields.io/nuget/v/picoXLSX.svg?maxAge=86400)
-![license](https://img.shields.io/github/license/rabanti-github/picoXlsx.svg)
+![NuGet Downloads](https://img.shields.io/nuget/dt/PicoXLSX)
+![GitHub License](https://img.shields.io/github/license/rabanti-github/PicoXLSX)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Frabanti-github%2FPicoXLSX.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Frabanti-github%2FPicoXLSX?ref=badge_shield)
 
  PicoXLSX is a small .NET library written in C#, to create Microsoft Excel files in the XLSX format (Microsoft Excel 2007 or newer) in an easy and native way