fix some ownership issues
This commit is contained in:
1 parent
d6089bbd35
commit
ba7a663eb6
4 files changed
+20
-22
No files matched your search
@@ -1,16 +1,16 @@
|
||||
use core::{self, fmt::Debug};
|
||||
use std::cell::RefCell;
|
||||
use std::fmt::{self, Formatter};
|
||||
use std::marker::PhantomData;
|
||||
|
||||
use std::rc::Rc;
|
||||
//
|
||||
use dioxus_core::prelude::*;
|
||||
|
||||
use crate::dependency::Dep;
|
||||
use crate::use_signal;
|
||||
use crate::{dependency::Dependency, CopyValue};
|
||||
use crate::{use_signal, Signal};
|
||||
|
||||
#[derive(Default, Clone, Copy)]
|
||||
#[derive(Default, Clone)]
|
||||
pub(crate) struct EffectStack {
|
||||
pub(crate) effects: CopyValue<Vec<Effect>>,
|
||||
pub(crate) effects: Rc<RefCell<Vec<Effect>>>,
|
||||
}
|
||||
|
||||
pub(crate) fn get_effect_stack() -> EffectStack {
|
||||
@@ -65,7 +65,7 @@ impl Debug for Effect {
|
||||
|
||||
impl Effect {
|
||||
pub(crate) fn current() -> Option<Self> {
|
||||
get_effect_stack().effects.read().last().copied()
|
||||
get_effect_stack().effects.borrow().last().copied()
|
||||
}
|
||||
|
||||
/// Create a new effect. The effect will be run immediately and whenever any signal it reads changes.
|
||||
@@ -85,11 +85,11 @@ impl Effect {
|
||||
pub fn try_run(&self) {
|
||||
if let Some(mut callback) = self.callback.try_write() {
|
||||
{
|
||||
get_effect_stack().effects.write().push(*self);
|
||||
get_effect_stack().effects.borrow_mut().push(*self);
|
||||
}
|
||||
callback();
|
||||
{
|
||||
get_effect_stack().effects.write().pop();
|
||||
get_effect_stack().effects.borrow_mut().pop();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,8 +3,8 @@ use std::cell::{Ref, RefMut};
|
||||
use std::rc::Rc;
|
||||
|
||||
use dioxus_core::prelude::{
|
||||
consume_context, consume_context_from_scope, current_scope_id, provide_context_to_scope,
|
||||
provide_root_context,
|
||||
consume_context, consume_context_from_scope, current_scope_id, provide_context,
|
||||
provide_context_to_scope, provide_root_context,
|
||||
};
|
||||
use dioxus_core::ScopeId;
|
||||
|
||||
@@ -25,7 +25,7 @@ fn current_owner() -> Rc<Owner> {
|
||||
Some(rt) => rt,
|
||||
None => {
|
||||
let owner = Rc::new(current_store().owner());
|
||||
provide_root_context(owner).expect("in a virtual dom")
|
||||
provide_context(owner).expect("in a virtual dom")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@ pub fn selector<R: PartialEq>(mut f: impl FnMut() -> R + 'static) -> ReadOnlySig
|
||||
};
|
||||
|
||||
{
|
||||
get_effect_stack().effects.write().push(effect);
|
||||
get_effect_stack().effects.borrow_mut().push(effect);
|
||||
}
|
||||
state.inner.value.set(SignalData {
|
||||
subscribers: Default::default(),
|
||||
@@ -87,7 +87,7 @@ pub fn selector<R: PartialEq>(mut f: impl FnMut() -> R + 'static) -> ReadOnlySig
|
||||
value: f(),
|
||||
});
|
||||
{
|
||||
get_effect_stack().effects.write().pop();
|
||||
// get_effect_stack().effects.borrow_mut().pop();
|
||||
}
|
||||
|
||||
effect.callback.value.set(Box::new(move || {
|
||||
|
||||
Reference in new issue
Block a user