remove unwrap calls

andrei-ng · andrei-ng · commit 3b66a48b86c7 · 2025-05-12T23:02:47.000+02:00
- update changelog

Signed-off-by: Andrei Gherghescu &lt;8067229+andrei-ng@users.noreply.github.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -115,7 +115,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        example: [wasm-yew-minimal]
+        example: [wasm-yew-minimal, wasm-yew-callback-minimal]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 ### Changed
 - [[#277](https://github.com/plotly/plotly.rs/pull/277)] Removed `wasm` feature flag and put evrything behind target specific dependencies. Added `.cargo/config.toml` for configuration flags needed by `getrandom` version 0.3 on `wasm` targets.
 - [[#281]((https://github.com/plotly/plotly.rs/pull/xxx))] Update to askama 0.13.0
+- [[#287]](https://github.com/plotly/plotly.rs/pull/287) Added functionality for callbacks (using wasm)
 - [[#289]](https://github.com/plotly/plotly.rs/pull/289) Fixes Kaleido static export for MacOS targets by removing `--disable-gpu` flag for MacOS 
 - [[#290]](https://github.com/plotly/plotly.rs/pull/289) Remove `--disable-gpu` flag for Kaleido static-image generation for all targets. 
 
diff --git a/examples/wasm-yew-callback-minimal/src/main.rs b/examples/wasm-yew-callback-minimal/src/main.rs
@@ -1,5 +1,5 @@
 use plotly::callbacks::ClickEvent;
-use plotly::{Histogram, Plot, Scatter, common::Mode};
+use plotly::{Histogram, Plot, Scatter, common::Mode, histogram::Bins};
 use web_sys::js_sys::Math;
 use yew::prelude::*;
 
@@ -23,14 +23,18 @@ pub fn plot_component() -> Html {
         let id = "plot-div";
         let mut fig = Plot::new();
         let xs: Vec<f64> = (0..50).map(|i| i as f64).collect();
-        let ys: Vec<f64> = xs.iter().map(|x| x.sin()).collect();
+        let ys: Vec<f64> = xs.iter().map(|x| x.sin() * 5.0).collect();
         fig.add_trace(
             Scatter::new(xs.clone(), ys.clone())
                 .mode(Mode::Markers)
-                .name("Sine markers"),
+                .name("Sine Wave Markers"),
+        );
+        let random_values: Vec<f64> = (0..500).map(|_| Math::random() * 100.0).collect();
+        fig.add_trace(
+            Histogram::new(random_values)
+                .name("Random Data Histogram")
+                .x_bins(Bins::new(-1.0, 30.0, 5.0)),
         );
-        let random_values: Vec<f64> = (0..100).map(|_| Math::random()).collect();
-        fig.add_trace(Histogram::new(random_values).name("Random histogram"));
         let layout = plotly::Layout::new().title("Click Event Callback Example in Yew");
         fig.set_layout(layout);
         async move {
diff --git a/plotly/src/callbacks.rs b/plotly/src/callbacks.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 use wasm_bindgen::prelude::*;
-use web_sys::{js_sys::Function, window, HtmlElement};
+use web_sys::{js_sys::Function, HtmlElement};
 
 /// Provides utilities for binding Plotly.js click events to Rust closures
 /// via `wasm-bindgen`.  
@@ -61,22 +61,25 @@ pub fn bind_click<F>(div_id: &str, mut cb: F)
 where
     F: 'static + FnMut(ClickEvent),
 {
-    let plot_div: PlotlyDiv = window()
-        .unwrap()
-        .document()
-        .unwrap()
-        .get_element_by_id(div_id)
-        .unwrap()
-        .unchecked_into();
     let closure = Closure::wrap(Box::new(move |event: JsValue| {
         let event: ClickEvent =
-            serde_wasm_bindgen::from_value(event).expect("\n Couldn't serialize the event \n");
+            serde_wasm_bindgen::from_value(event).expect("Could not serialize the event");
         cb(event);
     }) as Box<dyn FnMut(JsValue)>);
+
+    let plot_div: PlotlyDiv = get_div(div_id).expect("Could not get Div element by Id");
     plot_div.on("plotly_click", closure.as_ref().unchecked_ref());
     closure.forget();
 }
 
+fn get_div(tag: &str) -> Option<PlotlyDiv> {
+    web_sys::window()?
+        .document()?
+        .get_element_by_id(tag)?
+        .dyn_into()
+        .ok()
+}
+
 /// Represents a single point from a Plotly click event.
 ///
 /// Fields mirror Plotly’s `event.points[i]` properties, all optional
