Skip to content

Commit 1b71768

Browse files
committed
Added fix to ensure ModalUiDialog works
1 parent 1db4ba1 commit 1b71768

5 files changed

Lines changed: 26 additions & 10 deletions

File tree

source/TS.NET.Sequencer/Steps/ModalUiStep.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using Microsoft.AspNetCore.Components.Web;
33
using Microsoft.Extensions.DependencyInjection;
44
using Microsoft.Extensions.Logging;
5-
using System.Reflection;
65
using System.Text.Json;
76
using System.Text.RegularExpressions;
87

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
1+
using TS.NET.Sequencer;
2+
13
namespace TS.NET.Testbench.UI;
24

35
public class ModalUiUpdateDto : MessageDto
46
{
57
public required string? Html { get; set; }
68
public required string? Script { get; set; }
9+
10+
internal static ModalUiUpdateDto FromModalUiUpdate(ModalUiUpdate modalUiUpdate)
11+
{
12+
return new ModalUiUpdateDto
13+
{
14+
Type = "modal-ui-update",
15+
Html = modalUiUpdate.Html,
16+
Script = modalUiUpdate.Script
17+
};
18+
}
719
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<linker>
3+
<assembly fullname="TS.NET.Testbench.UI" preserve="all" />
4+
<assembly fullname="TS.NET.Sequences" preserve="all" />
5+
<assembly fullname="TS.NET.Sequencer" preserve="all" />
6+
</linker>

source/TS.NET.Testbench.UI/Program.cs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,11 @@ static void Main(string[] args)
3232
#endif
3333

3434
PhotinoWindow? window = null;
35-
Action<ModalUiUpdate> modalUiUpdate = (ModalUiUpdate modalUiUpdate) =>
35+
36+
void modalUiUpdate(ModalUiUpdate modalUiUpdate)
3637
{
37-
var dto = new ModalUiUpdateDto
38-
{
39-
Type = "modal-ui-update",
40-
Html = modalUiUpdate.Html,
41-
Script = modalUiUpdate.Script
42-
};
43-
window?.SendWebMessage(JsonSerializer.Serialize(dto, CamelCaseContext.Default.ModalUiUpdateDto));
44-
};
38+
window?.SendWebMessage(JsonSerializer.Serialize(ModalUiUpdateDto.FromModalUiUpdate(modalUiUpdate), CamelCaseContext.Default.ModalUiUpdateDto));
39+
}
4540
var modalUiContext = new ModalUiContext(modalUiUpdate);
4641

4742
window = new PhotinoWindow()

source/TS.NET.Testbench.UI/TS.NET.Testbench.UI.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
2424
</PropertyGroup>
2525

26+
<ItemGroup>
27+
<TrimmerRootDescriptor Include="Linker.xml" />
28+
</ItemGroup>
29+
2630
<ItemGroup>
2731
<EmbeddedResource Include="Resources\**" />
2832
</ItemGroup>

0 commit comments

Comments
 (0)