dotnet
/
Comet
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #114 from twsouthwick/update-preview-8 

Update blazor for preview 8 and fix some casing issues
This commit is contained in:
James Clancey 2019-08-26 19:43:42 -08:00
Родитель 4ea2b803f3 826890ceed
Коммит b44347e5d8
27 изменённых файлов: 339 добавлений и 324 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

68
build/build-dev.yml
Просмотреть файл

@ -1,40 +1,40 @@
stages:
- stage: BuildSource
jobs:
# - job: BuildCometBlazor
# displayName: Build Comet Blazor
# pool:
# vmImage: 'ubuntu-latest'
# steps:
# - task: UseDotNet@2
# displayName: 'Use .NET Core sdk'
# inputs:
# packageType: sdk
# version: 3.0.100-preview7-012821
# includePreviewVersions: true
# installationPath: $(Agent.ToolsDirectory)/dotnet
# - task: DotNetCoreCLI@2
# displayName: 'Build Blazor'
# inputs:
# command: 'build'
# projects: 'Comet.Blazor.sln'
# arguments: '-c $(BuildConfiguration)'
# - task: DotNetCoreCLI@2
# displayName: 'Test Blazor'
# inputs:
# command: 'test'
# projects: 'Comet.Blazor.sln'
# arguments: '-c $(BuildConfiguration)'
# - task: DotNetCoreCLI@2
# displayName: 'Pack Blazor'
# inputs:
# command: 'pack'
# packagesToPack: 'src/Comet.Blazor/Comet.Blazor.csproj'
# arguments: '-c $(BuildConfiguration)'
# - task: PublishBuildArtifacts@1
# inputs:
# pathtoPublish: '$(Build.ArtifactStagingDirectory)'
# artifactName: drop
- job: BuildCometBlazor
displayName: Build Comet Blazor
pool:
vmImage: 'ubuntu-latest'
steps:
- task: UseDotNet@2
displayName: 'Use .NET Core sdk'
inputs:
packageType: sdk
version: 3.0.100-preview8-013656
includePreviewVersions: true
installationPath: $(Agent.ToolsDirectory)/dotnet
- task: DotNetCoreCLI@2
displayName: 'Build Blazor'
inputs:
command: 'build'
projects: 'Comet.Blazor.sln'
arguments: '-c $(BuildConfiguration)'
- task: DotNetCoreCLI@2
displayName: 'Test Blazor'
inputs:
command: 'test'
projects: 'Comet.Blazor.sln'
arguments: '-c $(BuildConfiguration)'
- task: DotNetCoreCLI@2
displayName: 'Pack Blazor'
inputs:
command: 'pack'
packagesToPack: 'src/Comet.Blazor/Comet.Blazor.csproj'
arguments: '-c $(BuildConfiguration)'
- task: PublishBuildArtifacts@1
inputs:
pathtoPublish: '$(Build.ArtifactStagingDirectory)'
artifactName: drop
- job: BuildCometMac
displayName: Build Comet Mac

2
build/build-master.yml
Просмотреть файл

@ -10,7 +10,7 @@ stages:
displayName: 'Use .NET Core sdk'
inputs:
packageType: sdk
version: 3.0.100-preview7-012821
version: 3.0.100-preview8-013656
includePreviewVersions: true
installationPath: $(Agent.ToolsDirectory)/dotnet
- task: DotNetCoreCLI@2

2
sample/Comet.Blazor.Sample/Pages/_Host.cshtml
Просмотреть файл

@ -24,7 +24,7 @@
<body>
<app>@(await Html.RenderComponentAsync<App>())</app>
<script src="_Comet/Comet.js"></script>
<script src="_comet/comet.js"></script>
<script src="_framework/blazor.server.js"></script>
</body>
</html>

1
sample/Comet.Blazor.Sample/_Imports.razor
Просмотреть файл

@ -1,6 +1,5 @@
@using System.Net.Http
@using Microsoft.AspNetCore.Components.Forms
@using Microsoft.AspNetCore.Components.Layouts
@using Microsoft.AspNetCore.Components.Routing
@using Microsoft.JSInterop
@using Comet.Blazor.Sample

4
src/Comet.Blazor/CanvasWriter.cs
Просмотреть файл

@ -12,8 +12,8 @@ namespace Comet.Blazor
_jsRuntime = jsRuntime;
}
public Task<SizeF> GetSizeAsync(object canvas) => _jsRuntime.InvokeAsync<SizeF>("Comet.canvas.getSize", new[] { canvas });
public Task<SizeF> GetSizeAsync(object canvas) => _jsRuntime.InvokeAsync<SizeF>("comet.canvas.getSize", new[] { canvas });
public Task DrawImageAsync(object canvas, byte[] bytes) => _jsRuntime.InvokeAsync<object>("Comet.canvas.drawImage", new[] { canvas, bytes });
public Task DrawImageAsync(object canvas, byte[] bytes) => _jsRuntime.InvokeAsync<object>("comet.canvas.drawImage", new[] { canvas, bytes });
}
}

