From 0b1df4fe48e00b40e9abd2180a064ec80277b188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felipe=20Ba=C3=B1ados=20Schwerter?= <banadoss@ualberta.ca>
Date: Tue, 17 Dec 2024 22:49:09 +0000
Subject: [PATCH] Added refocusing after clicking on next wordnet sense

---
 frontend/index.js                                 | 15 +++++++++++++++
 .../templates/morphodict/wordnet-results.html     | 10 ++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/frontend/index.js b/frontend/index.js
index 0cf9dbd03..14a5a586a 100644
--- a/frontend/index.js
+++ b/frontend/index.js
@@ -70,6 +70,7 @@ document.addEventListener("DOMContentLoaded", () => {
   } else if (route === "/search") {
     // Search page
     prepareSearchResults(getSearchResultList());
+    setupRefocus();
   } else if (route.match(/^[/]word[/].+/)) {
     // Word detail/paradigm page. This one has the 🔊 button.
     setSubtitle(getEntryHead());
@@ -330,3 +331,17 @@ function createAudioButton(recordingURL, element) {
 function getSearchResultList() {
   return document.getElementById("search-result-list");
 }
+
+function setupRefocus(){
+  // add an action on click to refocus when data-md-focus is available
+  document.querySelectorAll("[data-md-focus]").forEach((object) => {
+    let focus_obj = document.getElementById(object.getAttribute("data-md-focus"))
+    focus_obj.addEventListener("shown.bs.collapse", function(){
+      focus_obj.scrollIntoView({
+        beahior:"smooth",
+        block:"start",
+        inline:"start"
+      });
+    })
+  })
+}
\ No newline at end of file
diff --git a/src/morphodict/frontend/templates/morphodict/wordnet-results.html b/src/morphodict/frontend/templates/morphodict/wordnet-results.html
index 8534059a4..1fb0db67e 100644
--- a/src/morphodict/frontend/templates/morphodict/wordnet-results.html
+++ b/src/morphodict/frontend/templates/morphodict/wordnet-results.html
@@ -7,12 +7,12 @@ <h3>Messages from search run</h3>
             <pre>{{ verbose_messages }}</pre>
         </li>
     {% endif %}
-    <div id="resultsContainer">
+    <div id="resultsContainer" style="scroll-behavior: smooth;">
     {% for result in search_results %}
     {% with has_more=search_results|has_next:forloop.counter0 %}
     {% with has_previous=search_results|has_previous:forloop.counter0 %}
     
-    <div class="synset" style="background-color: var(--menu-hover-bg-color); border: 4px solid var(--prose-title-color); border-radius:5px; padding: 10px; margin-left:10px; margin-right:10px; margin-top:.5cm; margin-bottom:.5cm;">
+    <div id="result-synset-{{result.wn_entry.nltk_name}}" class="synset" style="background-color: var(--menu-hover-bg-color); border: 4px solid var(--prose-title-color); border-radius:5px; padding: 10px; margin-left:10px; margin-right:10px; margin-top:.5cm; margin-bottom:.5cm;">
         <a name="result-synset-{{result.wn_entry.nltk_name}}"></a>
         <section class="prose box box--spaced">
             <h2 class="prose__section-title">{{result.wn_entry.numbering}}. {{result.wn_entry.original_str}} ({% relabel_one result.wn_entry.paren_pos %})</h2>
@@ -27,13 +27,15 @@ <h2 class="prose__section-title">{{result.wn_entry.numbering}}. {{result.wn_entr
             <div style="display:flex; justify-content:flex-end;">
             {% if has_previous %}
             {% with previous_element=search_results|previous:forloop.counter0 %}
-            <a href="#result-synset-{{previous_element.wn_entry.nltk_name}}" style="text-decoration:none;" data-bs-toggle="collapse" data-bs-target="#synset-results-{{previous_element.wn_entry.nltk_name}}" aria-expanded="false" aria-controls="synset-results-{{previous_element.wn_entry.nltk_name}}" style="text-align:right;">⏪</a>
+            <label for="result-synset-{{previous_element.wn_entry.nltk_name}}" style="text-decoration:none;" data-bs-toggle="collapse" data-bs-target="#synset-results-{{previous_element.wn_entry.nltk_name}}" aria-expanded="false" aria-controls="synset-results-{{previous_element.wn_entry.nltk_name}}" style="text-align:right;"
+            data-md-focus="result-synset-{{previous_element.wn_entry.nltk_name}}">⏪</label>
             {% endwith %}
             {% endif %}
             <a href="#" class="expand-accordion" style="text-decoration:none;" data-bs-toggle="collapse" data-bs-target="#synset-results-{{result.wn_entry.nltk_name}}" aria-expanded="{%if forloop.counter0 == 0 %}true{%else%}false{%endif%}" aria-controls="synset-results-{{result.wn_entry.nltk_name}}"></a>
             {% if has_more %}
             {% with next_element=search_results|next:forloop.counter0 %}
-            <a href="#result-synset-{{next_element.wn_entry.nltk_name}}" style="text-decoration:none;" data-bs-toggle="collapse" data-bs-target="#synset-results-{{next_element.wn_entry.nltk_name}}" aria-expanded="false" aria-controls="synset-results-{{next_element.wn_entry.nltk_name}}" style="text-align:right;">⏩</a>
+            <label class="refocus-accordion" for="result-synset-{{next_element.wn_entry.nltk_name}}" style="text-decoration:none;" data-bs-toggle="collapse" data-bs-target="#synset-results-{{next_element.wn_entry.nltk_name}}" aria-expanded="false" aria-controls="synset-results-{{next_element.wn_entry.nltk_name}}" style="text-align:right;"
+            data-md-focus="result-synset-{{next_element.wn_entry.nltk_name}}">⏩</label>
             {% endwith %}
             {% endif %}
             </div>