Skip to content

Commit c7e842a

Browse files
authored
[dotnet] [bidi] Make input Origin as not nested (#15445)
1 parent 96ac5f9 commit c7e842a

File tree

2 files changed

+9
-15
lines changed

2 files changed

+9
-15
lines changed

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

+4-4
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

+5-11
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,12 @@
1717
// under the License.
1818
// </copyright>
1919

20-
using System.Text.Json.Serialization;
21-
2220
namespace OpenQA.Selenium.BiDi.Modules.Input;
2321

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

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

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

0 commit comments

Comments
 (0)