adam/leptos-use
1
0
Fork 0
mirror of https://github.com/adoyle0/leptos-use.git synced 2025-02-02 10:54:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

on{name}-> on_{name} for using same naming

Browse source 
conventions for callbacks all over the place
This commit is contained in:
Jens Krause 2023-07-13 08:38:11 +02:00
parent e4f221f275
commit bd65a4de92
2 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
examples/use_websocket/src/main.rs
View file

@ -67,29 +67,29 @@ fn Demo(cx: Scope) -> impl IntoView {
let (history2, set_history2) = create_signal(cx, vec![]); let (history2, set_history2) = create_signal(cx, vec![]);
let onopen = move |e: Event| { let on_open_callback = move |e: Event| {
set_history2.update(|history: &mut Vec<_>| { set_history2.update(|history: &mut Vec<_>| {
history.push(format! {"[onopen]: event {:?}", e.type_()}) history.push(format! {"[onopen]: event {:?}", e.type_()})
}); });
}; };
let onclose = move |e: CloseEvent| { let on_close_callback = move |e: CloseEvent| {
set_history2.update(|history: &mut Vec<_>| { set_history2.update(|history: &mut Vec<_>| {
history.push(format! {"[onclose]: event {:?}", e.type_()}) history.push(format! {"[onclose]: event {:?}", e.type_()})
}); });
}; };
let onerror = move |e: Event| { let on_error_callback = move |e: Event| {
set_history2.update(|history: &mut Vec<_>| { set_history2.update(|history: &mut Vec<_>| {
history.push(format! {"[onerror]: event {:?}", e.type_()}) history.push(format! {"[onerror]: event {:?}", e.type_()})
}); });
}; };
let onmessage = move |m: String| { let on_message_callback = move |m: String| {
set_history2.update(|history: &mut Vec<_>| history.push(format! {"[onmessage]: {:?}", m})); set_history2.update(|history: &mut Vec<_>| history.push(format! {"[onmessage]: {:?}", m}));
}; };
let onmessage_bytes = move |m: Vec<u8>| { let on_message_bytes_callback = move |m: Vec<u8>| {
set_history2 set_history2
.update(|history: &mut Vec<_>| history.push(format! {"[onmessage_bytes]: {:?}", m})); .update(|history: &mut Vec<_>| history.push(format! {"[onmessage_bytes]: {:?}", m}));
}; };
@ -108,11 +108,11 @@ fn Demo(cx: Scope) -> impl IntoView {
"wss://echo.websocket.events/".to_string(), "wss://echo.websocket.events/".to_string(),
UseWebSocketOptions::default() UseWebSocketOptions::default()
.manual(true) .manual(true)
.onopen(onopen.clone()) .on_open(on_open_callback.clone())
.onclose(onclose.clone()) .on_close(on_close_callback.clone())
.onerror(onerror.clone()) .on_error(on_error_callback.clone())
.onmessage(onmessage.clone()) .on_message(on_message_callback.clone())
.onmessage_bytes(onmessage_bytes.clone()), .on_message_bytes(on_message_bytes_callback.clone()),
); );
let open_connection2 = move |_| { let open_connection2 = move |_| {

50
src/websocket/use_websocket.rs
View file

@ -101,11 +101,11 @@ pub fn use_websocket_with_options(
let (message_bytes, set_message_bytes) = create_signal(cx, None); let (message_bytes, set_message_bytes) = create_signal(cx, None);
let ws_ref: StoredValue<Option<WebSocket>> = store_value(cx, None); let ws_ref: StoredValue<Option<WebSocket>> = store_value(cx, None);
let onopen_ref = store_value(cx, options.onopen); let on_open_ref = store_value(cx, options.on_open);
let onmessage_ref = store_value(cx, options.onmessage); let on_message_ref = store_value(cx, options.on_message);
let onmessage_bytes_ref = store_value(cx, options.onmessage_bytes); let on_message_bytes_ref = store_value(cx, options.on_message_bytes);
let onerror_ref = store_value(cx, options.onerror); let on_error_ref = store_value(cx, options.on_error);
let onclose_ref = store_value(cx, options.onclose); let on_close_ref = store_value(cx, options.on_close);
let reconnect_limit = options.reconnect_limit.unwrap_or(3); let reconnect_limit = options.reconnect_limit.unwrap_or(3);
let reconnect_interval = options.reconnect_interval.unwrap_or(3 * 1000); let reconnect_interval = options.reconnect_interval.unwrap_or(3 * 1000);
@ -179,8 +179,8 @@ pub fn use_websocket_with_options(
return; return;
} }
let onopen = onopen_ref.get_value(); let callback = on_open_ref.get_value();
onopen(e); callback(e);
set_ready_state.set(UseWebSocketReadyState::Open); set_ready_state.set(UseWebSocketReadyState::Open);
}) as Box<dyn FnMut(Event)>); }) as Box<dyn FnMut(Event)>);
@ -204,8 +204,8 @@ pub fn use_websocket_with_options(
}, },
|txt| { |txt| {
let txt = String::from(&txt); let txt = String::from(&txt);
let onmessage = onmessage_ref.get_value(); let callback = on_message_ref.get_value();
onmessage(txt.clone()); callback(txt.clone());
set_message.set(Some(txt.clone())); set_message.set(Some(txt.clone()));
}, },
@ -214,8 +214,8 @@ pub fn use_websocket_with_options(
|array_buffer| { |array_buffer| {
let array = js_sys::Uint8Array::new(&array_buffer); let array = js_sys::Uint8Array::new(&array_buffer);
let array = array.to_vec(); let array = array.to_vec();
let onmessage_bytes = onmessage_bytes_ref.get_value(); let callback = on_message_bytes_ref.get_value();
onmessage_bytes(array.clone()); callback(array.clone());
set_message_bytes.set(Some(array)); set_message_bytes.set(Some(array));
}, },
@ -236,8 +236,8 @@ pub fn use_websocket_with_options(
reconnect(); reconnect();
} }
let onerror = onerror_ref.get_value(); let callback = on_error_ref.get_value();
onerror(e); callback(e);
set_ready_state.set(UseWebSocketReadyState::Closed); set_ready_state.set(UseWebSocketReadyState::Closed);
}) as Box<dyn FnMut(Event)>); }) as Box<dyn FnMut(Event)>);
@ -255,8 +255,8 @@ pub fn use_websocket_with_options(
reconnect(); reconnect();
} }
let onclose = onclose_ref.get_value(); let callback = on_close_ref.get_value();
onclose(e); callback(e);
set_ready_state.set(UseWebSocketReadyState::Closed); set_ready_state.set(UseWebSocketReadyState::Closed);
}) })
@ -371,15 +371,15 @@ impl fmt::Display for UseWebSocketReadyState {
#[derive(DefaultBuilder)] #[derive(DefaultBuilder)]
pub struct UseWebSocketOptions { pub struct UseWebSocketOptions {
/// `WebSocket` connect callback. /// `WebSocket` connect callback.
onopen: Box<dyn CloneableFnWithArg<Event> + 'static>, on_open: Box<dyn CloneableFnWithArg<Event> + 'static>,
/// `WebSocket` message callback for text. /// `WebSocket` message callback for text.
onmessage: Box<dyn CloneableFnWithArg<String> + 'static>, on_message: Box<dyn CloneableFnWithArg<String> + 'static>,
/// `WebSocket` message callback for binary. /// `WebSocket` message callback for binary.
onmessage_bytes: Box<dyn CloneableFnWithArg<Vec<u8>> + 'static>, on_message_bytes: Box<dyn CloneableFnWithArg<Vec<u8>> + 'static>,
/// `WebSocket` error callback. /// `WebSocket` error callback.
onerror: Box<dyn CloneableFnWithArg<Event> + 'static>, on_error: Box<dyn CloneableFnWithArg<Event> + 'static>,
/// `WebSocket` close callback. /// `WebSocket` close callback.
onclose: Box<dyn CloneableFnWithArg<CloseEvent> + 'static>, on_close: Box<dyn CloneableFnWithArg<CloseEvent> + 'static>,
/// Retry times. /// Retry times.
reconnect_limit: Option<u64>, reconnect_limit: Option<u64>,
/// Retry interval(ms). /// Retry interval(ms).
@ -393,11 +393,11 @@ pub struct UseWebSocketOptions {
impl Default for UseWebSocketOptions { impl Default for UseWebSocketOptions {
fn default() -> Self { fn default() -> Self {
Self { Self {
onopen: Box::new(|_| {}), on_open: Box::new(|_| {}),
onmessage: Box::new(|_| {}), on_message: Box::new(|_| {}),
onmessage_bytes: Box::new(|_| {}), on_message_bytes: Box::new(|_| {}),
onerror: Box::new(|_| {}), on_error: Box::new(|_| {}),
onclose: Box::new(|_| {}), on_close: Box::new(|_| {}),
reconnect_limit: Some(3), reconnect_limit: Some(3),
reconnect_interval: Some(3 * 1000), reconnect_interval: Some(3 * 1000),
manual: false, manual: false,