From 45c1fd0588253483cce0a080bf7a6e05d6435665 Mon Sep 17 00:00:00 2001 From: ronimizy Date: Wed, 14 Sep 2022 22:00:45 +0300 Subject: [PATCH] fix: frozen dimension size evaluation --- FluentSpreadsheets.Test/RowSheetTest.cs | 2 +- .../FluentSpreadsheets.ClosedXML.csproj | 4 ++-- .../FluentSpreadsheets.GoogleSheets.csproj | 4 ++-- Source/FluentSpreadsheets.Playground/Program.cs | 6 +++--- Source/FluentSpreadsheets/FluentSpreadsheets.csproj | 4 ++-- Source/FluentSpreadsheets/Visitors/ComponentVisitor.cs | 6 ++++-- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/FluentSpreadsheets.Test/RowSheetTest.cs b/FluentSpreadsheets.Test/RowSheetTest.cs index 92a0777..fbe39ce 100644 --- a/FluentSpreadsheets.Test/RowSheetTest.cs +++ b/FluentSpreadsheets.Test/RowSheetTest.cs @@ -10,7 +10,7 @@ namespace FluentSpreadsheets.Test; public class RowSheetTest { [Fact] - public void Test1() + public void Render_Should_ProduceCorrectAmountOfComponents() { // Arrange var studentA = new Student("Aboba 1"); diff --git a/Source/FluentSpreadsheets.ClosedXML/FluentSpreadsheets.ClosedXML.csproj b/Source/FluentSpreadsheets.ClosedXML/FluentSpreadsheets.ClosedXML.csproj index d717187..b84c9c1 100644 --- a/Source/FluentSpreadsheets.ClosedXML/FluentSpreadsheets.ClosedXML.csproj +++ b/Source/FluentSpreadsheets.ClosedXML/FluentSpreadsheets.ClosedXML.csproj @@ -21,8 +21,8 @@ - 1.2.0 - Added frozen dimensions support + 1.2.1 + Fixed frozen dimension size evaluation diff --git a/Source/FluentSpreadsheets.GoogleSheets/FluentSpreadsheets.GoogleSheets.csproj b/Source/FluentSpreadsheets.GoogleSheets/FluentSpreadsheets.GoogleSheets.csproj index c5b425e..79bba56 100644 --- a/Source/FluentSpreadsheets.GoogleSheets/FluentSpreadsheets.GoogleSheets.csproj +++ b/Source/FluentSpreadsheets.GoogleSheets/FluentSpreadsheets.GoogleSheets.csproj @@ -21,8 +21,8 @@ - 1.2.0 - Added frozen dimensions support + 1.2.1 + Fixed frozen dimension size evaluation diff --git a/Source/FluentSpreadsheets.Playground/Program.cs b/Source/FluentSpreadsheets.Playground/Program.cs index 3aa0b45..376f33e 100644 --- a/Source/FluentSpreadsheets.Playground/Program.cs +++ b/Source/FluentSpreadsheets.Playground/Program.cs @@ -66,7 +66,7 @@ async Task RenderGoogleSheets() var renderer = new GoogleSheetComponentRenderer(service); - const string title = ""; + const string title = "New Sheet Name"; var renderCommandFactory = new RenderCommandFactory(service); @@ -108,8 +108,8 @@ protected override IEnumerable RenderRows(StudentPointsSheetData { yield return Row ( - Label("#").Frozen(), - Label("Student Name").WithColumnWidth(30), + Label("#"), + Label("Student Name").WithColumnWidth(30).Frozen(), ForEach(model.HeaderData.Labs, headerData => VStack ( Label(headerData.Name), diff --git a/Source/FluentSpreadsheets/FluentSpreadsheets.csproj b/Source/FluentSpreadsheets/FluentSpreadsheets.csproj index a89ce47..2817aac 100644 --- a/Source/FluentSpreadsheets/FluentSpreadsheets.csproj +++ b/Source/FluentSpreadsheets/FluentSpreadsheets.csproj @@ -21,8 +21,8 @@ - 1.2.0 - Added frozen dimensions support + 1.2.1 + Fixed frozen dimension size evaluation diff --git a/Source/FluentSpreadsheets/Visitors/ComponentVisitor.cs b/Source/FluentSpreadsheets/Visitors/ComponentVisitor.cs index ffa7e71..0d62072 100644 --- a/Source/FluentSpreadsheets/Visitors/ComponentVisitor.cs +++ b/Source/FluentSpreadsheets/Visitors/ComponentVisitor.cs @@ -150,11 +150,13 @@ public void Visit(IColumnWidthComponent component) public void Visit(IFrozenRowComponent component) { - _handler.FreezeRows(component.Size.Height); + var count = _index.Row + component.Size.Height - 1; + _handler.FreezeRows(count); } public void Visit(IFrozenColumnComponent component) { - _handler.FreezeColumns(component.Size.Width); + var count = _index.Column + component.Size.Width - 1; + _handler.FreezeColumns(count); } } \ No newline at end of file