Skip to content

Fix settings back button navigation #730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ManorDev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix settings back button navigation #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions packages/oneclient_app/src/layout/animated_outlet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,19 @@ impl Component for AnimatedAppOutlet {
fn render(&self) -> impl IntoElement {
let mut router = use_animated_router::<Route>();

let history = use_previous_and_current(use_route::<Route>());
let back_title = history.read().0.title();
let route = use_route::<Route>();
let mut origin_route = use_state(|| route.clone());
let mut last_route = use_state(|| route.clone());

use_side_effect_with_deps(&route, move |current| {
let prev = last_route.peek().clone();
if !(is_sidebar_route(&prev) && is_sidebar_route(current)) {
origin_route.set(prev);
}
last_route.set(current.clone());
});

let back_title = origin_route.read().title();

let anim = use_animation(|_conf| {
AnimNum::new(0., 1.)
Expand Down
7 changes: 3 additions & 4 deletions packages/oneclient_app/src/layout/settings_shell.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,7 @@ const SEARCH_INDEX: &[SearchItem] = &[
title: "Free up space",
description: "Remove cached packages and leftovers nothing is using.",
keywords: &[
"storage", "clean", "cleanup", "free", "space", "cache", "unused", "orphan",
"leftover",
"storage", "clean", "cleanup", "free", "space", "cache", "unused", "orphan", "leftover",
],
route: Route::SettingsStorage {},
},
Expand Down Expand Up @@ -576,7 +575,7 @@ fn search_results(query: &SearchQuery, mut search: State<String>) -> Vec<Element
.on_press(move |_| {
set_pending_setting_focus(id);
search.set(String::new());
let _ = RouterContext::get().push(route.clone());
let _ = RouterContext::get().replace(route.clone());
})
.child(Icon::new(item.icon))
.child(
Expand Down Expand Up @@ -808,7 +807,7 @@ impl Component for SidebarItem {
})
.map(route, |el, route| {
el.on_all_press(move |_| {
let _ = RouterContext::get().push(route.clone());
let _ = RouterContext::get().replace(route.clone());
})
});

Expand Down