Cargo.lock

@@ -2965,7 +2965,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-notmuch"
-version = "0.9.9"
+version = "0.9.8"
 dependencies = [
  "itertools 0.14.0",
  "log",
@@ -2980,14 +2980,14 @@ dependencies = [
 
 [[package]]
 name = "letterbox-procmail2notmuch"
-version = "0.9.9"
+version = "0.9.8"
 dependencies = [
  "anyhow",
 ]
 
 [[package]]
 name = "letterbox-server"
-version = "0.9.9"
+version = "0.9.8"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -3030,7 +3030,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-shared"
-version = "0.9.9"
+version = "0.9.8"
 dependencies = [
  "build-info",
  "letterbox-notmuch",
@@ -3039,7 +3039,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-web"
-version = "0.9.9"
+version = "0.9.8"
 dependencies = [
  "build-info",
  "build-info-build",

Cargo.toml

@@ -8,7 +8,7 @@ authors = ["Bill Thiede <git@xinu.tv>"]
 edition = "2021"
 license = "UNLICENSED"
 publish = ["xinu"]
-version = "0.9.9"
+version = "0.9.8"
 repository = "https://git.z.xinu.tv/wathiede/letterbox"
 
 [profile.dev]

server/Cargo.toml

@@ -48,8 +48,8 @@ urlencoding = "2.1.3"
 #xtracing = { path = "../../xtracing" }
 #xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" }
 xtracing = { version = "0.3.0", registry = "xinu" }
-letterbox-notmuch = { version = "0.9.9", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.9.8", path = "../notmuch", registry = "xinu" }
-letterbox-shared = { version = "0.9.9", path = "../shared", registry = "xinu" }
+letterbox-shared = { version = "0.9.8", path = "../shared", registry = "xinu" }
 
 [build-dependencies]
 build-info-build = "0.0.40"

shared/Cargo.toml

@@ -12,5 +12,5 @@ version.workspace = true
 
 [dependencies]
 build-info = "0.0.40"
-letterbox-notmuch = { version = "0.9.9", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.9.8", path = "../notmuch", registry = "xinu" }
 serde = { version = "1.0.147", features = ["derive"] }

web/Cargo.toml

@@ -33,8 +33,8 @@ wasm-bindgen = "=0.2.100"
 uuid = { version = "1.13.1", features = [
   "js",
 ] } # direct dep to set js feature, prevents Rng issues
-letterbox-shared = { version = "0.9.9", path = "../shared", registry = "xinu" }
+letterbox-shared = { version = "0.9.8", path = "../shared", registry = "xinu" }
-letterbox-notmuch = { version = "0.9.9", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.9.8", path = "../notmuch", registry = "xinu" }
 seed_hooks = { version = "0.4.0", registry = "xinu" }
 strum_macros = "0.27.1"
 
@@ -50,6 +50,4 @@ features = [
   "MediaQueryList",
   "Navigator",
   "Window",
-  "History",
-  "ScrollRestoration",
 ]

web/src/state.rs

@@ -29,12 +29,6 @@ pub fn unread_query() -> &'static str {
 pub fn init(url: Url, orders: &mut impl Orders<Msg>) -> Model {
     let version = letterbox_shared::build_version(bi);
     info!("Build Info: {}", version);
-    // Disable restoring to scroll position when navigating
-    window()
-        .history()
-        .expect("couldn't get history")
-        .set_scroll_restoration(web_sys::ScrollRestoration::Manual)
-        .expect("failed to set scroll restoration to manual");
     if url.hash().is_none() {
         orders.request_url(urls::search(unread_query(), 0));
     } else {

web/src/view/mod.rs

@@ -198,7 +198,8 @@ fn catchup_view(
                 "p-4",
                 "border-b",
                 "border-gray-500",
-                "bg-black/50",
+                "bg-black",
+                "opacity-50",
             ],
             div![
                 C!["absolute", "top-0", "right-4", "text-gray-500", "p-4"],
@@ -223,28 +224,20 @@ fn catchup_view(
                 "p-4",
                 "border-t",
                 "border-gray-500",
-                "bg-black/50",
+                "bg-black",
+                "opacity-50",
             ],
             button![
                 tw_classes::button(),
                 span![i![C!["far", "fa-envelope"]]],
                 span![C!["pl-2"], "Keep unread"],
-                ev(Ev::Click, |_| Msg::CatchupKeepUnread)
+                ev(Ev::Click, move |_| Msg::CatchupKeepUnread)
-            ],
-            button![
-                tw_classes::button(),
-                span![i![C!["fas", "fa-house"]]],
-                span![C!["pl-2"], "Go home"],
-                ev(Ev::Click, |_| Msg::MultiMsg(vec![
-                    Msg::CatchupExit,
-                    Msg::GoToSearchResults
-                ]))
             ],
             button![
                 tw_classes::button_with_color("bg-green-800", "hover:bg-neutral-700"),
                 span![i![C!["far", "fa-envelope-open"]]],
                 span![C!["pl-2"], "Mark as read"],
-                ev(Ev::Click, |_| Msg::CatchupMarkAsRead)
+                ev(Ev::Click, move |_| Msg::CatchupMarkAsRead)
             ]
         ],
         reading_progress(read_completion_ratio)