diff --git a/examples/use_websocket/src/main.rs b/examples/use_websocket/src/main.rs index ecb8488..e5a6eb7 100644 --- a/examples/use_websocket/src/main.rs +++ b/examples/use_websocket/src/main.rs @@ -67,29 +67,29 @@ fn Demo(cx: Scope) -> impl IntoView { 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<_>| { 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<_>| { 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<_>| { 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})); }; - let onmessage_bytes = move |m: Vec| { + let on_message_bytes_callback = move |m: Vec| { set_history2 .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(), UseWebSocketOptions::default() .manual(true) - .onopen(onopen.clone()) - .onclose(onclose.clone()) - .onerror(onerror.clone()) - .onmessage(onmessage.clone()) - .onmessage_bytes(onmessage_bytes.clone()), + .on_open(on_open_callback.clone()) + .on_close(on_close_callback.clone()) + .on_error(on_error_callback.clone()) + .on_message(on_message_callback.clone()) + .on_message_bytes(on_message_bytes_callback.clone()), ); let open_connection2 = move |_| { diff --git a/src/websocket/use_websocket.rs b/src/websocket/use_websocket.rs index 24c57d0..14b002b 100644 --- a/src/websocket/use_websocket.rs +++ b/src/websocket/use_websocket.rs @@ -101,11 +101,11 @@ pub fn use_websocket_with_options( let (message_bytes, set_message_bytes) = create_signal(cx, None); let ws_ref: StoredValue> = store_value(cx, None); - let onopen_ref = store_value(cx, options.onopen); - let onmessage_ref = store_value(cx, options.onmessage); - let onmessage_bytes_ref = store_value(cx, options.onmessage_bytes); - let onerror_ref = store_value(cx, options.onerror); - let onclose_ref = store_value(cx, options.onclose); + let on_open_ref = store_value(cx, options.on_open); + let on_message_ref = store_value(cx, options.on_message); + let on_message_bytes_ref = store_value(cx, options.on_message_bytes); + let on_error_ref = store_value(cx, options.on_error); + let on_close_ref = store_value(cx, options.on_close); let reconnect_limit = options.reconnect_limit.unwrap_or(3); let reconnect_interval = options.reconnect_interval.unwrap_or(3 * 1000); @@ -179,8 +179,8 @@ pub fn use_websocket_with_options( return; } - let onopen = onopen_ref.get_value(); - onopen(e); + let callback = on_open_ref.get_value(); + callback(e); set_ready_state.set(UseWebSocketReadyState::Open); }) as Box); @@ -204,8 +204,8 @@ pub fn use_websocket_with_options( }, |txt| { let txt = String::from(&txt); - let onmessage = onmessage_ref.get_value(); - onmessage(txt.clone()); + let callback = on_message_ref.get_value(); + callback(txt.clone()); set_message.set(Some(txt.clone())); }, @@ -214,8 +214,8 @@ pub fn use_websocket_with_options( |array_buffer| { let array = js_sys::Uint8Array::new(&array_buffer); let array = array.to_vec(); - let onmessage_bytes = onmessage_bytes_ref.get_value(); - onmessage_bytes(array.clone()); + let callback = on_message_bytes_ref.get_value(); + callback(array.clone()); set_message_bytes.set(Some(array)); }, @@ -236,8 +236,8 @@ pub fn use_websocket_with_options( reconnect(); } - let onerror = onerror_ref.get_value(); - onerror(e); + let callback = on_error_ref.get_value(); + callback(e); set_ready_state.set(UseWebSocketReadyState::Closed); }) as Box); @@ -255,8 +255,8 @@ pub fn use_websocket_with_options( reconnect(); } - let onclose = onclose_ref.get_value(); - onclose(e); + let callback = on_close_ref.get_value(); + callback(e); set_ready_state.set(UseWebSocketReadyState::Closed); }) @@ -371,15 +371,15 @@ impl fmt::Display for UseWebSocketReadyState { #[derive(DefaultBuilder)] pub struct UseWebSocketOptions { /// `WebSocket` connect callback. - onopen: Box + 'static>, + on_open: Box + 'static>, /// `WebSocket` message callback for text. - onmessage: Box + 'static>, + on_message: Box + 'static>, /// `WebSocket` message callback for binary. - onmessage_bytes: Box> + 'static>, + on_message_bytes: Box> + 'static>, /// `WebSocket` error callback. - onerror: Box + 'static>, + on_error: Box + 'static>, /// `WebSocket` close callback. - onclose: Box + 'static>, + on_close: Box + 'static>, /// Retry times. reconnect_limit: Option, /// Retry interval(ms). @@ -393,11 +393,11 @@ pub struct UseWebSocketOptions { impl Default for UseWebSocketOptions { fn default() -> Self { Self { - onopen: Box::new(|_| {}), - onmessage: Box::new(|_| {}), - onmessage_bytes: Box::new(|_| {}), - onerror: Box::new(|_| {}), - onclose: Box::new(|_| {}), + on_open: Box::new(|_| {}), + on_message: Box::new(|_| {}), + on_message_bytes: Box::new(|_| {}), + on_error: Box::new(|_| {}), + on_close: Box::new(|_| {}), reconnect_limit: Some(3), reconnect_interval: Some(3 * 1000), manual: false,