Compare commits
2 Commits
release-20
...
release-20
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
92720c15b3 | ||
|
|
5e59f66056 |
@@ -111,8 +111,6 @@ pub fn StatusBar() -> impl IntoView {
|
||||
|
||||
// Signal-based dropdown state: 0=none, 1=download, 2=upload, 3=theme
|
||||
let (active_dropdown, set_active_dropdown) = create_signal(0u8);
|
||||
// Guard to prevent global close from firing right after toggle opens
|
||||
let skip_next_close = store_value(false);
|
||||
|
||||
// Toggle a specific dropdown
|
||||
let toggle = move |id: u8| {
|
||||
@@ -121,8 +119,6 @@ pub fn StatusBar() -> impl IntoView {
|
||||
set_active_dropdown.set(0);
|
||||
} else {
|
||||
set_active_dropdown.set(id);
|
||||
// Mark that the next global close should be skipped
|
||||
skip_next_close.set_value(true);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -131,16 +127,15 @@ pub fn StatusBar() -> impl IntoView {
|
||||
set_active_dropdown.set(0);
|
||||
};
|
||||
|
||||
// Close dropdowns when tapping outside — uses click (fires after pointerdown)
|
||||
let _ = window_event_listener(ev::click, move |_| {
|
||||
if skip_next_close.get_value() {
|
||||
skip_next_close.set_value(false);
|
||||
return;
|
||||
}
|
||||
set_active_dropdown.set(0);
|
||||
});
|
||||
|
||||
view! {
|
||||
// Transparent overlay to close dropdowns when clicking outside
|
||||
<Show when=move || active_dropdown.get() != 0>
|
||||
<div
|
||||
class="fixed inset-0 z-[98] cursor-default"
|
||||
on:pointerdown=move |_| close_all()
|
||||
></div>
|
||||
</Show>
|
||||
|
||||
<div class="fixed bottom-0 left-0 right-0 h-8 min-h-8 bg-base-200 border-t border-base-300 flex items-center px-4 text-xs gap-4 text-base-content/70 z-[99]">
|
||||
|
||||
// --- DOWNLOAD SPEED DROPDOWN ---
|
||||
@@ -167,7 +162,6 @@ pub fn StatusBar() -> impl IntoView {
|
||||
<ul
|
||||
class="absolute bottom-full left-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300"
|
||||
style=move || if active_dropdown.get() == 1 { "display: block" } else { "display: none" }
|
||||
on:pointerdown=move |e| e.stop_propagation()
|
||||
>
|
||||
{
|
||||
limits.clone().into_iter().map(|(val, label)| {
|
||||
@@ -221,7 +215,6 @@ pub fn StatusBar() -> impl IntoView {
|
||||
<ul
|
||||
class="absolute bottom-full left-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300"
|
||||
style=move || if active_dropdown.get() == 2 { "display: block" } else { "display: none" }
|
||||
on:pointerdown=move |e| e.stop_propagation()
|
||||
>
|
||||
{
|
||||
limits.clone().into_iter().map(|(val, label)| {
|
||||
@@ -269,7 +262,6 @@ pub fn StatusBar() -> impl IntoView {
|
||||
<ul
|
||||
class="absolute bottom-full right-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-52 mb-2 border border-base-300 max-h-96 overflow-y-auto"
|
||||
style=move || if active_dropdown.get() == 3 { "display: block" } else { "display: none" }
|
||||
on:pointerdown=move |e| e.stop_propagation()
|
||||
>
|
||||
{
|
||||
let themes = vec![
|
||||
@@ -302,7 +294,6 @@ pub fn StatusBar() -> impl IntoView {
|
||||
}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<button
|
||||
class="btn btn-ghost btn-xs btn-square"
|
||||
title="Settings & Notification Permissions"
|
||||
|
||||
@@ -154,14 +154,6 @@ pub fn TorrentTable() -> impl IntoView {
|
||||
|
||||
// Signal-based sort dropdown for mobile
|
||||
let (sort_open, set_sort_open) = create_signal(false);
|
||||
let sort_skip_close = store_value(false);
|
||||
let _ = window_event_listener(ev::click, move |_| {
|
||||
if sort_skip_close.get_value() {
|
||||
sort_skip_close.set_value(false);
|
||||
return;
|
||||
}
|
||||
set_sort_open.set(false);
|
||||
});
|
||||
|
||||
let sort_arrow = move |col: SortColumn| {
|
||||
if sort_col.get() == col {
|
||||
@@ -332,7 +324,15 @@ pub fn TorrentTable() -> impl IntoView {
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="md:hidden flex flex-col h-full bg-base-200">
|
||||
<div class="md:hidden flex flex-col h-full bg-base-200 relative">
|
||||
// Transparent overlay to close sort dropdown
|
||||
<Show when=move || sort_open.get()>
|
||||
<div
|
||||
class="fixed inset-0 z-[98] cursor-default"
|
||||
on:pointerdown=move |_| set_sort_open.set(false)
|
||||
></div>
|
||||
</Show>
|
||||
|
||||
<div class="px-3 py-2 border-b border-base-200 flex justify-between items-center bg-base-100/95 backdrop-blur z-10 shrink-0">
|
||||
<span class="text-xs font-bold opacity-50 uppercase tracking-wider">"Torrents"</span>
|
||||
|
||||
@@ -343,12 +343,7 @@ pub fn TorrentTable() -> impl IntoView {
|
||||
on:pointerdown=move |e| {
|
||||
e.stop_propagation();
|
||||
let cur = sort_open.get_untracked();
|
||||
if cur {
|
||||
set_sort_open.set(false);
|
||||
} else {
|
||||
set_sort_open.set(true);
|
||||
sort_skip_close.set_value(true);
|
||||
}
|
||||
set_sort_open.set(!cur);
|
||||
}
|
||||
>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
|
||||
@@ -405,8 +400,7 @@ pub fn TorrentTable() -> impl IntoView {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="overflow-y-auto p-3 pb-20 flex-1 grid grid-cols-1 content-start gap-3">
|
||||
{move || filtered_torrents().into_iter().map(|t| {
|
||||
<div class="overflow-y-auto p-3 pb-20 flex-1 grid grid-cols-1 content-start gap-3"> {move || filtered_torrents().into_iter().map(|t| {
|
||||
let progress_class = if t.percent_complete >= 100.0 { "progress-success" } else { "progress-primary" };
|
||||
let status_str = format!("{:?}", t.status);
|
||||
let status_badge_class = match t.status {
|
||||
|
||||
Reference in New Issue
Block a user