Merge pull request #1218 from TheJayMann/issue-1205-iframe-targets-2

FlorianRappl · web-flow · commit 7fa4d5f58a31 · 2025-02-02T22:21:54.000+01:00
Add support for finding targets in auxilary browsing contexts
diff --git a/src/AngleSharp.Core.Tests/Html/IframeTargets.cs b/src/AngleSharp.Core.Tests/Html/IframeTargets.cs
@@ -263,7 +263,7 @@ public async Task AnchorTargetsSiblingIframeInIframe()
     }
 
     [Test]
-    public async Task AnchorTargetsIframeInDifferentWindow()
+    public async Task AnchorTargetsIframeFromDifferentWindow()
     {
         var context = BrowsingContext.New(Configuration.Default.WithVirtualRequester(req => req.Address.Href switch
         {
@@ -327,6 +327,71 @@ public async Task AnchorTargetsIframeInDifferentWindow()
         Assert.AreEqual("iframe content", headerTexts[0].InnerHtml);
     }
 
+    [Test]
+    public async Task AnchorTargetsIframeInDifferentWindow()
+    {
+        var context = BrowsingContext.New(Configuration.Default.WithVirtualRequester(req => req.Address.Href switch
+        {
+            "https://localhost/inner-iframe.html" => CreateResponse(req.Address,
+                // language=html
+                """
+                <html>
+                <body>
+                    <h1>iframe content</h1>
+                </body>
+                </html>
+                """u8
+            ),
+            "https://localhost/new-window.html" => CreateResponse(req.Address,
+                // language=html
+                """
+                <html>
+                <body>
+                    <iframe id="iframe" name="iframe"></iframe>
+                </body>
+                </html>
+                """u8
+            ),
+            "https://localhost/" => CreateResponse(req.Address,
+                // language=html
+                """
+                <html>
+                <body>
+                    <a href="inner-iframe.html" id="frame-link" target="iframe">Load frame</a>
+                    <a href="new-window.html" id="window-link" target="new-window">Load window</a>
+                </body>
+                </html>
+                """u8
+            ),
+            _ => CreateNotFoundResponse(req.Address),
+        }));
+
+        var doc = await context.OpenAsync("https://localhost/");
+
+        var newWindowLink = doc.GetElementById("window-link") as IHtmlAnchorElement;
+        Assert.IsNotNull(newWindowLink);
+        newWindowLink.DoClick();
+
+        await Task.Delay(1000);
+
+        var newWindowDoc = context.FindChild("new-window")?.Active;
+        Assert.IsNotNull(newWindowDoc);
+
+        var frameLink = doc.GetElementById("frame-link") as IHtmlAnchorElement;
+        Assert.IsNotNull(frameLink);
+        frameLink.DoClick();
+
+        await Task.Delay(1000);
+
+        var iframe = newWindowDoc.GetElementById("iframe") as IHtmlInlineFrameElement;
+        Assert.IsNotNull(iframe?.ContentDocument);
+
+        var headerTexts = iframe.ContentDocument.GetElementsByTagName("h1");
+        Assert.IsNotNull(headerTexts);
+        Assert.AreEqual(1, headerTexts.Length);
+        Assert.AreEqual("iframe content", headerTexts[0].InnerHtml);
+    }
+
     [Test]
     public async Task AnchorTargetsCurrentWindowWithTop()
     {
diff --git a/src/AngleSharp/BrowsingContext.cs b/src/AngleSharp/BrowsingContext.cs
@@ -21,6 +21,7 @@ public sealed class BrowsingContext : EventTarget, IBrowsingContext, IDisposable
         private readonly Boolean _isFrameContext;
         private readonly IHistory? _history;
         private readonly Dictionary<String, WeakReference<IBrowsingContext>> _children;
+        private readonly List<WeakReference<IBrowsingContext>> _contextGroup;
 
         #endregion
 
@@ -45,6 +46,7 @@ private BrowsingContext(Sandboxes security)
             _originalServices = _services;
             _security = security;
             _children = [];
+            _contextGroup = [];
         }
 
         internal BrowsingContext(IEnumerable<Object> services, Sandboxes security)
@@ -207,6 +209,19 @@ internal IBrowsingContext CreateChild(String? name, Sandboxes security, Boolean
         {
             var context = new BrowsingContext(this, security, isFrameContext);
 
+            // if the new context is not a frame context, then it should be added
+            // to the top-most browsing context, as a new top-level auxilary
+            // browser context
+            if (!isFrameContext)
+            {
+                if (_contextGroup is null)
+                {
+                    // _parent should not be null if _contextGroup is null
+                    return _parent!.CreateChild(name, security);
+                }
+                _contextGroup.Add(new(context));
+            }
+
             if (name is { Length: > 0 })
             {
                 _children[name] = new WeakReference<IBrowsingContext>(context);
@@ -230,7 +245,26 @@ internal IBrowsingContext CreateChild(String? name, Sandboxes security, Boolean
                 foundChildContext = currentContext.FindChildRecursive(name, excludedChild);
                 excludedChild = currentContext;
                 currentContext = currentContext.Parent as BrowsingContext;
+            }
 
+            if (foundChildContext is null && excludedChild is BrowsingContext { _contextGroup : not null and  var group })
+            {
+                // TODO
+                // if the initial browsing context was part of a top-level auxilary browsing context,
+                // it should be filtered out so that it is not searched again
+                foreach (var contextRef in group)
+                {
+                    if (!contextRef.TryGetTarget(out var c) || c is not BrowsingContext context)
+                    {
+                        continue;
+                    }
+
+                    foundChildContext = context.FindChildRecursive(name, null);
+
+                    if (foundChildContext is not null) {
+                        return foundChildContext;
+                    }
+                }
             }
 
             return foundChildContext;
