Skip to content

Commit 0a4fdb7

Browse files
authored
Update chrome to 121.0.6167.85 (#2411)
* Update chrome to 121.0.6167.85 * Update accessibility * more accessibility fixes
1 parent a9b8033 commit 0a4fdb7

File tree

8 files changed

+36
-21
lines changed

8 files changed

+36
-21
lines changed

lib/PuppeteerSharp.Tests/AccessibilityTests/AccessibilityTests.cs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ namespace PuppeteerSharp.Tests.AccessibilityTests
88
{
99
public class AccessibilityTests : PuppeteerPageBaseTest
1010
{
11-
public AccessibilityTests() : base()
12-
{
13-
}
14-
1511
[PuppeteerTest("accessibility.spec.ts", "Accessibility", "should work")]
1612
[Skip(SkipAttribute.Targets.Firefox)]
1713
public async Task ShouldWork()
@@ -86,7 +82,8 @@ await Page.SetContentAsync(@"
8682
Role = "textbox",
8783
Name = "placeholder",
8884
Value= "and a value",
89-
Description= "This is a description!"},
85+
Description= "This is a description!"
86+
},
9087
new (){
9188
Role= "combobox",
9289
Name= "",
@@ -118,6 +115,8 @@ public async Task ShouldReportUninterestingNodes()
118115
await Page.SetContentAsync("<textarea autofocus>hi</textarea>");
119116
await Page.FocusAsync("textarea");
120117

118+
// This object has more children than in upstream.
119+
// Because upstream uses `toMatchObject` which stops going deeper if the element has not Children.
121120
Assert.AreEqual(
122121
new SerializedAXNode
123122
{
@@ -135,7 +134,14 @@ public async Task ShouldReportUninterestingNodes()
135134
{
136135
new() {
137136
Role = "StaticText",
138-
Name = "hi"
137+
Name = "hi",
138+
Children = new SerializedAXNode[]
139+
{
140+
new()
141+
{
142+
Role = "InlineTextBox",
143+
}
144+
}
139145
}
140146
}
141147
}

lib/PuppeteerSharp.Tests/AccessibilityTests/RootOptionTests.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ namespace PuppeteerSharp.Tests.AccessibilityTests
88
{
99
public class RootOptionTests : PuppeteerPageBaseTest
1010
{
11-
public RootOptionTests(): base()
12-
{
13-
}
14-
1511
[PuppeteerTest("accessibility.spec.ts", "root option", "should work a button")]
1612
[Skip(SkipAttribute.Targets.Firefox)]
1713
public async Task ShouldWorkAButton()
@@ -124,6 +120,13 @@ public async Task ShouldSupportTheInterestingOnlyOption()
124120
{
125121
Role = "StaticText",
126122
Name = "My Button",
123+
Children = new SerializedAXNode[]
124+
{
125+
new()
126+
{
127+
Role = "InlineTextBox",
128+
}
129+
}
127130
}
128131
}
129132
}

lib/PuppeteerSharp/BrowserData/Chrome.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static class Chrome
1313
/// <summary>
1414
/// Default chrome build.
1515
/// </summary>
16-
public static string DefaultBuildId => "119.0.6045.105";
16+
public static string DefaultBuildId => "121.0.6167.85";
1717

1818
internal static async Task<string> ResolveBuildIdAsync(ChromeReleaseChannel channel)
1919
=> (await GetLastKnownGoodReleaseForChannel(channel).ConfigureAwait(false)).Version;

lib/PuppeteerSharp/Messaging/AccessibilityGetFullAXTreeResponse.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ public class AXTreeNode
2424
public IEnumerable<AXTreeProperty> Properties { get; set; }
2525

2626
public object BackendDOMNodeId { get; set; }
27+
28+
public bool Ignored { get; set; }
2729
}
2830

2931
public class AXTreeProperty

lib/PuppeteerSharp/PageAccessibility/AXNode.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@ internal class AXNode
1515
private readonly bool _editable;
1616
private readonly bool _hidden;
1717
private readonly string _role;
18+
private readonly bool _ignored;
1819
private bool? _cachedHasFocusableChild;
1920

20-
public AXNode(AccessibilityGetFullAXTreeResponse.AXTreeNode payload)
21+
private AXNode(AccessibilityGetFullAXTreeResponse.AXTreeNode payload)
2122
{
2223
Payload = payload;
2324

2425
_name = payload.Name != null ? payload.Name.Value.ToObject<string>() : string.Empty;
2526
_role = payload.Role != null ? payload.Role.Value.ToObject<string>() : "Unknown";
27+
_ignored = payload.Ignored;
2628

2729
_richlyEditable = payload.Properties?.FirstOrDefault(p => p.Name == "editable")?.Value.Value.ToObject<string>() == "richtext";
2830
_editable |= _richlyEditable;
@@ -151,6 +153,7 @@ internal bool IsControl()
151153
case "tab":
152154
case "textbox":
153155
case "tree":
156+
case "treeitem":
154157
return true;
155158
default:
156159
return false;
@@ -159,7 +162,7 @@ internal bool IsControl()
159162

160163
internal bool IsInteresting(bool insideControl)
161164
{
162-
if (_role == "Ignored" || _hidden)
165+
if (_role == "Ignored" || _hidden || _ignored)
163166
{
164167
return false;
165168
}
@@ -252,7 +255,8 @@ private bool IsPlainTextField()
252255
private bool IsTextOnlyObject()
253256
=> _role == "LineBreak" ||
254257
_role == "text" ||
255-
_role == "InlineTextBox";
258+
_role == "InlineTextBox" ||
259+
_role == "StaticText";
256260

257261
private bool HasFocusableChild()
258262
{

lib/PuppeteerSharp/PageAccessibility/Accessibility.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ private SerializedAXNode[] SerializeTree(AXNode node, List<AXNode> whitelistedNo
8888
var serializedNode = node.Serialize();
8989
if (children.Count > 0)
9090
{
91-
serializedNode.Children = children.ToArray();
91+
serializedNode.Children = [.. children];
9292
}
9393

94-
return new[] { serializedNode };
94+
return [serializedNode];
9595
}
9696
}
9797
}

lib/PuppeteerSharp/PageAccessibility/CheckedState.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace PuppeteerSharp.PageAccessibility
66
public enum CheckedState
77
{
88
/// <summary>
9-
/// Flse.
9+
/// False.
1010
/// </summary>
1111
False = 0,
1212

lib/PuppeteerSharp/PuppeteerSharp.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<Description>Headless Browser .NET API</Description>
1313
<PackageId>PuppeteerSharp</PackageId>
1414
<PackageReleaseNotes></PackageReleaseNotes>
15-
<PackageVersion>13.0.2</PackageVersion>
16-
<ReleaseVersion>13.0.2</ReleaseVersion>
17-
<AssemblyVersion>13.0.2</AssemblyVersion>
18-
<FileVersion>13.0.2</FileVersion>
15+
<PackageVersion>14.0.0</PackageVersion>
16+
<ReleaseVersion>14.0.0</ReleaseVersion>
17+
<AssemblyVersion>14.0.0</AssemblyVersion>
18+
<FileVersion>14.0.0</FileVersion>
1919
<SynchReleaseVersion>false</SynchReleaseVersion>
2020
<StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>
2121
<DebugType>embedded</DebugType>

0 commit comments

Comments
 (0)