Lifetime subtyping and variance???
This commit is contained in:
parent
30d96df00a
commit
a0a3ebb856
GPG Key ID:
F2272B50E129FC5C
|
|
@ -6,7 +6,7 @@
|
|||
<link href="https://cdn.jsdelivr.net/npm/@mdi/font@6.9.96/css/materialdesignicons.min.css" rel="stylesheet">
|
||||
<title>LAN Party</title>
|
||||
|
||||
<link rel="preload" href="/index-a2c5ffc914f34da_bg.wasm" as="fetch" type="application/wasm" crossorigin="">
|
||||
<link rel="modulepreload" href="/index-a2c5ffc914f34da.js"></head>
|
||||
<link rel="preload" href="/index-175ab564dbb350a3_bg.wasm" as="fetch" type="application/wasm" crossorigin="">
|
||||
<link rel="modulepreload" href="/index-175ab564dbb350a3.js"></head>
|
||||
<body>
|
||||
<script type="module">import init from '/index-a2c5ffc914f34da.js';init('/index-a2c5ffc914f34da_bg.wasm');</script></body></html>
|
||||
<script type="module">import init from '/index-175ab564dbb350a3.js';init('/index-175ab564dbb350a3_bg.wasm');</script></body></html>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
use std::{marker::PhantomData, str::FromStr};
|
||||
use std::{cell::RefCell, marker::PhantomData, str::FromStr};
|
||||
|
||||
use crate::components::Block;
|
||||
use lan_party_core::event::{
|
||||
|
|
@ -7,11 +7,11 @@ use lan_party_core::event::{
|
|||
};
|
||||
use log::debug;
|
||||
use paste::paste;
|
||||
use sycamore::prelude::*;
|
||||
use sycamore::{builder::prelude::*, component::Prop, prelude::*};
|
||||
|
||||
macro_rules! editable {
|
||||
($type:ty => $editor:ty) => {
|
||||
impl<'a, G: Html> Editable<'a, G> for $type {
|
||||
impl<'s: 'a, 'a, G: Html> Editable<'s, 'a, G> for $type {
|
||||
type Editor = $editor;
|
||||
}
|
||||
};
|
||||
|
|
@ -48,7 +48,7 @@ macro_rules! edit_struct {
|
|||
paste! {
|
||||
pub struct [<$struct Edit>];
|
||||
|
||||
impl<'a, G: Html> Editor<'a, G, $struct> for [<$struct Edit>] {
|
||||
impl<'s: 'a, 'a, G: Html> Editor<'s, 'a, G, $struct> for [<$struct Edit>] {
|
||||
fn edit(cx: Scope<'a>, props: EditProps<'a, $struct>) -> View<G> {
|
||||
let state = props.state;
|
||||
link_fields!(cx, $($prop,)* => state as $struct);
|
||||
|
|
@ -90,7 +90,7 @@ macro_rules! edit_enum {
|
|||
paste! {
|
||||
pub struct [<$enum Edit>];
|
||||
|
||||
impl<'a, G: Html> Editor<'a, G, $enum> for [<$enum Edit>] {
|
||||
impl<'s: 'a, 'a, G: Html> Editor<'s, 'a, G, $enum> for [<$enum Edit>] {
|
||||
fn edit(cx: Scope<'a>, props: EditProps<'a, $enum>) -> View<G> {
|
||||
let state = props.state;
|
||||
|
||||
|
|
@ -129,40 +129,40 @@ impl<'a, T> From<&'a Signal<T>> for EditProps<'a, T> {
|
|||
}
|
||||
}
|
||||
|
||||
pub trait IntoEdit<'a, G: Html> {
|
||||
fn edit(self, cx: Scope<'a>) -> View<G>;
|
||||
pub trait IntoEdit<'s: 'a, 'a, G: Html> {
|
||||
fn edit(self, cx: BoundedScope<'a, 's>) -> View<G>;
|
||||
}
|
||||
|
||||
impl<'a, G: Html, T: Editable<'a, G>> IntoEdit<'a, G> for &'a Signal<T>
|
||||
impl<'s: 'a, 'a, G: Html, T: Editable<'s, 'a, G> + 'a> IntoEdit<'s, 'a, G> for &'a Signal<T>
|
||||
where
|
||||
EditProps<'a, T>: From<&'a Signal<T>>,
|
||||
{
|
||||
fn edit(self, cx: Scope<'a>) -> View<G> {
|
||||
fn edit(self, cx: BoundedScope<'a, 's>) -> View<G> {
|
||||
T::edit(cx, self.into())
|
||||
}
|
||||
}
|
||||
|
||||
pub trait Edit<'a, G: Html>: Sized {
|
||||
fn edit(cx: Scope<'a>, props: EditProps<'a, Self>) -> View<G>;
|
||||
pub trait Edit<'s: 'a, 'a, G: Html>: Sized {
|
||||
fn edit(cx: BoundedScope<'a, 's>, props: EditProps<'a, Self>) -> View<G>;
|
||||
}
|
||||
|
||||
impl<'a, G, E, Type> Edit<'a, G> for Type
|
||||
impl<'s: 'a, 'a, G, E, Type> Edit<'s, 'a, G> for Type
|
||||
where
|
||||
G: Html,
|
||||
E: Editor<'a, G, Type>,
|
||||
Type: Editable<'a, G, Editor = E>,
|
||||
E: Editor<'s, 'a, G, Type>,
|
||||
Type: Editable<'s, 'a, G, Editor = E> + 'a,
|
||||
{
|
||||
fn edit(cx: Scope<'a>, props: EditProps<'a, Self>) -> View<G> {
|
||||
fn edit(cx: BoundedScope<'a, 's>, props: EditProps<'a, Self>) -> View<G> {
|
||||
E::edit(cx, props)
|
||||
}
|
||||
}
|
||||
|
||||
pub trait Editor<'a, G: Html, Type>: Sized {
|
||||
fn edit(cx: Scope<'a>, props: EditProps<'a, Type>) -> View<G>;
|
||||
pub trait Editor<'s: 'a, 'a, G: Html, Type: 'a>: Sized {
|
||||
fn edit(cx: BoundedScope<'a, 's>, props: EditProps<'a, Type>) -> View<G>;
|
||||
}
|
||||
|
||||
pub trait Editable<'a, G: Html>: Sized {
|
||||
type Editor: Editor<'a, G, Self>;
|
||||
pub trait Editable<'s: 'a, 'a, G: Html>: Sized + 'a {
|
||||
type Editor: Editor<'s, 'a, G, Self>;
|
||||
}
|
||||
|
||||
edit_struct!(EventSpec => ("Name", name), ("Description", description), ("Event type", event_type));
|
||||
|
|
@ -179,7 +179,7 @@ edit_struct!(FreeForAllGameSpec => );
|
|||
|
||||
pub struct StringEdit;
|
||||
|
||||
impl<'a, G: Html> Editor<'a, G, String> for StringEdit {
|
||||
impl<'s: 'a, 'a, G: Html> Editor<'s, 'a, G, String> for StringEdit {
|
||||
fn edit(cx: Scope<'a>, props: EditProps<'a, String>) -> View<G> {
|
||||
view! { cx,
|
||||
input(bind:value=props.state)
|
||||
|
|
@ -191,9 +191,9 @@ editable!(String => StringEdit);
|
|||
|
||||
pub struct StubEdit;
|
||||
|
||||
impl<'a, G: Html, T> Editor<'a, G, T> for StubEdit
|
||||
impl<'s: 'a, 'a, G: Html, T> Editor<'s, 'a, G, T> for StubEdit
|
||||
where
|
||||
T: Editable<'a, G, Editor = StubEdit>,
|
||||
T: Editable<'s, 'a, G, Editor = StubEdit>,
|
||||
{
|
||||
fn edit(cx: Scope<'a>, _props: EditProps<'a, T>) -> View<G> {
|
||||
view! { cx,
|
||||
|
|
@ -204,9 +204,9 @@ where
|
|||
|
||||
pub struct InputEdit;
|
||||
|
||||
impl<'a, G: Html, T> Editor<'a, G, T> for InputEdit
|
||||
impl<'s: 'a, 'a, G: Html, T> Editor<'s, 'a, G, T> for InputEdit
|
||||
where
|
||||
T: Editable<'a, G, Editor = InputEdit> + FromStr + ToString + Default,
|
||||
T: Editable<'s, 'a, G, Editor = InputEdit> + FromStr + ToString + Default,
|
||||
{
|
||||
fn edit(cx: Scope<'a>, props: EditProps<'a, T>) -> View<G> {
|
||||
let value = create_signal(cx, props.state.get_untracked().to_string());
|
||||
|
|
@ -236,7 +236,7 @@ editable!(f32 => InputEdit);
|
|||
|
||||
pub struct BoolEdit;
|
||||
|
||||
impl<'a, G: Html> Editor<'a, G, bool> for BoolEdit {
|
||||
impl<'s: 'a, 'a, G: Html> Editor<'s, 'a, G, bool> for BoolEdit {
|
||||
fn edit(cx: Scope<'a>, props: EditProps<'a, bool>) -> View<G> {
|
||||
view! { cx,
|
||||
input(type="checkbox", bind:checked=props.state)
|
||||
|
|
@ -248,14 +248,14 @@ editable!(bool => BoolEdit);
|
|||
|
||||
pub struct VecEdit;
|
||||
|
||||
impl<'a, G, T, I> Editor<'a, G, I> for VecEdit
|
||||
impl<'s: 'a, 'a, G, T, I> Editor<'s, 'a, G, I> for VecEdit
|
||||
where
|
||||
G: Html,
|
||||
T: Editable<'a, G> + Clone + PartialEq + 'a,
|
||||
I: IntoIterator<Item = T> + FromIterator<T> + Clone,
|
||||
T: Editable<'s, 'a, G> + Clone + PartialEq + 'a,
|
||||
I: IntoIterator<Item = T> + FromIterator<T> + Clone + 'a,
|
||||
{
|
||||
fn edit(cx: Scope<'a>, props: EditProps<'a, I>) -> View<G> {
|
||||
let vec = create_signal(
|
||||
fn edit(cx: BoundedScope<'a, 's>, props: EditProps<'a, I>) -> View<G> {
|
||||
let vec: &'a Signal<Vec<&'a Signal<T>>> = create_signal(
|
||||
cx,
|
||||
props
|
||||
.state
|
||||
|
|
@ -273,7 +273,6 @@ where
|
|||
create_effect(cx, || {
|
||||
props.state.set(
|
||||
vec.get()
|
||||
.as_ref()
|
||||
.iter()
|
||||
.cloned()
|
||||
.map(|x| x.get().as_ref().clone())
|
||||
|
|
@ -281,26 +280,106 @@ where
|
|||
)
|
||||
});
|
||||
|
||||
let test = Indexed(
|
||||
cx,
|
||||
IndexedProps::builder()
|
||||
.iterable(vec)
|
||||
.view(|cx: BoundedScope<'_, '_>, x: &'a Signal<T>| {
|
||||
//view! { cx, (T::edit(cx, EditProps { state: x })) }
|
||||
T::edit(cx, EditProps { state: x })
|
||||
})
|
||||
.build(),
|
||||
);
|
||||
test
|
||||
|
||||
/*
|
||||
//view! { cx, "Vec" }
|
||||
view! { cx,
|
||||
Indexed(
|
||||
iterable=vec,
|
||||
view=|cx: BoundedScope<'_, 'a>, x| {
|
||||
let signal = create_ref(cx, x);
|
||||
view=|cx: BoundedScope<'_, 'a>, x: &'a Signal<T>| {
|
||||
view! { cx,
|
||||
(T::edit(cx, x.into()))
|
||||
//(T::edit(cx, EditProps { state: x }))
|
||||
(something_with_signal(cx, EditProps { state: x }))
|
||||
}
|
||||
},
|
||||
)
|
||||
}
|
||||
*/
|
||||
|
||||
/*
|
||||
view! { cx,
|
||||
(View::new_fragment((vec.get().try_borrow().unwrap().clone().into_iter().map(|s: &'a Signal<T>| {
|
||||
view! { cx, (T::edit(cx, s.into())) }
|
||||
})).collect()))
|
||||
}
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a, G, T> Editable<'a, G> for Vec<T>
|
||||
/*
|
||||
#[component]
|
||||
pub fn VecTest<
|
||||
'a,
|
||||
G: Html,
|
||||
T: 'a + PartialEq + Clone + Editable<'a, G, Editor = E>,
|
||||
E: Editor<'a, G, T>,
|
||||
>(
|
||||
cx: Scope<'a>,
|
||||
props: EditProps<'a, Vec<T>>,
|
||||
) -> View<G> {
|
||||
/*
|
||||
let signals: &'a Signal<Vec<&'a Signal<String>>> = create_signal(
|
||||
cx,
|
||||
vec![
|
||||
create_signal(cx, String::new()),
|
||||
create_signal(cx, String::new()),
|
||||
],
|
||||
);
|
||||
*/
|
||||
|
||||
let signals = create_signal(
|
||||
cx,
|
||||
props
|
||||
.state
|
||||
.get()
|
||||
.iter()
|
||||
.cloned()
|
||||
.map(|s| create_signal(cx, s))
|
||||
.collect::<Vec<_>>(),
|
||||
);
|
||||
|
||||
view! { cx,
|
||||
Indexed(
|
||||
iterable=signals,
|
||||
view=|cx: BoundedScope<'_, 'a>, signal: &'a Signal<T>| {
|
||||
view! { cx,
|
||||
//(something_with_signal(cx, SignalWrapper(signal)))
|
||||
//(E::edit(cx, EditProps { state: signal }))
|
||||
//(T::edit(cx, EditProps { state: signal }))
|
||||
//(signal.edit(cx))
|
||||
}
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
pub struct SignalWrapper<'a, T>(&'a Signal<T>);
|
||||
|
||||
#[component]
|
||||
pub fn something_with_signal<'a, G: Html, T: 'a>(
|
||||
cx: Scope<'a>,
|
||||
signal: EditProps<'a, T>,
|
||||
) -> View<G> {
|
||||
drop(signal);
|
||||
view! { cx, "Something" }
|
||||
}
|
||||
|
||||
impl<'s: 'a, 'a, G, T> Editable<'s, 'a, G> for Vec<T>
|
||||
where
|
||||
G: Html,
|
||||
T: Editable<'a, G> + Clone + PartialEq + 'a,
|
||||
T: Editable<'s, 'a, G> + Clone + PartialEq + 'a,
|
||||
{
|
||||
type Editor = VecEdit;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue