Mirrors/dioxus
2
0
Fork 0
mirror of https://github.com/DioxusLabs/dioxus synced 2024-11-23 04:33:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix shortcut by wrapping callback

Browse source
This commit is contained in:
Jonathan Kelley 2024-02-05 18:50:13 -08:00
parent f2ec5c5cb8
commit 2ade193a5b
No known key found for this signature in database
GPG key ID: 1FBB50F7EB0A08BE
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/desktop/src/hooks.rs
View file

@ -9,6 +9,7 @@ use dioxus_core::{
use_hook,
};
use dioxus_hooks::use_callback;
use tao::{event::Event, event_loop::EventLoopWindowTarget};
use wry::RequestAsyncResponder;
@ -56,8 +57,11 @@ pub fn use_global_shortcut(
accelerator: impl IntoAccelerator,
handler: impl FnMut() + 'static,
) -> Result<ShortcutHandle, ShortcutRegistryError> {
// wrap the user's handler in something that will carry the scope/runtime with it
let mut cb = use_callback(handler);
use_hook_with_cleanup(
move || window().create_shortcut(accelerator.accelerator(), handler),
move || window().create_shortcut(accelerator.accelerator(), move || cb.call()),
|handle| {
if let Ok(handle) = handle {
handle.remove();

17
packages/hooks/src/use_callback.rs
View file

@ -1,4 +1,4 @@
use dioxus_core::prelude::use_hook;
use dioxus_core::prelude::{current_scope_id, use_hook, Runtime};
use dioxus_signals::CopyValue;
use dioxus_signals::Writable;
@ -18,10 +18,17 @@ pub fn use_callback<O>(f: impl FnMut() -> O + 'static) -> UseCallback<O> {
inner.set(Some(f));
// And then wrap that callback in a boxed callback so we're blind to the size of the actual callback
use_hook(|| UseCallback {
inner: CopyValue::new(Box::new(move || {
inner.with_mut(|f: &mut Option<_>| f.as_mut().unwrap()())
})),
use_hook(|| {
let cur_scope = current_scope_id().unwrap();
let rt = Runtime::current().unwrap();
UseCallback {
inner: CopyValue::new(Box::new(move || {
// run this callback in the context of the scope it was created in.
let run_callback = || inner.with_mut(|f: &mut Option<_>| f.as_mut().unwrap()());
rt.on_scope(cur_scope, run_callback)
})),
}
})
}