Mirrors/leptos
2
0
Fork 0
mirror of https://github.com/leptos-rs/leptos synced 2024-11-10 14:54:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove actions

Browse source
This commit is contained in:
Greg Johnston 2022-11-03 21:11:59 -04:00
parent d5e3661bcf
commit e16cc4fc4a
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
router/src/components/route.rs
View file

@ -5,7 +5,7 @@ use typed_builder::TypedBuilder;
use crate::{
matching::{resolve_path, PathMatch, RouteDefinition, RouteMatch},
Action, Loader, ParamsMap, RouterContext,
Loader, ParamsMap, RouterContext,
};
pub struct ChildlessRoute {}
@ -21,8 +21,6 @@ where
#[builder(default, setter(strip_option))]
loader: Option<Loader>,
#[builder(default, setter(strip_option))]
action: Option<Action>,
#[builder(default, setter(strip_option))]
children: Option<Box<dyn Fn() -> Vec<RouteDefinition>>>,
}
@ -35,7 +33,6 @@ where
RouteDefinition {
path: props.path,
loader: props.loader,
action: props.action,
children: props.children.map(|c| c()).unwrap_or_default(),
element: Rc::new(move |cx| (props.element)(cx).into_child(cx)),
}
@ -58,10 +55,7 @@ impl RouteContext {
let RouteMatch { path_match, route } = matcher()?;
let PathMatch { path, .. } = path_match;
let RouteDefinition {
element,
loader,
action,
..
element, loader, ..
} = route.key;
let params = create_memo(cx, move |_| {
matcher()
@ -75,7 +69,6 @@ impl RouteContext {
base_path: base.to_string(),
child: Box::new(child),
loader,
action,
path,
original_path: route.original_path.to_string(),
params,
@ -107,7 +100,6 @@ impl RouteContext {
base_path: path.to_string(),
child: Box::new(|| None),
loader: None,
action: None,
path: path.to_string(),
original_path: path.to_string(),
params: create_memo(cx, |_| ParamsMap::new()),
@ -134,7 +126,6 @@ pub(crate) struct RouteContextInner {
base_path: String,
pub(crate) child: Box<dyn Fn() -> Option<RouteContext>>,
pub(crate) loader: Option<Loader>,
pub(crate) action: Option<Action>,
pub(crate) path: String,
pub(crate) original_path: String,
pub(crate) params: Memo<ParamsMap>,

4
router/src/matching/route.rs
View file

@ -3,13 +3,12 @@ use std::rc::Rc;
use leptos::leptos_dom::Child;
use leptos::*;
use crate::{Action, Loader};
use crate::Loader;
#[derive(Clone)]
pub struct RouteDefinition {
pub path: &'static str,
pub loader: Option<Loader>,
pub action: Option<Action>,
pub children: Vec<RouteDefinition>,
pub element: Rc<dyn Fn(Scope) -> Child>,
}
@ -36,7 +35,6 @@ impl Default for RouteDefinition {
Self {
path: Default::default(),
loader: Default::default(),
action: Default::default(),
children: Default::default(),
element: Rc::new(|_| Child::Null),
}