zenithsiz/dynatos
1
0
Fork 0
mirror of https://github.com/Zenithsiz/dynatos.git synced 2026-02-08 04:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed WithDefault not working for signals that yield &Option<T>.

Browse Source
This commit is contained in:
Filipe Rodrigues 2024-12-22 15:17:27 +00:00
parent 91b7927e3b
commit e9f29e1229
Signed by: zenithsiz
SSH Key Fingerprint: SHA256:Mb5ppb3Sh7IarBO/sBTXLHbYEOz37hJAlslLQPPAPaU
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dynatos-reactive/src/with_default.rs
View File

@ -65,7 +65,9 @@ impl<S: SignalBorrow, T> SignalBorrow for WithDefault<S, T> {
impl<S, T> SignalWith for WithDefault<S, T>
where
S: for<'a> SignalWith<Value<'a> = Option<&'a T>>,
S: SignalWith,
// Note: This allows both `Option<&'_ T>` and `&'_ Option<T>`
for<'a> S::Value<'a>: Into<Option<&'a T>>,
T: 'static,
{
type Value<'a> = &'a T;
@ -75,13 +77,15 @@ where
where
F: for<'a> FnOnce(Self::Value<'a>) -> O,
{
self.inner.with(|value| match value {
self.inner.with(|value| match value.into() {
Some(value) => f(value),
None => f(&self.default),
})
}
}
// TODO: Impl `SignalGet<Option<T>>` once we can?
impl<S, T> SignalReplace<T> for WithDefault<S, T>
where
S: SignalReplace<Option<T>>,