5
src/Comet.Blazor/Comet.Blazor.csproj
Просмотреть файл

@ -9,12 +9,11 @@
<ItemGroup>
<None Remove="Comet.js" />
<None Remove="Scripts\comet.js" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Scripts\Comet.js">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Scripts\comet.js" />
</ItemGroup>
<ItemGroup>

4
src/Comet.Blazor/CometExtensions.cs
Просмотреть файл

@ -16,11 +16,11 @@ namespace Comet.Blazor
UI.Init();
app.UseImages();
app.Map("/_Comet/Comet.js", app2 =>
app.Map("/_comet/comet.js", app2 =>
{
app2.Run(async ctx =>
{
using (var stream = typeof(CometExtensions).Assembly.GetManifestResourceStream(typeof(CometExtensions), "Scripts.Comet.js"))
using (var stream = typeof(CometExtensions).Assembly.GetManifestResourceStream(typeof(CometExtensions), "Scripts.comet.js"))
{
ctx.Response.StatusCode = 200;
ctx.Response.ContentType = "application/javascript";

2
src/Comet.Blazor/CometPage.razor
Просмотреть файл

@ -1,6 +1,6 @@
@using Comet.Blazor.Components
<div class="Comet-page" @onmousedown="@OnMouseDown">
<div class="comet-page" @onmousedown="@OnMouseDown">
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
@foreach (var view in _navigationStack.Reverse())

2
src/Comet.Blazor/Components/BButton.razor
Просмотреть файл

@ -1,6 +1,6 @@
@inherits CometComponentBase
<span class="Comet-button">
<span class="comet-button">
<button class="btn btn-primary" @onclick="@OnClick">@Text</button>
</span>

2
src/Comet.Blazor/Components/BContainerView.razor
Просмотреть файл

@ -1,6 +1,6 @@
@inherits CometComponentBase
<div class="container-fluid Comet-containerview">
<div class="container-fluid comet-containerview">
@foreach (var view in Views)
{
<BView @key="@view" View="@view" />

2
src/Comet.Blazor/Components/BImage.razor
Просмотреть файл

@ -1,6 +1,6 @@
@inherits CometComponentBase
<span class="Comet-img">
<span class="comet-img">
<img src="@Url" />
</span>

2
src/Comet.Blazor/Components/BListView.razor
Просмотреть файл

@ -1,6 +1,6 @@
@inherits CometComponentBase
<ui class="Comet-listview list-group">
<ui class="comet-listview list-group">
@if (List != null)
{
var cursor = HasOnSelected ? "Pointer" : "Default";

4
src/Comet.Blazor/Components/BProgressBar.razor
Просмотреть файл

@ -2,13 +2,13 @@
@if (IsIndeterminate)
{
<div class="Comet-progress progress">
<div class="comet-progress progress">
<div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" style="width: 100%" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" />
</div>
}
else
{
<div class="Comet-progress progress">
<div class="comet-progress progress">
<div class="progress-bar" role="progressbar" style="width: @Value%" aria-valuenow="@Value" aria-valuemin="0" aria-valuemax="100" />
</div>
}

2
src/Comet.Blazor/Components/BShape.razor
Просмотреть файл

@ -5,7 +5,7 @@
@inject CanvasWriter Writer;
<canvas @ref="@_canvas" />
<canvas @ref="@_canvas" @ref:suppressField />
@code {
private object _canvas;

2
src/Comet.Blazor/Components/BSpacer.razor
Просмотреть файл

@ -1,5 +1,5 @@
@inherits CometComponentBase
<span class="Comet-spacer">
<span class="comet-spacer">
<br />
</span>

2
src/Comet.Blazor/Components/BTabView.razor
Просмотреть файл

@ -1,6 +1,6 @@
@inherits CometComponentBase
<div class="Comet-tabview">
<div class="comet-tabview">
<div class="nav nav-tabs" role="tablist">
@foreach (var view in Views)
{

2
src/Comet.Blazor/Components/BText.razor
Просмотреть файл

@ -1,6 +1,6 @@
@inherits CometComponentBase
<div class="Comet-text">
<div class="comet-text">
<p>@Value</p>
</div>

2
src/Comet.Blazor/Components/BTextField.razor
Просмотреть файл

@ -1,7 +1,7 @@
@inherits CometComponentBase
<div class="form-group">
<div class="Comet-textfield">
<div class="comet-textfield">
<input class="form-control" type="text" value="@Text" @onchange="@OnChange" @oninput="@OnInput"/>
</div>
</div>

2
src/Comet.Blazor/Components/BUnsupported.razor
Просмотреть файл

@ -1,6 +1,6 @@
@inherits CometComponentBase
<div class="Comet-unsupported Comet-unsupported-@View.GetType().Name alert alert-danger" role="alert">
<div class="comet-unsupported comet-unsupported-@View.GetType().Name alert alert-danger" role="alert">
Unsupported component: @View.GetType().FullName
</div>

2
src/Comet.Blazor/Components/BView.cs
Просмотреть файл

@ -13,7 +13,7 @@ namespace Comet.Blazor.Components
var name = View?.GetType().Name ?? "null";
builder.OpenElement(0, "div");
builder.AddAttribute(1, "class", $"Comet-view Comet-view-{name}");
builder.AddAttribute(1, "class", $"comet-view comet-view-{name}");
if (View is null)
{

2
src/Comet.Blazor/Components/CometComponentBase.cs
Просмотреть файл

@ -8,6 +8,6 @@ namespace Comet.Blazor.Components
{
}
internal void NotifyUpdate() => Invoke(StateHasChanged);
internal void NotifyUpdate() => InvokeAsync(StateHasChanged);
}
}

2
src/Comet.Blazor/Scripts/cometui.js → src/Comet.Blazor/Scripts/comet.js
Просмотреть файл

@ -1,4 +1,4 @@
var Comet = (function () {
var comet = (function () {
return {
canvas: (function () {
return {

7
src/Comet.Blazor/UI.cs
Просмотреть файл

@ -31,7 +31,12 @@ namespace Comet.Blazor
// Unsupported views. Without registering these, it cause an infinite recursion on derived views
Registrar.Handlers.Register<ActivityIndicator, UnsupportedHandler<ActivityIndicator>>();
//Registrar.Handlers.Register<Control, UnsupportedHandler<Control>>();
Registrar.Handlers.Register<SecureField, UnsupportedHandler<SecureField>>();
Registrar.Handlers.Register<Slider, UnsupportedHandler<Slider>>();
Registrar.Handlers.Register<Toggle, UnsupportedHandler<Toggle>>();
Registrar.Handlers.Register<DrawableControl, UnsupportedHandler<DrawableControl>>();
Registrar.Handlers.Register<ViewRepresentable, UnsupportedHandler<ViewRepresentable>>();
Registrar.Handlers.Register<WebView, UnsupportedHandler<WebView>>();
Device.PerformInvokeOnMainThread = a => a();
ListView.HandlerSupportsVirtualization = false;

Двоичные данные
templates/nuget.exe
Просмотреть файл

Двоичный файл не отображается.

9
tests/Comet.Blazor.Tests/Comet.Blazor.Tests.csproj
Просмотреть файл

@ -9,9 +9,12 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="NSubstitute" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>

9
tests/Comet.Blazor.Tests/RegistrarTests.cs
Просмотреть файл

@ -5,11 +5,19 @@ using System;
using System.Linq;
using System.Reflection;
using Xunit;
using Xunit.Abstractions;
namespace Comet.Blazor.Tests
{
public class RegistrarTests
{
private readonly ITestOutputHelper _output;
public RegistrarTests(ITestOutputHelper output)
{
_output = output;
}
[Fact]
public void AllHandlersAreRegistered()
{
@ -57,6 +65,7 @@ namespace Comet.Blazor.Tests
}
else
{
_output.WriteLine(type.FullName);
Assert.IsNotType<ViewHandler>(handler);
}
}

520
tests/Comet.Tests/HStackTests.cs
Просмотреть файл

@ -3,300 +3,300 @@ using System.Drawing;
using Comet.Tests.Handlers;
using Xunit;
namespace Comet.Tests
namespace Comet.Tests
{
public class HStackTests : TestBase
{
public class HStackTestView1 : View
{
public readonly State<string> text = "Test";
public class HStackTests : TestBase
{
public class HStackTestView1 : View
{
public readonly State<string> text = "Test";
[Body]
View body() => new HStack
{
new TextField(text).Tag("textfield"),
new Spacer().Tag("spacer"),
new Text(text).Tag("text")
}.Tag("stack");
}
[Body]
View body() => new HStack
{
new TextField(text).Tag("textfield"),
new Spacer().Tag("spacer"),
new Text(text).Tag("text")
}.Tag("stack");
}
[Fact]
public void TestView1()
{
var view = new HStackTestView1();
InitializeHandlers(view);
[Fact]
public void TestView1()
{
var view = new HStackTestView1();
InitializeHandlers(view);
var stack = view.GetViewWithTag<HStack>("stack");
var textField = view.GetViewWithTag<TextField>("textfield");
var spacer = view.GetViewWithTag<Spacer>("spacer");
var text = view.GetViewWithTag<Text>("text");
var stack = view.GetViewWithTag<HStack>("stack");
var textField = view.GetViewWithTag<TextField>("textfield");
var spacer = view.GetViewWithTag<Spacer>("spacer");
var text = view.GetViewWithTag<Text>("text");
view.Frame = new RectangleF(0,0,320,600);
Assert.True(view.MeasurementValid);
Assert.Equal(new SizeF(320, 12), view.MeasuredSize);
Assert.Equal(new RectangleF(0,0,320,600), view.Frame);
view.Frame = new RectangleF(0, 0, 320, 600);
Assert.True(stack.MeasurementValid);
Assert.Equal(new SizeF(320, 12), stack.MeasuredSize);
Assert.Equal(new RectangleF(0,294,320,12), stack.Frame);
Assert.True(textField.MeasurementValid);
Assert.Equal(new SizeF(40, 12), textField.MeasuredSize);
Assert.Equal(new RectangleF(0,0,40,12), textField.Frame);
Assert.True(view.MeasurementValid);
Assert.Equal(new SizeF(320, 12), view.MeasuredSize);
Assert.Equal(new RectangleF(0, 0, 320, 600), view.Frame);
Assert.True(spacer.MeasurementValid);
Assert.Equal(new SizeF(-1, -1), spacer.MeasuredSize);
Assert.Equal(new RectangleF(40,0,240,12), spacer.Frame);
Assert.True(stack.MeasurementValid);
Assert.Equal(new SizeF(320, 12), stack.MeasuredSize);
Assert.Equal(new RectangleF(0, 294, 320, 12), stack.Frame);
Assert.True(text.MeasurementValid);
Assert.Equal(new SizeF(40, 12), text.MeasuredSize);
Assert.Equal(new RectangleF(280,0,40,12), text.Frame);
}
[Fact]
public void TestView1WithFrameConstraints()
{
var view = new HStackTestView1().Frame(320, 600);
InitializeHandlers(view);
Assert.True(textField.MeasurementValid);
Assert.Equal(new SizeF(40, 12), textField.MeasuredSize);
Assert.Equal(new RectangleF(0, 0, 40, 12), textField.Frame);
var stack = view.GetViewWithTag<HStack>("stack");
var textField = view.GetViewWithTag<TextField>("textfield");
var spacer = view.GetViewWithTag<Spacer>("spacer");
var text = view.GetViewWithTag<Text>("text");
view.Frame = new RectangleF(0,0,320,600);
Assert.True(view.MeasurementValid);
Assert.Equal(new SizeF(320, 12), view.MeasuredSize);
Assert.Equal(new RectangleF(0,0,320,600), view.Frame);
Assert.True(spacer.MeasurementValid);
Assert.Equal(new SizeF(-1, -1), spacer.MeasuredSize);
Assert.Equal(new RectangleF(40, 0, 240, 12), spacer.Frame);
Assert.True(stack.MeasurementValid);
Assert.Equal(new SizeF(320, 12), stack.MeasuredSize);
Assert.Equal(new RectangleF(0,294,320,12), stack.Frame);
Assert.True(textField.MeasurementValid);
Assert.Equal(new SizeF(40, 12), textField.MeasuredSize);
Assert.Equal(new RectangleF(0,0,40,12), textField.Frame);
Assert.True(text.MeasurementValid);
Assert.Equal(new SizeF(40, 12), text.MeasuredSize);
Assert.Equal(new RectangleF(280, 0, 40, 12), text.Frame);
}
Assert.True(spacer.MeasurementValid);
Assert.Equal(new SizeF(-1, -1), spacer.MeasuredSize);
Assert.Equal(new RectangleF(40,0,240,12), spacer.Frame);
[Fact(Skip = "Measurements not as expected")]
public void TestView1WithFrameConstraints()
{
var view = new HStackTestView1().Frame(320, 600);
InitializeHandlers(view);
Assert.True(text.MeasurementValid);
Assert.Equal(new SizeF(40, 12), text.MeasuredSize);
Assert.Equal(new RectangleF(280,0,40,12), text.Frame);
}
[Fact]
public void TestView1WithPaddingOnStack()
{
var view = new HStackTestView1();
InitializeHandlers(view);
var stack = view.GetViewWithTag<HStack>("stack");
var textField = view.GetViewWithTag<TextField>("textfield");
var spacer = view.GetViewWithTag<Spacer>("spacer");
var text = view.GetViewWithTag<Text>("text");
var stack = view.GetViewWithTag<HStack>("stack").Padding();
var textField = view.GetViewWithTag<TextField>("textfield");
var spacer = view.GetViewWithTag<Spacer>("spacer");
var text = view.GetViewWithTag<Text>("text");
view.Frame = new RectangleF(0,0,320,600);
Assert.True( view.MeasurementValid);
Assert.Equal(new SizeF(300, 12), view.MeasuredSize);
Assert.Equal(new RectangleF(0,0,320,600), view.Frame);
view.Frame = new RectangleF(0, 0, 320, 600);
Assert.True( stack.MeasurementValid);
Assert.Equal(new SizeF(300, 12), stack.MeasuredSize);
Assert.Equal(new RectangleF(10,294,300,12), stack.Frame);
Assert.True(textField.MeasurementValid);
Assert.Equal(new SizeF(40, 12), textField.MeasuredSize);
Assert.Equal(new RectangleF(0,0,40,12), textField.Frame);
Assert.True(view.MeasurementValid);
Assert.Equal(new SizeF(320, 12), view.MeasuredSize);
Assert.Equal(new RectangleF(0, 0, 320, 600), view.Frame);
Assert.True(spacer.MeasurementValid);
Assert.Equal(new SizeF(-1, -1), spacer.MeasuredSize);
Assert.Equal(new RectangleF(40,0,220,12), spacer.Frame);
Assert.True(stack.MeasurementValid);
Assert.Equal(new SizeF(320, 12), stack.MeasuredSize);
Assert.Equal(new RectangleF(0, 294, 320, 12), stack.Frame);
Assert.True(text.MeasurementValid);
Assert.Equal(new SizeF(40, 12), text.MeasuredSize);
Assert.Equal(new RectangleF(260,0,40,12), text.Frame);
}
[Fact]
public void TestView1WithPaddingAndFrameConstraintsOnStack()
{
var view = new HStackTestView1();
InitializeHandlers(view);
Assert.True(textField.MeasurementValid);
Assert.Equal(new SizeF(40, 12), textField.MeasuredSize);
Assert.Equal(new RectangleF(0, 0, 40, 12), textField.Frame);
var stack = view.GetViewWithTag<HStack>("stack").Padding().Frame(height:20);
var textField = view.GetViewWithTag<TextField>("textfield");
var spacer = view.GetViewWithTag<Spacer>("spacer");
var text = view.GetViewWithTag<Text>("text");
view.Frame = new RectangleF(0,0,320,600);
Assert.True( view.MeasurementValid);
Assert.Equal(new SizeF(300, 20), view.MeasuredSize);
Assert.Equal(new RectangleF(0,0,320,600), view.Frame);
Assert.True(spacer.MeasurementValid);
Assert.Equal(new SizeF(-1, -1), spacer.MeasuredSize);
Assert.Equal(new RectangleF(40, 0, 240, 12), spacer.Frame);
Assert.True( stack.MeasurementValid);
Assert.Equal(new SizeF(300, 20), stack.MeasuredSize);
Assert.Equal(new RectangleF(10,290,300,20), stack.Frame);
Assert.True(textField.MeasurementValid);
Assert.Equal(new SizeF(40, 12), textField.MeasuredSize);
Assert.Equal(new RectangleF(0,4,40,12), textField.Frame);
Assert.True(text.MeasurementValid);
Assert.Equal(new SizeF(40, 12), text.MeasuredSize);
Assert.Equal(new RectangleF(280, 0, 40, 12), text.Frame);
}
Assert.True(spacer.MeasurementValid);
Assert.Equal(new SizeF(-1, -1), spacer.MeasuredSize);
Assert.Equal(new RectangleF(40,4,220,12), spacer.Frame);
[Fact]
public void TestView1WithPaddingOnStack()
{
var view = new HStackTestView1();
InitializeHandlers(view);
Assert.True(text.MeasurementValid);
Assert.Equal(new SizeF(40, 12), text.MeasuredSize);
Assert.Equal(new RectangleF(260,4,40,12), text.Frame);
}
[Fact]
public void TestView1WithPaddingAndFrameConstraintsOnStackAndItems()
{
var view = new HStackTestView1();
InitializeHandlers(view);
var stack = view.GetViewWithTag<HStack>("stack").Padding();
var textField = view.GetViewWithTag<TextField>("textfield");
var spacer = view.GetViewWithTag<Spacer>("spacer");
var text = view.GetViewWithTag<Text>("text");
var stack = view.GetViewWithTag<HStack>("stack").Padding().Frame(height:20);
var textField = view.GetViewWithTag<TextField>("textfield").Frame(alignment:Alignment.Top);
var spacer = view.GetViewWithTag<Spacer>("spacer");
var text = view.GetViewWithTag<Text>("text").Frame(alignment:Alignment.Bottom);
view.Frame = new RectangleF(0,0,320,600);
Assert.True( view.MeasurementValid);
Assert.Equal(new SizeF(300, 20), view.MeasuredSize);
Assert.Equal(new RectangleF(0,0,320,600), view.Frame);
view.Frame = new RectangleF(0, 0, 320, 600);
Assert.True( stack.MeasurementValid);
Assert.Equal(new SizeF(300, 20), stack.MeasuredSize);
Assert.Equal(new RectangleF(10,290,300,20), stack.Frame);
Assert.True(textField.MeasurementValid);
Assert.Equal(new SizeF(40, 12), textField.MeasuredSize);
Assert.Equal(new RectangleF(0,0,40,12), textField.Frame);
Assert.True(view.MeasurementValid);
Assert.Equal(new SizeF(300, 12), view.MeasuredSize);
Assert.Equal(new RectangleF(0, 0, 320, 600), view.Frame);
Assert.True(spacer.MeasurementValid);
Assert.Equal(new SizeF(-1, -1), spacer.MeasuredSize);
Assert.Equal(new RectangleF(40,4,220,12), spacer.Frame);
Assert.True(stack.MeasurementValid);
Assert.Equal(new SizeF(300, 12), stack.MeasuredSize);
Assert.Equal(new RectangleF(10, 294, 300, 12), stack.Frame);
Assert.True(text.MeasurementValid);
Assert.Equal(new SizeF(40, 12), text.MeasuredSize);
Assert.Equal(new RectangleF(260,8,40,12), text.Frame);
}
[Fact]
public void TestView1WithPaddingAndFrameConstraintsOnItems()
{
var view = new HStackTestView1();
InitializeHandlers(view);
Assert.True(textField.MeasurementValid);
Assert.Equal(new SizeF(40, 12), textField.MeasuredSize);
Assert.Equal(new RectangleF(0, 0, 40, 12), textField.Frame);
var stack = view.GetViewWithTag<HStack>("stack").Padding();
var textField = view.GetViewWithTag<TextField>("textfield").Frame(height:22);
var spacer = view.GetViewWithTag<Spacer>("spacer");
var text = view.GetViewWithTag<Text>("text").Frame(height:18);
view.Frame = new RectangleF(0,0,320,600);
Assert.True( view.MeasurementValid);
Assert.Equal(new SizeF(300, 22), view.MeasuredSize);
Assert.Equal(new RectangleF(0,0,320,600), view.Frame);
Assert.True(spacer.MeasurementValid);
Assert.Equal(new SizeF(-1, -1), spacer.MeasuredSize);
Assert.Equal(new RectangleF(40, 0, 220, 12), spacer.Frame);
Assert.True( stack.MeasurementValid);
Assert.Equal(new SizeF(300, 22), stack.MeasuredSize);
Assert.Equal(new RectangleF(10,289,300,22), stack.Frame);
Assert.True(textField.MeasurementValid);
Assert.Equal(new SizeF(40, 22), textField.MeasuredSize);
Assert.Equal(new RectangleF(0,0,40,22), textField.Frame);
Assert.True(text.MeasurementValid);
Assert.Equal(new SizeF(40, 12), text.MeasuredSize);
Assert.Equal(new RectangleF(260, 0, 40, 12), text.Frame);
}
Assert.True(spacer.MeasurementValid);
Assert.Equal(new SizeF(-1, -1), spacer.MeasuredSize);
Assert.Equal(new RectangleF(40,0,220,22), spacer.Frame);
[Fact]
public void TestView1WithPaddingAndFrameConstraintsOnStack()
{
var view = new HStackTestView1();
InitializeHandlers(view);
Assert.True(text.MeasurementValid);
Assert.Equal(new SizeF(40, 18), text.MeasuredSize);
Assert.Equal(new RectangleF(260,2,40,18), text.Frame);
}
[Fact]
public void TestView1WithPaddingAndFrameConstraintsAndPaddingOnItems()
{
var view = new HStackTestView1();
InitializeHandlers(view);
var stack = view.GetViewWithTag<HStack>("stack").Padding().Frame(height: 20);
var textField = view.GetViewWithTag<TextField>("textfield");
var spacer = view.GetViewWithTag<Spacer>("spacer");
var text = view.GetViewWithTag<Text>("text");
var stack = view.GetViewWithTag<HStack>("stack").Padding();
var textField = view.GetViewWithTag<TextField>("textfield").Frame(height:22).Padding();
var spacer = view.GetViewWithTag<Spacer>("spacer");
var text = view.GetViewWithTag<Text>("text").Frame(height:18);
view.Frame = new RectangleF(0,0,320,600);
Assert.True( view.MeasurementValid);
Assert.Equal(new SizeF(300, 42), view.MeasuredSize);
Assert.Equal(new RectangleF(0,0,320,600), view.Frame);
view.Frame = new RectangleF(0, 0, 320, 600);
Assert.True( stack.MeasurementValid);
Assert.Equal(new SizeF(300, 42), stack.MeasuredSize);
Assert.Equal(new RectangleF(10,279,300,42), stack.Frame);
Assert.True(textField.MeasurementValid);
Assert.Equal(new SizeF(40, 22), textField.MeasuredSize);
Assert.Equal(new RectangleF(10,10,40,22), textField.Frame);
Assert.True(view.MeasurementValid);
Assert.Equal(new SizeF(300, 20), view.MeasuredSize);
Assert.Equal(new RectangleF(0, 0, 320, 600), view.Frame);
Assert.True(spacer.MeasurementValid);
Assert.Equal(new SizeF(-1, -1), spacer.MeasuredSize);
Assert.Equal(new RectangleF(60,10,200,22), spacer.Frame);
Assert.True(stack.MeasurementValid);
Assert.Equal(new SizeF(300, 20), stack.MeasuredSize);
Assert.Equal(new RectangleF(10, 290, 300, 20), stack.Frame);
Assert.True(text.MeasurementValid);
Assert.Equal(new SizeF(40, 18), text.MeasuredSize);
Assert.Equal(new RectangleF(260,12,40,18), text.Frame);
}
public class HStackTestView2 : View
{
public readonly State<string> text = "Test";
Assert.True(textField.MeasurementValid);
Assert.Equal(new SizeF(40, 12), textField.MeasuredSize);
Assert.Equal(new RectangleF(0, 4, 40, 12), textField.Frame);
[Body]
View body() => new HStack(spacing:10)
{
new TextField(text).Tag("textfield"),
new Text(text).Tag("text")
}.Tag("stack");
}
[Fact]
public void TestView2()
{
var view = new HStackTestView2();
InitializeHandlers(view);
Assert.True(spacer.MeasurementValid);
Assert.Equal(new SizeF(-1, -1), spacer.MeasuredSize);
Assert.Equal(new RectangleF(40, 4, 220, 12), spacer.Frame);
var stack = view.GetViewWithTag<HStack>("stack");
var textField = view.GetViewWithTag<TextField>("textfield");
var text = view.GetViewWithTag<Text>("text");
Assert.True(text.MeasurementValid);
Assert.Equal(new SizeF(40, 12), text.MeasuredSize);
Assert.Equal(new RectangleF(260, 4, 40, 12), text.Frame);
}
view.Frame = new RectangleF(0,0,320,600);
Assert.True(view.MeasurementValid);
Assert.Equal(new SizeF(90, 12), view.MeasuredSize);
Assert.Equal(new RectangleF(0,0,320,600), view.Frame);
[Fact]
public void TestView1WithPaddingAndFrameConstraintsOnStackAndItems()
{
var view = new HStackTestView1();
InitializeHandlers(view);
Assert.True(stack.MeasurementValid);
Assert.Equal(new SizeF(90, 12), stack.MeasuredSize);
Assert.Equal(new RectangleF(115,294,90,12), stack.Frame);
Assert.True(textField.MeasurementValid);
Assert.Equal(new SizeF(40, 12), textField.MeasuredSize);
Assert.Equal(new RectangleF(0,0,40,12), textField.Frame);
Assert.True(text.MeasurementValid);
Assert.Equal(new SizeF(40, 12), text.MeasuredSize);
Assert.Equal(new RectangleF(50,0,40,12), text.Frame);
}
}
var stack = view.GetViewWithTag<HStack>("stack").Padding().Frame(height: 20);
var textField = view.GetViewWithTag<TextField>("textfield").Frame(alignment: Alignment.Top);
var spacer = view.GetViewWithTag<Spacer>("spacer");
var text = view.GetViewWithTag<Text>("text").Frame(alignment: Alignment.Bottom);
view.Frame = new RectangleF(0, 0, 320, 600);
Assert.True(view.MeasurementValid);
Assert.Equal(new SizeF(300, 20), view.MeasuredSize);
Assert.Equal(new RectangleF(0, 0, 320, 600), view.Frame);
Assert.True(stack.MeasurementValid);
Assert.Equal(new SizeF(300, 20), stack.MeasuredSize);
Assert.Equal(new RectangleF(10, 290, 300, 20), stack.Frame);
Assert.True(textField.MeasurementValid);
Assert.Equal(new SizeF(40, 12), textField.MeasuredSize);
Assert.Equal(new RectangleF(0, 0, 40, 12), textField.Frame);
Assert.True(spacer.MeasurementValid);
Assert.Equal(new SizeF(-1, -1), spacer.MeasuredSize);
Assert.Equal(new RectangleF(40, 4, 220, 12), spacer.Frame);
Assert.True(text.MeasurementValid);
Assert.Equal(new SizeF(40, 12), text.MeasuredSize);
Assert.Equal(new RectangleF(260, 8, 40, 12), text.Frame);
}
[Fact]
public void TestView1WithPaddingAndFrameConstraintsOnItems()
{
var view = new HStackTestView1();
InitializeHandlers(view);
var stack = view.GetViewWithTag<HStack>("stack").Padding();
var textField = view.GetViewWithTag<TextField>("textfield").Frame(height: 22);
var spacer = view.GetViewWithTag<Spacer>("spacer");
var text = view.GetViewWithTag<Text>("text").Frame(height: 18);
view.Frame = new RectangleF(0, 0, 320, 600);
Assert.True(view.MeasurementValid);
Assert.Equal(new SizeF(300, 22), view.MeasuredSize);
Assert.Equal(new RectangleF(0, 0, 320, 600), view.Frame);
Assert.True(stack.MeasurementValid);
Assert.Equal(new SizeF(300, 22), stack.MeasuredSize);
Assert.Equal(new RectangleF(10, 289, 300, 22), stack.Frame);
Assert.True(textField.MeasurementValid);
Assert.Equal(new SizeF(40, 22), textField.MeasuredSize);
Assert.Equal(new RectangleF(0, 0, 40, 22), textField.Frame);
Assert.True(spacer.MeasurementValid);
Assert.Equal(new SizeF(-1, -1), spacer.MeasuredSize);
Assert.Equal(new RectangleF(40, 0, 220, 22), spacer.Frame);
Assert.True(text.MeasurementValid);
Assert.Equal(new SizeF(40, 18), text.MeasuredSize);
Assert.Equal(new RectangleF(260, 2, 40, 18), text.Frame);
}
[Fact]
public void TestView1WithPaddingAndFrameConstraintsAndPaddingOnItems()
{
var view = new HStackTestView1();
InitializeHandlers(view);
var stack = view.GetViewWithTag<HStack>("stack").Padding();
var textField = view.GetViewWithTag<TextField>("textfield").Frame(height: 22).Padding();
var spacer = view.GetViewWithTag<Spacer>("spacer");
var text = view.GetViewWithTag<Text>("text").Frame(height: 18);
view.Frame = new RectangleF(0, 0, 320, 600);
Assert.True(view.MeasurementValid);
Assert.Equal(new SizeF(300, 42), view.MeasuredSize);
Assert.Equal(new RectangleF(0, 0, 320, 600), view.Frame);
Assert.True(stack.MeasurementValid);
Assert.Equal(new SizeF(300, 42), stack.MeasuredSize);
Assert.Equal(new RectangleF(10, 279, 300, 42), stack.Frame);
Assert.True(textField.MeasurementValid);
Assert.Equal(new SizeF(40, 22), textField.MeasuredSize);
Assert.Equal(new RectangleF(10, 10, 40, 22), textField.Frame);
Assert.True(spacer.MeasurementValid);
Assert.Equal(new SizeF(-1, -1), spacer.MeasuredSize);
Assert.Equal(new RectangleF(60, 10, 200, 22), spacer.Frame);
Assert.True(text.MeasurementValid);
Assert.Equal(new SizeF(40, 18), text.MeasuredSize);
Assert.Equal(new RectangleF(260, 12, 40, 18), text.Frame);
}
public class HStackTestView2 : View
{
public readonly State<string> text = "Test";
[Body]
View body() => new HStack(spacing: 10)
{
new TextField(text).Tag("textfield"),
new Text(text).Tag("text")
}.Tag("stack");
}
[Fact]
public void TestView2()
{
var view = new HStackTestView2();
InitializeHandlers(view);
var stack = view.GetViewWithTag<HStack>("stack");
var textField = view.GetViewWithTag<TextField>("textfield");
var text = view.GetViewWithTag<Text>("text");
view.Frame = new RectangleF(0, 0, 320, 600);
Assert.True(view.MeasurementValid);
Assert.Equal(new SizeF(90, 12), view.MeasuredSize);
Assert.Equal(new RectangleF(0, 0, 320, 600), view.Frame);
Assert.True(stack.MeasurementValid);
Assert.Equal(new SizeF(90, 12), stack.MeasuredSize);
Assert.Equal(new RectangleF(115, 294, 90, 12), stack.Frame);
Assert.True(textField.MeasurementValid);
Assert.Equal(new SizeF(40, 12), textField.MeasuredSize);
Assert.Equal(new RectangleF(0, 0, 40, 12), textField.Frame);
Assert.True(text.MeasurementValid);
Assert.Equal(new SizeF(40, 12), text.MeasuredSize);
Assert.Equal(new RectangleF(50, 0, 40, 12), text.Frame);
}
}
}