From 67310771914bbcdb15fcf3de12abb2ab461f2e22 Mon Sep 17 00:00:00 2001
From: thepra <thepra@pm.me>
Date: Tue, 6 Oct 2026 22:43:35 +0200
Subject: [PATCH] Dialogs close from a button and rise from the bottom on
 phones
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

DModal draws a close button (✕, named by CloseText) beside its heading, in a header that stays in view while the box
scrolls; a long list of who liked a post left only the thin margins around the box to tap out of it. A new
ResponsiveBottom placement makes the box a sheet from the bottom below md and keeps it in the middle from md; the
report, liked-by and boosted-by, edit history and public notice dialogs use it. Boxes are at most 100dvh tall, so a
phone's browser bars don't cut them, and a bottom sheet leaves 3rem above itself and clears the home indicator. The
report dialog gets a Cancel button.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LsXgEaXee4GCU1hwYgPJXw
---
 Components/Content.razor                |  2 +-
 Components/Daisy/Actions/DModal.razor   | 28 +++++++++++++++++++++----
 Components/Daisy/Actions/DModalEnums.cs |  4 +++-
 Components/InteractedByDialog.razor     |  2 +-
 Components/PublicNoticeHost.razor       |  2 +-
 Components/ReportDialog.razor           |  7 +++++--
 Styles/neo.css                          |  8 +++++++
 7 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/Components/Content.razor b/Components/Content.razor
index 079976b..85298aa 100644
--- a/Components/Content.razor
+++ b/Components/Content.razor
@@ -398,7 +398,7 @@
 						}
 						@if (isHistoryOpen)
 						{
-							<DModal IsOpen="true" IsOpenChanged="HistoryClosed" CloseText="@Localizer["Close"]" data-history-list>
+							<DModal Placement="DModalPlacement.ResponsiveBottom" IsOpen="true" IsOpenChanged="HistoryClosed" CloseText="@Localizer["Close"]" data-history-list>
 								<Heading>@Localizer["Edit history"]</Heading>
 								<ChildContent>
 									<ol class="flex flex-col gap-4 mt-3">
diff --git a/Components/Daisy/Actions/DModal.razor b/Components/Daisy/Actions/DModal.razor
index 59a8ad6..fcd6cce 100644
--- a/Components/Daisy/Actions/DModal.razor
+++ b/Components/Daisy/Actions/DModal.razor
@@ -2,13 +2,30 @@
 
 @* daisyUI Modal: https://daisyui.com/components/modal/ . Always rendered; the open state lives in C# (@bind-IsOpen)
    and shows as modal-open. On opening, the box takes the focus (Blazor's FocusAsync) so that Escape, handled on the
-   root, closes it; the backdrop button stretches over the area outside the box and closes it on click. *@
+   root, closes it; the backdrop button stretches over the area outside the box and closes it on click, and a visible
+   close button (ShowClose, named by CloseText) sits beside the heading, which stays in view while the box scrolls. *@
 <div @attributes="AdditionalAttributes" role="dialog" aria-modal="true" aria-labelledby="@(Heading is null ? null : uid)"
 	 class="@CssClass" @onkeydown="OnKeyDown">
 	<div @ref="box" tabindex="-1" class="@Cx("modal-box focus:outline-none", BoxClass)">
-		@if (Heading is not null)
+		@if (Heading is not null || ShowClose)
 		{
-			<h3 id="@uid" class="text-lg font-bold">@Heading</h3>
+			<div class="sticky top-0 z-10 flex items-start gap-3 bg-base-100">
+				@if (Heading is not null)
+				{
+					<h3 id="@uid" class="flex-1 min-w-0 text-lg font-bold">@Heading</h3>
+				}
+				else
+				{
+					<span class="flex-1"></span>
+				}
+				@if (ShowClose)
+				{
+					<button type="button" class="btn btn-sm btn-circle btn-ghost flex-none" aria-label="@CloseText" title="@CloseText"
+							@onclick="Close" data-modal-close>
+						<span aria-hidden="true">✕</span>
+					</button>
+				}
+			</div>
 		}
 		@ChildContent
 		@if (Actions is not null)
@@ -35,8 +52,10 @@
 	[Parameter] public DModalPlacement Placement { get; set; }
 	/// <summary>Close on a click outside the box (renders the modal-backdrop).</summary>
 	[Parameter] public bool CloseOnBackdrop { get; set; } = true;
-	/// <summary>Text of the invisible backdrop button, read by screen readers.</summary>
+	/// <summary>Name of the close button and of the invisible backdrop button, read by screen readers.</summary>
 	[Parameter] public string CloseText { get; set; } = "close";
+	/// <summary>A visible close button beside the heading.</summary>
+	[Parameter] public bool ShowClose { get; set; } = true;
 	[Parameter] public string BoxClass { get; set; }
 
 	readonly string uid = "d" + Guid.NewGuid().ToString("N")[..8];
@@ -52,6 +71,7 @@
 		DModalPlacement.Bottom => "modal-bottom",
 		DModalPlacement.Start => "modal-start",
 		DModalPlacement.End => "modal-end",
+		DModalPlacement.ResponsiveBottom => "modal-bottom md:modal-middle",
 		_ => null
 	};
 
diff --git a/Components/Daisy/Actions/DModalEnums.cs b/Components/Daisy/Actions/DModalEnums.cs
index 0182e4a..853bf6e 100644
--- a/Components/Daisy/Actions/DModalEnums.cs
+++ b/Components/Daisy/Actions/DModalEnums.cs
@@ -7,5 +7,7 @@ public enum DModalPlacement
 	Top,
 	Bottom,
 	Start,
-	End
+	End,
+	/// <summary>A sheet rising from the bottom below md (phones), in the middle from md.</summary>
+	ResponsiveBottom
 }
diff --git a/Components/InteractedByDialog.razor b/Components/InteractedByDialog.razor
index 72ba5d8..9f23294 100644
--- a/Components/InteractedByDialog.razor
+++ b/Components/InteractedByDialog.razor
@@ -2,7 +2,7 @@
 
 @* Who liked a post, or boosted it (/api/v1/statuses/:id/favourited_by, reblogged_by): the accounts PrivaPub knows to
    have done so, newest first, each opening its profile. *@
-<DModal IsOpen="true" IsOpenChanged="Closed" CloseText="@Localizer["Close"]" data-interacted-by="@(Boosts ? "boosts" : "likes")">
+<DModal Placement="DModalPlacement.ResponsiveBottom" IsOpen="true" IsOpenChanged="Closed" CloseText="@Localizer["Close"]" data-interacted-by="@(Boosts ? "boosts" : "likes")">
 	<Heading>@(Boosts ? Localizer["Boosted by"] : Localizer["Liked by"])</Heading>
 	<ChildContent>
 		@if (IsLoading)
diff --git a/Components/PublicNoticeHost.razor b/Components/PublicNoticeHost.razor
index 97fc0b5..170c225 100644
--- a/Components/PublicNoticeHost.razor
+++ b/Components/PublicNoticeHost.razor
@@ -3,7 +3,7 @@
 
 @* The one-time notice before a persona's first reaction or poll vote, and before it first joins an event
    (PublicNoticeService), in MainLayout. *@
-<DModal IsOpen="Notices.IsAsking" IsOpenChanged="Closed" CloseOnBackdrop="false" CloseText="@Localizer["Close"]">
+<DModal Placement="DModalPlacement.ResponsiveBottom" IsOpen="Notices.IsAsking" IsOpenChanged="Closed" CloseOnBackdrop="false" CloseText="@Localizer["Close"]">
 	<Heading>@(Notices.Act == PublicAct.Participation ? Localizer["Joining an event is public"] : Localizer["Reactions and votes are public"])</Heading>
 	<ChildContent>
 		<p class="text-sm">
diff --git a/Components/ReportDialog.razor b/Components/ReportDialog.razor
index e4ff613..5417240 100644
--- a/Components/ReportDialog.razor
+++ b/Components/ReportDialog.razor
@@ -2,7 +2,7 @@
 
 @* Reports an account, and the post it was opened from, to the persona's server's moderators (/api/v1/reports).
    Forwarded, a remote account's server gets the report too, from PrivaPub's own actor: it never names the persona. *@
-<DModal IsOpen="true" IsOpenChanged="Closed" CloseText="@Localizer["Close"]" data-report-dialog>
+<DModal Placement="DModalPlacement.ResponsiveBottom" IsOpen="true" IsOpenChanged="Closed" CloseText="@Localizer["Close"]" data-report-dialog>
 	<Heading>@Localizer["Report {0}", Account.Name]</Heading>
 	<ChildContent>
 		<EditForm Model="form" OnValidSubmit="Send" class="flex flex-col gap-3 mt-3">
@@ -20,7 +20,10 @@
 				<DCheckbox @bind-Value="form.Forward" LabelText="@Localizer["Send a copy to {0}", host]" data-report-forward />
 				<p class="text-xs opacity-70">@Localizer["The copy comes from the server, never from you."]</p>
 			}
-			<DButton Type="submit" Color="DColor.Error" Disabled="@(IsDefaultDisabled || isSending)" data-report-send>@Localizer["Report"]</DButton>
+			<div class="flex justify-end gap-2">
+				<DButton OnClick="() => Closed(false)" data-report-cancel>@Localizer["Cancel"]</DButton>
+				<DButton Type="submit" Color="DColor.Error" Disabled="@(IsDefaultDisabled || isSending)" data-report-send>@Localizer["Report"]</DButton>
+			</div>
 		</EditForm>
 	</ChildContent>
 </DModal>
diff --git a/Styles/neo.css b/Styles/neo.css
index 194144a..7794668 100644
--- a/Styles/neo.css
+++ b/Styles/neo.css
@@ -262,8 +262,16 @@
 	}
 }
 
+/* At most the screen's height as the phone shows it (dvh: its browser bars come and go), and a bottom sheet leaves room
+   above it and clears the home indicator. */
 @utility modal-box {
 	box-shadow: -6px -6px 12px var(--neo-light), 6px 6px 12px var(--neo-dark);
+	max-height: 100dvh;
+
+	:where(.modal-bottom) > & {
+		max-height: calc(100dvh - 3rem);
+		padding-bottom: max(1.5rem, env(safe-area-inset-bottom));
+	}
 }
 
 @utility dropdown-content {