Skip to content

[dotnet] [bidi] Make input Origin as not nested #15445

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 17, 2025
Merged

[dotnet] [bidi] Make input Origin as not nested #15445

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0829cb3
[dotnet] [bidi] Make input `Origin` as not nested
nvborisenko Mar 17, 2025
5e2717f
We don't need it because of custom converter
nvborisenko Mar 17, 2025
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
8 changes: 4 additions & 4 deletions dotnet/src/webdriver/BiDi/Communication/Json/Converters/InputOriginConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,20 @@ public override Origin Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS

public override void Write(Utf8JsonWriter writer, Origin value, JsonSerializerOptions options)
{
if (value is Origin.Viewport)
if (value is ViewportOrigin)
{
writer.WriteStringValue("viewport");
}
else if (value is Origin.Pointer)
else if (value is PointerOrigin)
{
writer.WriteStringValue("pointer");
}
else if (value is Origin.Element element)
else if (value is ElementOrigin element)
{
writer.WriteStartObject();
writer.WriteString("type", "element");
writer.WritePropertyName("element");
JsonSerializer.Serialize(writer, element.SharedReference, options);
JsonSerializer.Serialize(writer, element.Element, options);
writer.WriteEndObject();
}
}
Expand Down
16 changes: 8 additions & 8 deletions dotnet/src/webdriver/BiDi/Modules/Input/Origin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@

namespace OpenQA.Selenium.BiDi.Modules.Input;

public abstract record Origin
{
public record Viewport() : Origin;
public abstract record Origin;

public record ViewportOrigin() : Origin;

public record Pointer() : Origin;
public record PointerOrigin() : Origin;

public record Element([property: JsonPropertyName("element")] Script.ISharedReference SharedReference) : Origin
{
public string Type { get; } = "element";
}
public record ElementOrigin(Script.ISharedReference Element) : Origin
{
[JsonInclude]
internal string Type { get; } = "element";
}
Loading