feat: Add generic overloads for Find and WaitFor methods to support specific element types

Author: linkdotnet

CHANGELOG.md

@@ -8,6 +8,8 @@ All notable changes to **bUnit** will be documented in this file. The project ad
 
 ## Added
 - Added `FindByAllByLabel` to `bunit.web.query` package. By [@linkdotnet](https://github.com/linkdotnet).
+- Added generic overloads `Find<TComponent, TElement>` and `FindAll<TComponent, TElement>` to query for specific element types (e.g., `IHtmlInputElement`). By [@linkdotnet](https://github.com/linkdotnet).
+- Added generic overloads `WaitForElement<TComponent, TElement>` and `WaitForElements<TComponent, TElement>` to wait for specific element types. By [@linkdotnet](https://github.com/linkdotnet).
 
 ## [2.1.1] - 2025-11-21
 

src/bunit/Extensions/RenderedComponentExtensions.cs

@@ -18,6 +18,22 @@ public static class RenderedComponentExtensions
 	/// <param name="cssSelector">The group of selectors to use.</param>
 	public static IElement Find<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector)
 		where TComponent : IComponent
+		=> Find<TComponent, IElement>(renderedComponent, cssSelector);
+
+	/// <summary>
+	/// Returns the first element of type <typeparamref name="TElement"/> from the rendered fragment or component under test,
+	/// using the provided <paramref name="cssSelector"/>, in a depth-first pre-order traversal
+	/// of the rendered nodes.
+	/// </summary>
+	/// <typeparam name="TComponent">The type of the component under test.</typeparam>
+	/// <typeparam name="TElement">The type of element to find (e.g., IHtmlInputElement).</typeparam>
+	/// <param name="renderedComponent">The rendered fragment to search.</param>
+	/// <param name="cssSelector">The group of selectors to use.</param>
+	/// <exception cref="ElementNotFoundException">Thrown if no element matches the <paramref name="cssSelector"/>.</exception>
+	/// <exception cref="InvalidOperationException">Thrown if the element found does not match the type <typeparamref name="TElement"/>.</exception>
+	public static TElement Find<TComponent, TElement>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector)
+		where TComponent : IComponent
+		where TElement : class, IElement
 	{
 		ArgumentNullException.ThrowIfNull(renderedComponent);
 
@@ -26,7 +42,11 @@ public static IElement Find<TComponent>(this IRenderedComponent<TComponent> rend
 		if (result is null)
 			throw new ElementNotFoundException(cssSelector);
 
-		return result.WrapUsing(new CssSelectorElementFactory((IRenderedComponent<IComponent>)renderedComponent, cssSelector));
+		if (result is not TElement)
+			throw new ElementNotFoundException(
+				$"The element matching '{cssSelector}' is of type '{result.GetType().Name}', not '{typeof(TElement).Name}'.");
+
+		return (TElement)result.WrapUsing(new CssSelectorElementFactory((IRenderedComponent<IComponent>)renderedComponent, cssSelector));
 	}
 
 	/// <summary>
@@ -39,10 +59,25 @@ public static IElement Find<TComponent>(this IRenderedComponent<TComponent> rend
 	/// <returns>An <see cref="IReadOnlyList{IElement}"/>, that can be refreshed to execute the search again.</returns>
 	public static IReadOnlyList<IElement> FindAll<TComponent>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector)
 		where TComponent : IComponent
+		=> FindAll<TComponent, IElement>(renderedComponent, cssSelector);
+
+	/// <summary>
+	/// Returns a collection of elements of type <typeparamref name="TElement"/> from the rendered fragment or component under test,
+	/// using the provided <paramref name="cssSelector"/>, in a depth-first pre-order traversal
+	/// of the rendered nodes. Only elements matching the type <typeparamref name="TElement"/> are returned.
+	/// </summary>
+	/// <typeparam name="TComponent">The type of the component under test.</typeparam>
+	/// <typeparam name="TElement">The type of elements to find (e.g., IHtmlInputElement).</typeparam>
+	/// <param name="renderedComponent">The rendered fragment to search.</param>
+	/// <param name="cssSelector">The group of selectors to use.</param>
+	/// <returns>An <see cref="IReadOnlyList{TElement}"/> containing only elements matching the specified type.</returns>
+	public static IReadOnlyList<TElement> FindAll<TComponent, TElement>(this IRenderedComponent<TComponent> renderedComponent, string cssSelector)
+		where TComponent : IComponent
+		where TElement : class, IElement
 	{
 		ArgumentNullException.ThrowIfNull(renderedComponent);
 
-		return renderedComponent.Nodes.QuerySelectorAll(cssSelector).ToArray();
+		return renderedComponent.Nodes.QuerySelectorAll(cssSelector).OfType<TElement>().ToArray();
 	}
 
 	/// <summary>