Share button on notebook no longer uses the current base url for web viewer urls (#11379)

Author: Wumpf

crates/top/rerun/src/commands/entrypoint.rs

@@ -984,9 +984,7 @@ fn native_startup_options_from_args(args: &Args) -> anyhow::Result<re_viewer::St
         force_wgpu_backend: args.renderer.clone(),
         video_decoder_hw_acceleration,
 
-        on_event: None,
-
-        panel_state_overrides: Default::default(),
+        ..Default::default()
     })
 }
 

crates/viewer/re_viewer/src/startup_options.rs

@@ -80,8 +80,11 @@ pub struct StartupOptions {
     pub enable_history: bool,
 
     /// The base viewer url that's used when sharing a link in this viewer.
-    #[cfg(target_arch = "wasm32")]
-    pub viewer_url: Option<String>,
+    ///
+    /// If not set:
+    /// * notebooks & native: use rerun.io/viewer with the crate's last known stable version
+    /// * web viewers: use the url of the page it is embedded in
+    pub viewer_base_url: Option<String>,
 }
 
 impl StartupOptions {
@@ -102,20 +105,28 @@ impl StartupOptions {
     /// The url to use for the web viewer when sharing links.
     #[allow(clippy::unused_self)] // Only used on web.
     pub fn web_viewer_base_url(&self) -> Option<url::Url> {
-        #[cfg(target_arch = "wasm32")]
-        {
-            self.viewer_url
-                .as_ref()
-                .and_then(|url| url.parse().ok())
-                .or_else(|| crate::web_tools::current_base_url().ok())
-        }
+        // TODO(RR-1878): Would be great to grab this from the dataplatform when available.
 
-        #[cfg(not(target_arch = "wasm32"))]
+        if let Some(url) = &self.viewer_base_url
+            && let Ok(url) = url.parse::<url::Url>()
         {
-            // TODO(RR-1878): Would be great to grab this from the dataplatform when available.
+            Some(url)
+        } else if self.is_in_notebook || cfg!(not(target_arch = "wasm32")) {
+            // Notebooks behave like native viewers here because just like on native,
+            // there's no useful base url in the address bar to use.
             let version = re_build_info::build_info!().version.latest_stable();
 
             url::Url::parse(&format!("https://rerun.io/viewer/version/{version}")).ok()
+        } else {
+            #[cfg(target_arch = "wasm32")]
+            {
+                crate::web_tools::current_base_url().ok()
+            }
+
+            #[cfg(not(target_arch = "wasm32"))]
+            {
+                None
+            }
         }
     }
 }
@@ -155,8 +166,7 @@ impl Default for StartupOptions {
             #[cfg(target_arch = "wasm32")]
             enable_history: false,
 
-            #[cfg(target_arch = "wasm32")]
-            viewer_url: None,
+            viewer_base_url: None,
         }
     }
 }

crates/viewer/re_viewer/src/web.rs

@@ -661,21 +661,24 @@ impl From<PanelState> for re_types::blueprint::components::PanelState {
 // Keep in sync with the `AppOptions` interface in `rerun_js/web-viewer/index.ts`.
 #[derive(Clone, Default, Deserialize)]
 pub struct AppOptions {
-    viewer_url: Option<String>,
-    url: Option<StringOrStringArray>,
     manifest_url: Option<String>,
     render_backend: Option<String>,
     video_decoder: Option<String>,
     hide_welcome_screen: Option<bool>,
-    panel_state_overrides: Option<PanelStateOverrides>,
-    on_viewer_event: Option<Callback>,
-    fullscreen: Option<FullscreenOptions>,
+    // allow_fullscreen: Option<bool>, // Not serialized from js as it governs how the `fullscreen` option is used.
     enable_history: Option<bool>,
+    // width: Option<String>, // Width & height aren't serialized and only used to configure the canvas.
+    // height: Option<String>,
+    fallback_token: Option<String>,
 
+    // Hidden `WebViewerOptions`
+    // ------------
+    viewer_base_url: Option<String>,
     notebook: Option<bool>,
-    persist: Option<bool>,
-
-    fallback_token: Option<String>,
+    url: Option<StringOrStringArray>,
+    panel_state_overrides: Option<PanelStateOverrides>,
+    on_viewer_event: Option<Callback>,
+    fullscreen: Option<FullscreenOptions>,
 }
 
 // Keep in sync with the `FullscreenOptions` interface in `rerun_js/web-viewer/index.ts`
@@ -720,7 +723,7 @@ fn create_app(
     };
 
     let AppOptions {
-        viewer_url,
+        viewer_base_url,
         url,
         manifest_url,
         render_backend,
@@ -732,7 +735,6 @@ fn create_app(
         enable_history,
 
         notebook,
-        persist,
 
         fallback_token,
     } = app_options;
@@ -762,7 +764,7 @@ fn create_app(
             max_bytes: Some(2_500_000_000),
         },
         location: Some(cc.integration_info.web_info.location.clone()),
-        persist_state: persist.unwrap_or(true),
+        persist_state: true,
         is_in_notebook: notebook.unwrap_or(false),
         expect_data_soon: None,
         force_wgpu_backend: render_backend.clone(),
@@ -784,7 +786,7 @@ fn create_app(
         panel_state_overrides: panel_state_overrides.unwrap_or_default().into(),
 
         enable_history,
-        viewer_url,
+        viewer_base_url,
     };
     crate::customize_eframe_and_setup_renderer(cc)?;
 

rerun_js/web-viewer/index.ts

@@ -107,24 +107,26 @@ export interface WebViewerOptions {
 // otherwise we need to restructure how we pass options to the viewer
 
 /**
- * The public interface is @see {WebViewerOptions}
+ * The public interface is @see {WebViewerOptions}. This adds a few additional, internal options.
  *
  * @private
  */
 export interface AppOptions extends WebViewerOptions {
-  /** The url that's used when sharing web viewer urls */
-  viewer_url?: string;
+  /** The url that's used when sharing web viewer urls
+   *
+   * If not set, the viewer will use the url of the page it is embedded in.
+   */
+  viewer_base_url?: string;
+
+  /** Whether the viewer is running in a notebook. */
+  notebook?: boolean;
+
   url?: string;
-  manifest_url?: string;
-  video_decoder?: VideoDecoder;
-  render_backend?: Backend;
-  hide_welcome_screen?: boolean;
   panel_state_overrides?: Partial<{
     [K in Panel]: PanelState;
   }>;
   on_viewer_event?: (event_json: string) => void;
   fullscreen?: FullscreenOptions;
-  enable_history?: boolean;
 }
 
 // Types are based on `crates/viewer/re_viewer/src/event.rs`.

rerun_notebook/src/js/widget.ts

@@ -3,7 +3,7 @@ import {
   type Panel,
   type PanelState,
   WebViewer,
-  type WebViewerOptions,
+  type AppOptions,
 } from "@rerun-io/web-viewer";
 
 import type { AnyModel, Render } from "@anywidget/types";
@@ -53,7 +53,8 @@ class ViewerWidget {
   viewer: WebViewer = new WebViewer();
   url: Opt<string> = null;
   panel_states: Opt<PanelStates> = null;
-  options: WebViewerOptions = {
+  options: AppOptions = {
+    notebook: true,
     hide_welcome_screen: true,
     width: "100%",
     height: "100%",