From 5b27952b34fa47652a6cf51e2272d8ee18b5c151 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 4 Dec 2021 09:48:55 -0800
Subject: [PATCH 1/6] Use html details instead of javascript menus

---
 bookwyrm/static/css/bookwyrm.css            |  4 ++++
 bookwyrm/templates/components/dropdown.html | 17 ++++++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 0d280fd5..3d9db301 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -115,6 +115,10 @@ input[type=file]::file-selector-button:hover {
     color: #363636;
 }
 
+details[open] .dropdown-menu {
+    display: block !important;
+}
+
 /** Shelving
  ******************************************************************************/
 
diff --git a/bookwyrm/templates/components/dropdown.html b/bookwyrm/templates/components/dropdown.html
index 98291bc9..b3710271 100644
--- a/bookwyrm/templates/components/dropdown.html
+++ b/bookwyrm/templates/components/dropdown.html
@@ -2,25 +2,20 @@
 {% load utilities %}
 
 {% with 0|uuid as uuid %}
-<div
+<details
     id="menu_{{ uuid }}"
     class="
         dropdown control
         {% if right %}is-right{% endif %}
     "
 >
-    <button
-        class="button dropdown-trigger pulldown-menu {{ class }}"
-        type="button"
-        aria-expanded="false"
-        aria-haspopup="true"
-        aria-controls="menu_options_{{ uuid }}"
-        data-controls="menu_{{ uuid }}"
+    <summary
+        class="button control dropdown-trigger pulldown-menu {{ class }}"
     >
         {% block dropdown-trigger %}{% endblock %}
-    </button>
+    </summary>
 
-    <div class="dropdown-menu">
+    <div class="dropdown-menu control">
         <ul
             id="menu_options_{{ uuid }}"
             class="dropdown-content p-0 is-clipped"
@@ -29,6 +24,6 @@
             {% block dropdown-list %}{% endblock %}
         </ul>
     </div>
-</div>
+</details>
 {% endwith %}
 {% endspaceless %}

From b6106691ef85afe7ab15b4f1b239e676503aad9d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 4 Dec 2021 09:57:45 -0800
Subject: [PATCH 2/6] Force dropdown menus to always visible

---
 bookwyrm/static/css/bookwyrm.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 3d9db301..4f4d2efc 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -115,7 +115,7 @@ input[type=file]::file-selector-button:hover {
     color: #363636;
 }
 
-details[open] .dropdown-menu {
+details .dropdown-menu {
     display: block !important;
 }
 

From f98fe0348a041c1b230e02a1acee4421211808dc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 4 Dec 2021 11:45:02 -0800
Subject: [PATCH 3/6] Fixes merge error

---
 bookwyrm/static/css/bookwyrm.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 145bf439..7e2b24bc 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -117,6 +117,7 @@ input[type=file]::file-selector-button:hover {
 
 details .dropdown-menu {
     display: block !important;
+}
 
 summary::marker {
     content: none;

From 7050013144eb410f098fa0b627c3d34285393663 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 4 Dec 2021 11:51:57 -0800
Subject: [PATCH 4/6] Close menus when the rest of the page is clicked

Ce-authored-by: Joachim <joachim.robert@protonmail.com>
---
 bookwyrm/static/css/bookwyrm.css | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 7e2b24bc..0e812e2a 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -119,6 +119,15 @@ details .dropdown-menu {
     display: block !important;
 }
 
+details.dropdown[open] summary.dropdown-trigger::before {
+    content: "";
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+}
+
 summary::marker {
     content: none;
 }

From ba34e11fb01e7253dcf7baf0173dbcdbed5ddf81 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 4 Dec 2021 12:11:29 -0800
Subject: [PATCH 5/6] Fixes auto-closing menu

---
 bookwyrm/static/js/status_cache.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js
index 418b7dee..dbc238c4 100644
--- a/bookwyrm/static/js/status_cache.js
+++ b/bookwyrm/static/js/status_cache.js
@@ -210,10 +210,10 @@ let StatusCache = new class {
             .forEach(item => BookWyrm.addRemoveClass(item, "is-hidden", true));
 
         // Close menu
-        let menu = button.querySelector(".dropdown-trigger[aria-expanded=true]");
+        let menu = button.querySelector("details[open]");
 
         if (menu) {
-            menu.click();
+            menu.removeAttribute("open");
         }
     }
 

From 89c23c3e0c20424295ce0afd8fc34ea7f3abf173 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 5 Dec 2021 09:07:17 -0800
Subject: [PATCH 6/6] More thoroughly checking if title is set to avoid error

---
 bookwyrm/utils/isni.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/utils/isni.py b/bookwyrm/utils/isni.py
index 65d20c85..180c5e38 100644
--- a/bookwyrm/utils/isni.py
+++ b/bookwyrm/utils/isni.py
@@ -104,12 +104,14 @@ def find_authors_by_name(name_string, description=False):
             # otherwise just grab the first title listing
             titles.append(element.find(".//title"))
 
-            if titles is not None:
+            if titles:
                 # some of the "titles" in ISNI are a little ...iffy
                 # '@' is used by ISNI/OCLC to index the starting point ignoring stop words
                 # (e.g. "The @Government of no one")
                 title_elements = [
-                    e for e in titles if not e.text.replace("@", "").isnumeric()
+                    e
+                    for e in titles
+                    if hasattr(e, "text") and not e.text.replace("@", "").isnumeric()
                 ]
                 if len(title_elements):
                     author.bio = title_elements[0].text.replace("@", "")