Skip to content

Commit 0829cb3

Browse files
committed
[dotnet] [bidi] Make input Origin as not nested
1 parent 2518ae1 commit 0829cb3

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

dotnet/src/webdriver/BiDi/Communication/Json/Converters/InputOriginConverter.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@ public override Origin Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS
3333

3434
public override void Write(Utf8JsonWriter writer, Origin value, JsonSerializerOptions options)
3535
{
36-
if (value is Origin.Viewport)
36+
if (value is ViewportOrigin)
3737
{
3838
writer.WriteStringValue("viewport");
3939
}
40-
else if (value is Origin.Pointer)
40+
else if (value is PointerOrigin)
4141
{
4242
writer.WriteStringValue("pointer");
4343
}
44-
else if (value is Origin.Element element)
44+
else if (value is ElementOrigin element)
4545
{
4646
writer.WriteStartObject();
4747
writer.WriteString("type", "element");
4848
writer.WritePropertyName("element");
49-
JsonSerializer.Serialize(writer, element.SharedReference, options);
49+
JsonSerializer.Serialize(writer, element.Element, options);
5050
writer.WriteEndObject();
5151
}
5252
}

dotnet/src/webdriver/BiDi/Modules/Input/Origin.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121

2222
namespace OpenQA.Selenium.BiDi.Modules.Input;
2323

24-
public abstract record Origin
25-
{
26-
public record Viewport() : Origin;
24+
public abstract record Origin;
25+
26+
public record ViewportOrigin() : Origin;
2727

28-
public record Pointer() : Origin;
28+
public record PointerOrigin() : Origin;
2929

30-
public record Element([property: JsonPropertyName("element")] Script.ISharedReference SharedReference) : Origin
31-
{
32-
public string Type { get; } = "element";
33-
}
30+
public record ElementOrigin(Script.ISharedReference Element) : Origin
31+
{
32+
[JsonInclude]
33+
internal string Type { get; } = "element";
3434
}

0 commit comments

Comments
 (0)