Do not read query in embedded web viewer

.vscode/settings.json

@@ -66,5 +66,6 @@
     },
     "[yaml]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
-    }
+    },
+    "rust-analyzer.cargo.target": "wasm32-unknown-unknown"
 }

Cargo.lock

@@ -5200,6 +5200,7 @@ dependencies = [
  "image",
  "itertools 0.13.0",
  "js-sys",
+ "parking_lot",
  "poll-promise",
  "re_analytics",
  "re_blueprint_tree",

crates/re_viewer/Cargo.toml

@@ -100,6 +100,7 @@ egui.workspace = true
 ehttp.workspace = true
 image = { workspace = true, default-features = false, features = ["png"] }
 itertools = { workspace = true }
+parking_lot.workspace = true
 poll-promise = { workspace = true, features = ["web"] }
 rfd.workspace = true
 ron.workspace = true
@@ -121,6 +122,7 @@ wasm-bindgen.workspace = true
 web-sys = { workspace = true, features = [
   "History",
   "Location",
+  "PopStateEvent",
   "Storage",
   "Url",
   "UrlSearchParams",

crates/re_viewer/src/app.rs

@@ -80,6 +80,9 @@ pub struct StartupOptions {
 
     /// Default overrides for state of top/side/bottom panels.
     pub panel_state_overrides: PanelStateOverrides,
+
+    #[cfg(target_arch = "wasm32")]
+    pub enable_history: bool,
 }
 
 impl Default for StartupOptions {
@@ -107,6 +110,9 @@ impl Default for StartupOptions {
             fullscreen_options: Default::default(),
 
             panel_state_overrides: Default::default(),
+
+            #[cfg(target_arch = "wasm32")]
+            enable_history: false,
         }
     }
 }
@@ -127,6 +133,9 @@ pub struct App {
     pub(crate) egui_ctx: egui::Context,
     screenshotter: crate::screenshotter::Screenshotter,
 
+    #[cfg(target_arch = "wasm32")]
+    pub(crate) popstate_listener: Option<crate::web_tools::PopstateListener>,
+
     #[cfg(not(target_arch = "wasm32"))]
     profiler: re_tracing::Profiler,
 
@@ -272,6 +281,9 @@ impl App {
             egui_ctx,
             screenshotter,
 
+            #[cfg(target_arch = "wasm32")]
+            popstate_listener: None,
+
             #[cfg(not(target_arch = "wasm32"))]
             profiler: Default::default(),
 
@@ -945,6 +957,11 @@ impl App {
                     if let Some(store_view) = store_context {
                         let entity_db = store_view.recording;
 
+                        #[cfg(target_arch = "wasm32")]
+                        let is_history_enabled = self.startup_options.enable_history;
+                        #[cfg(not(target_arch = "wasm32"))]
+                        let is_history_enabled = false;
+
                         self.state.show(
                             app_blueprint,
                             ui,
@@ -960,6 +977,7 @@ impl App {
                                 hide: self.startup_options.hide_welcome_screen,
                                 opacity: self.welcome_screen_opacity(egui_ctx),
                             },
+                            is_history_enabled,
                         );
                     }
                     render_ctx.before_submit();
@@ -1462,7 +1480,7 @@ impl eframe::App for App {
         }
 
         #[cfg(target_arch = "wasm32")]
-        {
+        if self.startup_options.enable_history {
             // Handle pressing the back/forward mouse buttons explicitly, since eframe catches those.
             let back_pressed =
                 egui_ctx.input(|i| i.pointer.button_pressed(egui::PointerButton::Extra1));

crates/re_viewer/src/app_state.rs

@@ -132,6 +132,7 @@ impl AppState {
         rx: &ReceiveSet<LogMsg>,
         command_sender: &CommandSender,
         welcome_screen_state: &WelcomeScreenState,
+        is_history_enabled: bool,
     ) {
         re_tracing::profile_function!();
 
@@ -417,7 +418,7 @@ impl AppState {
             .frame(viewport_frame)
             .show_inside(ui, |ui| {
                 if show_welcome {
-                    welcome_screen.ui(ui, command_sender, welcome_screen_state);
+                    welcome_screen.ui(ui, command_sender, welcome_screen_state, is_history_enabled);
                 } else {
                     viewport.viewport_ui(ui, &ctx, view_states);
                 }

crates/re_viewer/src/ui/welcome_screen/example_section.rs

@@ -246,6 +246,7 @@ impl ExampleSection {
         ui: &mut egui::Ui,
         command_sender: &CommandSender,
         header_ui: &impl Fn(&mut Ui),
+        is_history_enabled: bool,
     ) {
         let examples = self
             .examples
@@ -352,19 +353,11 @@ impl ExampleSection {
                                     // panel to quit auto-zoom mode.
                                     ui.input_mut(|i| i.pointer = Default::default());
 
-                                    let open_in_new_tab = ui.input(|i| i.modifiers.any());
                                     open_example_url(
                                         ui.ctx(),
                                         command_sender,
                                         &example.desc.rrd_url,
-                                        open_in_new_tab,
-                                    );
-                                } else if response.middle_clicked() {
-                                    open_example_url(
-                                        ui.ctx(),
-                                        command_sender,
-                                        &example.desc.rrd_url,
-                                        true,
+                                        is_history_enabled,
                                     );
                                 }
 
@@ -433,28 +426,12 @@ impl ExampleSection {
     }
 }
 
-#[cfg(target_arch = "wasm32")]
-fn open_in_background_tab(egui_ctx: &egui::Context, rrd_url: &str) {
-    egui_ctx.open_url(egui::output::OpenUrl {
-        url: format!("/?url={}", crate::web_tools::percent_encode(rrd_url)),
-        new_tab: true,
-    });
-}
-
 fn open_example_url(
     _egui_ctx: &egui::Context,
     command_sender: &CommandSender,
     rrd_url: &str,
-    _open_in_new_tab: bool,
+    _is_history_enabled: bool,
 ) {
-    #[cfg(target_arch = "wasm32")]
-    {
-        if _open_in_new_tab {
-            open_in_background_tab(_egui_ctx, rrd_url);
-            return;
-        }
-    }
-
     let data_source = re_data_source::DataSource::RrdHttpUrl {
         url: rrd_url.to_owned(),
         follow: false,
@@ -471,30 +448,13 @@ fn open_example_url(
     command_sender.send_system(SystemCommand::LoadDataSource(data_source));
 
     #[cfg(target_arch = "wasm32")]
-    {
-        // Ensure that the user returns to the welcome page after navigating to an example.
-        use crate::web_tools;
-
-        // So we know where to return to
-        let welcome_screen_app_id = re_viewer_context::StoreHub::welcome_screen_app_id();
-        let welcome_screen_url = format!(
-            "?app_id={}",
-            web_tools::percent_encode(&welcome_screen_app_id.to_string())
-        );
+    if _is_history_enabled {
+        use crate::web_tools::{history, HistoryEntry, HistoryExt, JsResultExt};
 
-        if web_tools::current_url_suffix()
-            .unwrap_or_default()
-            .is_empty()
-        {
-            // Replace, otherwise the user would need to hit back twice to return to
-            // whatever linked them to `https://www.rerun.io/viewer` in the first place.
-            web_tools::replace_history(&welcome_screen_url);
-        } else {
-            web_tools::push_history(&welcome_screen_url);
+        if let Some(history) = history().ok_or_log_js_error() {
+            let entry = HistoryEntry::new().rrd_url(rrd_url.to_owned());
+            history.push_entry(entry).ok_or_log_js_error();
         }
-
-        // Where we're going:
-        web_tools::push_history(&format!("?url={}", web_tools::percent_encode(rrd_url)));
     }
 }
 

crates/re_viewer/src/ui/welcome_screen/mod.rs

@@ -23,6 +23,7 @@ impl WelcomeScreen {
         ui: &mut egui::Ui,
         command_sender: &re_viewer_context::CommandSender,
         welcome_screen_state: &WelcomeScreenState,
+        is_history_enabled: bool,
     ) {
         if welcome_screen_state.opacity <= 0.0 {
             return;
@@ -51,8 +52,12 @@ impl WelcomeScreen {
                     if welcome_screen_state.hide {
                         no_data_ui::no_data_ui(ui);
                     } else {
-                        self.example_page
-                            .ui(ui, command_sender, &welcome_section_ui);
+                        self.example_page.ui(
+                            ui,
+                            command_sender,
+                            &welcome_section_ui,
+                            is_history_enabled,
+                        );
                     }
                 });
             });