Bidi: Pass clickablePoint (#2998)

* Bidi: Pass clickablePoint

* fix

* implement Frames prop

* improve prompts

* fix

Author: kblok

lib/.claude/commands/implement-bidi-feature.md

@@ -16,3 +16,4 @@ In order to do that you will need to:
  * You will have to implement the code as close as possible to the original code, but adapted to .NET idioms and practices.
  * As part of the task you will need to generate a document explaining the changes you made, and how they relate to the original PR.
  * You need to run related tests to ensure everything is working as expected.
+ * You will need to run the tests using the ENV variables BROWSER=FIREFOX and PROTOCOL=bidi

lib/CLAUDE.md

@@ -390,16 +390,17 @@ Test directory structure demonstrates comprehensive coverage:
 ### Building and Running Tests
 
 When running tests, always build first and then use the `--no-build` flag to avoid rebuilding during test execution. This provides faster and more reliable test runs:
+Always be explicit with the browser and protocol you want to test using ENV variables BROWSER=FIREFOX|CHROME and PROTOCOL=bidi|cdp
 
 ```bash
 # Build the test project first
-dotnet build PuppeteerSharp.Tests/PuppeteerSharp.Tests.csproj
+BROWSER=FIREFOX PROTOCOL=bidi dotnet build PuppeteerSharp.Tests/PuppeteerSharp.Tests.csproj
 
 # Then run tests with --no-build flag
-dotnet test PuppeteerSharp.Tests/PuppeteerSharp.Tests.csproj --filter "FullyQualifiedName~TestName" --no-build -- NUnit.TestOutputXml=TestResults
+BROWSER=CHROME PROTOCOL=bidi dotnet test PuppeteerSharp.Tests/PuppeteerSharp.Tests.csproj --filter "FullyQualifiedName~TestName" --no-build -- NUnit.TestOutputXml=TestResults
 
 # Can also chain them together
-dotnet build PuppeteerSharp.Tests/PuppeteerSharp.Tests.csproj && dotnet test PuppeteerSharp.Tests/PuppeteerSharp.Tests.csproj --filter "FullyQualifiedName~TestName" --no-build -- NUnit.TestOutputXml=TestResults
+BROWSER=CHROME PROTOCOL=cdp dotnet build PuppeteerSharp.Tests/PuppeteerSharp.Tests.csproj && dotnet test PuppeteerSharp.Tests/PuppeteerSharp.Tests.csproj --filter "FullyQualifiedName~TestName" --no-build -- NUnit.TestOutputXml=TestResults
 ```
 
 You can switch between CDP and Bidi by changing the PuppeteerTestAttribute.IsCdp property.

lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json

@@ -735,21 +735,6 @@
       "FAIL"
     ]
   },
-  {
-    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
-    "testIdPattern": "[jshandle.spec] *.clickablePoint*",
-    "platforms": [
-      "darwin",
-      "linux",
-      "win32"
-    ],
-    "parameters": [
-      "webDriverBiDi"
-    ],
-    "expectations": [
-      "FAIL"
-    ]
-  },
   {
     "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
     "testIdPattern": "[jshandle.spec] *.evaluateHandle*",

lib/PuppeteerSharp.Tests/JSHandleTests/ClickablePointTests.cs

@@ -6,10 +6,6 @@ namespace PuppeteerSharp.Tests.JSHandleTests
 {
     public class ClickablePointTests : PuppeteerPageBaseTest
     {
-        public ClickablePointTests() : base()
-        {
-        }
-
         [Test, PuppeteerTest("jshandle.spec", "JSHandle JSHandle.clickablePoint", "should work")]
         public async Task ShouldWork()
         {

lib/PuppeteerSharp/Bidi/BidiElementHandle.cs

@@ -36,6 +36,8 @@ internal class BidiElementHandle(RemoteValue value, BidiRealm realm) : ElementHa
     /// </summary>
     public RemoteValue Value { get; } = value;
 
+    internal BidiJSHandle BidiJSHandle => Handle as BidiJSHandle;
+
     internal override Realm Realm => realm;
 
     internal override CustomQuerySelectorRegistry CustomQuerySelectorRegistry { get; } = new();
@@ -60,13 +62,13 @@ public override async Task<IFrame> ContentFrameAsync()
             return;
         }").ConfigureAwait(false);
 
-        if (handle is not BidiJSHandle bidiHandle)
+        if (handle is not BidiElementHandle bidiHandle)
         {
             await handle.DisposeAsync().ConfigureAwait(false);
             return null;
         }
 
-        var value = bidiHandle.RemoteValue;
+        var value = bidiHandle.BidiJSHandle.RemoteValue;
         await handle.DisposeAsync().ConfigureAwait(false);
 
         if (value.Type == "window" && value.Value is WindowProxyProperties windowProxy)

lib/PuppeteerSharp/Bidi/BidiFrame.cs

@@ -40,7 +40,7 @@ public class BidiFrame : Frame
 
     internal BidiFrame(BidiPage parentPage, BidiFrame parentFrame, BrowsingContext browsingContext)
     {
-        Client = new BidiCdpSession(this, parentPage.BidiBrowser.LoggerFactory);
+        Client = new BidiCdpSession(this, parentPage?.BidiBrowser?.LoggerFactory ?? parentFrame?.BidiPage?.BidiBrowser?.LoggerFactory);
         ParentPage = parentPage;
         ParentFrame = parentFrame;
         BrowsingContext = browsingContext;

lib/PuppeteerSharp/Bidi/BidiPage.cs

@@ -57,7 +57,19 @@ internal BidiPage(BidiBrowserContext browserContext, BrowsingContext browsingCon
     public override Target Target { get; }
 
     /// <inheritdoc />
-    public override IFrame[] Frames { get; }
+    public override IFrame[] Frames
+    {
+        get
+        {
+            var frames = new List<IFrame> { BidiMainFrame };
+            for (var i = 0; i < frames.Count; i++)
+            {
+                frames.AddRange(frames[i].ChildFrames);
+            }
+
+            return [.. frames];
+        }
+    }
 
     /// <inheritdoc />
     public override WebWorker[] Workers { get; }

lib/PuppeteerSharp/ElementHandle.cs

@@ -1002,6 +1002,8 @@ private void IntersectBoundingBox(BoundingBox box, decimal width, decimal height
                     ? Math.Min(height - box.Y, box.Height)
                     : Math.Min(height, box.Height + box.Y),
                 0);
+            box.X = Math.Max(box.X, 0);
+            box.Y = Math.Max(box.Y, 0);
         }
     }
 }