From b25f46b3f635c43c3bb2f5b605309dfd2025763c Mon Sep 17 00:00:00 2001
From: Zachary Friss <friss@frissdesigns.com>
Date: Thu, 23 Apr 2026 11:11:26 -0400
Subject: [PATCH 1/2] fix web wasm loader and dialogs

---
 crates/i3rs-app/index.html             | 104 +++++++++++++++++--------
 crates/i3rs-app/src/app.rs             |   5 ++
 crates/i3rs-app/src/background_jobs.rs |   8 +-
 crates/i3rs-app/src/panels/graph.rs    |   9 ++-
 4 files changed, 91 insertions(+), 35 deletions(-)
diff --git a/crates/i3rs-app/index.html b/crates/i3rs-app/index.html
index 0f41a60..63b0424 100644
--- a/crates/i3rs-app/index.html
+++ b/crates/i3rs-app/index.html
@@ -4,7 +4,9 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>i3rs Web</title>
+    <link rel="icon" href="i3rs.ico" />
     <link data-trunk rel="rust" href="Cargo.toml" data-target-name="i3rs_app" />
+    <link data-trunk rel="copy-file" href="packaging/icons/i3rs.ico" />
     <link data-trunk rel="copy-file" href="../../test_data/VIR_LAP.ld" />
     <link data-trunk rel="copy-file" href="../../test_data/VIR_LAP.ldx" />
     <style>
@@ -21,24 +23,41 @@
       }
 
       body {
+        position: relative;
+      }
+
+      .load-overlay {
+        position: fixed;
+        inset: 0;
+        z-index: 10;
         display: grid;
-        grid-template-rows: auto 1fr;
+        place-items: center;
+        padding: 1rem;
+        background: rgba(15, 17, 21, 0.5);
+        backdrop-filter: blur(3px);
+      }
+
+      .load-overlay[hidden] {
+        display: none;
       }
 
-      .app-shell {
-        padding: 0.75rem 1rem;
-        border-bottom: 1px solid rgba(255, 255, 255, 0.08);
-        background: linear-gradient(180deg, rgba(255, 255, 255, 0.04), rgba(255, 255, 255, 0));
+      .load-modal {
+        width: min(40rem, 100%);
+        padding: 1rem;
+        border: 1px solid rgba(255, 255, 255, 0.12);
+        border-radius: 0.5rem;
+        background: #171a20;
+        box-shadow: 0 1.5rem 4rem rgba(0, 0, 0, 0.35);
       }
 
-      .app-shell h1 {
+      .load-modal h1 {
         margin: 0;
         font-size: 1rem;
         font-weight: 650;
         letter-spacing: 0.02em;
       }
 
-      .app-shell p {
+      .load-modal p {
         margin: 0.3rem 0 0;
         font-size: 0.9rem;
         opacity: 0.75;
@@ -133,30 +152,32 @@
     </style>
   </head>
   <body>
-    <div class="app-shell">
-      <h1>i3rs Web</h1>
-      <p>Open a MoTeC <code>.ld</code> file from the File menu inside the app.</p>
-      <div class="load-controls">
-        <label>
-          LD file
-          <input id="ld-file" type="file" accept=".ld" />
-        </label>
-        <label>
-          Optional LDX file
-          <input id="ldx-file" type="file" accept=".ldx" />
-        </label>
-        <button id="load-session" type="button">Load Session</button>
-        <button id="load-vir-lap" type="button">Load VIR_LAP Sample</button>
-      </div>
-      <div id="load-status" class="load-status" data-state="idle" aria-live="polite">
-        <span class="load-status-message">Web app starting...</span>
+    <canvas id="i3rs-canvas"></canvas>
+    <div id="load-overlay" class="load-overlay">
+      <div class="load-modal" role="dialog" aria-labelledby="load-title" aria-modal="true">
+        <h1 id="load-title">Open telemetry</h1>
+        <p>Select a MoTeC <code>.ld</code> file and optional <code>.ldx</code> sidecar together.</p>
+        <div class="load-controls">
+          <label for="session-files">
+            Session files
+            <input
+              id="session-files"
+              name="session-files"
+              type="file"
+              accept=".ld,.ldx"
+              multiple
+            />
+          </label>
+          <button id="load-vir-lap" type="button">Load VIR_LAP Sample</button>
+        </div>
+        <div id="load-status" class="load-status" data-state="idle" aria-live="polite">
+          <span class="load-status-message">Web app starting...</span>
+        </div>
       </div>
     </div>
-    <canvas id="i3rs-canvas"></canvas>
     <script>
-      const ldInput = document.getElementById("ld-file");
-      const ldxInput = document.getElementById("ldx-file");
-      const loadButton = document.getElementById("load-session");
+      const loadOverlay = document.getElementById("load-overlay");
+      const sessionFilesInput = document.getElementById("session-files");
       const sampleButton = document.getElementById("load-vir-lap");
       const statusEl = document.getElementById("load-status");
       const statusMessageEl = statusEl.querySelector(".load-status-message");
@@ -165,9 +186,13 @@ <h1>i3rs Web</h1>
 
       const readAsUint8Array = async (file) => new Uint8Array(await file.arrayBuffer());
       const readAsText = async (file) => await file.text();
+      const extensionOf = (file) => file.name.split(".").pop()?.toLowerCase() ?? "";
       const waitForPaint = async () =>
         await new Promise((resolve) => requestAnimationFrame(() => requestAnimationFrame(resolve)));
       const notifyLoadState = (state) => {
+        if (state.state !== "success") {
+          loadOverlay.hidden = false;
+        }
         window.i3rsLoadState = state;
         statusEl.dataset.state = state.state;
         statusMessageEl.textContent = state.message;
@@ -180,7 +205,7 @@ <h1>i3rs Web</h1>
         }
       };
       const setBusy = (busy) => {
-        loadButton.disabled = busy;
+        sessionFilesInput.disabled = busy;
         sampleButton.disabled = busy;
       };
       const setLoadState = (state, message, extra = {}) => {
@@ -221,6 +246,8 @@ <h1>i3rs Web</h1>
           parseDurationMs,
           summary,
         });
+        await waitForPaint();
+        loadOverlay.hidden = true;
         return summary;
       };
 
@@ -241,12 +268,19 @@ <h1>i3rs Web</h1>
         setLoadState("error", "Web app startup timed out.");
       };
 
