refactor: rename PartialBase to FragmentBase

Author: egil

src/Htmxor/Builder/HtmxorComponentEndpointMatcherPolicy.cs

@@ -33,7 +33,7 @@ public Task ApplyAsync(HttpContext httpContext, CandidateSet candidates)
             var endpoint = candidates[i].Endpoint;
             var htmxorEndpointMetadata = endpoint.Metadata.GetMetadata<HtmxorEndpointMetadata>();
 
-            if (htmxorEndpointMetadata is null && htmxContext.Request.IsHtmxRequest && !htmxContext.Request.IsBoosted)
+            if (htmxorEndpointMetadata is null && !htmxContext.Request.IsFullPageRequest)
             {
                 candidates.SetValidity(i, false);
                 continue;

src/Htmxor/Components/FragmentBase.cs

@@ -0,0 +1,9 @@
+using Microsoft.AspNetCore.Components;
+
+namespace Htmxor.Components;
+
+public abstract class FragmentBase : ComponentBase
+{
+    internal bool WillRender() => ShouldRender();
+}
+

src/Htmxor/Components/HtmxPartial.cs

@@ -1,17 +1,30 @@
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Rendering;
 
 namespace Htmxor.Components;
 
-public sealed class HtmxPartial : PartialBase
+public sealed class HtmxPartial : FragmentBase
 {
+    [Parameter, EditorRequired]
+    public required RenderFragment ChildContent { get; set; }
+
     [Parameter] public bool Condition { get; set; } = true;
 
     public override Task SetParametersAsync(ParameterView parameters)
     {
+        if (!parameters.TryGetValue<RenderFragment>(nameof(ChildContent), out var childContent))
+        {
+            throw new ArgumentException($"{nameof(HtmxPartial)} requires a value for the parameter {nameof(ChildContent)}.");
+        }
+
+        ChildContent = childContent;
         Condition = parameters.GetValueOrDefault(nameof(Condition), true);
         return base.SetParametersAsync(parameters);
     }
 
-    protected internal override bool ShouldRender() => Condition;
+    protected override void BuildRenderTree(RenderTreeBuilder builder) 
+        => builder.AddContent(0, ChildContent);
+
+    protected override bool ShouldRender() => Condition;
 }
 

src/Htmxor/Components/PartialBase.cs

@@ -2,27 +2,34 @@
 
 namespace Htmxor.Http;
 
-public sealed class HtmxRequest(HttpContext context)
+public sealed class HtmxRequest
 {
+    private readonly HttpContext context;
+
+    /// <summary>
+    /// Gets whether or not the current request should be treated as a full page request.
+    /// </summary>
+    internal bool IsFullPageRequest => !IsHtmxRequest || IsBoosted;
+
     /// <summary>
     /// Gets the HTTP method of the current request.
     /// </summary>
-    public string Method => context.Request.Method;
+    public string Method { get; }
 
     /// <summary>
     /// Gets whether or not the current request is an Htmx triggered request.
     /// </summary>
-    public bool IsHtmxRequest => context.Request.Headers.ContainsKey(HtmxRequestHeaderNames.HtmxRequest);
+    public bool IsHtmxRequest { get; }
 
     /// <summary>
     /// Gets whether or not the current request is an request initiated via an element using hx-boost.
     /// </summary>
-    public bool IsBoosted => IsHtmxRequest && context.Request.Headers.ContainsKey(HtmxRequestHeaderNames.Boosted);
+    public bool IsBoosted { get; }
 
     /// <summary>
     /// Gets whether or not the current request is an Htmx history restore request.
     /// </summary>
-    public bool IsHistoryRestoreRequest => IsHtmxRequest && context.Request.Headers.ContainsKey(HtmxRequestHeaderNames.HistoryRestoreRequest);
+    public bool IsHistoryRestoreRequest { get; }
 
     /// <summary>
     /// Gets the current URL of the browser.
@@ -83,4 +90,16 @@ public string? Trigger
         && !string.IsNullOrWhiteSpace(values[0])
         ? values[0]
         : null;
+
+    /// <summary>
+    /// Creates a new instance of <see cref="HtmxRequest"/>.
+    /// </summary>
+    public HtmxRequest(HttpContext context)
+    {
+        this.context = context;
+        var ishtmx = IsHtmxRequest = context.Request.Headers.ContainsKey(HtmxRequestHeaderNames.HtmxRequest);
+        IsBoosted = ishtmx && context.Request.Headers.ContainsKey(HtmxRequestHeaderNames.Boosted);
+        IsHistoryRestoreRequest = ishtmx && context.Request.Headers.ContainsKey(HtmxRequestHeaderNames.HistoryRestoreRequest);
+        Method = context.Request.Method;
+    }
 }

src/Htmxor/Http/HtmxRequest.cs

@@ -514,12 +514,7 @@ private int RenderChildren(int componentId, TextWriter output, ArrayRange<Render
     private int RenderChildComponent(TextWriter output, ArrayRange<RenderTreeFrame> frames, int position)
     {
         ref var frame = ref frames.Array[position];
-
-        if (frame.Component is not PartialBase htmxPartial || htmxPartial.ShouldRender())
-        {
-            RenderChildComponent(output, ref frame);
-        }
-
+        RenderChildComponent(output, ref frame);
         return position + frame.ComponentSubtreeLength;
     }
 }

src/Htmxor/Rendering/HtmxorRenderer.HtmlWriting.cs

@@ -145,17 +145,17 @@ internal static void InitializeStandardComponentServices(
     internal void WriteComponentHtml(int componentId, TextWriter output)
     {
         var htmxContext = httpContext.GetHtmxContext();
-        if (htmxContext.Request.IsHtmxRequest && !htmxContext.Request.IsBoosted)
+        if (htmxContext.Request.IsFullPageRequest)
+        {
+            WriteComponent(componentId, output);
+        }
+        else
         {
             var matchingPartialComponentId = FindPartialComponentMatchingRequest(componentId);
             WriteComponent(
                 matchingPartialComponentId.HasValue ? matchingPartialComponentId.Value : componentId,
                 output);
         }
-        else
-        {
-            WriteComponent(componentId, output);
-        }
     }
 
     private int? FindPartialComponentMatchingRequest(int componentId)
@@ -168,9 +168,9 @@ internal void WriteComponentHtml(int componentId, TextWriter output)
 
             if (frame.FrameType is RenderTreeFrameType.Component)
             {
-                if (frame.Component is PartialBase partial)
+                if (frame.Component is FragmentBase partial)
                 {
-                    if (partial.ShouldRender())
+                    if (partial.WillRender())
                     {
                         return frame.ComponentId;
                     }