fix

Author: sempruijs

.DS_Store

@@ -715,7 +715,7 @@ pub fn CommandPalette(
         }
     });
 
-    // Set up global keyboard handling when palette is open
+    // Set up global keyboard handling when palette is open with proper cleanup
     let nav = navigate.clone();
     Effect::new(move |_| {
         if is_open.get() {
@@ -728,6 +728,10 @@ pub fn CommandPalette(
                         set_selected_index.set(0);
                     }
                     "Enter" => {
+                        // Double-check that palette is still open before processing
+                        if !is_open.get() {
+                            return; // Palette closed, don't process Enter
+                        }
                         e.prevent_default();
                         let results = filtered_results.get();
                         if !results.is_empty() {
@@ -767,8 +771,11 @@ pub fn CommandPalette(
                 }
             };
 
-            let _cleanup = window_event_listener(leptos::ev::keydown, handle_keydown);
-            // cleanup will happen when effect re-runs or component unmounts
+            let cleanup = window_event_listener(leptos::ev::keydown, handle_keydown);
+            on_cleanup(move || {
+                // Explicitly clean up when palette closes
+                drop(cleanup);
+            });
         }
     });
 
@@ -785,7 +792,8 @@ pub fn CommandPalette(
         }
     });
 
-    // Handle navigation
+    // Handle navigation - process immediately regardless of palette state
+    // Navigation should happen even after palette closes to complete the user's action
     Effect::new(move |_| {
         if let Some(path) = navigate_to.get() {
             // Debug log to track navigation
@@ -986,7 +994,7 @@ pub fn CommandPalette(
                                                             SearchResult::RecentChapter { .. } => {
                                                                 view! {
                                                                     <div class="text-xs opacity-75 mt-1 flex items-center">
-                                                                        <svg class="w-3 h-3 mr-1" fill="currentColor" viewBox="0 0 20 20">
+                                                                        <svg class="w-2 h-2 mr-1" fill="currentColor" viewBox="0 0 20 20">
                                                                             <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm1-12a1 1 0 10-2 0v4a1 1 0 00.293.707l2.828 2.829a1 1 0 101.415-1.415L11 9.586V6z" clip-rule="evenodd"></path>
                                                                         </svg>
                                                                         "Recent chapter"

site/.DS_Store

@@ -176,10 +176,16 @@ fn reference_to_url(reference: &Reference) -> String {
     // Convert canonical book name back to display book name used in the Bible
     let display_book_name = get_display_book_name(&reference.to_book_name);
     let encoded_book = encode(&display_book_name);
+    
+    // Ensure chapter and verse are valid positive numbers
+    let chapter = reference.to_chapter.max(1);
+    let verse_start = reference.to_verse_start.max(1);
+    
     if let Some(end_verse) = reference.to_verse_end {
-        format!("/{}/{}?verses={}-{}", encoded_book, reference.to_chapter, reference.to_verse_start, end_verse)
+        let verse_end = end_verse.max(verse_start);
+        format!("/{}/{}?verses={}-{}", encoded_book, chapter, verse_start, verse_end)
     } else {
-        format!("/{}/{}?verses={}", encoded_book, reference.to_chapter, reference.to_verse_start)
+        format!("/{}/{}?verses={}", encoded_book, chapter, verse_start)
     }
 }
 
@@ -265,6 +271,11 @@ pub fn CrossReferencesSidebar(
     let (_sidebar_has_focus, set_sidebar_has_focus) = signal(false);
     let navigate = use_navigate();
 
+    // Use a simple Arc<AtomicBool> for disposal tracking that doesn't rely on reactive system
+    use std::sync::atomic::{AtomicBool, Ordering};
+    use std::sync::Arc;
+    let is_disposed = Arc::new(AtomicBool::new(false));
+    
     // Convert display book name (e.g. "I Samuël") to canonical English name (e.g. "1 Samuel") 
     // for cross-reference lookup
     let canonical_book_name = get_canonical_book_name(&book_name);
@@ -351,24 +362,32 @@ pub fn CrossReferencesSidebar(
     });
 
     // Keyboard navigation for references - with comprehensive safety checks and debouncing
+    let is_disposed_clone = is_disposed.clone();
+    let _component_book_name = book_name.clone();
+    let _component_chapter = chapter;
+    let _component_verse = verse;
     let handle_keydown = move |e: KeyboardEvent| {
-        // Don't handle navigation when command palette is open (let palette handle it)
-        if palette_open.get() {
+        // Early exit if component is disposed
+        if is_disposed_clone.load(Ordering::Relaxed) {
             return;
         }
 
-        // Only handle specific Ctrl combinations to avoid conflicts with vim navigation
-        if !e.ctrl_key() {
-            return; // Let vim navigation handle non-Ctrl keys
-        }
 
-        // Only handle navigation when references are available and we're specifically targeting cross-refs
-        if !sorted_references.get().is_some_and(|refs| !refs.is_empty()) {
+        // Don't handle navigation when command palette is open (let palette handle it)
+        if palette_open.get() {
             return;
         }
 
-        // Only handle Ctrl+J and Ctrl+K specifically for cross-references
-        if !matches!((e.key().as_str(), e.ctrl_key()), ("j", true) | ("k", true)) {
+        // Safe access to sorted_references with disposal check
+        let refs = match std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
+            sorted_references.get()
+        })) {
+            Ok(Some(refs)) if !refs.is_empty() => refs,
+            _ => return, // Component is disposed or no references available
+        };
+        
+        // Only handle specific keys: Ctrl+J, Ctrl+K for navigation, or Enter for selection
+        if !matches!((e.key().as_str(), e.ctrl_key()), ("j", true) | ("k", true) | ("Enter", false)) {
             return;
         }
 
@@ -377,11 +396,6 @@ pub fn CrossReferencesSidebar(
             return; // Skip if already processing navigation
         }
 
-        // Get current references safely with additional checks
-        let refs = match sorted_references.get() {
-            Some(refs) if !refs.is_empty() => refs,
-            _ => return, // No references available
-        };
 
         // Bounds check current selection before processing with recovery
         let current = selected_reference_index.get();
@@ -463,16 +477,18 @@ pub fn CrossReferencesSidebar(
             ("Enter", false, false) => {
                 // Enter: Navigate to selected reference with bounds checking
                 e.prevent_default();
+                web_sys::console::log_1(&format!("Enter pressed, current index: {}, refs length: {}", current, refs.len()).into());
                 if let Some(reference) = refs.get(current) {
                     let reference_url = reference_to_url(reference);
+                    web_sys::console::log_1(&format!("Navigating to: {}", reference_url).into());
                     navigate(&reference_url, NavigateOptions { scroll: false, ..Default::default() });
                     // Close sidebar on mobile when reference is selected
                     if is_mobile_screen() {
                         set_sidebar_open.set(false);
                         save_references_sidebar_open(false);
                     }
                 } else {
-                    web_sys::console::warn_1(&"Attempted to navigate to reference at invalid index".into());
+                    web_sys::console::warn_1(&format!("Attempted to navigate to reference at invalid index: {} (refs.len: {})", current, refs.len()).into());
                 }
                 set_is_navigating.set(false); // Clear navigation flag
             }
@@ -482,8 +498,14 @@ pub fn CrossReferencesSidebar(
         }
     };
 
-    // Add keyboard event listener - with proper bounds checking to prevent WASM errors
-    window_event_listener(ev::keydown, handle_keydown);
+    // Add keyboard event listener - with proper cleanup to prevent disposed reactive value access
+    let _cleanup = window_event_listener(ev::keydown, handle_keydown);
+    on_cleanup(move || {
+        // Mark component as disposed to prevent reactive value access
+        is_disposed.store(true, Ordering::Relaxed);
+        // Cleanup is handled automatically when _cleanup is dropped
+        drop(_cleanup);
+    });
 
     view! {
         <div 

site/src/.DS_Store

@@ -245,15 +245,15 @@ where
                 // Add reference and link
                 copy_text.push_str("\n\n");
 
-                let book_name = context.current_chapter.name
-                    .split_whitespace()
-                    .next()
-                    .unwrap_or("");
-                let translated_book_name = self.get_translated_book_name(book_name);
-                let chapter_num = context.current_chapter.name
-                    .split_whitespace()
-                    .nth(1)
-                    .unwrap_or("1");
+                // Extract book name from chapter name (everything except the last word which is the chapter number)
+                let name_parts: Vec<&str> = context.current_chapter.name.split_whitespace().collect();
+                let book_name = if name_parts.len() > 1 {
+                    name_parts[..name_parts.len() - 1].join(" ")
+                } else {
+                    context.current_chapter.name.clone()
+                };
+                let translated_book_name = self.get_translated_book_name(&book_name);
+                let chapter_num = context.current_chapter.chapter.to_string();
 
                 // Format reference
                 if verse_ranges.len() == 1 && verse_ranges[0].start == verse_ranges[0].end {
@@ -272,7 +272,7 @@ where
 
                 // Add link
                 copy_text.push('\n');
-                let book_name_url = book_name.replace(' ', "_").to_lowercase();
+                let book_name_url = urlencoding::encode(&book_name);
                 let verses_param = context.search_params
                     .split("verses=")
                     .nth(1)

site/src/components/command_palette.rs

@@ -256,30 +256,17 @@ fn BibleWithSidebar() -> impl IntoView {
                                 }
                             )
                             on:click=move |_| {
-                                if cross_references_data.get().is_some() {
-                                    set_is_right_sidebar_open.update(|open| {
-                                        *open = !*open;
-                                        save_references_sidebar_open(*open);
-                                    });
-                                } else {
-                                    // Show sidebar with helpful message
-                                    set_is_right_sidebar_open.set(true);
-                                    save_references_sidebar_open(true);
-                                }
+                                // Always toggle like the "r" key does
+                                set_is_right_sidebar_open.update(|open| {
+                                    *open = !*open;
+                                    save_references_sidebar_open(*open);
+                                });
                             }
                             aria-label=move || {
-                                if cross_references_data.get().is_some() {
-                                    if is_right_sidebar_open.get() { "Hide cross-references" } else { "Show cross-references" }
-                                } else {
-                                    "Show references help"
-                                }
+                                if is_right_sidebar_open.get() { "Hide cross-references" } else { "Show cross-references" }
                             }
                             title=move || {
-                                if cross_references_data.get().is_some() {
-                                    if is_right_sidebar_open.get() { "Hide cross-references" } else { "Show cross-references" }
-                                } else {
-                                    "References (select a verse first)"
-                                }
+                                if is_right_sidebar_open.get() { "Hide cross-references" } else { "Show cross-references" }
                             }
                         >
                             <svg

site/src/components/cross_references_sidebar.rs

@@ -9,7 +9,7 @@ pub fn get_translations() -> Vec<BibleTranslation> {
             wikipedia: String::from("https://nl.wikipedia.org/wiki/Statenvertaling"),
             release_year: 1637,
             languages: vec![Language::Dutch],
-            iagon: String::from("https://gw.iagon.com/api/v2/storage/shareable/link/Njg4NjlmY2VlMTNjNGI2YzhhMmU3MzQx:NWFlN2IwYmIyZDQ0OWI3OTQ1ZmJhYWI4NGFjODJkYjYyMmM1MWJkZmEzYmI1NTA1NzgyZWEwNGQwOGMyMGM3MQ"),
+            iagon: String::from("https://gw.iagon.com/api/v2/storage/shareable/link/Njg5MjEyOTM0NzVmZTAwZjg3Y2VjN2Iy:MjhiNDNiOTMyNDllYTAwMzRmYWM4ZTdmOTdlZDU3NGExNzQxNjA4MzBiNzU3MThmNjE5ZGEzODZiNjVlOWE2MA"),
         },
         BibleTranslation {
             name: String::from("Petrus Canisiusvertaling"),
@@ -18,7 +18,7 @@ pub fn get_translations() -> Vec<BibleTranslation> {
             wikipedia: String::from("https://nl.wikipedia.org/wiki/Petrus_Canisiusvertaling"),
             release_year: 1939,
             languages: vec![Language::Dutch],
-            iagon: String::from("https://gw.iagon.com/api/v2/storage/shareable/link/Njg4NjYwZTZlMTNjNGI2YzhhMmU0Zjc0:MGYyYTlkYmRiZDhhNThjYjRmNzk4NzA2ODZkODY0M2NlMzJjZDRkMjM3YWJmNjQ5MWU4NmFkMTRmNDMwZWMzYQ"),
+            iagon: String::from("https://gw.iagon.com/api/v2/storage/shareable/link/Njg5MjEyOGY0NzVmZTAwZjg3Y2VjN2Iw:N2U3ZTg1MTkxMmFiZGY5NTU0ZjM5MTdhZThkMDIzYWYxZDg4ZDQ1N2EyMDA1NzhiZWRiYmY4NmUzZTA3ZWIyOA"),
         },
         BibleTranslation {
             name: String::from("King james version"),
@@ -27,7 +27,16 @@ pub fn get_translations() -> Vec<BibleTranslation> {
             wikipedia: String::from("https://en.wikipedia.org/wiki/King_James_Version"),
             release_year: 1611,
             languages: vec![Language::English],
-            iagon: String::from("https://gw.iagon.com/api/v2/storage/shareable/link/Njg4NjYzMDBlMTNjNGI2YzhhMmU1Yzc2:MzI3ZTY3NjBmMDAwMzBlMDVlZGM3NGQxNjU5MDIxMDdlNTE0MDA2ZWJkNTRkMjAyZGJjZWE1ZTlhMTQzNmYzNg"),
+            iagon: String::from("https://gw.iagon.com/api/v2/storage/shareable/link/Njg5MjEyZGM0NzVmZTAwZjg3Y2VkNDU0:Yjc0MjAwNzMzN2RmM2UyMGVkZDgzYThiMWRjZWIxMjM0OTUwMjZhNDVhMWFkOGZmMThjOTU4NTUzMmUwY2FhYQ"),
+        },
+        BibleTranslation {
+            name: String::from("American King james version"),
+            short_name: String::from("akjv"),
+            description: String::from("The American King James Version (AKJV) is a modernized update of the original 1769 Oxford edition of the King James Bible. Created by Michael Peter Engelbrite, this version retains the literary beauty and structure of the original KJV while updating some archaic English words and spellings to make the text more accessible to contemporary readers. Importantly, the AKJV makes no changes to the underlying meaning of the scriptures, preserving the integrity and style of the King James tradition. It is in the public domain and widely used by those who appreciate the KJV but prefer a slightly more readable form."),
+            wikipedia: String::from("https://studybible.info/version/AKJV"),
+            release_year: 1999,
+            languages: vec![Language::English],
+            iagon: String::from("https://gw.iagon.com/api/v2/storage/shareable/link/Njg5MjEyZGI0NzVmZTAwZjg3Y2VkNDQ2:MWRjOGI2N2Y3OGE1MWY5MmU1YmMwYjhiZjY2NjM3ZWRkMjY0OWZiMWY4ZDg3MTZmMmU1ODViOTgwNDM4ZjU3Zg"),
         }
     ]
 }

site/src/instructions/processor.rs

@@ -0,0 +1,4 @@
+# sources
+
+There sources are hosted on [iagon](https://iagon.com/). These files are not read by the rust code directly but these files are published and fetched by the rust code.
+If you want to use these for your own bible project feel free to do so.