-      loadButton.addEventListener("click", async () => {
-        const ldFile = ldInput.files && ldInput.files[0];
+      const loadSelectedFiles = async () => {
+        const selectedFiles = Array.from(sessionFilesInput.files ?? []);
+        const ldFiles = selectedFiles.filter((file) => extensionOf(file) === "ld");
+        const ldxFiles = selectedFiles.filter((file) => extensionOf(file) === "ldx");
+        const ldFile = ldFiles[0];
         if (!ldFile) {
           setLoadState("error", "Choose an .ld file first.");
           return;
         }
+        if (ldFiles.length > 1) {
+          setLoadState("error", "Choose only one .ld file.");
+          return;
+        }
 
         setBusy(true);
         try {
@@ -256,7 +290,7 @@ <h1>i3rs Web</h1>
             phase: "read",
           });
           const ldBytes = await readAsUint8Array(ldFile);
-          const ldxFile = ldxInput.files && ldxInput.files[0];
+          const ldxFile = ldxFiles[0];
           let ldxText = null;
           if (ldxFile) {
             setLoadState("loading", `Reading ${ldxFile.name}...`, {
@@ -277,6 +311,12 @@ <h1>i3rs Web</h1>
         } finally {
           setBusy(false);
         }
+      };
+
+      sessionFilesInput.addEventListener("change", () => {
+        if (sessionFilesInput.files && sessionFilesInput.files.length > 0) {
+          void loadSelectedFiles();
+        }
       });
 
       sampleButton.addEventListener("click", async () => {
diff --git a/crates/i3rs-app/src/app.rs b/crates/i3rs-app/src/app.rs
index 54467b6..0889b54 100644
--- a/crates/i3rs-app/src/app.rs
+++ b/crates/i3rs-app/src/app.rs
@@ -117,6 +117,7 @@ fn apply_theme_to_ctx(ctx: &egui::Context, theme: ThemeChoice) {
 }
 
 pub struct App {
+    egui_ctx: egui::Context,
     shared: SharedState,
     worksheets: Vec<Worksheet>,
     active_worksheet: usize,
@@ -167,6 +168,7 @@ impl App {
         }];
         apply_theme_to_ctx(&cc.egui_ctx, preferences.theme);
         Self {
+            egui_ctx: cc.egui_ctx.clone(),
             shared,
             worksheets,
             active_worksheet: 0,
@@ -370,6 +372,8 @@ impl App {
         if let Some(path) = self.shared.ld_path.clone() {
             self.register_project_session(&path);
         }
+
+        self.egui_ctx.request_repaint();
     }
 
     fn submit_load_session(
@@ -2166,6 +2170,7 @@ mod tests {
         #[cfg(not(target_arch = "wasm32"))]
         let (native_pick_tx, native_pick_rx) = crate::platform::native_pick_channel();
         App {
+            egui_ctx: egui::Context::default(),
             shared,
             worksheets,
             active_worksheet: 0,
diff --git a/crates/i3rs-app/src/background_jobs.rs b/crates/i3rs-app/src/background_jobs.rs
index 6b6478a..aa80029 100644
--- a/crates/i3rs-app/src/background_jobs.rs
+++ b/crates/i3rs-app/src/background_jobs.rs
@@ -3,9 +3,11 @@ use std::sync::Arc;
 
 use crate::state::{ChannelStats, DownsampleSeriesKey, compute_channel_stats};
 use i3rs_core::{
-    ChannelData, DownsampledPoint, Lap, LdFile, LdxFile, TrackData, detect_laps, downsample_minmax,
-    evaluate_expression_with_aliases, extract_gps_track, find_ldx_for_ld,
+    ChannelData, DownsampledPoint, Lap, LdFile, LdxFile, TrackData, detect_laps,
+    evaluate_expression_with_aliases, find_ldx_for_ld,
 };
+#[cfg(not(target_arch = "wasm32"))]
+use i3rs_core::{downsample_minmax, extract_gps_track};
 
 pub struct LoadedSession {
     pub file_name: String,
@@ -180,6 +182,7 @@ fn perform_decode_physical_channel(
     })
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 fn perform_build_track_data(ld: Arc<LdFile>) -> Option<TrackData> {
     let _perf = crate::perf_metrics::scope("track-map draw");
     extract_gps_track(&ld)
@@ -201,6 +204,7 @@ fn perform_evaluate_math_channel(
     })
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 fn perform_build_downsampled_series(
     data: Arc<[f64]>,
     freq: u16,
diff --git a/crates/i3rs-app/src/panels/graph.rs b/crates/i3rs-app/src/panels/graph.rs
index 0b8ae2f..8b753b2 100644
--- a/crates/i3rs-app/src/panels/graph.rs
+++ b/crates/i3rs-app/src/panels/graph.rs
@@ -2721,7 +2721,14 @@ impl GraphPanel {
 
                 let picker_ctx = viewport_ui.ctx().clone();
                 let ui = &mut *viewport_ui;
-                ui.label("Channels");
+                ui.horizontal(|ui| {
+                    ui.label("Channels");
+                    ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+                        if ui.button("Close").clicked() {
+                            open = false;
+                        }
+                    });
+                });
                 ui.small(
                     "Drag rows onto the drop lines to reorder them or move them into another graph.",
                 );

From 5eb954862d8af4968b874c7be4be05eb548e5c79 Mon Sep 17 00:00:00 2001
From: Zachary Friss <friss@frissdesigns.com>
Date: Thu, 23 Apr 2026 11:13:43 -0400
Subject: [PATCH 2/2] bump app packager version

---
 crates/i3rs-app/Packager.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/i3rs-app/Packager.toml b/crates/i3rs-app/Packager.toml
index 1a9ed48..18ce6ef 100644
--- a/crates/i3rs-app/Packager.toml
+++ b/crates/i3rs-app/Packager.toml
@@ -1,6 +1,6 @@
 product-name = "i3rs"
 name = "i3rs-app"
-version = "0.4.0"
+version = "0.5.0"
 identifier = "io.github.friss.i3rs"
 publisher = "i3rs contributors"
 authors = ["i3rs contributors"]
