From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 868DC1FF1F5 for ; Tue, 16 Dec 2025 10:54:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D608CAE09; Tue, 16 Dec 2025 10:55:33 +0100 (CET) From: Dominik Csapak To: yew-devel@lists.proxmox.com Date: Tue, 16 Dec 2025 10:55:18 +0100 Message-ID: <20251216095529.1019541-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [yew-devel] [PATCH yew-widget-toolkit 1/2] state: navigation: add 'replace_relative_route' to NavigationContextExt X-BeenThere: yew-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Yew framework devel list at Proxmox List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Yew framework devel list at Proxmox Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: yew-devel-bounces@lists.proxmox.com Sender: "yew-devel" so we can not only push new relative routes, but also replace the current one. To not duplicate that much code, refactor the absolute path generation out, this even avoids some duplication we already had. Signed-off-by: Dominik Csapak --- src/state/navigation_container.rs | 55 ++++++++++++++++--------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/src/state/navigation_container.rs b/src/state/navigation_container.rs index eced509..b9090eb 100644 --- a/src/state/navigation_container.rs +++ b/src/state/navigation_container.rs @@ -243,10 +243,25 @@ pub trait NavigationContextExt { fn nav_context(&self) -> Option; /// Returns the full route to this context ("/parent_path/path"). fn full_path(&self) -> Option; - /// Change the current route to "/parent_path/path". + /// Push a new route "/parent_path/path". /// /// Only works if the scope provides a [Navigator](yew_router::navigator::Navigator). fn push_relative_route(&self, path: &str); + /// Replace the current route with "/parent_path/path". + /// + /// Only works if the scope provides a [Navigator](yew_router::navigator::Navigator). + fn replace_relative_route(&self, path: &str); +} + +fn get_new_absolute_path(scope: &yew::html::Scope, path: &str) -> String { + let path = normalize_segment(path); + let parent_path = scope + .context::(Callback::from(|_| {})) + .and_then(|(ctx, _)| ctx.parent_path); + match parent_path { + Some(parent_path) => format!("{}/{}", parent_path, path), + None => format!("/{}", path), + } } impl NavigationContextExt for yew::html::Scope { @@ -260,32 +275,18 @@ impl NavigationContextExt for yew::html::Scope { } fn push_relative_route(&self, path: &str) { - let path = normalize_segment(path); - //log::info!("PUSH REL {}", path); - if let Some((nav_ctx, _handle)) = self.context::(Callback::from(|_| {})) - { - let abs_path = match &nav_ctx.parent_path { - Some(parent_path) => format!("{}/{}", parent_path, path), - None => format!("/{}", path), - }; - match self.navigator() { - Some(navigator) => { - navigator.push(&AnyRoute::new(abs_path)); - } - None => { - log::error!("no Navigator found"); - } - } - } else { - match self.navigator() { - Some(navigator) => { - let path = format!("/{}", path); - navigator.push(&AnyRoute::new(path)); - } - None => { - log::error!("no Navigator found"); - } - } + let new_path = get_new_absolute_path(self, path); + match self.navigator() { + Some(navigator) => navigator.push(&AnyRoute::new(new_path)), + None => log::error!("no Navigator found"), + } + } + + fn replace_relative_route(&self, path: &str) { + let new_path = get_new_absolute_path(self, path); + match self.navigator() { + Some(navigator) => navigator.replace(&AnyRoute::new(new_path)), + None => log::error!("no Navigator found"), } } } -- 2.47.3 _______________________________________________ yew-devel mailing list yew-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/yew-devel