Skip to content
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.

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

fix: frozen dimension size evaluation #22

Merged
merged 1 commit into from
Sep 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion FluentSpreadsheets.Test/RowSheetTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
</PropertyGroup>

<PropertyGroup>
<PackageVersion>1.2.0</PackageVersion>
<PackageReleaseNotes>Added frozen dimensions support</PackageReleaseNotes>
<PackageVersion>1.2.1</PackageVersion>
<PackageReleaseNotes>Fixed frozen dimension size evaluation</PackageReleaseNotes>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
</PropertyGroup>

<PropertyGroup>
<PackageVersion>1.2.0</PackageVersion>
<PackageReleaseNotes>Added frozen dimensions support</PackageReleaseNotes>
<PackageVersion>1.2.1</PackageVersion>
<PackageReleaseNotes>Fixed frozen dimension size evaluation</PackageReleaseNotes>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Source/FluentSpreadsheets.Playground/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -108,8 +108,8 @@ protected override IEnumerable<IRowComponent> 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),
Expand Down
4 changes: 2 additions & 2 deletions Source/FluentSpreadsheets/FluentSpreadsheets.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
</PropertyGroup>

<PropertyGroup>
<PackageVersion>1.2.0</PackageVersion>
<PackageReleaseNotes>Added frozen dimensions support</PackageReleaseNotes>
<PackageVersion>1.2.1</PackageVersion>
<PackageReleaseNotes>Fixed frozen dimension size evaluation</PackageReleaseNotes>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 4 additions & 2 deletions Source/FluentSpreadsheets/Visitors/ComponentVisitor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}